wok-next rev 20773
jack2: up (1.9.12)
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Wed Jun 06 19:59:31 2018 +0300 (2018-06-06) |
| parents | 3624b95f4aac |
| children | 82665910c526 |
| files | jack2/receipt jack2/stuff/patches/fix-docdir.patch jack2/stuff/patches/gcc6.patch jack2/stuff/patches/jack1compat.diff jack2/stuff/patches/series |
line diff
1.1 --- a/jack2/receipt Wed Jun 06 19:46:11 2018 +0300 1.2 +++ b/jack2/receipt Wed Jun 06 19:59:31 2018 +0300 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="jack2" 1.7 -VERSION="1.9.10" 1.8 +VERSION="1.9.12" 1.9 CATEGORY="multimedia" 1.10 SHORT_DESC="The JACK2 with SMP support" 1.11 MAINTAINER="al.bobylev@gmail.com" 1.12 @@ -15,9 +15,7 @@ 1.13 libsndfile-dev readline-dev opus-dev doxygen" 1.14 SPLIT="jack2-dev" 1.15 1.16 -# Rules to configure and make the package. 1.17 -compile_rules() 1.18 -{ 1.19 +compile_rules() { 1.20 ./waf configure \ 1.21 --prefix=/usr \ 1.22 --classic \ 1.23 @@ -29,14 +27,11 @@ 1.24 ./waf install 1.25 } 1.26 1.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.28 -genpkg_rules() 1.29 -{ 1.30 +genpkg_rules() { 1.31 case $PACKAGE in 1.32 jack2) 1.33 copy @std 1.34 - DEPENDS="alsa-lib dbus expat libsamplerate libsndfile ncurses opus \ 1.35 - readline" 1.36 + DEPENDS="alsa-lib dbus expat libsamplerate libsndfile opus readline" 1.37 ;; 1.38 *-dev) 1.39 copy @dev
2.1 --- a/jack2/stuff/patches/fix-docdir.patch Wed Jun 06 19:46:11 2018 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,16 +0,0 @@ 2.4 ---- a/wscript 2.5 -+++ b/wscript 2.6 -@@ -433,10 +433,10 @@ 2.7 - #bld.add_subdirs('tests') 2.8 - 2.9 - if bld.env['BUILD_DOXYGEN_DOCS'] == True: 2.10 -- html_docs_source_dir = "build/default/html" 2.11 -+ html_docs_source_dir = "html" 2.12 - if bld.cmd == 'install': 2.13 -- share_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/jack-audio-connection-kit' 2.14 -- html_docs_install_dir = share_dir + '/reference/html/' 2.15 -+ doc_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/doc/jack-audio-connection-kit-' + VERSION 2.16 -+ html_docs_install_dir = doc_dir + '/reference/html/' 2.17 - if os.path.isdir(html_docs_install_dir): 2.18 - Logs.pprint('CYAN', "Removing old doxygen documentation installation...") 2.19 - shutil.rmtree(html_docs_install_dir)
3.1 --- a/jack2/stuff/patches/gcc6.patch Wed Jun 06 19:46:11 2018 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,62 +0,0 @@ 3.4 -From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001 3.5 -From: Adrian Knoth <adi@drcomp.erfurt.thur.de> 3.6 -Date: Sat, 11 Jun 2016 05:35:07 +0200 3.7 -Subject: [PATCH] Fix initialization in test/iodelay.cpp 3.8 - 3.9 -jack_latency_range_t is 3.10 - 3.11 -struct _jack_latency_range { 3.12 - jack_nframes_t min; 3.13 - jack_nframes_t max; 3.14 -}; 3.15 - 3.16 -and jack_nframes_t is 3.17 - 3.18 -typedef uint32_t jack_nframes_t; 3.19 - 3.20 -so it's unsigned. Initialising it with -1 is invalid (at least in C++14). We cannot use {0, 0}, because latency_cb has 3.21 - 3.22 - jack_latency_range_t range; 3.23 - range.min = range.max = 0; 3.24 - if ((range.min != capture_latency.min) || (range.max != 3.25 - capture_latency.max)) { 3.26 - capture_latency = range; 3.27 - } 3.28 - 3.29 -so we must not have {0, 0}, otherwise the condition would never be true. 3.30 - 3.31 -Using UINT32_MAX should be equivalent to the previous -1. 3.32 ---- 3.33 - tests/iodelay.cpp | 7 ++++--- 3.34 - 1 file changed, 4 insertions(+), 3 deletions(-) 3.35 - 3.36 -diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp 3.37 -index e1ba63f..1ef470f 100644 3.38 ---- a/tests/iodelay.cpp 3.39 -+++ b/tests/iodelay.cpp 3.40 -@@ -20,6 +20,7 @@ 3.41 - 3.42 - #include <stdlib.h> 3.43 - #include <stdio.h> 3.44 -+#include <stdint.h> 3.45 - #include <math.h> 3.46 - #include <unistd.h> 3.47 - #include <jack/jack.h> 3.48 -@@ -167,8 +168,8 @@ static jack_client_t *jack_handle; 3.49 - static jack_port_t *jack_capt; 3.50 - static jack_port_t *jack_play; 3.51 - 3.52 --jack_latency_range_t capture_latency = {-1, -1}; 3.53 --jack_latency_range_t playback_latency = {-1, -1}; 3.54 -+jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; 3.55 -+jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; 3.56 - 3.57 - void 3.58 - latency_cb (jack_latency_callback_mode_t mode, void *arg) 3.59 -@@ -266,4 +267,4 @@ int main (int ac, char *av []) 3.60 - return 0; 3.61 - } 3.62 - 3.63 --// -------------------------------------------------------------------------------- 3.64 -\ No newline at end of file 3.65 -+// --------------------------------------------------------------------------------
4.1 --- a/jack2/stuff/patches/jack1compat.diff Wed Jun 06 19:46:11 2018 +0300 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,33 +0,0 @@ 4.4 -diff --git a/common/jack/types.h b/common/jack/types.h 4.5 -index 094d407..2dccf34 100644 4.6 ---- a/common/jack/types.h 4.7 -+++ b/common/jack/types.h 4.8 -@@ -403,10 +403,8 @@ typedef void (*JackPortConnectCallback)(jack_port_id_t a, jack_port_id_t b, int 4.9 - * @param port the port that has been renamed 4.10 - * @param new_name the new name 4.11 - * @param arg pointer to a client supplied structure 4.12 -- * 4.13 -- * @return zero on success, non-zero on error 4.14 - */ 4.15 --typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); 4.16 -+typedef void (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); 4.17 - 4.18 - /** 4.19 - * Prototype for the client supplied function that is called 4.20 -diff --git a/tests/test.cpp b/tests/test.cpp 4.21 -index 750d152..8a8a811 100644 4.22 ---- a/tests/test.cpp 4.23 -+++ b/tests/test.cpp 4.24 -@@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg) 4.25 - client_register--; 4.26 - } 4.27 - 4.28 --int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) 4.29 -+void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) 4.30 - { 4.31 - Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name); 4.32 - port_rename_clbk = 1; 4.33 -- return 0; 4.34 - } 4.35 - 4.36 - int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)