summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2021-06-17 07:53:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-17 22:20:44 +0100
commit1239d73e8967e2659c4d6065fb45bf019ae01d8c (patch)
tree464c06b4f1598e1da602e0e07aa8ea53331ab935 /meta/recipes-multimedia/alsa
parent64ce39210f5469687c9e583e0af7e0d322c35dd5 (diff)
downloadpoky-1239d73e8967e2659c4d6065fb45bf019ae01d8c.tar.gz
alsa-lib: upgrade 1.2.5 -> 1.2.5.1
0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch removed since it is included in 1.2.5.1 (From OE-Core rev: 293c6819a4c3ee397ff87ee73d42b5c85f2daf6c) Signed-off-by: Wang Mingyu <wangmy@fujitsu.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-.patch41
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb)5
2 files changed, 2 insertions, 44 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
deleted file mode 100644
index 8752ef0dc0..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 26ab44c99e9f370e3da0c18982fa482e2e55f0a8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Thu, 3 Jun 2021 12:29:03 +0200
4Subject: [PATCH] ucm_exec.c: Include limits.h explicitly to fix build on musl
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Fixes:
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
20Upstream-Status: Submitted [https://github.com/alsa-project/alsa-lib/pull/145]
21
22Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
23---
24 src/ucm/ucm_exec.c | 1 +
25 1 file changed, 1 insertion(+)
26
27diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
28index 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--
402.31.1
41
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb
index 1d6a9655f6..151d63c0e8 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
9 file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ 9 file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \
10 " 10 "
11 11
12SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ 12SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
13 file://0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch" 13SRC_URI[sha256sum] = "628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e"
14SRC_URI[sha256sum] = "9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig
17 16