diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2021-06-03 17:43:08 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-06 23:16:50 +0100 |
commit | 8217f02048733ea5b486c479885ca1b6bef4465e (patch) | |
tree | e020511f5264b1d32df06070823a6151a613fc26 /meta/recipes-multimedia/alsa | |
parent | 97a8f1c4b51de8fd0ea0ac05a8aa86e30dfc04a1 (diff) | |
download | poky-8217f02048733ea5b486c479885ca1b6bef4465e.tar.gz |
alsa-lib: upgrade 1.2.4 -> 1.2.5
* Backported patch can go
* See full changelog at [1]
[1] https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.5
(From OE-Core rev: 2aa6eee190e123e224b34ed4521b095e2dbb780c)
Signed-off-by: Andreas Müller <schnitzeltony@gmail.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_exec.c-Include-limits.h-explicitly-to-fix-build-.patch | 41 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch | 31 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb) | 4 |
3 files changed, 43 insertions, 33 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch new file mode 100644 index 0000000000..8752ef0dc0 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 26ab44c99e9f370e3da0c18982fa482e2e55f0a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Thu, 3 Jun 2021 12:29:03 +0200 | ||
4 | Subject: [PATCH] ucm_exec.c: Include limits.h explicitly to fix build on musl | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Fixes: | ||
10 | | ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c: In function 'find_exec': | ||
11 | | ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:43:18: error: 'PATH_MAX' undeclared (first use in this function) | ||
12 | | 43 | char bin[PATH_MAX]; | ||
13 | | | ^~~~~~~~ | ||
14 | | ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:43:18: note: each undeclared identifier is reported only once for each function it appears in | ||
15 | | ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c: In function 'uc_mgr_exec': | ||
16 | | ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:177:18: error: 'PATH_MAX' undeclared (first use in this function) | ||
17 | | 177 | char bin[PATH_MAX]; | ||
18 | | | ^~~~~~~~ | ||
19 | |||
20 | Upstream-Status: Submitted [https://github.com/alsa-project/alsa-lib/pull/145] | ||
21 | |||
22 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
23 | --- | ||
24 | src/ucm/ucm_exec.c | 1 + | ||
25 | 1 file changed, 1 insertion(+) | ||
26 | |||
27 | diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c | ||
28 | index d83206d0..4ddf5d15 100644 | ||
29 | --- a/src/ucm/ucm_exec.c | ||
30 | +++ b/src/ucm/ucm_exec.c | ||
31 | @@ -30,6 +30,7 @@ | ||
32 | #include "ucm_local.h" | ||
33 | #include <sys/stat.h> | ||
34 | #include <sys/wait.h> | ||
35 | +#include <limits.h> | ||
36 | #include <dirent.h> | ||
37 | |||
38 | static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER; | ||
39 | -- | ||
40 | 2.31.1 | ||
41 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch b/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch deleted file mode 100644 index 98e2988dda..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 | ||
2 | From: Jaroslav Kysela <perex@perex.cz> | ||
3 | Date: Thu, 22 Oct 2020 20:57:32 +0200 | ||
4 | Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be | ||
5 | declared even for \!DL_ORIGIN_AVAILABLE | ||
6 | |||
7 | Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") | ||
8 | BugLink: https://github.com/alsa-project/alsa-lib/issues/91 | ||
9 | Signed-off-by: Jaroslav Kysela <perex@perex.cz> | ||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | src/dlmisc.c | 2 -- | ||
14 | 1 file changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/dlmisc.c b/src/dlmisc.c | ||
17 | index c9517c55..f20eb593 100644 | ||
18 | --- a/src/dlmisc.c | ||
19 | +++ b/src/dlmisc.c | ||
20 | @@ -42,11 +42,9 @@ | ||
21 | #ifndef PIC | ||
22 | struct snd_dlsym_link *snd_dlsym_start = NULL; | ||
23 | #endif | ||
24 | -#ifdef DL_ORIGIN_AVAILABLE | ||
25 | static int snd_plugin_dir_set = 0; | ||
26 | static char *snd_plugin_dir = NULL; | ||
27 | #endif | ||
28 | -#endif | ||
29 | |||
30 | #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) | ||
31 | static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb index c49cc2a9b4..1d6a9655f6 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb | |||
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ | |||
10 | " | 10 | " |
11 | 11 | ||
12 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ | 12 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ |
13 | file://ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch" | 13 | file://0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch" |
14 | SRC_URI[sha256sum] = "f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7" | 14 | SRC_URI[sha256sum] = "9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18" |
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
17 | 17 | ||