All of lore.kernel.org
 help / color / mirror / Atom feed
From: michael.opdenacker@rootcommit.com
To: openembedded-core@lists.openembedded.org
Cc: Michael Opdenacker <michael.opdenacker@rootcommit.com>
Subject: [PATCH v2 2/5] alsa-utils: upgrade 1.2.14 -> 1.2.15
Date: Wed, 17 Dec 2025 16:05:48 +0000 (UTC)	[thread overview]
Message-ID: <20251217160533.600164-3-michael.opdenacker@rootcommit.com> (raw)
In-Reply-To: <20251217160533.600164-1-michael.opdenacker@rootcommit.com>

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

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 <michael.opdenacker@rootcommit.com>
---
 ...sactl-fix-build-when-in-subdirectory.patch | 29 +++++++++++++++++++
 ...a-utils_1.2.14.bb => alsa-utils_1.2.15.bb} |  7 +++--
 2 files changed, 33 insertions(+), 3 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} (96%)

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 <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.14.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb
similarity index 96%
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..8fae1cfd9e 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.15.bb
@@ -24,14 +24,15 @@ 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
 # | make[1]: *** No rule to make target 'alsaucm.1', needed by 'all-am'.  Stop.
 # Avoid this by disabling expicitly
-EXTRA_OECONF = "--disable-rst2man"
+# EXTRA_OECONF = "--disable-rst2man"
 
 inherit autotools gettext pkgconfig manpages
 


  reply	other threads:[~2025-12-17 16:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-17 16:05 [PATCH v2 0/5] ALSA 1.2.15 updates michael.opdenacker
2025-12-17 16:05 ` michael.opdenacker [this message]
2025-12-22 17:24   ` [OE-core] [PATCH v2 2/5] alsa-utils: upgrade 1.2.14 -> 1.2.15 Alexander Kanavin
2025-12-22 17:32     ` Michael Opdenacker
2025-12-17 16:05 ` [PATCH v2 3/5] alsa-tools: " michael.opdenacker
2025-12-17 16:05 ` [PATCH v2 1/5] alsa-lib: " michael.opdenacker
2025-12-17 16:05 ` [PATCH v2 4/5] alsa-ucm-conf: " michael.opdenacker
2025-12-17 16:05 ` [PATCH v2 5/5] maintainers.inc: update e-mail address michael.opdenacker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251217160533.600164-3-michael.opdenacker@rootcommit.com \
    --to=michael.opdenacker@rootcommit.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.