Skip to contentSkip to conversation

package/jack2: bump to version 1.9.12

PATCH New Fabrice Fontaine 2 participants 2 messages Mar 17, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/jack2: bump to version 1.9.12

Remove patches (already in version)

---
 .../0001-Fix-initialization-in-test-iodelay.patch  | 65 -----------------
 .../jack2/0002-Improve-check-for-ucontext.patch    | 84 ----------------------
 ...ace-support-depends-on-execinfo.h-existen.patch | 67 -----------------
 .../0004-tests-define-__STDC_LIMIT_MACROS.patch    | 41 -----------
 package/jack2/0005-gcc7.patch                      | 31 --------
 package/jack2/0006-fix-ftbfs-with-clang.patch      | 28 --------
 package/jack2/jack2.hash                           |  2 +-
 package/jack2/jack2.mk                             |  2 +-
 8 files changed, 2 insertions(+), 318 deletions(-)
 delete mode 100644 package/jack2/0001-Fix-initialization-in-test-iodelay.patch
 delete mode 100644 package/jack2/0002-Improve-check-for-ucontext.patch
 delete mode 100644 package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch
 delete mode 100644 package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch
 delete mode 100644 package/jack2/0005-gcc7.patch
 delete mode 100644 package/jack2/0006-fix-ftbfs-with-clang.patch
package/jack2/0001-Fix-initialization-in-test-iodelay.patch deleted +0 -65
deleted file mode 100644
index ee2493886b..0000000000
@@ -1,65 +0,0 @@
-From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <[email protected]>
-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.
-
-[Upstream commit https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645]
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- tests/iodelay.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp
-index e1ba63fa..1ef470fd 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
-+// --------------------------------------------------------------------------------
package/jack2/0002-Improve-check-for-ucontext.patch deleted +0 -84

84 lines not on this page · raw message

package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch deleted +0 -67

67 lines not on this page · raw message

package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch deleted +0 -41

41 lines not on this page · raw message

package/jack2/0005-gcc7.patch deleted +0 -31
deleted file mode 100644
index dadaf44ed9..0000000000
@@ -1,31 +0,0 @@
-From f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Mon Sep 17 00:00:00 2001
-From: Kjetil Matheussen <[email protected]>
-Date: Sat, 15 Jul 2017 13:21:59 +0200
-Subject: [PATCH] Tests: Fix compilation with gcc7
-
-Fixes
-../tests/test.cpp: In function ?int process4(jack_nframes_t, void*)?:
-../tests/test.cpp:483:73: error: call of overloaded ?abs(jack_nframes_t)? is ambiguous
-  if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
-
-Downloaded from upstream commit
-https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- 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);
- 	}
- 
package/jack2/0006-fix-ftbfs-with-clang.patch deleted +0 -28
deleted file mode 100644
index a73fe69e15..0000000000
@@ -1,28 +0,0 @@
-From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <[email protected]>
-Date: Thu, 18 Sep 2014 18:29:23 +0200
-Subject: [PATCH] Fix FTBFS with clang++
-
-Forwarded from http://bugs.debian.org/757820
-
-Downloaded from upstream commit
-https://github.com/jackaudio/jack2/commit/d3c8e2d8d78899fba40a3e677ed4dbe388d82269
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- common/memops.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/memops.c b/common/memops.c
-index 27f6194a..2d416b64 100644
---- a/common/memops.c
-+++ b/common/memops.c
-@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
-  */
- static unsigned int seed = 22222;
- 
--inline unsigned int fast_rand() {
-+static inline unsigned int fast_rand() {
- 	seed = (seed * 96314165) + 907633515;
- 	return seed;
- }
package/jack2/jack2.hash +1 -1
index ab031b9d94..54107d9bf4 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d  jack2-v1.9.10.tar.gz
+sha256 deefe2f936dc32f59ad3cef7e37276c2035ef8a024ca92118f35c9a292272e33  jack2-v1.9.12.tar.gz
package/jack2/jack2.mk +1 -1
index b61c5d75f7..7f4fbfbe04 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JACK2_VERSION = v1.9.10
+JACK2_VERSION = v1.9.12
 JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION))
 JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
 JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 package/jack2: bump to version 1.9.12

Quoted 19 lines · On Sun, 17 Mar 2019 16:32:11 +0100 Fabrice Fontaine…

Remove patches (already in version)

---
 .../0001-Fix-initialization-in-test-iodelay.patch  | 65 -----------------
 .../jack2/0002-Improve-check-for-ucontext.patch    | 84 ----------------------
 ...ace-support-depends-on-execinfo.h-existen.patch | 67 -----------------
 .../0004-tests-define-__STDC_LIMIT_MACROS.patch    | 41 -----------
 package/jack2/0005-gcc7.patch                      | 31 --------
 package/jack2/0006-fix-ftbfs-with-clang.patch      | 28 --------
 package/jack2/jack2.hash                           |  2 +-
 package/jack2/jack2.mk                             |  2 +-
 8 files changed, 2 insertions(+), 318 deletions(-)
 delete mode 100644 package/jack2/0001-Fix-initialization-in-test-iodelay.patch
 delete mode 100644 package/jack2/0002-Improve-check-for-ucontext.patch
 delete mode 100644 package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch
 delete mode 100644 package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch
 delete mode 100644 package/jack2/0005-gcc7.patch
 delete mode 100644 package/jack2/0006-fix-ftbfs-with-clang.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com