[arch-commits] Commit in jack2/trunk (PKGBUILD)

[Ray Rashif]

    Date: Saturday, May 18, 2013 @ 22:01:22
  Author: schiv
Revision: 91077

upgpkg: jack2 1.9.9.5-3

close FS#35343

Modified:
  jack2/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-18 18:46:51 UTC (rev 91076)
+++ PKGBUILD	2013-05-18 20:01:22 UTC (rev 91077)
@@ -9,12 +9,12 @@
 #pkgname= # single build (overrides split)
 _tarname=jack
 pkgver=1.9.9.5
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'libffado' 'celt' 'libsamplerate')
+makedepends=('python2' 'libffado' 'celt' 'opus' 'libsamplerate')
 source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2"
         '99-audio.conf'
         '40-hpet-permissions.rules')
@@ -22,6 +22,10 @@
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
          '471aad533ff56c5d3cbbf65ce32cadef')
 
+_isbuild() {
+  printf "%s\n" ${pkgname[@]} | grep -qx $1
+}
+
 _pyfix() {
   sed -i 's:bin/env python:bin/env python2:' \
     "$pkgdir/usr/bin/jack_control"
@@ -36,25 +40,25 @@
   # see https://github.com/jackaudio/jack2/issues/22
 }
 
-_isbuild() {
-  printf "%s\n" ${pkgname[@]} | grep -qx $1
-}
-
-build() {
+prepare() {
   cd "$srcdir"
 
   # Some optimisation bug exists for current GCC
   # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
-  export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
-  export CXXFLAGS="$CFLAGS"
+  #export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
+  #export CXXFLAGS="$CFLAGS"
 
   # fix doxygen building
-  # TODO: report upstream, but redundant until gihub issue 22 resolves
+  # TODO: report upstream, but redundant until github 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
+}
 
+build() {
+  cd "$srcdir"
+
   # mixed dbus/classic build
   if _isbuild jack2; then
     cd $_tarname-$pkgver
@@ -78,7 +82,7 @@
   ! _isbuild jack2 && return 0
 
   pkgdesc="The next-generation JACK with SMP support"
-  depends=('libsamplerate' 'celt' 'libffado')
+  depends=('libsamplerate' 'celt' 'opus' 'libffado')
   optdepends=('python2: jack_control')
   conflicts=('jack')
   provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
@@ -103,7 +107,7 @@
   ! _isbuild jack2-dbus && return 0
 
   pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
-  depends=('libsamplerate' 'celt' 'libffado')
+  depends=('libsamplerate' 'celt' 'opus' 'libffado')
   optdepends=('python2: jack_control')
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')