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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 (file)
index 8752ef0..0000000
--- 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 @@
-From 26ab44c99e9f370e3da0c18982fa482e2e55f0a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 3 Jun 2021 12:29:03 +0200
-Subject: [PATCH] ucm_exec.c: Include limits.h explicitly to fix build on musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c: In function 'find_exec':
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:43:18: error: 'PATH_MAX' undeclared (first use in this function)
-|    43 |         char bin[PATH_MAX];
-|       |                  ^~~~~~~~
-| ../../../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
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c: In function 'uc_mgr_exec':
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:177:18: error: 'PATH_MAX' undeclared (first use in this function)
-|   177 |         char bin[PATH_MAX];
-|       |                  ^~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/alsa-project/alsa-lib/pull/145]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/ucm/ucm_exec.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
-index d83206d0..4ddf5d15 100644
---- a/src/ucm/ucm_exec.c
-+++ b/src/ucm/ucm_exec.c
-@@ -30,6 +30,7 @@
- #include "ucm_local.h"
- #include <sys/stat.h>
- #include <sys/wait.h>
-+#include <limits.h>
- #include <dirent.h>
- 
- static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER;
--- 
-2.31.1
-

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
similarity index 88%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb
index 1d6a9655f6078da6b8418e319da576a0eec79746..151d63c0e8c39b8dc01aeaa80af742f9b06c7796 100644 (file)
--- 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 \
                     file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \
                     "
 
-SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
-           file://0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch"
-SRC_URI[sha256sum] = "9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e"
 
 inherit autotools pkgconfig