From: Alexander Kanavin <[email protected]> alsa-lib: backport a patch to address musl build failures.
alsa-utils: backport a separate-build-directory build fix. Signed-off-by: Alexander Kanavin <[email protected]> --- ...cf08ad67447893b707cddfce31c9cafee643.patch | 50 +++++++++++++++++++ ...{alsa-lib_1.2.14.bb => alsa-lib_1.2.15.bb} | 6 ++- ...a-tools_1.2.14.bb => alsa-tools_1.2.15.bb} | 2 +- ...conf_1.2.14.bb => alsa-ucm-conf_1.2.15.bb} | 2 +- ...7067fcf5b05e7fa5a84c38238dbffd079c4f.patch | 29 +++++++++++ ...a-utils_1.2.14.bb => alsa-utils_1.2.15.bb} | 6 ++- 6 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/a068cf08ad67447893b707cddfce31c9cafee643.patch rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.14.bb => alsa-lib_1.2.15.bb} (89%) rename meta/recipes-multimedia/alsa/{alsa-tools_1.2.14.bb => alsa-tools_1.2.15.bb} (97%) rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.14.bb => alsa-ucm-conf_1.2.15.bb} (89%) create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/10587067fcf5b05e7fa5a84c38238dbffd079c4f.patch rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.14.bb => alsa-utils_1.2.15.bb} (97%) diff --git a/meta/recipes-multimedia/alsa/alsa-lib/a068cf08ad67447893b707cddfce31c9cafee643.patch b/meta/recipes-multimedia/alsa/alsa-lib/a068cf08ad67447893b707cddfce31c9cafee643.patch new file mode 100644 index 0000000000..2e84a11f26 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/a068cf08ad67447893b707cddfce31c9cafee643.patch @@ -0,0 +1,50 @@ +From a068cf08ad67447893b707cddfce31c9cafee643 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Mon, 8 Dec 2025 23:46:17 -0500 +Subject: [PATCH] ucm: use closefrom instead of close_range + +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 <[email protected]> +Signed-off-by: Jaroslav Kysela <[email protected]> + +Upstream-Status: Backport [https://github.com/alsa-project/alsa-lib/commit/a068cf08ad67447893b707cddfce31c9cafee643] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + 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 8f4bd0de1..f4862f64c 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 b5a22023b..713039b49 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..c357f31c4c 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,10 @@ 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://a068cf08ad67447893b707cddfce31c9cafee643.patch \ + " +SRC_URI[sha256sum] = "83770841585e766a60c99fd23f8c574c22643ae0cb1f2d20b793c3d84eb95a8d" inherit autotools pkgconfig diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.2.15.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb rename to meta/recipes-multimedia/alsa/alsa-tools_1.2.15.bb index 751d9e8a76..1228176fb9 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.2.15.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65 SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2"; -SRC_URI[sha256sum] = "faef6fdd39ec79c9a5473dc63aa1b6331bf7664a9d452a0a8198cec7016cbc6f" +SRC_URI[sha256sum] = "800498d35233672ef67f4bf74cc6e1d37e1fe70c0540e2d2e062f2319e7b5df7" inherit autotools-brokensep pkgconfig # brokensep as as10k1 (and probably more) fail out of tree diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.bb similarity index 89% rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.bb rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.bb index d9ef831937..1eaec98e3b 100644 --- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.bb +++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.15.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] = "32e9809f592d92b978aa1032e35293c33b8d0f1ec475f937022c3ee9a3069c21" +SRC_URI[sha256sum] = "5510cb0947a3bb877b5ce218e3ecedd78bfa6643e372346c87d93d4844a45ffa" # Something went wrong at upstream tarballing inherit allarch diff --git a/meta/recipes-multimedia/alsa/alsa-utils/10587067fcf5b05e7fa5a84c38238dbffd079c4f.patch b/meta/recipes-multimedia/alsa/alsa-utils/10587067fcf5b05e7fa5a84c38238dbffd079c4f.patch new file mode 100644 index 0000000000..3269e3eeba --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils/10587067fcf5b05e7fa5a84c38238dbffd079c4f.patch @@ -0,0 +1,29 @@ +From 10587067fcf5b05e7fa5a84c38238dbffd079c4f Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +Date: Mon, 8 Dec 2025 11:12:34 +0000 +Subject: [PATCH] alsactl: fix build when in subdirectory + +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 <[email protected]> +Signed-off-by: Jaroslav Kysela <[email protected]> + +Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/10587067fcf5b05e7fa5a84c38238dbffd079c4f] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + alsactl/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 48b7c7a6..c8729e04 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.14.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb index 3cbb9b464b..7ea9ee6f8a 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb @@ -24,8 +24,10 @@ 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"; -SRC_URI[sha256sum] = "0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741" +SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://10587067fcf5b05e7fa5a84c38238dbffd079c4f.patch \ + " +SRC_URI[sha256sum] = "d3183d2ed2d69e9143c5beb97036267c3fdabfe8bfbea8bc6863f17b1f0b568e" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228328): https://lists.openembedded.org/g/openembedded-core/message/228328 Mute This Topic: https://lists.openembedded.org/mt/116906892/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
