diff options
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch | 35 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb) | 9 |
2 files changed, 3 insertions, 41 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch deleted file mode 100644 index 8e5b6a2a21..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 4350314c941489833a8baa930e16512e55f72a13 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tanu Kaskinen <tanuk@iki.fi> | ||
3 | Date: Wed, 27 Jan 2016 13:22:38 +0200 | ||
4 | Subject: [PATCH] pph: include config.h from rate_speexrate.c | ||
5 | |||
6 | Fixes compilation against libspeexdsp 1.2rc3. | ||
7 | |||
8 | rate_speexrate.c includes speex_resampler.h, which depends on config.h | ||
9 | by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not | ||
10 | a good idea to include config.h from headers (I don't know/remember | ||
11 | why, though), which is why I include config.h from rate_speexrate.c | ||
12 | instead of speex_resampler.h. | ||
13 | |||
14 | Upstream-Status: Accepted [expected in 1.1.1] | ||
15 | |||
16 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
17 | --- | ||
18 | pph/rate_speexrate.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c | ||
22 | index 0a1325c..8fc4cef 100644 | ||
23 | --- a/pph/rate_speexrate.c | ||
24 | +++ b/pph/rate_speexrate.c | ||
25 | @@ -28,6 +28,7 @@ | ||
26 | POSSIBILITY OF SUCH DAMAGE. | ||
27 | */ | ||
28 | |||
29 | +#include "config.h" | ||
30 | #include <stdio.h> | ||
31 | #include <alsa/asoundlib.h> | ||
32 | #include <alsa/pcm_rate.h> | ||
33 | -- | ||
34 | 2.7.0.rc3 | ||
35 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb index e54101764b..c95ea54160 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb | |||
@@ -20,12 +20,9 @@ LIC_FILES_CHKSUM = "\ | |||
20 | file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \ | 20 | file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI = "\ | 23 | SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2" |
24 | ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \ | 24 | SRC_URI[md5sum] = "69f9f3e2de3c97fc71d496e91e271fe5" |
25 | file://0001-pph-include-config.h-from-rate_speexrate.c.patch \ | 25 | SRC_URI[sha256sum] = "8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1" |
26 | " | ||
27 | SRC_URI[md5sum] = "b123e42ed881b9adbc99e4040f257c39" | ||
28 | SRC_URI[sha256sum] = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee" | ||
29 | 26 | ||
30 | DEPENDS += "alsa-lib" | 27 | DEPENDS += "alsa-lib" |
31 | 28 | ||