appy upstream patch to fix udev restore rules file [release 1.2.13-2mamba;Thu Nov 14 2024]

alsa-utils-1.0.18-glibc_use_bsd.patch

@@ -1,17 +0,0 @@
-diff -Nru alsa-utils-1.0.18.orig/alsactl/init_sysdeps.c alsa-utils-1.0.18/alsactl/init_sysdeps.c
---- alsa-utils-1.0.18.orig/alsactl/init_sysdeps.c	2008-11-13 12:24:15.000000000 +0100
-+++ alsa-utils-1.0.18/alsactl/init_sysdeps.c	2008-11-13 12:23:25.000000000 +0100
-@@ -18,6 +18,7 @@
-  */
- 
- #ifdef __GLIBC__
-+#ifndef __USE_BSD
- static size_t strlcpy(char *dst, const char *src, size_t size)
- {
- 	size_t bytes = 0;
-@@ -60,4 +61,5 @@
- 	*q = '\0';
- 	return bytes;
- }
-+#endif /* __USE_BSD */
- #endif /* __GLIBC__ */

alsa-utils-1.0.19-fix_bsd_check.patch

@@ -1,14 +0,0 @@
-diff -Nru alsa-utils-1.0.19.orig/alsactl/init_sysdeps.c alsa-utils-1.0.19/alsactl/init_sysdeps.c
---- alsa-utils-1.0.19.orig/alsactl/init_sysdeps.c	2009-01-19 12:17:19.000000000 +0100
-+++ alsa-utils-1.0.19/alsactl/init_sysdeps.c	2009-01-23 15:16:49.000000000 +0100
-@@ -17,8 +17,8 @@
-  *
-  */
- 
--#if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
--static size_t strlcpy(char *dst, const char *src, size_t size)
-+#if defined(__GLIBC__) && !(defined(__USE_BSD))
-+size_t strlcpy(char *dst, const char *src, size_t size)
- {
- 	size_t bytes = 0;
- 	char *q = dst;

alsa-utils-1.0.21-bsd_check.patch

@@ -1,12 +0,0 @@
-diff -Nru alsa-utils-1.0.21.orig/alsactl/init_sysdeps.c alsa-utils-1.0.21/alsactl/init_sysdeps.c
---- alsa-utils-1.0.21.orig/alsactl/init_sysdeps.c	2009-10-02 16:47:19.000000000 +0200
-+++ alsa-utils-1.0.21/alsactl/init_sysdeps.c	2009-10-02 16:53:01.000000000 +0200
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#if defined(__GLIBC__) && !(defined(__USE_BSD))
-+#if defined(__GLIBC__)
- size_t strlcpy(char *dst, const char *src, size_t size)
- {
- 	size_t bytes = 0;

alsa-utils-1.0.27-systemd-fix-typo.patch

@@ -1,11 +0,0 @@
-diff -Nru alsa-utils-1.0.27.orig/alsactl/alsa-restore.service.in alsa-utils-1.0.27/alsactl/alsa-restore.service.in
---- alsa-utils-1.0.27.orig/alsactl/alsa-restore.service.in	2013-04-11 13:43:06.000000000 +0200
-+++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in	2013-04-20 20:59:16.124867861 +0200
-@@ -12,6 +12,6 @@
- Conflicts=shutdown.target
- 
- [Service]
--Type=oneshop
-+Type=oneshot
- ExecStart=-@sbindir@/alsactl restore
- StandardOutput=syslog

alsa-utils-1.2.13-upstream-fix_alsa_restore_rule.patch

@@ -0,0 +1,37 @@
+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 85f0b15f..dae2ed8c 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}"
+ 

alsa-utils.spec

@@ -1,7 +1,7 @@
 %define _distrib_milestone %(echo %_distrib_codename | cut -d- -f1)
 %define majver %(echo %version | cut -d. -f1-3)
 Name:          alsa-utils
-Version:       1.2.7
+Version:       1.2.13
 Release:       2mamba
 Summary:       Utilities for the Advanced Linux Sound Architecture (ALSA)
 Group:         System/Kernel and Hardware
@@ -14,11 +14,8 @@ Source1:       alsa-initscript
 Source2:       alsa-asound.conf
 Source3:       alsa-asound.conf-usb
 Source4:       alsa-udev-asound.conf.rules
-Patch0:        %{name}-1.0.19-alsaconf.patch
-Patch1:        %{name}-1.0.18-glibc_use_bsd.patch
-Patch2:        %{name}-1.0.19-fix_bsd_check.patch
-Patch3:        %{name}-1.0.21-bsd_check.patch
-Patch4:        alsa-utils-1.0.27-systemd-fix-typo.patch
+Patch0:        alsa-utils-1.0.19-alsaconf.patch
+Patch1:        alsa-utils-1.2.13-upstream-fix_alsa_restore_rule.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -65,11 +62,8 @@ This package contains the utilities for the Advanced Linux Sound Architecture (A
 
 %prep
 %setup -q
-%patch0 -p1
-#%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-#%patch4 -p1
+%patch 0 -p1
+%patch 1 -p1 -b .upstream-fix_alsa_restore_rule
 
 autoreconf -f -i
 
@@ -103,9 +97,7 @@ cat >> %{buildroot}%{_modulesloaddir}/alsa-seq-midi.conf << _EOF
 snd-seq-midi
 _EOF
 
-%find_lang %{name}
-%find_lang alsaconf
-cat alsaconf.lang >> %{name}.lang
+%find_lang %{name} --with-man --all-name
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -160,8 +152,10 @@ exit 0
 %{_bindir}/amixer
 %{_bindir}/aplay
 %{_bindir}/arecord
+%{_bindir}/aseqsend
 %{_bindir}/axfer
 %{_bindir}/iecset
+%{_bindir}/nhlt-dmic-info
 %{_bindir}/speaker-test
 %{_sbindir}/alsaconf
 %{_sbindir}/alsactl
@@ -172,7 +166,6 @@ exit 0
 %{_unitdir}/alsa-state.service
 %{_unitdir}/sound.target.wants/alsa-restore.service
 %{_unitdir}/sound.target.wants/alsa-state.service
-%{_libdir}/alsa-topology/libalsatplg_module_nhlt.la
 %{_libdir}/alsa-topology/libalsatplg_module_nhlt.so
 %{_datadir}/alsa/init/*
 %{_datadir}/sounds/alsa/*.wav
@@ -185,10 +178,10 @@ exit 0
 %{_mandir}/man1/alsabat.1*
 %{_mandir}/man1/axfer*.1*
 %{_mandir}/man1/iecset.1*
+%{_mandir}/man1/nhlt-dmic-info.1*
 %{_mandir}/man1/speaker-test.1*
 %{_mandir}/man7/alsactl_init.7*
 %{_mandir}/man8/alsaconf.8*
-%lang(fr) %{_mandir}/fr/man8/alsaconf.*
 
 %files midi
 %defattr(-,root,root)
@@ -196,15 +189,41 @@ exit 0
 %{_bindir}/amidi
 %{_bindir}/aplaymidi
 %{_bindir}/arecordmidi
+%{_bindir}/aplaymidi2
+%{_bindir}/arecordmidi2
 %{_bindir}/aseqdump
 %{_bindir}/aseqnet
 %{_mandir}/man1/amidi.1*
 %{_mandir}/man1/aplaymidi.1*
+%{_mandir}/man1/aplaymidi2.1*
 %{_mandir}/man1/arecordmidi.1*
+%{_mandir}/man1/arecordmidi2.1*
 %{_mandir}/man1/aseqdump.1*
 %{_mandir}/man1/aseqnet.1*
+%{_mandir}/man1/aseqsend.1*
 
 %changelog
+* Thu Nov 14 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.13-2mamba
+- appy upstream patch to fix udev restore rules file
+
+* Thu Nov 14 2024 Automatic Build System <autodist@openmamba.org> 1.2.13-1mamba
+- automatic version update by autodist
+
+* Thu Jun 13 2024 Automatic Build System <autodist@openmamba.org> 1.2.12-1mamba
+- automatic version update by autodist
+
+* Wed Jan 31 2024 Automatic Build System <autodist@openmamba.org> 1.2.11-1mamba
+- automatic version update by autodist
+
+* Sun Sep 10 2023 Automatic Build System <autodist@mambasoft.it> 1.2.10-1mamba
+- automatic version update by autodist
+
+* Fri May 05 2023 Automatic Build System <autodist@mambasoft.it> 1.2.9-1mamba
+- automatic version update by autodist
+
+* Sat Oct 29 2022 Automatic Build System <autodist@mambasoft.it> 1.2.8-1mamba
+- automatic version update by autodist
+
 * Tue Jun 21 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.7-2mamba
 - fix permissions of /etc/asound.conf.alsa*