diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-27 12:30:14 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-27 12:30:14 -0300 |
commit | ac84c0a6f7b12fcf77af9b7ed5c71a3949a35ec3 (patch) | |
tree | 1d06aac4a3c6b42643952e6aad303b9179669f5b /community/jack2 | |
parent | 259debb981a976da83ba1c9b93fb6e9ec1a68fe8 (diff) | |
parent | 342100843ef3e4379443c526403fac1b1cb6416a (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/ntp/PKGBUILD
extra/ortp/PKGBUILD
Diffstat (limited to 'community/jack2')
-rw-r--r-- | community/jack2/PKGBUILD | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index f457100d7..1f876dec7 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,8 +8,8 @@ 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' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -19,10 +19,10 @@ makedepends=('python2' 'doxygen' 'libffado' [ "$CARCH" = "mips64el" ] && \ makedepends=('python2' 'doxygen' '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') @@ -48,7 +48,7 @@ _isbuild() { } build() { - cd "$srcdir" + cd "$srcdir/$_tarname-$pkgver" # fix doxygen building sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript @@ -76,12 +76,11 @@ 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') [ "$CARCH" = "mips64el" ] && \ @@ -89,10 +88,9 @@ package_jack2() { '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" @@ -109,21 +107,19 @@ 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') [ "$CARCH" = "mips64el" ] && \ optdepends=('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" |