Compare commits
17 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b5135ae23 | ||
|
|
e5f06f10f7 | ||
|
|
af596e344c | ||
|
|
6832b4487f | ||
|
|
712def8d07 | ||
|
|
d2872e5bc6 | ||
|
|
234977f2a8 | ||
|
|
b81158d8ee | ||
|
|
c6dfe02d6f | ||
|
|
b4926c6a54 | ||
|
|
8af5b81ac1 | ||
|
|
6b0bfe6502 | ||
|
|
65c6a14b10 | ||
|
|
76b6ba63bc | ||
|
|
df95d97fce | ||
|
|
af2b8fab73 | ||
|
|
57be7e615a |
3 changed files with 40 additions and 48 deletions
|
|
@ -1,40 +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] 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 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
|
||||
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
%define baseversion 1.2.13
|
||||
#define fixversion .2
|
||||
%define baseversion 1.2.15
|
||||
%define fixversion .2
|
||||
%global _hardened_build 1
|
||||
|
||||
%global utils_patch 0
|
||||
|
||||
Summary: Advanced Linux Sound Architecture (ALSA) utilities
|
||||
Name: alsa-utils
|
||||
Version: %{baseversion}%{?fixversion}
|
||||
|
|
@ -9,13 +11,14 @@ 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
|
||||
Source4: alsaunmute
|
||||
Source5: alsaunmute.1
|
||||
Source11: alsactl.conf
|
||||
Source20: alsa-restore.service
|
||||
Source22: alsa-state.service
|
||||
%if %{utils_patch}
|
||||
Patch1: alsa-git.patch
|
||||
%endif
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: autoconf automake libtool
|
||||
|
|
@ -63,7 +66,9 @@ Architecture (ALSA) framework and Fast Fourier Transform library.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%if %{utils_patch}
|
||||
%patch -P1 -p1 -b .alsa-git
|
||||
%endif
|
||||
|
||||
%build
|
||||
autoreconf -vif
|
||||
|
|
@ -117,9 +122,11 @@ find %{buildroot} -name "*.la" -exec rm {} \;
|
|||
#{_unitdir}/sound.target.wants/*
|
||||
%{alsacfgdir}/init/*
|
||||
%{_bindir}/aconnect
|
||||
%{_sbindir}/alsactl
|
||||
%{_bindir}/alsaloop
|
||||
%{_bindir}/alsamixer
|
||||
%{_bindir}/alsaunmute
|
||||
%{_sbindir}/alsa-info.sh
|
||||
%{_bindir}/amidi
|
||||
%{_bindir}/amixer
|
||||
%{_bindir}/aplay
|
||||
|
|
@ -133,10 +140,8 @@ find %{buildroot} -name "*.la" -exec rm {} \;
|
|||
%{_bindir}/aseqsend
|
||||
%{_bindir}/axfer
|
||||
%{_bindir}/iecset
|
||||
%{_bindir}/speaker-test
|
||||
%{_bindir}/nhlt-dmic-info
|
||||
%{_sbindir}/*
|
||||
%exclude %{_sbindir}/alsabat-test.sh
|
||||
%{_bindir}/speaker-test
|
||||
%{_datadir}/alsa/
|
||||
%{_datadir}/sounds/*
|
||||
%{_mandir}/man7/*
|
||||
|
|
@ -161,7 +166,7 @@ find %{buildroot} -name "*.la" -exec rm {} \;
|
|||
%{_mandir}/man1/iecset.1.gz
|
||||
%{_mandir}/man1/speaker-test.1.gz
|
||||
%{_mandir}/man1/aconnect.1.gz
|
||||
%{_mandir}/man1/alsa-info.sh.1.gz
|
||||
%{_mandir}/man8/alsa-info.sh.8.gz
|
||||
%{_mandir}/man1/nhlt-dmic-info.1.gz
|
||||
|
||||
%dir /etc/alsa/
|
||||
|
|
@ -206,9 +211,36 @@ fi
|
|||
%systemd_postun_with_restart alsa-state.service
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.15.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Thu Jan 8 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.15.2-1
|
||||
* Updated to 1.2.15.2
|
||||
|
||||
* Thu Jan 1 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.15.1-3
|
||||
* Apply fix to alsactl (card detection issue)
|
||||
|
||||
* Fri Dec 19 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.15.1-1
|
||||
* Updated to 1.2.15.1
|
||||
|
||||
* Mon Dec 8 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.15-2
|
||||
* Updated to 1.2.15
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Apr 14 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.14-1
|
||||
* Updated to 1.2.14
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Nov 14 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.13-2
|
||||
* Updated to 1.2.13
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jun 11 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.12-1
|
||||
* Updated to 1.2.12
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (alsa-utils-1.2.13.tar.bz2) = 0e2fb5b6e497b977badba2ebe2bddfc819654d24001622e0299e4034210caeeea2f3c2c2d1d260a48caefb6584e0b989fdb7036c6012108c8c38d89b3cb04c78
|
||||
SHA512 (alsa-utils-1.2.15.2.tar.bz2) = 13ca15a63bcbf81a4643ef03e391200d7523335bc300e290756089c4cfeccb9773cf6b77f9fcf4b80e6aa2e8c5e33a2c86c9173f1feb480aedf5ecda0f7c47cd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue