summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-21 17:00:14 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-04-26 20:13:29 +0200
commit1d7d2dbfc808270c963090b77253d96c0129a5a3 (patch)
tree4c0228fe2c544b4fa095e9eb0ef38f8bc8ec4c6f /meta-oe
parent850ab4df1679e675b26acec5442c9604ac04ebf4 (diff)
downloadmeta-openembedded-1d7d2dbfc808270c963090b77253d96c0129a5a3.tar.gz
jack2: Fix build errors found with gcc7
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch32
-rw-r--r--meta-oe/recipes-multimedia/jack/jack_git.bb4
2 files changed, 35 insertions, 1 deletions
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
new file mode 100644
index 000000000..c119f1981
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch
@@ -0,0 +1,32 @@
1From 8ec6f75bf7a318a3a1e352df7c97630cfaba537a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Apr 2017 16:18:39 -0700
4Subject: [PATCH] typecast input parameter to int for abs()
5
6Fixes
7../tests/test.cpp:482:73: error: call of overloaded 'abs(jack_nframes_t)' is ambiguous
8
9because the signature is int abs(int) and its passing
10unsigned int to it.
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 tests/test.cpp | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/tests/test.cpp b/tests/test.cpp
18index 8a8a8117..9655742e 100644
19--- a/tests/test.cpp
20+++ b/tests/test.cpp
21@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
22 jack_nframes_t delta_time = cur_time - last_time;
23
24 Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
25- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
26+ if (delta_time > 0 && (jack_nframes_t)abs(int(delta_time - cur_buffer_size)) > tolerance) {
27 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);
28 }
29
30--
312.12.2
32
diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb
index ba52691d3..b85ba8a02 100644
--- a/meta-oe/recipes-multimedia/jack/jack_git.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_git.bb
@@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS = "libsamplerate0 libsndfile1 readline" 15DEPENDS = "libsamplerate0 libsndfile1 readline"
16 16
17SRC_URI = "git://github.com/jackaudio/jack2.git" 17SRC_URI = "git://github.com/jackaudio/jack2.git \
18 file://0001-typecast-input-parameter-to-int-for-abs.patch \
19 "
18SRCREV = "2d1d323505585d406a7e64fb932953baefc5945e" 20SRCREV = "2d1d323505585d406a7e64fb932953baefc5945e"
19PV = "1.9.10+git${SRCPV}" 21PV = "1.9.10+git${SRCPV}"
20S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"