diff mbox series

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

Message ID 20260103211155.51433-2-michael.opdenacker@rootcommit.com
State Under Review
Headers show
Series [1/4] alsa-lib: upgrade 1.2.15 -> 1.2.15.1 | expand

Commit Message

Michael Opdenacker Jan. 3, 2026, 9:11 p.m. UTC 
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 mbox series

Patch

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