[arch-commits] Commit in jack2/trunk (4 files)
David Runge
dvzrv at archlinux.org
Sun Dec 17 13:58:23 UTC 2017
Date: Sunday, December 17, 2017 @ 13:58:22
Author: dvzrv
Revision: 274642
upgpkg: jack2 1.9.12-1
Updating to 1.9.12. Removing all patches relevant to the 1.9.11_RC1 version. Removing libsamplerate from the depends array, as it is already included by proxy.
Modified:
jack2/trunk/PKGBUILD
Deleted:
jack2/trunk/example-clients-fix-compilation-of-tw.c.patch
jack2/trunk/jackdebugclient-keep-client-fsynchrotable.patch
jack2/trunk/tests-fix-compilation-with-gcc7.patch
-------------------------------------------------+
PKGBUILD | 59 ++++++++--------------
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, 24 insertions(+), 137 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-17 13:08:21 UTC (rev 274641)
+++ PKGBUILD 2017-12-17 13:58:22 UTC (rev 274642)
@@ -8,39 +8,28 @@
pkgbase=jack2
pkgname=('jack2' 'jack2-dbus')
pkgdesc="The next-generation JACK with SMP support"
-pkgver=1.9.11_RC1
-pkgrel=3
+pkgver=1.9.12
+pkgrel=1
arch=('x86_64')
url="http://jackaudio.org/"
license=('GPL')
-makedepends=('python' 'python2-dbus' 'libffado' 'celt' 'opus' 'libsamplerate' 'doxygen')
-source=("${pkgbase}-${pkgver}::https://github.com/jackaudio/${pkgbase}/archive/v${pkgver//_/-}.tar.gz"
+makedepends=('python' 'python2-dbus' 'libffado' 'celt' 'opus' 'doxygen')
+source=("${pkgbase}-${pkgver}::https://github.com/jackaudio/${pkgbase}/archive/v${pkgver}.tar.gz"
'99-audio.conf'
'40-hpet-permissions.rules'
- 'tests-fix-compilation-with-gcc7.patch'
- 'jackdebugclient-keep-client-fsynchrotable.patch'
- 'example-clients-fix-compilation-of-tw.c.patch')
-sha512sums=('4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436'
+)
+sha512sums=('f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa'
'c21f593d46ff12d1b8d3ce7ca4593c230a673e67ed4e486944f52fd51bdf902873d3fb253220c8ec9c6c5d5b9f002ecf3dd72318222cd748b1925bfcbf1df5d7'
- '1f876aa61de4bc4e54d46dde7f8c8c2aa575fc382c09f3dc6819c328224b1998c7171cfd3039d35ca214e40909ad71f8d56a9b3b5652046beb5ca97e44a780b1'
- '79e44bae409fc47af8b9b227464a3a88c223f103bf59a2aaaf2ade99108c27aeca8f4f8d60ba919a3aa83a0072f9ffef03e7259c28a61d70caf9cc18a23afcad'
- '4c3290c51bd289e36edddb55a6e4cab981d9d3a3932da8c0a06652a22cce35c7858ff4afa99c309ed0e331224274bdb9dfe8e4fed46d486e1b2b44e6b971c484'
- 'ec5f46c8fffda5f90c7597c8a8058246adefec95c0565ccc72afb7f57cb159fdf368107d3160284f1b2cf1c8e5e5c490f53151039d69423ca48da0d3d676e1e0')
-
+ '1f876aa61de4bc4e54d46dde7f8c8c2aa575fc382c09f3dc6819c328224b1998c7171cfd3039d35ca214e40909ad71f8d56a9b3b5652046beb5ca97e44a780b1')
prepare() {
- cd "${pkgbase}-${pkgver//_/-}"
+ cd "${pkgbase}-${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"
-
# https://github.com/jackaudio/jack2/issues/308
sed -i 's:bin/env python:bin/env python2:' \
"example-clients/jack_control"
# copy of the source for jack2-dbus
- cp -r "${srcdir}/${pkgbase}-${pkgver//_/-}" "${srcdir}/${pkgname[1]}-${pkgver//_/-}"
+ cp -r "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/${pkgname[1]}-${pkgver}"
# configure jack2
python waf configure --prefix=/usr \
@@ -50,7 +39,7 @@
--dbus
# configure jack2-dbus
- cd "${srcdir}/${pkgname[1]}-${pkgver//_/-}"
+ cd "${srcdir}/${pkgname[1]}-${pkgver}"
python waf configure --prefix=/usr \
--htmldir="/usr/share/doc/${pkgbase}/" \
--freebob=no \
@@ -59,49 +48,49 @@
build() {
# build jack2
- cd "${pkgname[0]}-${pkgver//_/-}"
+ cd "${pkgname[0]}-${pkgver}"
python waf build
# build jack2-dbus
- cd "${srcdir}/${pkgname[1]}-${pkgver//_/-}"
+ cd "${srcdir}/${pkgname[1]}-${pkgver}"
python waf build
}
package_jack2() {
pkgdesc="The next-generation JACK with SMP support"
- depends=('libsamplerate' 'celt' 'opus' 'libffado' 'python2-dbus')
+ depends=('celt' 'opus' 'libffado' 'python2-dbus')
conflicts=('jack')
provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
backup=(etc/security/limits.d/99-audio.conf)
- cd "${pkgname[0]}-${pkgver//_/-}"
+ cd "${pkgname[0]}-${pkgver}"
python waf install --destdir="${pkgdir}"
# configure realtime access/scheduling
# see https://bugs.archlinux.org/task/26343
- install -Dm644 "$srcdir/99-audio.conf" \
- "$pkgdir/etc/security/limits.d/99-audio.conf"
+ install -Dm644 "${srcdir}/99-audio.conf" \
+ "${pkgdir}/etc/security/limits.d/99-audio.conf"
- install -Dm644 "$srcdir/40-hpet-permissions.rules" \
- "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
+ install -Dm644 "${srcdir}/40-hpet-permissions.rules" \
+ "${pkgdir}/usr/lib/udev/rules.d/40-hpet-permissions.rules"
}
package_jack2-dbus() {
pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
- depends=('libsamplerate' 'celt' 'opus' 'libffado' 'python2-dbus')
+ depends=('celt' 'opus' 'libffado' 'python2-dbus')
conflicts=('jack' 'jack2')
provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
backup=(etc/security/limits.d/99-audio.conf)
- cd "${pkgname[1]}-${pkgver//_/-}"
+ cd "${pkgname[1]}-${pkgver}"
python waf install --destdir="${pkgdir}"
# configure realtime access/scheduling
# see https://bugs.archlinux.org/task/26343
- install -Dm644 "$srcdir/99-audio.conf" \
- "$pkgdir/etc/security/limits.d/99-audio.conf"
+ install -Dm644 "${srcdir}/99-audio.conf" \
+ "${pkgdir}/etc/security/limits.d/99-audio.conf"
- install -Dm644 "$srcdir/40-hpet-permissions.rules" \
- "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules"
+ install -Dm644 "${srcdir}/40-hpet-permissions.rules" \
+ "${pkgdir}/usr/lib/udev/rules.d/40-hpet-permissions.rules"
}
# vim:set ts=2 sw=2 et:
Deleted: example-clients-fix-compilation-of-tw.c.patch
===================================================================
--- example-clients-fix-compilation-of-tw.c.patch 2017-12-17 13:08:21 UTC (rev 274641)
+++ example-clients-fix-compilation-of-tw.c.patch 2017-12-17 13:58:22 UTC (rev 274642)
@@ -1,24 +0,0 @@
-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
-
Deleted: jackdebugclient-keep-client-fsynchrotable.patch
===================================================================
--- jackdebugclient-keep-client-fsynchrotable.patch 2017-12-17 13:08:21 UTC (rev 274641)
+++ jackdebugclient-keep-client-fsynchrotable.patch 2017-12-17 13:58:22 UTC (rev 274642)
@@ -1,53 +0,0 @@
-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
-
Deleted: tests-fix-compilation-with-gcc7.patch
===================================================================
--- tests-fix-compilation-with-gcc7.patch 2017-12-17 13:08:21 UTC (rev 274641)
+++ tests-fix-compilation-with-gcc7.patch 2017-12-17 13:58:22 UTC (rev 274642)
@@ -1,25 +0,0 @@
-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