Accepting request 1224146 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/1224146
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-utils?expand=0&rev=148

0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch

@@ -0,0 +1,40 @@
+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 85f0b15f4856..dae2ed8ccc8f 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}"
+ 
+-- 
+2.43.0
+

alsa-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 14 09:02:51 UTC 2024 - Takashi Iwai <tiwai@suse.com>
+
+- Fix alsactl restore error (bsc#1233353):
+  0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch
+
 -------------------------------------------------------------------
 Tue Nov 12 14:09:44 UTC 2024 - Takashi Iwai <tiwai@suse.com>
 

alsa-utils.spec

@@ -44,6 +44,7 @@ Source5:        load-sound-modules.sh
 # from https://www.alsa-project.org/files/pub/gpg-release-key-v1.txt
 Source6:        alsa-utils.keyring
 # upstream fixes
+Patch1:         0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch
 # downstream fixes
 Patch100:       alsa-info-no-update-for-distro-script.patch
 Patch101:       alsa-utils-configure-version-revert.patch
@@ -90,6 +91,7 @@ and test audio before and after PM state changes.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 %patch -P 100 -p1
 %if 0%{?do_autoreconf} || 0%{?build_from_git}
 %patch -P 101 -p1