diff --git a/alsa-utils-1.2.10.tar.bz2 b/alsa-utils-1.2.10.tar.bz2 deleted file mode 100644 index a269ef08cb3e55348315364b4dedd70cfaecaa1b..0000000000000000000000000000000000000000 Binary files a/alsa-utils-1.2.10.tar.bz2 and /dev/null differ diff --git a/alsa-utils-1.2.13.tar.bz2 b/alsa-utils-1.2.13.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..cd40f35c21fa85c6a3da144e110d93c2aca26e3b Binary files /dev/null and b/alsa-utils-1.2.13.tar.bz2 differ diff --git a/alsa-utils-git.patch b/alsa-utils-git.patch deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/alsa-utils.spec b/alsa-utils.spec index 06ec68c4a6a4900b42cd23c472d928f5cbdc182f..1253285f60439e75159bc6f5ebc40db30ca4251e 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,17 +1,17 @@ Name: alsa-utils -Version: 1.2.10 +Version: 1.2.13 Release: 1 Summary: Advanced linux sound architecture (ALSA) utility to the Linux operating system. -License: GPLv2+ -URL: http://www.alsa-project.org/ -Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.bz2 +License: GPL-2.0-or-later +URL: https://www.alsa-project.org/ +Source: http://www.alsa-project.org/files/pub/utils/%{name}-%{version}.tar.bz2 Source1: alsaunmute Source2: alsaunmute.1 Source3: alsa.rules Source4: alsactl.conf Source5: alsa-restore.service Source6: alsa-state.service -Patch001: alsa-utils-git.patch +Patch001: backport-alsa-utils-fix-alsa_restore_go-std.patch BuildRequires: gcc alsa-lib-devel >= %{version} libsamplerate-devel ncurses-devel BuildRequires: gettext-devel xmlto python3-docutils systemd Requires: systemd alsa-lib >= %{version} alsa-ucm >= %{version} alsa-topology >= %{version} @@ -19,6 +19,7 @@ Provides: alsa-ucm-utils = %{version}-%{release} Obsoletes: alsa-ucm-utils < %{version}-%{release} Provides: alsa-topology-utils = %{version}-%{release} Obsoletes: alsa-topology-utils < %{version}-%{release} +%{?systemd_requires} %description This package provides command line utilities for audio and MIDI functionality @@ -35,11 +36,7 @@ Obsoletes: %{name}-alsabat < %{version}-%{release} This package contains tool for basic audio testing using ALSA framework and Fast Fourier Transform library. -%package help -Summary: ALSA help - -%description help -This package contains help docs for alsa-utils. +%package_help %prep %autosetup -n %{name}-%{version} -p1 @@ -87,7 +84,8 @@ fi %systemd_postun_with_restart alsa-state.service %files -f %{name}.lang -%doc COPYING ChangeLog +%license COPYING +%doc ChangeLog %config /etc/alsa/* %{_prefix}/lib/udev/rules.d/* %{_prefix}/lib/alsa/init/* @@ -113,6 +111,9 @@ fi %doc README.md TODO %changelog +* Thu Nov 14 2024 Funda Wang - 1.2.13-1 +- Upgrade to 1.2.13 + * Thu Mar 07 2024 yaoxin - 1.2.10-1 - Upgrade to 1.2.10 diff --git a/backport-alsa-utils-fix-alsa_restore_go-std.patch b/backport-alsa-utils-fix-alsa_restore_go-std.patch new file mode 100644 index 0000000000000000000000000000000000000000..7dcbf594fd1c8239f46ed904a44c0cc26d501fcf --- /dev/null +++ b/backport-alsa-utils-fix-alsa_restore_go-std.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 +