Compare commits

...

19 Commits

Author SHA1 Message Date
3d7b59dba5 automatic version update by autodist [release 1.2.14-1mamba;Fri Apr 18 2025] 2025-04-18 17:38:05 +02:00
bb57f4737a appy upstream patch to fix udev restore rules file [release 1.2.13-2mamba;Thu Nov 14 2024] 2024-11-14 20:42:40 +01:00
0c4c0f4e53 automatic version update by autodist [release 1.2.13-1mamba;Thu Nov 14 2024] 2024-11-14 09:07:21 +01:00
2e9aa34f1d automatic version update by autodist [release 1.2.12-1mamba;Thu Jun 13 2024] 2024-06-14 09:35:02 +02:00
899a7e4d68 automatic version update by autodist [release 1.2.11-1mamba;Wed Jan 31 2024] 2024-01-31 21:08:44 +01:00
0e6cf89d72 automatic version update by autodist [release 1.2.10-1mamba;Sun Sep 10 2023] 2024-01-05 20:21:35 +01:00
39aa6da18e automatic version update by autodist [release 1.2.9-1mamba;Fri May 05 2023] 2024-01-05 20:21:35 +01:00
d2283aee92 automatic version update by autodist [release 1.2.8-1mamba;Sat Oct 29 2022] 2024-01-05 20:21:34 +01:00
142837c04c fix permissions of /etc/asound.conf.alsa* [release 1.2.7-2mamba;Tue Jun 21 2022] 2024-01-05 20:21:34 +01:00
059a69e30f automatic version update by autodist [release 1.2.7-1mamba;Sat Jun 04 2022] 2024-01-05 20:21:34 +01:00
195208e86e automatic version update by autodist [release 1.2.6-1mamba;Wed Dec 08 2021] 2024-01-05 20:21:34 +01:00
1af052c82e automatic version update by autodist [release 1.2.5.1-1mamba;Mon Jun 14 2021] 2024-01-05 20:21:34 +01:00
edc42e7ecf automatic version update by autodist [release 1.2.5-1mamba;Sat Jun 05 2021] 2024-01-05 20:21:34 +01:00
e6aab3bca1 update to 1.2.4 [release 1.2.4-1mamba;Mon Oct 19 2020] 2024-01-05 20:21:33 +01:00
aa175ff770 automatic version update by autodist [release 1.2.3-1mamba;Fri Jun 12 2020] 2024-01-05 20:21:33 +01:00
ac2ecf2f53 automatic version update by autodist [release 1.2.2-1mamba;Mon Feb 24 2020] 2024-01-05 20:21:33 +01:00
fa0c5eda6d automatic version update by autodist [release 1.2.1-1mamba;Fri Nov 22 2019] 2024-01-05 20:21:33 +01:00
8276fa55ac automatic version update by autodist [release 1.1.9-1mamba;Wed May 22 2019] 2024-01-05 20:21:33 +01:00
d4ca5334fb move midi modules loading file to %_modulesloaddir [release 1.1.8-2mamba;Fri Mar 15 2019] 2024-01-05 20:21:33 +01:00
6 changed files with 95 additions and 166 deletions

View File

@ -1,62 +0,0 @@
#! /bin/bash
#
# alsa
#
# This script takes care of starting alsa oss compatibility modules for
# pcm and saving/restoring mixer volume settings.
# If an alsa driver is not loaded this script does nothing.
#
# Copyright (c) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
#
# chkconfig: 2345 87 14
# description: ALSA volumes set and oss compatibiliy layer
#
### END INIT INFO
[ -r /etc/init.d/functions ] && . /etc/init.d/functions
[ -r /etc/sysconfig/sound ] && . /etc/sysconfig/sound
# see how we were called.
case "$1" in
start)
if [ -d /proc/asound ]; then
[ "$ENABLE_LEGACY_OSS" = "true" -o "$ENABLE_LEGACY_OSS" = "1" ] && {
echo -n "Loading ALSA-OSS legacy sound modules: "
modprobe snd-seq-oss
modprobe snd-mixer-oss
modprobe snd-pcm-oss
evaluate_retval
echo
}
# Restore is now called by udev
echo -n "Restoring sound card volumes"
/usr/sbin/alsactl restore >/dev/null 2>&1 || /usr/sbin/alsactl init >/dev/null 2>&1
evaluate_retval
echo
else
echo "ALSA driver is not running."
fi
;;
stop)
# stop oss emulation modules
if [ -d /proc/asound ]; then
echo -n "Saving sound card volumes"
/usr/sbin/alsactl store >/dev/null 2>&1
evaluate_retval
fi
;;
restart|reload)
$0 stop
$0 start
;;
status)
[ -n "`lsmod | grep snd[-_]mixer[-_]oss`" ] \
&& echo "ALSA-OSS legacy modules loaded." \
|| echo "ALSA-OSS legacy modules not loaded."
;;
*)
echo "Usage: alsa {start|stop|restart|status}"
exit 1
esac
exit 0

View File

@ -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__ */

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -1,28 +1,26 @@
%define _distrib_milestone %(echo %_distrib_codename | cut -d- -f1)
%define majver %(echo %version | cut -d. -f1-3)
Name: alsa-utils
Version: 1.1.8
Version: 1.2.14
Release: 1mamba
Summary: Utilities for the Advanced Linux Sound Architecture (ALSA)
Group: System/Kernel and Hardware
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.alsa-project.org/
Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?spl}.tar.bz2
Source1: alsa-initscript
URL: https://www.alsa-project.org/wiki/Main_Page
Source: https://github.com/alsa-project/alsa-utils.git/v%{version}/alsa-utils-%{version}%{?spl}.tar.bz2
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
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libalsa-devel
BuildRequires: libffado-devel
BuildRequires: libfftw-devel
BuildRequires: libgcc
BuildRequires: libncurses-devel
BuildRequires: libsamplerate-devel
## AUTOBUILDREQ-END
@ -31,7 +29,6 @@ BuildRequires: xmlto
BuildRequires: docbook-utils
BuildRequires: /usr/bin/xsltproc
%systemd_requires
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux operating system.
@ -61,27 +58,21 @@ ALSA has the following significant features:
This package contains the utilities for the Advanced Linux Sound Architecture (ALSA) MIDI Sequencer.
%prep
%setup -q -n %{name}-%{version}%{?spl:%spl}
%patch0 -p1
#%patch1 -p1
%patch2 -p1
%patch3 -p1
#%patch4 -p1
%setup -q
%patch 0 -p1
autoreconf -f -i
%build
%configure
%make
%if "%{_distrib_milestone}" == "milestone2"
make -C alsactl 90-alsa-restore.rules
%endif
%install
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
%makeinstall
install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/asound.conf.alsa
install -D -m755 %{SOURCE3} %{buildroot}%{_sysconfdir}/asound.conf.alsa-usb
install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/asound.conf.alsa
install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/asound.conf.alsa-usb
#install -D -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/59-alsa-usb-asoundconf.rules
cat > %{buildroot}%{_sysconfdir}/asound.conf.dummy << _EOF
@ -97,14 +88,15 @@ cat > %{buildroot}%{_sysconfdir}/postplug/updates.d/alsa-utils-set-gain-001.upd
%{_sbindir}/alsactl store
_EOF
install -d %{buildroot}%{_sysconfdir}/modules.d
cat >> %{buildroot}%{_sysconfdir}/modules.d/alsa-seq-midi.conf << _EOF
install -d %{buildroot}%{_modulesloaddir}
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}
%post
/usr/sbin/alternatives --install \
@ -113,7 +105,7 @@ cat alsaconf.lang >> %{name}.lang
%{_sysconfdir}/asound.conf asound.conf %{_sysconfdir}/asound.conf.alsa-usb 10
/usr/sbin/alternatives --install \
%{_sysconfdir}/asound.conf asound.conf %{_sysconfdir}/asound.conf.dummy 5
exit 0
:
%preun
# erase
@ -122,7 +114,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/update-alternatives --remove asound.conf %{_sysconfdir}/asound.conf.alsa-usb
/usr/sbin/update-alternatives --remove asound.conf %{_sysconfdir}/asound.conf.dummy
fi
exit 0
:
%posttrans
/usr/sbin/alternatives --install \
@ -131,14 +123,14 @@ exit 0
%{_sysconfdir}/asound.conf asound.conf %{_sysconfdir}/asound.conf.alsa-usb 10
/usr/sbin/alternatives --install \
%{_sysconfdir}/asound.conf asound.conf %{_sysconfdir}/asound.conf.dummy 5
exit 0
:
%post midi
# new install
if [ $1 -eq 1 ]; then
modprobe snd-seq-midi || true
fi
exit 0
:
%files -f %{name}.lang
@ -156,62 +148,115 @@ 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
%{_sbindir}/alsa-info.sh
%{_sbindir}/alsabat-test.sh
#/lib/udev/rules.d/59-alsa-usb-asoundconf.rules
/lib/udev/rules.d/89-alsa-ucm.rules
/lib/udev/rules.d/90-alsa-restore.rules
%if "%{_distrib_milestone}" != "milestone2"
%{_udevrulesdir}/90-alsa-restore.rules
%{_unitdir}/alsa-restore.service
%{_unitdir}/alsa-state.service
%{_unitdir}/sound.target.wants/alsa-restore.service
%{_unitdir}/sound.target.wants/alsa-state.service
%endif
%{_libdir}/alsa-topology/libalsatplg_module_nhlt.so
%{_datadir}/alsa/init/*
%{_datadir}/alsa/speaker-test/sample_map.csv
%{_datadir}/sounds/alsa/*.wav
%dir /var/lib/alsa
%{_mandir}/man1/aconnect.1*
%{_mandir}/man1/alsactl.1*
%{_mandir}/man1/alsaloop.1*
%{_mandir}/man1/alsamixer.1*
%{_mandir}/man1/alsatplg.1*
%{_mandir}/man1/alsaucm.1.*
%{_mandir}/man1/alsa-info.sh.1*
%{_mandir}/man1/alsa*.1*
%{_mandir}/man1/amixer.1*
%{_mandir}/man1/aplay.1*
%{_mandir}/man1/arecord.1*
%{_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.*
%{_mandir}/man8/alsa-info.sh.8*
%files midi
%defattr(-,root,root)
%{_sysconfdir}/modules.d/alsa-seq-midi.conf
%{_modulesloaddir}/alsa-seq-midi.conf
%{_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*
%clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
%{_mandir}/man1/aseqsend.1*
%changelog
* Fri Apr 18 2025 Automatic Build System <autodist@openmamba.org> 1.2.14-1mamba
- automatic version update by autodist
* 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*
* Sat Jun 04 2022 Automatic Build System <autodist@mambasoft.it> 1.2.7-1mamba
- automatic version update by autodist
* Wed Dec 08 2021 Automatic Build System <autodist@mambasoft.it> 1.2.6-1mamba
- automatic version update by autodist
* Mon Jun 14 2021 Automatic Build System <autodist@mambasoft.it> 1.2.5.1-1mamba
- automatic version update by autodist
* Sat Jun 05 2021 Automatic Build System <autodist@mambasoft.it> 1.2.5-1mamba
- automatic version update by autodist
* Mon Oct 19 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.4-1mamba
- update to 1.2.4
* Fri Jun 12 2020 Automatic Build System <autodist@mambasoft.it> 1.2.3-1mamba
- automatic version update by autodist
* Mon Feb 24 2020 Automatic Build System <autodist@mambasoft.it> 1.2.2-1mamba
- automatic version update by autodist
* Fri Nov 22 2019 Automatic Build System <autodist@mambasoft.it> 1.2.1-1mamba
- automatic version update by autodist
* Wed May 22 2019 Automatic Build System <autodist@mambasoft.it> 1.1.9-1mamba
- automatic version update by autodist
* Fri Mar 15 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.8-2mamba
- move midi modules loading file to %_modulesloaddir
* Wed Jan 16 2019 Automatic Build System <autodist@mambasoft.it> 1.1.8-1mamba
- automatic version update by autodist
@ -403,7 +448,7 @@ exit 0
* Wed Dec 10 2003 Davide Madrisan <davide.madrisan@qilinux.it> 1.0.0rc2-1qilnx
- rebuilt with version 1.0.0rc2
* Mon Oct 22 2003 Davide Madrisan <davide.madrisan@qilinux.it> 0.9.8-1qilnx
* Wed Oct 22 2003 Davide Madrisan <davide.madrisan@qilinux.it> 0.9.8-1qilnx
- rebuilt with version 0.9.8
* Fri Sep 26 2003 Davide Madrisan <davide.madrisan@qilinux.it> 0.9.7-1qlnx
@ -412,5 +457,5 @@ exit 0
* Tue Sep 02 2003 Davide Madrisan <davide.madrisan@qilinux.it> 0.9.6-1qlnx
- rebuilt with version 0.9.6
* Tue Jul 04 2003 Silvan Calarco <silvan.calarco@qinet.it> 0.9.4-1qilnx
* Fri Jul 04 2003 Silvan Calarco <silvan.calarco@qinet.it> 0.9.4-1qilnx
- first build for alsa-utils