Mon Dec 26 23:14:57 UTC 2011

1 files changed, 14 insertions, 18 deletions

diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index c6b75a3b4..9507e7317 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60072 2011-12-04 18:08:53Z schiv $
+# $Id: PKGBUILD 61228 2011-12-25 08:59:30Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -8,18 +8,18 @@ pkgbase=jack2
 pkgname=('jack2' 'jack2-dbus')
 #pkgname= # single build (overrides split)
 _tarname=jack
-pkgver=1.9.7
-pkgrel=3
+pkgver=1.9.8
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
 makedepends=('python2' 'doxygen' 'libffado'
              'libsamplerate' 'dbus-core' 'celt')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2"
+source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
         '99-audio.conf'
         '40-hpet-permissions.rules')
-md5sums=('9759670feecbd43eeccf1c0f743ec199'
+md5sums=('1dd2ff054cab79dfc11d134756f27165'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
          '471aad533ff56c5d3cbbf65ce32cadef')
 
@@ -40,7 +40,7 @@ _isbuild() {
 }
 
 build() {
-  cd "$srcdir"
+  cd "$srcdir/$_tarname-$pkgver"
 
   # fix doxygen building
   sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
@@ -68,19 +68,17 @@ build() {
 }
 
 package_jack2() {
-  ! _isbuild jack2 && return
+  ! _isbuild jack2 && return 0
 
   pkgdesc="The next-generation JACK with SMP support"
-  depends=('libsamplerate')
+  depends=('libsamplerate' 'celt')
   optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
               'dbus-core: jackdbus'
               'python2: jack_control')
   conflicts=('jack')
-  provides=('jack' 'jack-audio-connection-kit'
-            'jackmp' 'jackdmp' 'jackdbus')
+  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
@@ -97,18 +95,16 @@ package_jack2() {
 }
 
 package_jack2-dbus() {
-  ! _isbuild jack2-dbus && return
+  ! _isbuild jack2-dbus && return 0
 
   pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
-  depends=('libsamplerate' 'dbus-core')
+  depends=('libsamplerate' 'celt' 'dbus-core')
   optdepends=('libffado: FireWire support'
-              'celt: NetJACK2 driver'
               'python2: jack_control')
   conflicts=('jack' 'jack2')
-  provides=('jack' 'jack2' 'jack-audio-connection-kit'
-            'jackmp' 'jackdmp' 'jackdbus')
+  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
 
-  cd "$srcdir/$_tarname-dbus-$pkgver"
+  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
 
   python2 waf install --destdir="$pkgdir"