summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-06-08 16:19:27 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 15:08:31 +0100
commit637744d48d8c02aa1a022ab394a33ea81fe8de2c (patch)
treee1748f3d935e9060b9586e15041bc08b693216a9 /meta/recipes-multimedia/alsa
parentc8897fecbd8bf017c84d73b920babbd65ef137d7 (diff)
downloadpoky-637744d48d8c02aa1a022ab394a33ea81fe8de2c.tar.gz
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 <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.4.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb)5
2 files changed, 2 insertions, 36 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
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 @@
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.3.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb
index 191a0367de..947f7d69e1 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb
@@ -11,10 +11,9 @@ 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 \
15" 14"
16SRC_URI[md5sum] = "eefe5992567ba00d6110a540657aaf5c" 15SRC_URI[md5sum] = "29fa3e69122d3cf3e8f0e01a0cb1d183"
17SRC_URI[sha256sum] = "71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c" 16SRC_URI[sha256sum] = "91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76"
18 17
19inherit autotools pkgconfig 18inherit autotools pkgconfig
20 19