Thu Jan 19 23:15:03 UTC 2012

1 files changed, 17 insertions, 16 deletions

diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD
index 7c61a3571..6c45b64d6 100644
--- a/multilib/jack2-multilib/PKGBUILD
+++ b/multilib/jack2-multilib/PKGBUILD
@@ -14,18 +14,19 @@ pkgbase=jack2-multilib
 pkgname=('jack2-multilib' 'jack2-dbus-multilib')
 #pkgname= # single build (overrides split)
 _tarname=jack
-pkgver=1.9.7
+pkgver=1.9.8
 pkgrel=1
 arch=('x86_64')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'libffado' 'libsamplerate' 'celt'
-             'doxygen' 'gcc-multilib' 'lib32-dbus-core')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2"
+makedepends=('python2' 'doxygen' 'libffado'
+             'libsamplerate' 'lib32-dbus-core' 'lib32-celt'
+             'gcc-multilib')
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
         '99-audio.conf'
         '40-hpet-permissions.rules')
-md5sums=('9759670feecbd43eeccf1c0f743ec199'
+md5sums=('1dd2ff054cab79dfc11d134756f27165'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
          '471aad533ff56c5d3cbbf65ce32cadef')
 
@@ -52,7 +53,9 @@ _mklinks() {
 }
 
 build() {
-  cd "$srcdir"
+  cd "$srcdir/$_tarname-$pkgver"
+
+  export LINKFLAGS="$LDFLAGS"
 
   # fix doxygen building
   sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
@@ -83,16 +86,15 @@ package_jack2-multilib() {
   ! _isbuild jack2-multilib && return 0
 
   pkgdesc="The next-generation JACK with SMP support & mixed mode"
-  depends=('libsamplerate' 'gcc-libs-multilib')
+  depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs')
   optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
               'lib32-dbus-core: jackdbus'
               'python2: jack_control')
   conflicts=('jack' 'jack2' 'lib32-jack')
-  provides=('jack' 'jack2' 'lib32-jack' 'jackmp'
-            'jackdmp' 'jackdbus' 'lib32-jack2')
+  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus'
+            'jack2' 'lib32-jack' 'lib32-jack2')
 
-  cd "$srcdir/$_tarname-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
@@ -116,15 +118,14 @@ package_jack2-dbus-multilib() {
   ! _isbuild jack2-dbus-multilib && return 0
 
   pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)"
-  depends=('libsamplerate' 'lib32-dbus-core')
+  depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs')
   optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
               'python2: jack_control')
   conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib')
-  provides=('jack' 'jack2' 'lib32-jack' 'jack2-multilib'
-            'jackmp' 'jackdmp' 'jackdbus' 'lib32-jack2')
+  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus'
+            'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2')
 
-  cd "$srcdir/$_tarname-dbus-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
 
   python2 waf install --destdir="$pkgdir"