diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-01-17 09:34:17 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-01-22 19:40:02 -0800 |
commit | cd388605bf0e5a4747cfa155b0747af650c5b5a1 (patch) | |
tree | eaf179a89a6b555189c0bffcd93f0dfa9454a58d /meta-oe | |
parent | 1a961e426d0bfaac0cc3fe33e7565dcda7d1b6df (diff) | |
download | meta-openembedded-cd388605bf0e5a4747cfa155b0747af650c5b5a1.tar.gz |
jack: Update 1.9.12
gcc7 build was fixed upstream [1]
[1] https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-multimedia/jack/jack/0001-typecast-input-parameter-to-int-for-abs.patch | 32 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/jack/jack_git.bb | 8 |
2 files changed, 3 insertions, 37 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 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 @@ | |||
1 | From 8ec6f75bf7a318a3a1e352df7c97630cfaba537a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 21 Apr 2017 16:18:39 -0700 | ||
4 | Subject: [PATCH] typecast input parameter to int for abs() | ||
5 | |||
6 | Fixes | ||
7 | ../tests/test.cpp:482:73: error: call of overloaded 'abs(jack_nframes_t)' is ambiguous | ||
8 | |||
9 | because the signature is int abs(int) and its passing | ||
10 | unsigned int to it. | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | tests/test.cpp | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/tests/test.cpp b/tests/test.cpp | ||
18 | index 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 | -- | ||
31 | 2.12.2 | ||
32 | |||
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 = " \ | |||
14 | 14 | ||
15 | DEPENDS = "libsamplerate0 libsndfile1 readline" | 15 | DEPENDS = "libsamplerate0 libsndfile1 readline" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/jackaudio/jack2.git \ | 17 | SRC_URI = "git://github.com/jackaudio/jack2.git" |
18 | file://0001-typecast-input-parameter-to-int-for-abs.patch \ | 18 | SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" |
19 | " | 19 | PV = "1.9.12" |
20 | SRCREV = "2d1d323505585d406a7e64fb932953baefc5945e" | ||
21 | PV = "1.9.10+git${SRCPV}" | ||
22 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
23 | 21 | ||
24 | inherit waf pkgconfig | 22 | inherit waf pkgconfig |