diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
| commit | c8bd9200906149d53827aaa64e85a7008d51339f (patch) | |
| tree | 9e366130f0f7afde9d7a478b5c898d873aed0483 /community/jack2 | |
| parent | d9a9508e07a00015e2a2f278719a9665ff565961 (diff) | |
| parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_hook
testing/dmraid/dmraid_install
testing/e2fsprogs/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.pam
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xfce4-session/PKGBUILD
Diffstat (limited to 'community/jack2')
| -rw-r--r-- | community/jack2/PKGBUILD | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 1f876dec7..89e9d7a5d 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61228 2011-12-25 08:59:30Z schiv $ +# $Id: PKGBUILD 70089 2012-04-29 08:01:28Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,7 +9,7 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -84,8 +84,7 @@ package_jack2() { 'dbus-core: jackdbus' 'python2: jack_control') [ "$CARCH" = "mips64el" ] && \ - optdepends=('celt: NetJACK2 driver' - 'dbus-core: jackdbus' + optdepends=('dbus-core: jackdbus' 'python2: jack_control') conflicts=('jack') provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') @@ -103,7 +102,7 @@ package_jack2() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" } package_jack2-dbus() { @@ -114,8 +113,7 @@ package_jack2-dbus() { optdepends=('libffado: FireWire support' 'python2: jack_control') [ "$CARCH" = "mips64el" ] && \ - optdepends=('celt: NetJACK2 driver' - 'python2: jack_control') + optdepends=('python2: jack_control') conflicts=('jack' 'jack2') provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') @@ -129,7 +127,7 @@ package_jack2-dbus() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" } # vim:set ts=2 sw=2 et: |