summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-02-15 09:13:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:52 -0800
commit5286f9c310eaaaf762b8d091ec6ae7b83d0417d8 (patch)
tree3752de13219cb9a73231d9536b295931c11e12c0 /meta/recipes-multimedia/alsa
parent00a2a55c01942c0afb51e16cb23993880c1915af (diff)
downloadpoky-5286f9c310eaaaf762b8d091ec6ae7b83d0417d8.tar.gz
alsa-lib: 1.1.2 -> 1.1.3
Changelog: http://alsa-project.org/main/index.php/Changes_v1.1.2_v1.1.3 Added a patch to fix a build failure with musl (cherry-picked from upstream). The new release doesn't any more install the smixer modules when Python support is disabled. The modules weren't usable without Python support before either, so this change does not constitute a loss of functionality [1]. alsa-lib-dev has automatic dependencies on alsa-lib and libasound, but since the smixer modules were the only thing in the alsa-lib package, the alsa-lib package doesn't get generated any more. alsa-lib-dev still has an automatic dependency on alsa-lib, however, so I had to override the RDEPENDS of alsa-lib-dev to only include libasound. [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2016-November/114682.html (From OE-Core rev: dc549b5510bfcf83f6e5e8e3aa7ed663dee83444) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch33
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb)12
2 files changed, 41 insertions, 4 deletions
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
new file mode 100644
index 0000000000..4edaf4d961
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm-parser-needs-limits.h.patch
@@ -0,0 +1,33 @@
1From 005ac9d2fa000912c8fb8257020a0471b1c6176c Mon Sep 17 00:00:00 2001
2From: Gustavo Zacarias <gustavo@zacarias.com.ar>
3Date: Wed, 21 Dec 2016 19:46:34 -0300
4Subject: [PATCH] ucm: parser needs limits.h
5
6It's using PATH_MAX which is defined there, otherwise the build fails on
7musl libc.
8
9Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
10Signed-off-by: Takashi Iwai <tiwai@suse.de>
11
12Upstream-Status: Accepted [expected in 1.1.4]
13
14Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
15---
16 src/ucm/parser.c | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/src/ucm/parser.c b/src/ucm/parser.c
20index c98373a9..f520abc5 100644
21--- a/src/ucm/parser.c
22+++ b/src/ucm/parser.c
23@@ -32,6 +32,7 @@
24
25 #include "ucm_local.h"
26 #include <dirent.h>
27+#include <limits.h>
28
29 /** The name of the environment variable containing the UCM directory */
30 #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
31--
322.11.0
33
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
index e313da78e4..5c213bebde 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
@@ -11,9 +11,10 @@ BBCLASSEXTEND = "native nativesdk"
11SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ 11SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
12 file://Check-if-wordexp-function-is-supported.patch \ 12 file://Check-if-wordexp-function-is-supported.patch \
13 file://avoid-including-sys-poll.h-directly.patch \ 13 file://avoid-including-sys-poll.h-directly.patch \
14 file://0001-ucm-parser-needs-limits.h.patch \
14" 15"
15SRC_URI[md5sum] = "1946e6438b8262a7b8fdadacd0e06ba7" 16SRC_URI[md5sum] = "eefe5992567ba00d6110a540657aaf5c"
16SRC_URI[sha256sum] = "d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6" 17SRC_URI[sha256sum] = "71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c"
17 18
18inherit autotools pkgconfig 19inherit autotools pkgconfig
19 20
@@ -25,8 +26,6 @@ EXTRA_OECONF = "--disable-python"
25EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " 26EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no "
26 27
27PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc" 28PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc"
28FILES_${PN} += "${libdir}/${BPN}/smixer/*.so"
29FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la"
30FILES_libasound = "${libdir}/libasound.so.*" 29FILES_libasound = "${libdir}/libasound.so.*"
31FILES_alsa-server = "${bindir}/*" 30FILES_alsa-server = "${bindir}/*"
32FILES_alsa-conf = "${datadir}/alsa/" 31FILES_alsa-conf = "${datadir}/alsa/"
@@ -38,6 +37,11 @@ ${datadir}/alsa/pcm/dmix.conf \
38${datadir}/alsa/pcm/dsnoop.conf" 37${datadir}/alsa/pcm/dsnoop.conf"
39 38
40RDEPENDS_libasound = "alsa-conf-base alsa-conf" 39RDEPENDS_libasound = "alsa-conf-base alsa-conf"
40
41# alsa-lib gets automatically added to alsa-lib-dev dependencies, but the
42# alsa-lib package doesn't exist. libasound is the real library package.
43RDEPENDS_${PN}-dev = "libasound"
44
41# upgrade path 45# upgrade path
42RPROVIDES_${PN}-dev = "alsa-dev" 46RPROVIDES_${PN}-dev = "alsa-dev"
43RREPLACES_${PN}-dev = "alsa-dev" 47RREPLACES_${PN}-dev = "alsa-dev"