Takashi Iwai
92894bb7fd
* alsactl: info updates
* Man page fixes
* alsactl: AMD acp-pdm-mach link
* alsa-info.sh: Add alsa-ucm package to package filter
* Topology: NHLT: Intel: Improve error message for DMIC enable conflict
* Topology: NHLT: Intel: Fix mono DMIC configure for MTL platform
* Topology: NHLT: Intel: Fix DMA slots config in SSP blob
* amixer: fix unknown TVL sequence print
* arecordmidi2: fix unitialization variable error in read_ump_raw()
* aseqdump: Fix typos in messages
For details, see:
https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14#alsa-utils
- Drop obsoleted patches:
0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch
0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=226
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
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
|
|
|