From 637744d48d8c02aa1a022ab394a33ea81fe8de2c Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Thu, 8 Jun 2017 16:19:27 +0300 Subject: alsa-lib: 1.1.3 -> 1.1.4.1 Changelogs: http://alsa-project.org/main/index.php/Changes_v1.1.3_v1.1.4 http://alsa-project.org/main/index.php/Changes_v1.1.4_v1.1.4.1 Dropped backported patch 0001-ucm-parser-needs-limits.h.patch. (From OE-Core rev: e2ede4f9080e8a01504067347eb69051dc04b6ed) Signed-off-by: Tanu Kaskinen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../alsa-lib/0001-ucm-parser-needs-limits.h.patch | 33 ---------------- meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb | 46 ---------------------- meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb | 45 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch deleted file mode 100644 index 4edaf4d961..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 005ac9d2fa000912c8fb8257020a0471b1c6176c Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 21 Dec 2016 19:46:34 -0300 -Subject: [PATCH] ucm: parser needs limits.h - -It's using PATH_MAX which is defined there, otherwise the build fails on -musl libc. - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Takashi Iwai - -Upstream-Status: Accepted [expected in 1.1.4] - -Signed-off-by: Tanu Kaskinen ---- - src/ucm/parser.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ucm/parser.c b/src/ucm/parser.c -index c98373a9..f520abc5 100644 ---- a/src/ucm/parser.c -+++ b/src/ucm/parser.c -@@ -32,6 +32,7 @@ - - #include "ucm_local.h" - #include -+#include - - /** The name of the environment variable containing the UCM directory */ - #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" --- -2.11.0 - diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb deleted file mode 100644 index 191a0367de..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb +++ /dev/null @@ -1,46 +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" - -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-ucm-parser-needs-limits.h.patch \ -" -SRC_URI[md5sum] = "eefe5992567ba00d6110a540657aaf5c" -SRC_URI[sha256sum] = "71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c" - -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 alsa-doc" -FILES_libasound = "${libdir}/libasound.so.*" -FILES_alsa-server = "${bindir}/*" -FILES_alsa-conf = "${datadir}/alsa/" - -RDEPENDS_libasound = "alsa-conf" - -# alsa-lib gets automatically added to alsa-lib-dev dependencies, but the -# alsa-lib package doesn't exist. libasound is the real library package. -RDEPENDS_${PN}-dev = "libasound" - -# upgrade path -RPROVIDES_${PN}-dev = "alsa-dev" -RREPLACES_${PN}-dev = "alsa-dev" -RCONFLICTS_${PN}-dev = "alsa-dev" - -RPROVIDES_alsa-conf = "alsa-conf-base" -RREPLACES_alsa-conf = "alsa-conf-base" -RCONFLICTS_alsa-conf = "alsa-conf-base" diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb new file mode 100644 index 0000000000..947f7d69e1 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb @@ -0,0 +1,45 @@ +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" + +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 \ +" +SRC_URI[md5sum] = "29fa3e69122d3cf3e8f0e01a0cb1d183" +SRC_URI[sha256sum] = "91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76" + +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 alsa-doc" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" + +RDEPENDS_libasound = "alsa-conf" + +# alsa-lib gets automatically added to alsa-lib-dev dependencies, but the +# alsa-lib package doesn't exist. libasound is the real library package. +RDEPENDS_${PN}-dev = "libasound" + +# upgrade path +RPROVIDES_${PN}-dev = "alsa-dev" +RREPLACES_${PN}-dev = "alsa-dev" +RCONFLICTS_${PN}-dev = "alsa-dev" + +RPROVIDES_alsa-conf = "alsa-conf-base" +RREPLACES_alsa-conf = "alsa-conf-base" +RCONFLICTS_alsa-conf = "alsa-conf-base" -- cgit v1.2.3-54-g00ecf