diff --git a/alsa-git.patch b/alsa-git.patch new file mode 100644 index 0000000..7dcbf59 --- /dev/null +++ b/alsa-git.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 85f0b15..dae2ed8 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.47.0 + diff --git a/alsa-utils.spec b/alsa-utils.spec index 5228bf5..5edb707 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,21 +1,21 @@ -%define baseversion 1.2.11 +%define baseversion 1.2.13 #define fixversion .2 %global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 -Patch1: alsa-utils-git.patch +#Patch1: alsa-utils-git.patch Source4: alsaunmute Source5: alsaunmute.1 -Source10: alsa.rules Source11: alsactl.conf Source20: alsa-restore.service Source22: alsa-state.service +Patch1: alsa-git.patch BuildRequires: gcc BuildRequires: autoconf automake libtool @@ -63,13 +63,15 @@ Architecture (ALSA) framework and Fast Fourier Transform library. %prep %setup -q -n %{name}-%{version} -%patch -P 1 -p1 -b .alsa-git +%patch -P1 -p1 -b .alsa-git %build autoreconf -vif %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ --with-udev-rules-dir=%{_prefix}/lib/udev/rules.d \ - --with-systemdsystemunitdir=%{_unitdir} + --with-systemdsystemunitdir=%{_unitdir} \ + --with-alsactl-udev-args="-E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main" \ + --with-alsactl-udev-extra-test="" make %{?_smp_mflags} cp %{SOURCE4} . @@ -79,9 +81,8 @@ cp %{SOURCE4} . make install DESTDIR=%{buildroot} %find_lang %{name} -# Install ALSA udev rules +# Install ALSA udev rules and services mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d -install -p -m 644 %{SOURCE10} %{buildroot}/%{_prefix}/lib/udev/rules.d/90-alsa-restore.rules mkdir -p %{buildroot}/%{_unitdir} install -p -m 644 %{SOURCE20} %{buildroot}/%{_unitdir}/alsa-restore.service install -p -m 644 %{SOURCE22} %{buildroot}/%{_unitdir}/alsa-state.service @@ -113,7 +114,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* %{_unitdir}/* -%{_unitdir}/sound.target.wants/* +#{_unitdir}/sound.target.wants/* %{alsacfgdir}/init/* %{_bindir}/aconnect %{_bindir}/alsaloop @@ -123,10 +124,13 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_bindir}/amixer %{_bindir}/aplay %{_bindir}/aplaymidi +%{_bindir}/aplaymidi2 %{_bindir}/arecord %{_bindir}/arecordmidi +%{_bindir}/arecordmidi2 %{_bindir}/aseqdump %{_bindir}/aseqnet +%{_bindir}/aseqsend %{_bindir}/axfer %{_bindir}/iecset %{_bindir}/speaker-test @@ -144,10 +148,13 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_mandir}/man1/amixer.1.gz %{_mandir}/man1/aplay.1.gz %{_mandir}/man1/aplaymidi.1.gz +%{_mandir}/man1/aplaymidi2.1.gz %{_mandir}/man1/arecord.1.gz %{_mandir}/man1/arecordmidi.1.gz +%{_mandir}/man1/arecordmidi2.1.gz %{_mandir}/man1/aseqdump.1.gz %{_mandir}/man1/aseqnet.1.gz +%{_mandir}/man1/aseqsend.1.gz %{_mandir}/man1/axfer.1.gz %{_mandir}/man1/axfer-list.1.gz %{_mandir}/man1/axfer-transfer.1.gz @@ -199,6 +206,12 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Thu Nov 14 2024 Jaroslav Kysela - 1.2.13-2 +* Updated to 1.2.13 + +* Tue Jun 11 2024 Jaroslav Kysela - 1.2.12-1 +* Updated to 1.2.12 + * Mon Jan 29 2024 Jaroslav Kysela - 1.2.11-1 * Updated to 1.2.11 diff --git a/alsa.rules b/alsa.rules deleted file mode 100644 index 6a4a0c3..0000000 --- a/alsa.rules +++ /dev/null @@ -1,8 +0,0 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" -GOTO="alsa_restore_end" - -LABEL="alsa_restore_go" -TEST!="/etc/alsa/state-daemon.conf", RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore /dev/$name" -TEST=="/etc/alsa/state-daemon.conf", RUN+="/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main nrestore /dev/$name" - -LABEL="alsa_restore_end" diff --git a/sources b/sources index cc35bdb..96a6018 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-utils-1.2.11.tar.bz2) = 5ce76807b53357584bfb4ace5acfdac4db9168ffaf5cdd1e499738eec046c36112bf84a99970f66368063a9baf73bad93af2d439630572f3eba5c9321071172d +SHA512 (alsa-utils-1.2.13.tar.bz2) = 0e2fb5b6e497b977badba2ebe2bddfc819654d24001622e0299e4034210caeeea2f3c2c2d1d260a48caefb6584e0b989fdb7036c6012108c8c38d89b3cb04c78