From: Michael Opdenacker <[email protected]> Include a fix from upstream fixing a build issue: https://github.com/alsa-project/alsa-utils/commit/10587067fcf5b05e7fa5a84c38238dbffd079c4f
Upstream changes: https://www.alsa-project.org/wiki/Changes_v1.2.14_v1.2.15#alsa-utils Signed-off-by: Michael Opdenacker <[email protected]> --- ...sactl-fix-build-when-in-subdirectory.patch | 29 +++++++++++++++++++ ...a-utils_1.2.14.bb => alsa-utils_1.2.15.bb} | 5 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create 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.14.bb => alsa-utils_1.2.15.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 new file mode 100644 index 0000000000..d1c6b3d830 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.2.15/0001-alsactl-fix-build-when-in-subdirectory.patch @@ -0,0 +1,29 @@ +From 10587067fcf5b05e7fa5a84c38238dbffd079c4f Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker <[email protected]> +Date: Mon, 8 Dec 2025 11:12:34 +0000 +Subject: [PATCH] alsactl: fix build when in subdirectory + +From: Rudi Heitbaum <[email protected]> + +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 [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.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..09b3de81f4 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,9 @@ 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://0001-alsactl-fix-build-when-in-subdirectory.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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228318): https://lists.openembedded.org/g/openembedded-core/message/228318 Mute This Topic: https://lists.openembedded.org/mt/116904854/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
