From 8369070cf6d40732ae9d0e34c2cb2e17669cec11 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Mon, 6 Jun 2016 19:55:58 +0300 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- ...clude-config.h-from-rate_speexrate.c.patch | 35 ------------------- ...plugins_1.1.0.bb => alsa-plugins_1.1.1.bb} | 9 ++--- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch rename meta/recipes-multimedia/alsa/{alsa-plugins_1.1.0.bb => alsa-plugins_1.1.1.bb} (93%) 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 -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 ---- - 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 - #include - #include --- -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 similarity index 93% rename from meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb rename to 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" -- 2.40.1