diff mbox series

[v2,1/5] alsa-lib: upgrade 1.2.14 -> 1.2.15

Message ID 20251217160533.600164-2-michael.opdenacker@rootcommit.com
State New
Headers show
Series ALSA 1.2.15 updates | expand

Commit Message

Michael Opdenacker Dec. 17, 2025, 4:05 p.m. UTC 
From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Include a fix from upstream that's needed with uclibc:
https://github.com/alsa-project/alsa-lib/commit/a068cf08ad67447893b707cddfce31c9cafee643

Upstream changes:
https://www.alsa-project.org/wiki/Changes_v1.2.14_v1.2.15#alsa-lib

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 ...use-closefrom-instead-of-close_range.patch | 50 +++++++++++++++++++
 ...{alsa-lib_1.2.14.bb => alsa-lib_1.2.15.bb} |  5 +-
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-lib-1.2.15/0001-ucm-use-closefrom-instead-of-close_range.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.14.bb => alsa-lib_1.2.15.bb} (89%)
diff mbox series

Patch

diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.2.15/0001-ucm-use-closefrom-instead-of-close_range.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.2.15/0001-ucm-use-closefrom-instead-of-close_range.patch
new file mode 100644
index 0000000000..815aca8019
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib-1.2.15/0001-ucm-use-closefrom-instead-of-close_range.patch
@@ -0,0 +1,50 @@ 
+From a068cf08ad67447893b707cddfce31c9cafee643 Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
+Date: Mon, 8 Dec 2025 23:46:17 -0500
+Subject: [PATCH] ucm: use closefrom instead of close_range
+
+From: Mike Gilbert <floppym@gentoo.org>
+
+closefrom is a library function with a fallback mechanism for when the
+kernel does not support the close_range syscall.
+
+Also check for the function properly instead of assuming it is available
+with _GNU_SOURCE defined.
+
+Closes: https://github.com/alsa-project/alsa-lib/pull/486
+Fixes: https://github.com/alsa-project/alsa-lib/issues/485
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+Upstream-Status: Backport [a068cf08ad67447893b707cddfce31c9cafee643]
+---
+ configure.ac       | 1 +
+ src/ucm/ucm_exec.c | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8f4bd0de..f4862f64 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,6 +52,7 @@ dnl Checks for library functions.
+ AC_PROG_GCC_TRADITIONAL
+ AC_CHECK_FUNCS([uselocale])
+ AC_CHECK_FUNCS([eaccess])
++AC_CHECK_DECLS([closefrom])
+ 
+ dnl Enable largefile support
+ AC_SYS_LARGEFILE
+diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
+index b5a22023..713039b4 100644
+--- a/src/ucm/ucm_exec.c
++++ b/src/ucm/ucm_exec.c
+@@ -259,8 +259,8 @@ int uc_mgr_exec(const char *prog)
+ 
+ 		close(f);
+ 
+-#if defined(_GNU_SOURCE)
+-		close_range(3, maxfd, 0);
++#if HAVE_DECL_CLOSEFROM
++		closefrom(3);
+ #else
+ 		for (f = 3; f < maxfd; f++)
+ 			close(f);
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.15.bb
similarity index 89%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.15.bb
index 41a42f9ecc..6ecdeefa46 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.15.bb
@@ -9,8 +9,9 @@  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"
-SRC_URI[sha256sum] = "be9c88a0b3604367dd74167a2b754a35e142f670292ae47a2fdef27a2ee97a32"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
+           file://0001-ucm-use-closefrom-instead-of-close_range.patch"
+SRC_URI[sha256sum] = "83770841585e766a60c99fd23f8c574c22643ae0cb1f2d20b793c3d84eb95a8d"
 
 inherit autotools pkgconfig