summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2016-06-06 19:55:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-06 22:47:05 +0100
commit8369070cf6d40732ae9d0e34c2cb2e17669cec11 (patch)
treed03e8796fc54fa1f1e01fb3085edde636222da17
parentf54d2d640b0169d9d3f55fd6eeed1c09e849223b (diff)
downloadopenembedded-core-contrib-8369070cf6d40732ae9d0e34c2cb2e17669cec11.tar.gz
openembedded-core-contrib-8369070cf6d40732ae9d0e34c2cb2e17669cec11.tar.bz2
openembedded-core-contrib-8369070cf6d40732ae9d0e34c2cb2e17669cec11.zip
alsa-plugins: 1.1.0 -> 1.1.1
Changelog: http://alsa-project.org/main/index.php/Changes_v1.1.0_v1.1.1 Removed upstreamed patch 0001-pph-include-config.h-from-rate_speexrate.c.patch. Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch35
-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 @@
-From 4350314c941489833a8baa930e16512e55f72a13 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk@iki.fi>
-Date: Wed, 27 Jan 2016 13:22:38 +0200
-Subject: [PATCH] pph: include config.h from rate_speexrate.c
-
-Fixes compilation against libspeexdsp 1.2rc3.
-
-rate_speexrate.c includes speex_resampler.h, which depends on config.h
-by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not
-a good idea to include config.h from headers (I don't know/remember
-why, though), which is why I include config.h from rate_speexrate.c
-instead of speex_resampler.h.
-
-Upstream-Status: Accepted [expected in 1.1.1]
-
-Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
----
- pph/rate_speexrate.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c
-index 0a1325c..8fc4cef 100644
---- a/pph/rate_speexrate.c
-+++ b/pph/rate_speexrate.c
-@@ -28,6 +28,7 @@
- POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include "config.h"
- #include <stdio.h>
- #include <alsa/asoundlib.h>
- #include <alsa/pcm_rate.h>
---
-2.7.0.rc3
-
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 = "\
file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
"
-SRC_URI = "\
- ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \
- file://0001-pph-include-config.h-from-rate_speexrate.c.patch \
-"
-SRC_URI[md5sum] = "b123e42ed881b9adbc99e4040f257c39"
-SRC_URI[sha256sum] = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2"
+SRC_URI[md5sum] = "69f9f3e2de3c97fc71d496e91e271fe5"
+SRC_URI[sha256sum] = "8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1"
DEPENDS += "alsa-lib"