diff options
author | Danny Rawlins <monster.romster@gmail.com> | 2019-12-24 00:18:29 +1100 |
---|---|---|
committer | Danny Rawlins <monster.romster@gmail.com> | 2019-12-24 00:18:29 +1100 |
commit | a042f4a1cd2b360d1672bd8c8f67ad294b7cb7c6 (patch) | |
tree | a473e66d66b182963c5b4e367ef790dbea9789b6 /jack | |
parent | 68c91a5ed2b37c2d2db5ce14be21789cb1bbf2e4 (diff) | |
download | contrib-a042f4a1cd2b360d1672bd8c8f67ad294b7cb7c6.tar.gz contrib-a042f4a1cd2b360d1672bd8c8f67ad294b7cb7c6.tar.xz |
jack: 1.9.12 -> 1.9.14
Diffstat (limited to 'jack')
-rw-r--r-- | jack/.footprint | 2 | ||||
-rw-r--r-- | jack/.signature | 8 | ||||
-rw-r--r-- | jack/Pkgfile | 7 | ||||
-rw-r--r-- | jack/gcc6.patch | 62 | ||||
-rw-r--r-- | jack/jack1compat.patch | 36 |
5 files changed, 9 insertions, 106 deletions
diff --git a/jack/.footprint b/jack/.footprint index 21b559814..83e720d2e 100644 --- a/jack/.footprint +++ b/jack/.footprint @@ -25,6 +25,7 @@ lrwxrwxrwx root/root usr/bin/jack_disconnect -> jack_connect -rwxr-xr-x root/root usr/bin/jack_net_master -rwxr-xr-x root/root usr/bin/jack_net_slave -rwxr-xr-x root/root usr/bin/jack_netsource +-rwxr-xr-x root/root usr/bin/jack_property -rwxr-xr-x root/root usr/bin/jack_rec -rwxr-xr-x root/root usr/bin/jack_samplerate -rwxr-xr-x root/root usr/bin/jack_server_control @@ -100,6 +101,7 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/jack_metro.1.gz -rw-r--r-- root/root usr/share/man/man1/jack_monitor_client.1.gz -rw-r--r-- root/root usr/share/man/man1/jack_netsource.1.gz +-rw-r--r-- root/root usr/share/man/man1/jack_property.1.gz -rw-r--r-- root/root usr/share/man/man1/jack_samplerate.1.gz -rw-r--r-- root/root usr/share/man/man1/jack_showtime.1.gz -rw-r--r-- root/root usr/share/man/man1/jack_simple_client.1.gz diff --git a/jack/.signature b/jack/.signature index 20b0b75fb..6ee4a38c0 100644 --- a/jack/.signature +++ b/jack/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30drllvgrPuuG6Zrg2DqJEMmMj1uR8tw9KD4yP9lIedg5/HTVuanUsyV4cPsEjwvuK1AlLFn+V2O+GRmEKxyWwI= -SHA256 (Pkgfile) = 534cabaea45a933954777869c19bfaa491010e2337d0b5b422b87e6b5b0491f8 -SHA256 (.footprint) = 1c6526cd35d46178e8a245efa6ff4c3d94c26751438306dd3e8126b2e0956810 -SHA256 (v1.9.12.tar.gz) = deefe2f936dc32f59ad3cef7e37276c2035ef8a024ca92118f35c9a292272e33 +RWSagIOpLGJF360N5CbFYZa8Xom1YGO1iFSu8sVSXZPPZUT7rNDv5Vg7IcvWVRIlOYfwgl/ZTr/98bwuFJgCajt9RKPvJmLZ6Ac= +SHA256 (Pkgfile) = 0d5fd4044f80b23dcdd56c3fa9aa04587e8034c7553c5678bd188a14dc39293e +SHA256 (.footprint) = 7cc24920f6a851ff1667772a27ec16bb32e76fe41a0c024fd514f7d57628bda6 +SHA256 (v1.9.14.tar.gz) = a20a32366780c0061fd58fbb5f09e514ea9b7ce6e53b080a44b11a558a83217c diff --git a/jack/Pkgfile b/jack/Pkgfile index 06832d31c..88f245ba6 100644 --- a/jack/Pkgfile +++ b/jack/Pkgfile @@ -1,12 +1,11 @@ # Description: A real-time, low latency audio daemon. # URL: http://jackaudio.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me -# Depends on: libsamplerate python +# Depends on: libsamplerate python3 name=jack -version=1.9.12 -release=3 +version=1.9.14 +release=1 source=(https://github.com/jackaudio/jack2/archive/v$version.tar.gz) build() { diff --git a/jack/gcc6.patch b/jack/gcc6.patch deleted file mode 100644 index ba7778ba5..000000000 --- a/jack/gcc6.patch +++ /dev/null @@ -1,62 +0,0 @@ -From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth <adi@drcomp.erfurt.thur.de> -Date: Sat, 11 Jun 2016 05:35:07 +0200 -Subject: [PATCH] Fix initialization in test/iodelay.cpp - -jack_latency_range_t is - -struct _jack_latency_range { - jack_nframes_t min; - jack_nframes_t max; -}; - -and jack_nframes_t is - -typedef uint32_t jack_nframes_t; - -so it's unsigned. Initialising it with -1 is invalid (at least in C++14). We cannot use {0, 0}, because latency_cb has - - jack_latency_range_t range; - range.min = range.max = 0; - if ((range.min != capture_latency.min) || (range.max != - capture_latency.max)) { - capture_latency = range; - } - -so we must not have {0, 0}, otherwise the condition would never be true. - -Using UINT32_MAX should be equivalent to the previous -1. ---- - tests/iodelay.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp -index e1ba63f..1ef470f 100644 ---- a/tests/iodelay.cpp -+++ b/tests/iodelay.cpp -@@ -20,6 +20,7 @@ - - #include <stdlib.h> - #include <stdio.h> -+#include <stdint.h> - #include <math.h> - #include <unistd.h> - #include <jack/jack.h> -@@ -167,8 +168,8 @@ static jack_client_t *jack_handle; - static jack_port_t *jack_capt; - static jack_port_t *jack_play; - --jack_latency_range_t capture_latency = {-1, -1}; --jack_latency_range_t playback_latency = {-1, -1}; -+jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; -+jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; - - void - latency_cb (jack_latency_callback_mode_t mode, void *arg) -@@ -266,4 +267,4 @@ int main (int ac, char *av []) - return 0; - } - --// -------------------------------------------------------------------------------- -\ No newline at end of file -+// -------------------------------------------------------------------------------- diff --git a/jack/jack1compat.patch b/jack/jack1compat.patch deleted file mode 100644 index 1d10a3476..000000000 --- a/jack/jack1compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/andrewrk/libsoundio/issues/7 -https://github.com/jackaudio/jack2/commit/05216197b491d64036733a2d3be511456c1f65cd - -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) |