From 3693f243a639351083eb29fb1a14916d0ff5990d Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Mon, 6 Jun 2016 19:55:56 +0300 Subject: alsa-lib: 1.1.0 -> 1.1.1 Release notes: http://alsa-project.org/main/index.php/Changes_v1.1.0_v1.1.1 Dropped upstreamed patch 0001-topology-Add-missing-include-sys-stat.h.patch. Updated "Upstream-Status" of accepted patch 0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch. Rebased avoid-including-sys-poll.h-directly.patch. Signed-off-by: Tanu Kaskinen Signed-off-by: Richard Purdie --- ...fix-appl-pointer-not-correct-when-mmap_co.patch | 2 +- ...1-topology-Add-missing-include-sys-stat.h.patch | 35 --------------- .../avoid-including-sys-poll.h-directly.patch | 2 +- meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb | 52 ---------------------- meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb | 51 +++++++++++++++++++++ 5 files changed, 53 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch index 9fd69f301d..bb2f82b1f5 100755 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch @@ -9,7 +9,7 @@ which cause the avail_update()'s result wrong. This patch move the snd_pcm_mmap_appl_forward() to the place when snd_pcm_mmap_commit() is successfully returned. -Upstream-Status: Submitted [https://patchwork.kernel.org/patch/8760881/] +Upstream-Status: Accepted [expected in 1.1.2] Signed-off-by: Shengjiu Wang Signed-off-by: Takashi Iwai diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch deleted file mode 100644 index 0ead0cdafe..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3f1dba9a821b53b42001605f9a126a958804884f Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Mon, 9 Nov 2015 13:37:26 +0100 -Subject: [PATCH] topology: Add missing include sys/stat.h - -Necessary for proper definitions of S_IRUSR & co. Otherwise it -results in compile errors with old glibc and uclibc: - parser.c: In function 'snd_tplg_build_file': - parser.c:262: error: 'S_IRUSR' undeclared (first use in this function) - parser.c:262: error: (Each undeclared identifier is reported only once - parser.c:262: error: for each function it appears in.) - -Upstream-Status: Backport - -Signed-off-by: Takashi Iwai -Signed-off-by: Maxin B. John ---- - src/topology/parser.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/topology/parser.c b/src/topology/parser.c -index 80a0ae0..18bb9c7 100644 ---- a/src/topology/parser.c -+++ b/src/topology/parser.c -@@ -16,6 +16,7 @@ - Liam Girdwood - */ - -+#include - #include "list.h" - #include "tplg_local.h" - --- -2.4.0 - diff --git a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch index 161619b279..b8b1cb6546 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch +++ b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch @@ -73,7 +73,7 @@ index b429f5d..e05898f 100644 +#include #include #include - #include + #if defined(__linux__) diff --git a/src/control/control.c b/src/control/control.c index 4a28cf6..071c5db 100644 --- a/src/control/control.c diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb deleted file mode 100644 index cff3d01cf7..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "ALSA sound library" -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" -SECTION = "libs/multimedia" -LICENSE = "LGPLv2.1 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545" - -BBCLASSEXTEND = "native nativesdk" - -# configure.in sets -D__arm__ on the command line for any arm system -# (not just those with the ARM instruction set), this should be removed, -# (or replaced by a permitted #define). -#FIXME: remove the following -ARM_INSTRUCTION_SET = "arm" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ - file://Check-if-wordexp-function-is-supported.patch \ - file://avoid-including-sys-poll.h-directly.patch \ - file://0001-topology-Add-missing-include-sys-stat.h.patch \ - file://0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch \ -" -SRC_URI[md5sum] = "69515ca73c3c4a212ef45160dea846c1" -SRC_URI[sha256sum] = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15" - -inherit autotools pkgconfig - -require alsa-fpu.inc -EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " - -EXTRA_OECONF = "--disable-python" - -EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " - -PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc" -FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" -FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" -FILES_libasound = "${libdir}/libasound.so.*" -FILES_alsa-server = "${bindir}/*" -FILES_alsa-conf = "${datadir}/alsa/" -FILES_alsa-conf-base = "\ -${datadir}/alsa/alsa.conf \ -${datadir}/alsa/cards/aliases.conf \ -${datadir}/alsa/pcm/default.conf \ -${datadir}/alsa/pcm/dmix.conf \ -${datadir}/alsa/pcm/dsnoop.conf" - -RDEPENDS_libasound = "alsa-conf-base alsa-conf" -# upgrade path -RPROVIDES_${PN}-dev = "alsa-dev" -RREPLACES_${PN}-dev = "alsa-dev" -RCONFLICTS_${PN}-dev = "alsa-dev" diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb new file mode 100644 index 0000000000..4fb7ccabc9 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb @@ -0,0 +1,51 @@ +SUMMARY = "ALSA sound library" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" +SECTION = "libs/multimedia" +LICENSE = "LGPLv2.1 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ + file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545" + +BBCLASSEXTEND = "native nativesdk" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ + file://Check-if-wordexp-function-is-supported.patch \ + file://avoid-including-sys-poll.h-directly.patch \ + file://0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch \ +" +SRC_URI[md5sum] = "881060d2c568f7f49db82c58df2f9ddc" +SRC_URI[sha256sum] = "8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269" + +inherit autotools pkgconfig + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + +EXTRA_OECONF = "--disable-python" + +EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc" +FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" +FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base alsa-conf" +# upgrade path +RPROVIDES_${PN}-dev = "alsa-dev" +RREPLACES_${PN}-dev = "alsa-dev" +RCONFLICTS_${PN}-dev = "alsa-dev" -- cgit 1.2.3-korg