From 5326d007b4e94498e9faf8fa22ac9736d624fe87 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:15:35 +0100 Subject: [PATCH] kdemultimedia: minor fixups, dropped _prefix variable --- .../trinity-kdemultimedia/PKGBUILD | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD index 12e75db87..b812735ba 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdemultimedia pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,13 +15,10 @@ options=('libtool' '!strip') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz' 'xine_artsplugin.patch') md5sums=('6d906b8a8fd0928e01ecd600175381c0' 'bb045d94e8dca80d73af4add43b7fc15') -_prefix=/opt/trinity - build() { - msg "Setting Trinity Environment variables" - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Patching..." patch -p0 -i ${srcdir}/xine_artsplugin.patch @@ -30,13 +27,12 @@ build() { cd "$srcdir/kdemultimedia" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in make -f admin/Makefile.common msg "Starting configure..." ./configure --with-qt-dir=${QTDIR} \ - --prefix=${_prefix} \ - --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ - --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \ + --prefix=${TDEDIR} \ --enable-closure \ --with-vorbis \ --with-alsa \ @@ -49,6 +45,8 @@ build() { --with-xine #--with-gstreamer #--with-akode \ + #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \ + #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \ msg "Building ${pkgname}..." make