diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-19 13:24:55 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-19 13:24:55 +0100 |
| commit | 48e718656f83ad8800caf503031b4efa0e49e38a (patch) | |
| tree | 2e415caf08da7fcf1724f2992cd47c99a7778bd6 /community/jack2 | |
| parent | 332060e036d38d6213201ed79b5d263241ca1825 (diff) | |
| parent | 19f11e0c4bbeefd65f85546a361e18532b60416a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtypist/PKGBUILD
community/jack2/PKGBUILD
community/linux-tools/PKGBUILD
community/udevil/PKGBUILD
extra/ntp/PKGBUILD
extra/pulseaudio/PKGBUILD
Diffstat (limited to 'community/jack2')
| -rw-r--r-- | community/jack2/PKGBUILD | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 3611b9eca..d3e1155a9 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77160 2012-10-06 07:11:43Z schiv $ +# $Id: PKGBUILD 81344 2012-12-18 10:05:59Z 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') #pkgname= # single build (overrides split) _tarname=jack -pkgver=1.9.8 -pkgrel=4 +pkgver=1.9.9.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'doxygen' 'libffado' - 'libsamplerate' 'dbus-core' 'celt') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('python2' 'doxygen' - 'libsamplerate' 'dbus-core' 'celt') -source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" +makedepends=('python2' 'celt' + 'libsamplerate' 'dbus-core') +[ "$CARCH" != "mips64el" ] && makedepends+=('libffado') +source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2" '99-audio.conf' - '40-hpet-permissions.rules' - 'ffado_setbuffsize-jack2.patch') -md5sums=('1dd2ff054cab79dfc11d134756f27165' + '40-hpet-permissions.rules') +md5sums=('6c9de6b89db9d7076fa2ce222816cf4c' 'ae65b7c9ebe0fff6c918ba9d97ae342d' - '471aad533ff56c5d3cbbf65ce32cadef' - '1502d82fe2276d6f224fff6467a0b6f9') + '471aad533ff56c5d3cbbf65ce32cadef') _pyfix() { sed -i 's:bin/env python:bin/env python2:' \ @@ -41,8 +37,10 @@ _wafconf() { fi python2 waf configure --prefix=/usr \ --alsa \ - $firewire \ - --doxygen $@ + --firewire $@ + + # not building with doxygen + # see https://github.com/jackaudio/jack2/issues/22 } _isbuild() { @@ -50,15 +48,7 @@ _isbuild() { } build() { - cd "$srcdir/$_tarname-$pkgver" - - # backport firewire stuff - # - needed for setbuffsize feature in latest stable ffado - # from https://github.com/jackaudio/jack2/commit/96e0251 - ( - cd $_tarname-$pkgver - patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch" - ) + cd "$srcdir" # Some optimisation bug exists for current GCC # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 @@ -66,7 +56,8 @@ build() { export CXXFLAGS="$CFLAGS" # fix doxygen building - sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript + # TODO: report upstream, but redundant until gihub issue 22 resolves + #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript # we may do 2 different builds cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver @@ -104,7 +95,7 @@ package_jack2() { conflicts=('jack') provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') - cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver" + cd "$srcdir/$_tarname-$pkgver" python2 waf install --destdir="$pkgdir" @@ -132,7 +123,7 @@ package_jack2-dbus() { conflicts=('jack' 'jack2') provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') - cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver" + cd "$srcdir/$_tarname-dbus-$pkgver" python2 waf install --destdir="$pkgdir" |