[arch-commits] Commit in lib32-jack2/trunk (4 files)
David Runge
dvzrv at archlinux.org
Fri Dec 8 10:25:42 UTC 2017
Date: Friday, December 8, 2017 @ 10:25:37
Author: dvzrv
Revision: 273292
upgpkg: lib32-jack2 1.9.11_RC1-1
Updating maintainer. Upgrading to 1.9.11_RC1. Adding lib32-{celt,opus} to depends and makedepends.
Adding required patches. Switching to python for waf build system.
Added:
lib32-jack2/trunk/example-clients-fix-compilation-of-tw.c.patch
lib32-jack2/trunk/jackdebugclient-keep-client-fsynchrotable.patch
lib32-jack2/trunk/tests-fix-compilation-with-gcc7.patch
Modified:
lib32-jack2/trunk/PKGBUILD
-------------------------------------------------+
PKGBUILD | 45 ++++++++++++------
example-clients-fix-compilation-of-tw.c.patch | 24 +++++++++
jackdebugclient-keep-client-fsynchrotable.patch | 53 ++++++++++++++++++++++
tests-fix-compilation-with-gcc7.patch | 25 ++++++++++
4 files changed, 132 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-08 09:58:39 UTC (rev 273291)
+++ PKGBUILD 2017-12-08 10:25:37 UTC (rev 273292)
@@ -1,38 +1,53 @@
# $Id$
-# Maintainer : speps <speps at aur dot archlinux dot org>
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=lib32-jack2
-pkgver=1.9.10
-pkgrel=3
+pkgver=1.9.11_RC1
+pkgrel=1
pkgdesc="The next-generation JACK with SMP support (32 bit)"
arch=('x86_64')
url="http://jackaudio.org/"
license=('GPL')
-makedepends=('python2' 'lib32-gcc-libs' 'gcc-multilib' 'libsamplerate')
+depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-opus' 'jack2')
+makedepends=('celt' 'doxygen' 'gcc-multilib' 'lib32-celt' 'lib32-gcc-libs' 'lib32-opus' 'libffado' 'libsamplerate' 'opus' 'python')
provides=('lib32-jack')
conflicts=('lib32-jack' 'jack2-multilib' 'jack2-dbus-multilib')
replaces=('jack2-multilib' 'jack2-dbus-multilib')
-source=("https://dl.dropboxusercontent.com/u/28869550/jack-$pkgver.tar.bz2")
-md5sums=('4aeb91d7ae0cabce98355436ed4f217a')
+source=("${pkgname#lib32-}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgname#lib32-}/archive/v${pkgver//_/-}.tar.gz"
+ 'tests-fix-compilation-with-gcc7.patch'
+ 'jackdebugclient-keep-client-fsynchrotable.patch'
+ 'example-clients-fix-compilation-of-tw.c.patch')
+sha512sums=('4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436'
+ '79e44bae409fc47af8b9b227464a3a88c223f103bf59a2aaaf2ade99108c27aeca8f4f8d60ba919a3aa83a0072f9ffef03e7259c28a61d70caf9cc18a23afcad'
+ '4c3290c51bd289e36edddb55a6e4cab981d9d3a3932da8c0a06652a22cce35c7858ff4afa99c309ed0e331224274bdb9dfe8e4fed46d486e1b2b44e6b971c484'
+ 'ec5f46c8fffda5f90c7597c8a8058246adefec95c0565ccc72afb7f57cb159fdf368107d3160284f1b2cf1c8e5e5c490f53151039d69423ca48da0d3d676e1e0')
+prepare() {
+ cd "${pkgname#lib32-}-${pkgver//_/-}"
+ # https://github.com/jackaudio/jack2/issues/253
+ patch -Np1 -i "${srcdir}/tests-fix-compilation-with-gcc7.patch"
+ patch -Np1 -i "${srcdir}/example-clients-fix-compilation-of-tw.c.patch"
+ patch -Np1 -i "${srcdir}/jackdebugclient-keep-client-fsynchrotable.patch"
+
+}
+
build() {
- cd "$srcdir/jack-$pkgver"
+ cd "${pkgname#lib32-}-${pkgver//_/-}"
- python2 waf configure --prefix=/usr \
+ python waf configure --prefix=/usr \
--libdir=/usr/lib \
--libdir32=/usr/lib32 \
--mixed
- python2 waf build $MAKEFLAGS
+ python waf build
}
package() {
- depends=('lib32-gcc-libs' 'jack2')
- cd "$srcdir/jack-$pkgver"
+ cd "${pkgname#lib32-}-${pkgver//_/-}"
- python2 waf install --destdir="$pkgdir"
-
- rm -rf "$pkgdir"/usr/{bin,lib,include,share}
-
+ python waf install --destdir="${pkgdir}"
+ # remove all non-32bit
+ rm -rf "${pkgdir}"/usr/{bin,lib,include,share}
}
# vim:set ts=2 sw=2 et:
Added: example-clients-fix-compilation-of-tw.c.patch
===================================================================
--- example-clients-fix-compilation-of-tw.c.patch (rev 0)
+++ example-clients-fix-compilation-of-tw.c.patch 2017-12-08 10:25:37 UTC (rev 273292)
@@ -0,0 +1,24 @@
+From eabc679bd4f564a6b5294d0558b579898d66e2fa Mon Sep 17 00:00:00 2001
+From: Kjetil Matheussen <k.s.matheussen at notam02.no>
+Date: Sat, 15 Jul 2017 13:21:36 +0200
+Subject: [PATCH] Example clients: Fix compilation of tw.c
+
+---
+ example-clients/tw.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/example-clients/tw.c b/example-clients/tw.c
+index 623ff240..edc7ef31 100644
+--- a/example-clients/tw.c
++++ b/example-clients/tw.c
+@@ -9,6 +9,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <signal.h>
+
+ #include <jack/jack.h>
+
+--
+2.15.0
+
Added: jackdebugclient-keep-client-fsynchrotable.patch
===================================================================
--- jackdebugclient-keep-client-fsynchrotable.patch (rev 0)
+++ jackdebugclient-keep-client-fsynchrotable.patch 2017-12-08 10:25:37 UTC (rev 273292)
@@ -0,0 +1,53 @@
+From ccedff2f357d7d52bf4327cf14dfade2b41052ca Mon Sep 17 00:00:00 2001
+From: Kjetil Matheussen <k.s.matheussen at notam02.no>
+Date: Sat, 15 Jul 2017 13:21:17 +0200
+Subject: [PATCH] JackDebugClient: Keep client->fSynchroTable. Prevents crash
+ in jack_client_wait, plus that it seems to be the correct thing to do.
+
+---
+ common/JackClient.cpp | 3 ---
+ common/JackClient.h | 1 -
+ common/JackDebugClient.cpp | 1 +
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/common/JackClient.cpp b/common/JackClient.cpp
+index 7334a57a..bcb06ead 100644
+--- a/common/JackClient.cpp
++++ b/common/JackClient.cpp
+@@ -39,9 +39,6 @@ namespace Jack
+
+ #define IsRealTime() ((fProcess != NULL) | (fThreadFun != NULL) | (fSync != NULL) | (fTimebase != NULL))
+
+-JackClient::JackClient():fThread(this)
+-{}
+-
+ JackClient::JackClient(JackSynchro* table):fThread(this)
+ {
+ fSynchroTable = table;
+diff --git a/common/JackClient.h b/common/JackClient.h
+index 3013334b..b6e78ef3 100644
+--- a/common/JackClient.h
++++ b/common/JackClient.h
+@@ -124,7 +124,6 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable
+
+ public:
+
+- JackClient();
+ JackClient(JackSynchro* table);
+ virtual ~JackClient();
+
+diff --git a/common/JackDebugClient.cpp b/common/JackDebugClient.cpp
+index 3308c457..7c1f539a 100644
+--- a/common/JackDebugClient.cpp
++++ b/common/JackDebugClient.cpp
+@@ -35,6 +35,7 @@ namespace Jack
+ {
+
+ JackDebugClient::JackDebugClient(JackClient * client)
++ : JackClient(client->fSynchroTable)
+ {
+ fTotalPortNumber = 1; // The total number of port opened and maybe closed. Historical view.
+ fOpenPortNumber = 0; // The current number of opened port.
+--
+2.15.0
+
Added: tests-fix-compilation-with-gcc7.patch
===================================================================
--- tests-fix-compilation-with-gcc7.patch (rev 0)
+++ tests-fix-compilation-with-gcc7.patch 2017-12-08 10:25:37 UTC (rev 273292)
@@ -0,0 +1,25 @@
+From f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Mon Sep 17 00:00:00 2001
+From: Kjetil Matheussen <k.s.matheussen at notam02.no>
+Date: Sat, 15 Jul 2017 13:21:59 +0200
+Subject: [PATCH] Tests: Fix compilation with gcc7
+
+---
+ tests/test.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 8a8a8117..d2ef9a05 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
+ jack_nframes_t delta_time = cur_time - last_time;
+
+ Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
+- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
++ if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) {
+ printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
+ }
+
+--
+2.15.0
+
More information about the arch-commits
mailing list