From bb57f4737aee1ab22722507d43d04c58506249ff Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 14 Nov 2024 20:42:40 +0100 Subject: [PATCH] appy upstream patch to fix udev restore rules file [release 1.2.13-2mamba;Thu Nov 14 2024] --- ....2.13-upstream-fix_alsa_restore_rule.patch | 37 +++++++++++++++++++ alsa-utils.spec | 9 ++++- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 alsa-utils-1.2.13-upstream-fix_alsa_restore_rule.patch diff --git a/alsa-utils-1.2.13-upstream-fix_alsa_restore_rule.patch b/alsa-utils-1.2.13-upstream-fix_alsa_restore_rule.patch new file mode 100644 index 0000000..e5e1573 --- /dev/null +++ b/alsa-utils-1.2.13-upstream-fix_alsa_restore_rule.patch @@ -0,0 +1,37 @@ +From f90124c73edd050b24961197a4abcf17e53b41a8 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +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 +--- + 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}" + diff --git a/alsa-utils.spec b/alsa-utils.spec index 9f4ecb8..d5f8822 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -2,7 +2,7 @@ %define majver %(echo %version | cut -d. -f1-3) Name: alsa-utils Version: 1.2.13 -Release: 1mamba +Release: 2mamba Summary: Utilities for the Advanced Linux Sound Architecture (ALSA) Group: System/Kernel and Hardware Vendor: openmamba @@ -14,7 +14,8 @@ Source1: alsa-initscript Source2: alsa-asound.conf Source3: alsa-asound.conf-usb Source4: alsa-udev-asound.conf.rules -Patch0: %{name}-1.0.19-alsaconf.patch +Patch0: alsa-utils-1.0.19-alsaconf.patch +Patch1: alsa-utils-1.2.13-upstream-fix_alsa_restore_rule.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -62,6 +63,7 @@ This package contains the utilities for the Advanced Linux Sound Architecture (A %prep %setup -q %patch 0 -p1 +%patch 1 -p1 -b .upstream-fix_alsa_restore_rule autoreconf -f -i @@ -201,6 +203,9 @@ exit 0 %{_mandir}/man1/aseqsend.1* %changelog +* Thu Nov 14 2024 Silvan Calarco 1.2.13-2mamba +- appy upstream patch to fix udev restore rules file + * Thu Nov 14 2024 Automatic Build System 1.2.13-1mamba - automatic version update by autodist