[PATCH 1/4] alsa-lib: upgrade 1.2.15 -> 1.2.15.1

[PATCH 1/4] alsa-lib: upgrade 1.2.15 -> 1.2.15.1

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Upstream changes: various fixes
https://www.alsa-project.org/wiki/Changes_v1.2.15_v1.2.15.1

Remove no longer needed patch:
0001-ucm-use-closefrom-instead-of-close_range.patch

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 ...use-closefrom-instead-of-close_range.patch | 50 -------------------
 ...lsa-lib_1.2.15.bb => alsa-lib_1.2.15.1.bb} |  5 +-
 2 files changed, 2 insertions(+), 53 deletions(-)
 delete 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.15.bb => alsa-lib_1.2.15.1.bb} (89%)

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
deleted file mode 100644
index 815aca8019..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-lib-1.2.15/0001-ucm-use-closefrom-instead-of-close_range.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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.15.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.15.1.bb
similarity index 89%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.15.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.15.1.bb
index 6ecdeefa46..f3dfd3f35d 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.15.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.15.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-use-closefrom-instead-of-close_range.patch"
-SRC_URI[sha256sum] = "83770841585e766a60c99fd23f8c574c22643ae0cb1f2d20b793c3d84eb95a8d"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "7f983ca89ca420872ca16e8a9f8f97fb63db6c1c6e2585b91737a08bb03f566c"
 
 inherit autotools pkgconfig
 

[PATCH 3/4] alsa-ucm-conf: upgrade 1.2.15 -> 1.2.15.1

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Upstream changes: various fixes
https://www.alsa-project.org/wiki/Changes_v1.2.15_v1.2.15.1

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 .../alsa/{alsa-ucm-conf_1.2.15.bb => alsa-ucm-conf_1.2.15.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.15.bb => alsa-ucm-conf_1.2.15.1.bb} (89%)

diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.1.bb
similarity index 89%
rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.bb
rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.1.bb
index 1eaec98e3b..961a1444e3 100644
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.bb
+++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.1.bb
@@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
 
 SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "5510cb0947a3bb877b5ce218e3ecedd78bfa6643e372346c87d93d4844a45ffa"
+SRC_URI[sha256sum] = "246c5d59d217b6f7f47a11fd10f1b766d25abcb0d9c996af3079bb9c9ac5a1b0"
 # Something went wrong at upstream tarballing
 
 inherit allarch

[PATCH 2/4] alsa-utils: upgrade 1.2.15 -> 1.2.15.1

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Upstream changes: alsactl and aplay fixes
https://www.alsa-project.org/wiki/Changes_v1.2.15_v1.2.15.1

Remove no longer necessary patch:
0001-alsactl-fix-build-when-in-subdirectory.patch

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 ...sactl-fix-build-when-in-subdirectory.patch | 29 -------------------
 ...utils_1.2.15.bb => alsa-utils_1.2.15.1.bb} |  5 ++--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.2.15/0001-alsactl-fix-build-when-in-subdirectory.patch
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.15.bb => alsa-utils_1.2.15.1.bb} (97%)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.2.15/0001-alsactl-fix-build-when-in-subdirectory.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.2.15/0001-alsactl-fix-build-when-in-subdirectory.patch
deleted file mode 100644
index d1c6b3d830..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils-1.2.15/0001-alsactl-fix-build-when-in-subdirectory.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 10587067fcf5b05e7fa5a84c38238dbffd079c4f Mon Sep 17 00:00:00 2001
-From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
-Date: Mon, 8 Dec 2025 11:12:34 +0000
-Subject: [PATCH] alsactl: fix build when in subdirectory
-
-From: Rudi Heitbaum <rudi@heitbaum.com>
-
-create the conf directory as part of the edit recipe
-
-Closes: https://github.com/alsa-project/alsa-utils/pull/311
-Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Upstream-Status: Backport [10587067fcf5b05e7fa5a84c38238dbffd079c4f]
----
- alsactl/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
-index 48b7c7a..c8729e0 100644
---- a/alsactl/Makefile.am
-+++ b/alsactl/Makefile.am
-@@ -47,6 +47,7 @@ endif
- edit = \
- 	extratest=$$(echo ' $(ALSACTL_UDEV_EXTRATEST)' | sed -e 's/__/ /g' -e 's/^ $$//'); \
- 	args=$$(echo ' $(ALSACTL_UDEV_ARGS)' | sed -e 's/__/ /g' -e 's/^ $$//'); \
-+	mkdir -p conf; \
- 	$(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
- 		  -e 's,@mydatadir\@,$(mydatadir),g' \
- 		  -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb
similarity index 97%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb
index 09b3de81f4..dad5478f39 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb
@@ -24,9 +24,8 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev
 PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
-SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \
-	   file://0001-alsactl-fix-build-when-in-subdirectory.patch"
-SRC_URI[sha256sum] = "d3183d2ed2d69e9143c5beb97036267c3fdabfe8bfbea8bc6863f17b1f0b568e"
+SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
+SRC_URI[sha256sum] = "5ad79f349e59c30c9a4929ad4995ebee33267473e0e632d7c1a30e2b093d3327"
 
 # On build machines with python-docutils (not python3-docutils !!) installed
 # rst2man (not rst2man.py) is detected and compile fails with

[PATCH 4/4] alsa-utils: remove no longer needed fixup

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Was only relevant for build machines with python-docutils,
which is now obsoleted by python3-docutils.

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb
index dad5478f39..f9ee10d240 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.1.bb
@@ -27,12 +27,6 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook
 SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
 SRC_URI[sha256sum] = "5ad79f349e59c30c9a4929ad4995ebee33267473e0e632d7c1a30e2b093d3327"
 
-# On build machines with python-docutils (not python3-docutils !!) installed
-# rst2man (not rst2man.py) is detected and compile fails with
-# | make[1]: *** No rule to make target 'alsaucm.1', needed by 'all-am'.  Stop.
-# Avoid this by disabling expicitly
-EXTRA_OECONF = "--disable-rst2man"
-
 inherit autotools gettext pkgconfig manpages
 
 # This are all packages that we need to make. Also, the now empty alsa-utils