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

[Ray Rashif]

    Date: Thursday, February 4, 2016 @ 22:03:39
  Author: schiv
Revision: 160347

upgpkg: jack2 1.9.10-4

jack1 compat fix; FS#47839

Added:
  jack2/trunk/jack1compat.diff
Modified:
  jack2/trunk/PKGBUILD

------------------+
 PKGBUILD         |   12 +++++++++---
 jack1compat.diff |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-04 20:24:16 UTC (rev 160346)
+++ PKGBUILD	2016-02-04 21:03:39 UTC (rev 160347)
@@ -9,7 +9,7 @@
 #pkgname= # single build (overrides split)
 _tarname=jack
 pkgver=1.9.10
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
@@ -17,10 +17,12 @@
 makedepends=('python2-dbus' 'libffado' 'celt' 'opus' 'libsamplerate')
 source=("https://dl.dropbox.com/u/28869550/jack-$pkgver.tar.bz2"
         '99-audio.conf'
-        '40-hpet-permissions.rules')
+        '40-hpet-permissions.rules'
+        'jack1compat.diff')
 md5sums=('4aeb91d7ae0cabce98355436ed4f217a'
          'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef')
+         '471aad533ff56c5d3cbbf65ce32cadef'
+         '8c367d60a6375ebacf0d53ad651a0486')
 
 _isbuild() {
   printf "%s\n" ${pkgname[@]} | grep -qx $1
@@ -52,6 +54,10 @@
   # TODO: report upstream, but redundant until github issue 22 resolves
   #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
 
+
+  # see https://bugs.archlinux.org/task/47839
+  (cd $_tarname-$pkgver && patch -Np1 -i $srcdir/jack1compat.diff)
+
   # we may do 2 different builds
   cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
 }

Added: jack1compat.diff
===================================================================
--- jack1compat.diff	                        (rev 0)
+++ jack1compat.diff	2016-02-04 21:03:39 UTC (rev 160347)
@@ -0,0 +1,33 @@
+diff --git a/common/jack/types.h b/common/jack/types.h
+index 094d407..2dccf34 100644
+--- a/common/jack/types.h
++++ b/common/jack/types.h
+@@ -403,10 +403,8 @@ typedef void (*JackPortConnectCallback)(jack_port_id_t a, jack_port_id_t b, int
+  * @param port the port that has been renamed
+  * @param new_name the new name
+  * @param arg pointer to a client supplied structure
+- *
+- * @return zero on success, non-zero on error
+  */
+-typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg);
++typedef void (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg);
+ 
+ /**
+  * Prototype for the client supplied function that is called
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 750d152..8a8a811 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg)
+ 		client_register--;
+ }
+ 
+-int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg)
++void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg)
+ {
+      Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name);
+      port_rename_clbk = 1;
+-     return 0;
+ }
+ 
+ int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)