mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
alsa-utils: upgrade 1.2.13 -> 1.2.14
Remove 2 patches now included upstream. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14 (From OE-Core rev: 23cb89eec07596330a1234f32ff47783c8f00d30) Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
324dfd2c77
commit
9440ea0648
|
@ -1,42 +0,0 @@
|
|||
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 1/2] 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>
|
||||
Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/f90124c73edd050b24961197a4abcf17e53b41a8]
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
---
|
||||
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.25.1
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 6f7ce73159c02b726a6f0fe0acff961c95e337a8 Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Ma <aaron.ma@canonical.com>
|
||||
Date: Wed, 20 Nov 2024 15:55:02 +0800
|
||||
Subject: [PATCH 2/2] alsactl: 90-alsa-restore.rules - fix AMD acp-pdm-mach
|
||||
link
|
||||
|
||||
The link name of AMD ACP digital microphones driver acp-pdm-mach
|
||||
is acp-dmic-codec. Fix it to make UCM initialize it again.
|
||||
|
||||
Closes: https://github.com/alsa-project/alsa-utils/pull/281
|
||||
Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone")
|
||||
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/6f7ce73159c02b726a6f0fe0acff961c95e337a8]
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
---
|
||||
alsactl/90-alsa-restore.rules.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
|
||||
index dae2ed8ccc8f..5db6080b0dc6 100644
|
||||
--- a/alsactl/90-alsa-restore.rules.in
|
||||
+++ b/alsactl/90-alsa-restore.rules.in
|
||||
@@ -14,7 +14,7 @@ DRIVERS=="snd_hda_intel", TEST=="device/pcmC$env{ALSA_CARD_NUMBER}D0p", RUN+="/b
|
||||
TEST=="device/device/acp3x-dmic-capture", GOTO="alsa_hda_analog"
|
||||
TEST=="device/device/acp6x-dmic-capture", GOTO="alsa_hda_analog"
|
||||
TEST=="device/device/acp63-dmic-capture", GOTO="alsa_hda_analog"
|
||||
-TEST=="device/device/acp-pdm-dmic", GOTO="alsa_hda_analog"
|
||||
+TEST=="device/device/acp-dmic-codec", GOTO="alsa_hda_analog"
|
||||
GOTO="alsa_restore_std"
|
||||
|
||||
LABEL="alsa_hda_analog"
|
||||
--
|
||||
2.25.1
|
||||
|
|
@ -24,11 +24,8 @@ 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 \
|
||||
file://0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch \
|
||||
file://0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "1702a6b1cdf9ba3e996ecbc1ddcf9171e6808f5961d503d0f27e80ee162f1daa"
|
||||
SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
|
||||
SRC_URI[sha256sum] = "0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741"
|
||||
|
||||
# On build machines with python-docutils (not python3-docutils !!) installed
|
||||
# rst2man (not rst2man.py) is detected and compile fails with
|
Loading…
Reference in New Issue
Block a user