diff --git a/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch b/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch new file mode 100644 index 0000000..577460c --- /dev/null +++ b/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 +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 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 + diff --git a/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch b/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch new file mode 100644 index 0000000..a1df5c6 --- /dev/null +++ b/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch @@ -0,0 +1,32 @@ +From 6f7ce73159c02b726a6f0fe0acff961c95e337a8 Mon Sep 17 00:00:00 2001 +From: Aaron Ma +Date: Wed, 20 Nov 2024 15:55:02 +0800 +Subject: [PATCH] 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 +Signed-off-by: Jaroslav Kysela +--- + 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.43.0 + diff --git a/alsa-utils-1.2.12.tar.bz2 b/alsa-utils-1.2.12.tar.bz2 deleted file mode 100644 index 40d35be..0000000 --- a/alsa-utils-1.2.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98bc6677d0c0074006679051822324a0ab0879aea558a8f68b511780d30cd924 -size 1631895 diff --git a/alsa-utils-1.2.12.tar.bz2.sig b/alsa-utils-1.2.12.tar.bz2.sig deleted file mode 100644 index 2fd6132..0000000 --- a/alsa-utils-1.2.12.tar.bz2.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmZm7lQACgkQg4BZbabl -nJEAsw//QOz2zlAN71eWmBc9y2YxLALkoWm91zpDCBrxt41ij8nuaSXVRwlOyho9 -jTgK+GF791IGd1s7pYYgAW0nyJf8ntK9AxsWRjQR8KgvR5kigHi7vuW3HApPJTnc -kgwvXsw3ORIgsoooJHbNN3M0BpMrRs7/ncvZUBhO+GUMrIvvURaZkprDpRkB1ark -GP1ZyMa7qq4tvBuSffbtfxaeEdbknrbKxSmLpjP6Klqb2aWrWJb4sB2HqyKfmZFp -mIQgkWRXNzMwHDKgPLQ+A75k1lS2B3AlnkszUB/mnS7zHAFbdlF65e0otUHk2xlc -vIATAg5wrXfcHDZhLzJa0PumVvAUEXkmGf9kknyI3HvPEP3DYa3icgmYvc7EMGfA -Qowz4HypLToTVQZRZPla15MDchwV6EvoCC/URppuG/4IkLY0FEZV7cSfcEo/ridV -FdExH4furlYlx1tmGQYGelFHreDjjxcqjFrLD+C6Q7Q1x2eKsSReAvYH1QLJE8Cb -3uxdFhbKjfF1cIBdFxzhtpjAMygKDUSPiYrLgGJHLnXc3gJ0G/9RbxvSpAjqJUwv -KYPa/rk4tW71q+865l8ZhFQQCLCBcmmCSKNKC0mfKsapUaMUtKvDP912+oA/p9MS -L0BB4XeWQiCTsLMcqngIGL2gFOmq/6roTaw1Ix70TedWeMEmIZg= -=Kre1 ------END PGP SIGNATURE----- diff --git a/alsa-utils-1.2.13.tar.bz2 b/alsa-utils-1.2.13.tar.bz2 new file mode 100644 index 0000000..6cbd351 --- /dev/null +++ b/alsa-utils-1.2.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1702a6b1cdf9ba3e996ecbc1ddcf9171e6808f5961d503d0f27e80ee162f1daa +size 1642028 diff --git a/alsa-utils-1.2.13.tar.bz2.sig b/alsa-utils-1.2.13.tar.bz2.sig new file mode 100644 index 0000000..7377d54 --- /dev/null +++ b/alsa-utils-1.2.13.tar.bz2.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmczJNYACgkQg4BZbabl +nJGHBQ//Ry1jfd8heASAU3cqB/MP8pHImI9s2vGelRw9RFBnDUNTkJlEbtIOLe+x +Z5uzVDkPiiy/tmX7fOsS5r1rFRI5vXNFCCsER547JrN+NVb1z53qiZROc/xUrXGg +blEl3Q7dxqMQXa8lCypGWAr7Fr0I0p83+B6epbdiLSNb5bNLBTdEoA+JC+vsTG6u +ND0/5OjUZdF/aw85DEgAolAWI5F4ubz46B/u5tTRWbHhXp5Zk5Vk5Iphw01cloAD +NtDCQJ3LF9SNxJMneu53fBTNrJY1O2wPI2jI60DgrHOdn6a/Yy7YElek7n+dwqUh +ANRE6hLJiEtQ/Ffrrbgo7dlTigg8C5A5kcOVNl7NY4DEagZM5BTxSYohPsjNxI18 ++p5dOW7qewqVBYIimMOn0ti6aE1Yo8MPxQyFlYUF83yzUY0+NIiJ7AAqdCndRg8E +tKQepZtB/r6hSHmuvQwzfqFyDUx/uaTfu7VtXz9mCQzMj82WBVrOjr1g4XmeukuG +dl7RhLfXUyy+GgMyfWYUtNg13uR1yYfcsC150bY8NZqSm0T5nfpj2cCEpA/vdzbx +plTcQdrrfAXZuHuj1HvjNbO6VdeSjZo0K2P+j1wvnmpMHy84wimmwY9OT3r440ni +nTKTcdLa0Dc7/XqJQ/2eabuULdMdv4U4cqFJ01QXz2PkeB/jUQ4= +=x7Lc +-----END PGP SIGNATURE----- diff --git a/alsa-utils.changes b/alsa-utils.changes index 74dbf18..1d48ba9 100644 --- a/alsa-utils.changes +++ b/alsa-utils.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Nov 20 11:25:32 UTC 2024 - Takashi Iwai + +- Yet another fix for alsactl for AMD acp dmic: + 0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch + +------------------------------------------------------------------- +Thu Nov 14 09:02:51 UTC 2024 - Takashi Iwai + +- 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 + +- Update to alsa-utils 1.2.13: + * alsactl: add support for AMD ACP digital microphone + * aplay: Print '=== PAUSE ===' only if it is supported + * aplaymidi/arecordmidi: Allow to pass 0 to -u option, too + * new aplaymidi2/arecordmidi2 for MIDI v2.0 + * aseqdump: improved UMP supports + * various topology updates + * aseqsend: improvement and UMP supports + For details, see: + https://www.alsa-project.org/wiki/Changes_v1.2.12_v1.2.13#alsa-utils + ------------------------------------------------------------------- Thu Jun 13 14:54:47 UTC 2024 - Takashi Iwai diff --git a/alsa-utils.spec b/alsa-utils.spec index c33738b..bfd7e42 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -16,6 +16,7 @@ # +%define build_from_git 0 %define do_autoreconf 0 %define _udevdir %(pkg-config --variable=udevdir udev) %ifarch %ix86 x86_64 %arm aarch64 ppc64le riscv64 @@ -25,20 +26,26 @@ %endif Name: alsa-utils -Version: 1.2.12 +Version: 1.2.13 Release: 0 Summary: Advanced Linux Sound Architecture Utilities License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Players URL: http://www.alsa-project.org/ +%if 0%{?build_from_git} Source: https://www.alsa-project.org/files/pub/utils/alsa-utils-%{version}.tar.bz2 Source1: https://www.alsa-project.org/files/pub/utils/alsa-utils-%{version}.tar.bz2.sig +%else +Source: alsa-utils-%{version}.tar.bz2 +%endif Source2: 01beep.conf Source3: sound-extra.service 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 +Patch2: 0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch # downstream fixes Patch100: alsa-info-no-update-for-distro-script.patch Patch101: alsa-utils-configure-version-revert.patch @@ -58,7 +65,7 @@ BuildRequires: python3-docutils BuildRequires: xmlto BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) -%if 0%{?do_autoreconf} +%if 0%{?do_autoreconf} || 0%{?build_from_git} BuildRequires: automake BuildRequires: libtool %endif @@ -85,8 +92,10 @@ and test audio before and after PM state changes. %prep %setup -q +%patch -P 1 -p1 +%patch -P 2 -p1 %patch -P 100 -p1 -%if 0%{?do_autoreconf} +%if 0%{?do_autoreconf} || 0%{?build_from_git} %patch -P 101 -p1 # fix stupid automake's automatic action sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am @@ -94,6 +103,13 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am %build export AUTOMAKE_JOBS="%{?_smp_mflags}" +%if 0%{?build_from_git} +export GITCOMPILE_NO_MAKE=1 +./gitcompile --with-curses=ncursesw \ + --with-systemdsystemunitdir=%{_unitdir} \ + --with-udev-rules-dir=%{_udevdir}/rules.d \ + --with-alsactl-lock-dir=/run/lock +%else %if 0%{?do_autoreconf} gettextize -c -f --no-changelog autoreconf -fi @@ -102,6 +118,7 @@ autoreconf -fi --with-systemdsystemunitdir=%{_unitdir} \ --with-udev-rules-dir=%{_udevdir}/rules.d \ --with-alsactl-lock-dir=/run/lock +%endif make %{?_smp_mflags} %install