Tue Aug 2 04:35:55 UTC 2011

1 files changed, 28 insertions, 35 deletions

diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 31d0a03e3..b0c49a04d 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 43953 2011-04-01 08:09:21Z schiv $
+# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -8,25 +8,21 @@ pkgbase=jack2
 pkgname=('jack2' 'jack2-dbus')
 _tarname=jack
 pkgver=1.9.7
-pkgrel=1
-pkgdesc="The next-generation JACK with SMP support"
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://jackaudio.org/"
 license=('GPL')
-depends=('libsamplerate')
-makedepends=('python2' 'doxygen' 'libffado' 'celt-0.7' 'dbus-core')
-optdepends=('libffado: FireWire support'
-            'celt-0.7: NetJACK2 driver'
-            'python2: jack_control')
-provides=('jack=0.118.0' 'jack-audio-connection-kit=0.118.0' 'jackdbus'
-          'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
-conflicts=('jack')
-source=(http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2)
+makedepends=('python2' 'doxygen' 'libffado' 'celt'
+             'libsamplerate' 'dbus-core')
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2")
 md5sums=('9759670feecbd43eeccf1c0f743ec199')
 
 _pyfix() {
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/jack_control"
+  sed -i 's:bin/env python:bin/env python2:' "$pkgdir/usr/bin/jack_control"
+}
+
+_wafconf() {
+  python2 waf configure --prefix=/usr --alsa --firewire --doxygen $@
 }
 
 build() {
@@ -41,51 +37,48 @@ build() {
   # mixed dbus/classic build
   cd $_tarname-$pkgver
   msg2 "Running Mixed D-Bus/Classic build"
-
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --dbus \
-                        --classic \
-                        --firewire \
-                        --doxygen
-
+  _wafconf --classic --dbus
   python2 waf build $MAKEFLAGS
 
   # dbus-ONLY build
   cd ../$_tarname-dbus-$pkgver
   msg2 "Running D-Bus-only build"
-
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --dbus \
-                        --firewire \
-                        --doxygen
-
+  _wafconf --dbus
   python2 waf build $MAKEFLAGS
 }
 
 package_jack2() {
+  pkgdesc="The next-generation JACK with SMP support"
+  depends=('libsamplerate')
   optdepends=('libffado: FireWire support'
-              'celt-0.7: NetJACK2 driver'
+              'celt: NetJACK2 driver'
               'dbus-core: jackdbus'
               'python2: jack_control')
+  conflicts=('jack')
+  provides=('jack' 'jack-audio-connection-kit' 'jackdbus'
+            'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
 
   cd "$srcdir/$_tarname-$pkgver"
 
-  python2 waf install --destdir="$pkgdir/"
+  python2 waf install --destdir="$pkgdir"
 
   # fix for major python transition
   _pyfix
 }
 
 package_jack2-dbus() {
-  pkgdesc+=" (for D-Bus interaction only)"
-  depends+=('dbus-core')
-  conflicts+=('jack2')
+  pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
+  depends=('libsamplerate' 'dbus-core')
+  optdepends=('libffado: FireWire support'
+              'celt: NetJACK2 driver'
+              'python2: jack_control')
+  conflicts=('jack' 'jack2')
+  provides=('jack' 'jack2' 'jack-audio-connection-kit' 'jackdbus'
+            'jack-audio-connection-kit-mp' 'jackmp' 'jackdmp')
 
   cd "$srcdir/$_tarname-dbus-$pkgver"
 
-  python2 waf install --destdir="$pkgdir/"
+  python2 waf install --destdir="$pkgdir"
 
   _pyfix
 }