alsa-utils: add alsa_restore_std.patch, relbump

zeppe-lin · Nov 20, 2024 · 0f19fe9 · 0f19fe9
1 parent c1a82f4
commit 0f19fe9
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/alsa-utils/.footprint b/alsa-utils/.footprint
@@ -4,6 +4,7 @@ drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/udev/
 drwxr-xr-x	root/root	lib/udev/rules.d/
+-rw-r--r--	root/root	lib/udev/rules.d/90-alsa-restore.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/aconnect

diff --git a/alsa-utils/.md5sum b/alsa-utils/.md5sum
@@ -1,4 +1,5 @@
 b3ecd7003c611196ebffcfc8d6651e9c  0001-simplify-nocolors-menu.patch
 c04cdabee211a88bf3c6c2f45b2a4f3e  alsa-utils-1.2.13.tar.bz2
+34fed4621924cd917ca45a6a8331a09a  alsa_restore_std.patch
 1d1586bd3daf562fdbb974f3730e1de1  f77a269370af917585df59d8c21c89bca07b5b73.patch
 530c7d48d48a50925c5bf9fc4fba8d3f  rc.alsa
diff --git a/alsa-utils/Pkgfile b/alsa-utils/Pkgfile
@@ -4,15 +4,17 @@
 
 name=alsa-utils
 version=1.2.13
-release=2
+release=3
 source="ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2
 	0001-simplify-nocolors-menu.patch
 	f77a269370af917585df59d8c21c89bca07b5b73.patch
+	alsa_restore_std.patch
 	rc.alsa"
 
 build() {
 	patch -d $name-$version -Np1 -i $SRC/0001-simplify-nocolors-menu.patch
 	patch -d $name-$version -Np1 -i $SRC/f77a269370af917585df59d8c21c89bca07b5b73.patch
+	patch -d $name-$version -Np1 -i $SRC/alsa_restore_std.patch
 
 	mkdir build; cd build
 
@@ -35,9 +37,6 @@ build() {
 
 	install -m 0755 -D $SRC/rc.alsa $PKG/etc/rc.d/alsa
 
-	# use /etc/rc.d/alsa for saving/restoring settings
-	rm $PKG/lib/udev/rules.d/90-alsa-restore.rules
-
 	# remove junk
 	rm $PKG/usr/sbin/alsa-info.sh
 	rmdir $PKG/usr/share/man/man7

diff --git a/alsa-utils/alsa_restore_std.patch b/alsa-utils/alsa_restore_std.patch
@@ -0,0 +1,37 @@
+From f90124c73edd050b24961197a4abcf17e53b41a8 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 14 Nov 2024 09:38:49 +0100
+Subject: [PATCH] alsactl: 90-alsa-restore.rules - fix alsa_restore_go/std
+
+Fix the label mismatch which was introduced in the transition from the
+temporary test rules.
+
+Closes: https://github.com/alsa-project/alsa-utils/issues/280
+Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone")
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ alsactl/90-alsa-restore.rules.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
+index 85f0b15f..dae2ed8c 100644
+--- a/alsactl/90-alsa-restore.rules.in
++++ b/alsactl/90-alsa-restore.rules.in
+@@ -3,6 +3,8 @@
+ ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*",@extratest@ GOTO="alsa_restore_go"
+ GOTO="alsa_restore_end"
+
++LABEL="alsa_restore_go"
++
+ ENV{ALSA_CARD_NUMBER}="$attr{device/number}"
+
+ # mark HDA analog card; HDMI/DP card does not have capture devices
+@@ -21,7 +23,7 @@ TEST!="/run/udev/alsa-hda-analog-card", GOTO="alsa_restore_std"
+ IMPORT{program}="/usr/bin/cat /run/udev/alsa-hda-analog-card"
+ ENV{ALSA_CARD_HDA_ANALOG}!="", ENV{ALSA_CARD_NUMBER}="$env{ALSA_CARD_HDA_ANALOG}"
+
+-LABEL="alsa_restore_go"
++LABEL="alsa_restore_std"
+ TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ restore $env{ALSA_CARD_NUMBER}"
+ TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ nrestore $env{ALSA_CARD_NUMBER}"
+