diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD index 2c925fccc..49d6b7aae 100644 --- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD @@ -1,45 +1,30 @@ -# Maintainer: Calvin Morrison +# Maintainer: Pawel 'l0ner' Soltys +# Contributor: Calvin Morrison pkgname=trinity-arts pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.com' license=('GPL') groups=('trinity-base') pkgdesc="Trinity arts Sound System and libraries" -depends=('audiofile' - 'alsa-lib' - 'libmad' - 'libvorbis' - 'trinity-tqtinterface') +depends=('trinity-tqtinterface' + 'audiofile' 'libmad' 'libvorbis' + 'glib2') makedepends=('pkgconfig' 'cmake') -conflicts=('trinity-arts') -replaces=('trinity-arts') -options=('libtool' '!strip') +conflicts=('kdemod3-arts') +options=('!libtool' '!emptydirs') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz) md5sums=('109124dabb1aaa9d44eb32e43b549142') -# set Qt location (not needed if profile.d/q3.sh present, set prefix (not used) -#_qtdir=/opt/qt -_builddir=build _prefix="/opt/trinity" build() { - msg "Setting PATH, CMAKE and Trinity Environment variables" - #if [[ -r /etc/profile.d/qt3.sh ]]; then - . /etc/profile.d/qt3.sh - # [[ -n $QTDIR ]] && _qtdir=$QTDIR - #else - # [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH - #fi - - # exports not required with /opt/qt/include in the right place - # export CMAKE_PREFIX_PATH=$QTDIR - # export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt - + . /etc/profile.d/qt3.sh + cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p build @@ -47,12 +32,8 @@ build() { msg "Starting cmake..." cmake ${srcdir}/dependencies/arts/ \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DQT_VERSION=3 || return 1 + -DCMAKE_INSTALL_PREFIX=${_prefix} -# -DQT_VERSION=3 \ -# -DWITH_QT3=ON \ -# -DQT_LIBRARY_DIRS=/opt/qt/lib msg "Building $pkgname..." make VERBOSE=1 @@ -61,10 +42,8 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" -# cd ${srcdir}/${_svnmod} cd ${srcdir}/build make DESTDIR="$pkgdir/" install -# rm -r ${srcdir}/${_svnmod} }