From cd388605bf0e5a4747cfa155b0747af650c5b5a1 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 17 Jan 2018 09:34:17 +0100 Subject: jack: Update 1.9.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gcc7 build was fixed upstream [1] [1] https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Signed-off-by: Andreas Müller Signed-off-by: Armin Kuster --- ...1-typecast-input-parameter-to-int-for-abs.patch | 32 ---------------------- meta-oe/recipes-multimedia/jack/jack_git.bb | 8 ++---- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch b/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch deleted file mode 100644 index c119f1981..000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ec6f75bf7a318a3a1e352df7c97630cfaba537a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 21 Apr 2017 16:18:39 -0700 -Subject: [PATCH] typecast input parameter to int for abs() - -Fixes -../tests/test.cpp:482:73: error: call of overloaded 'abs(jack_nframes_t)' is ambiguous - -because the signature is int abs(int) and its passing -unsigned int to it. - -Signed-off-by: Khem Raj ---- - tests/test.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test.cpp b/tests/test.cpp -index 8a8a8117..9655742e 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 && (jack_nframes_t)abs(int(delta_time - cur_buffer_size)) > 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.12.2 - diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb index b85ba8a02..11da6b1be 100644 --- a/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-oe/recipes-multimedia/jack/jack_git.bb @@ -14,11 +14,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git \ - file://0001-typecast-input-parameter-to-int-for-abs.patch \ - " -SRCREV = "2d1d323505585d406a7e64fb932953baefc5945e" -PV = "1.9.10+git${SRCPV}" +SRC_URI = "git://github.com/jackaudio/jack2.git" +SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" +PV = "1.9.12" S = "${WORKDIR}/git" inherit waf pkgconfig -- cgit v1.2.3-54-g00ecf