From 58696037115b1c029fb5e57f61411ed660404fdf Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 May 2017 15:07:32 +0200 Subject: [PATCH 01/70] updated to 1.1.4 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index b867efe..99b2e72 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -250,6 +250,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %changelog +* Tue May 16 2017 Jaroslav Kysela - 1.1.4-1 +- Updated to 1.1.4 + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 7dd4a91..5daf28f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69f9f3e2de3c97fc71d496e91e271fe5 alsa-plugins-1.1.1.tar.bz2 +MD5 (alsa-plugins-1.1.4.tar.bz2) = de51130a7444b79b2dd3c25e28420754 From 142eb75308d4fa9707aa84193fe448836f375fcb Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 May 2017 15:07:32 +0200 Subject: [PATCH 02/70] updated to 1.1.4 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index b867efe..99b2e72 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -250,6 +250,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %changelog +* Tue May 16 2017 Jaroslav Kysela - 1.1.4-1 +- Updated to 1.1.4 + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 7dd4a91..5daf28f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69f9f3e2de3c97fc71d496e91e271fe5 alsa-plugins-1.1.1.tar.bz2 +MD5 (alsa-plugins-1.1.4.tar.bz2) = de51130a7444b79b2dd3c25e28420754 From 6ed9d59b989eeed72b7b56a660fe9c656560020c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:47:06 +0000 Subject: [PATCH 03/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 99b2e72..427cf38 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -250,6 +250,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue May 16 2017 Jaroslav Kysela - 1.1.4-1 - Updated to 1.1.4 From 1f8726b33ceaa832720fcc40f49df8ed11b2c149 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:31:23 +0000 Subject: [PATCH 04/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 427cf38..d3cb0dd 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -250,6 +250,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4f01ceaeba74aba22f2bcd646908a47fbb173696 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 14 Nov 2017 09:53:26 +0100 Subject: [PATCH 05/70] updated to 1.1.5 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index d3cb0dd..298f761 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.4 -Release: 3%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -250,6 +250,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %changelog +* Tue Nov 14 2017 Jaroslav Kysela - 1.1.5-1 +- Updated to 1.1.5 + * Wed Aug 02 2017 Fedora Release Engineering - 1.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 5daf28f..ab587e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -MD5 (alsa-plugins-1.1.4.tar.bz2) = de51130a7444b79b2dd3c25e28420754 +SHA512 (alsa-plugins-1.1.5.tar.bz2) = 50a79d9dbcca72b2133aba7dca594302dcd5816eb71afc311a4c2a96aac7632a0a034875faf3100f2c8a44f3fbbede264e5cd9beacf2a07f2fa6786f66edae39 From 709e7ae313198406cefa732ec58116fbe97be6d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:09:23 +0000 Subject: [PATCH 06/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 298f761..13aac41 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -250,6 +250,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Nov 14 2017 Jaroslav Kysela - 1.1.5-1 - Updated to 1.1.5 From e68f9bd88c4268fe0056706d02a3021713abec1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Sun, 25 Feb 2018 19:17:52 +0100 Subject: [PATCH 07/70] Let plugin packages own %{_libdir}/alsa-lib (RHBZ#1548865) --- alsa-plugins.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 13aac41..09a8342 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -181,6 +181,7 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/README-jack %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-jack.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_jack.so %endif @@ -188,11 +189,13 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/README-pcm-oss %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-pcm-oss.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_oss.so %files pulseaudio %doc COPYING COPYING.GPL doc/README-pulse +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so %{_libdir}/alsa-lib/libasound_module_conf_pulse.so @@ -204,6 +207,7 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/samplerate.txt %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-samplerate.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so %{_libdir}/alsa-lib/libasound_module_rate_samplerate_linear.so @@ -214,28 +218,33 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/upmix.txt %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-upmix.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %files vdownmix %doc COPYING COPYING.GPL doc/vdownmix.txt %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/97-vdownmix.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %files usbstream %doc COPYING COPYING.GPL +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so %files arcamav %doc COPYING COPYING.GPL doc/README-arcam-av %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-arcamav.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so %files speex %doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-speex.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_speex.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so @@ -245,11 +254,15 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/README-maemo %dir %{_datadir}/alsa/alsa.conf.d %config(noreplace) %{_datadir}/alsa/alsa.conf.d/98-maemo.conf +%dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so %changelog +* Sun Feb 25 2018 Ralf Corsépius - 1.1.5-3 +- Let plugin packages own %%{_libdir}/alsa-lib (RHBZ#1548865) + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 406cbb880049fe28563d68167c36b0df773e37f6 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 3 Apr 2018 19:40:30 +0200 Subject: [PATCH 08/70] updated to 1.1.6 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 09a8342..70c439d 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.5 -Release: 3%{?dist} +Version: 1.1.6 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -260,6 +260,9 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %changelog +* Tue Apr 03 2018 Jaroslav Kysela - 1.1.6-1 +- Updated to 1.1.6 + * Sun Feb 25 2018 Ralf Corsépius - 1.1.5-3 - Let plugin packages own %%{_libdir}/alsa-lib (RHBZ#1548865) diff --git a/sources b/sources index ab587e5..194f06c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.1.5.tar.bz2) = 50a79d9dbcca72b2133aba7dca594302dcd5816eb71afc311a4c2a96aac7632a0a034875faf3100f2c8a44f3fbbede264e5cd9beacf2a07f2fa6786f66edae39 +SHA512 (alsa-plugins-1.1.6.tar.bz2) = f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b From 498539259d3a174d92996a459726197cae984469 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 4 Apr 2018 10:59:27 +0200 Subject: [PATCH 09/70] changed the add-on config directory to /etc/alsa/conf.d --- alsa-plugins.spec | 57 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 70c439d..5d2686b 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -152,11 +152,11 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} -install -d ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d +install -d %{buildroot}/etc/alsa/conf.d %if 0%{?with_jack} -install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d +install -m 644 %SOURCE1 %{buildroot}/etc/alsa/conf.d %endif install -m 644 %SOURCE2 \ %SOURCE3 \ @@ -165,11 +165,11 @@ install -m 644 %SOURCE2 \ %SOURCE6 \ %SOURCE8 \ %SOURCE9 \ - ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d -mv ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example \ - ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf + %{buildroot}/etc/alsa/conf.d +mv %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf.example \ + %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf -find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; +find %{buildroot} -name "*.la" -exec rm {} \; %post -p /sbin/ldconfig @@ -179,16 +179,16 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %if 0%{?with_jack} %files jack %doc COPYING COPYING.GPL doc/README-jack -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-jack.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/50-jack.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_jack.so %endif %files oss %doc COPYING COPYING.GPL doc/README-pcm-oss -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-pcm-oss.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/50-pcm-oss.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_oss.so @@ -199,14 +199,14 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so %{_libdir}/alsa-lib/libasound_module_conf_pulse.so -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/50-pulseaudio.conf +%config(noreplace) /etc/alsa/conf.d/99-pulseaudio-default.conf %files samplerate %doc COPYING COPYING.GPL doc/samplerate.txt -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-samplerate.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/10-samplerate.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so @@ -216,15 +216,15 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %files upmix %doc COPYING COPYING.GPL doc/upmix.txt -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-upmix.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/50-upmix.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %files vdownmix %doc COPYING COPYING.GPL doc/vdownmix.txt -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/97-vdownmix.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/97-vdownmix.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so @@ -235,15 +235,15 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %files arcamav %doc COPYING COPYING.GPL doc/README-arcam-av -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-arcamav.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/50-arcamav.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so %files speex %doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-speex.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/10-speex.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_speex.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate.so @@ -252,14 +252,17 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; %files maemo %doc COPYING COPYING.GPL doc/README-maemo -%dir %{_datadir}/alsa/alsa.conf.d -%config(noreplace) %{_datadir}/alsa/alsa.conf.d/98-maemo.conf +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/98-maemo.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so %changelog +* Wed Apr 04 2018 Jaroslav Kysela - 1.1.6-2 +- Changed the add-on config directory to /etc/alsa/conf.d + * Tue Apr 03 2018 Jaroslav Kysela - 1.1.6-1 - Updated to 1.1.6 From a8ca94350178235b04aa469ad4371899757ce043 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 16:55:25 +0200 Subject: [PATCH 10/70] changed the plugin config files --- 10-samplerate.conf | 11 - 10-speex.conf | 11 - 50-arcamav.conf | 10 - 50-jack.conf | 17 - 50-pcm-oss.conf | 9 - 50-upmix.conf | 10 - 97-vdownmix.conf | 18 -- 98-maemo.conf | 13 - alsa-plugins.spec | 22 +- plugin-config.patch | 750 ++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 759 insertions(+), 112 deletions(-) delete mode 100644 10-samplerate.conf delete mode 100644 10-speex.conf delete mode 100644 50-arcamav.conf delete mode 100644 50-jack.conf delete mode 100644 50-pcm-oss.conf delete mode 100644 50-upmix.conf delete mode 100644 97-vdownmix.conf delete mode 100644 98-maemo.conf create mode 100644 plugin-config.patch diff --git a/10-samplerate.conf b/10-samplerate.conf deleted file mode 100644 index 8bf7b9a..0000000 --- a/10-samplerate.conf +++ /dev/null @@ -1,11 +0,0 @@ -# samplerate plugin configuration -# $Id: samplerate.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $ - -pcm.my_rate { - type rate - slave.pcm "hw" - converter "samplerate" - hint { - description "External rate converter" - } -} diff --git a/10-speex.conf b/10-speex.conf deleted file mode 100644 index c4f23e3..0000000 --- a/10-speex.conf +++ /dev/null @@ -1,11 +0,0 @@ -# samplerate plugin configuration -# $Id$ - -pcm.my_rate { - type rate - slave.pcm "hw" - converter "speexrate" - hint { - description "Rate Converter Plugin Using Speex Resampler" - } -} diff --git a/50-arcamav.conf b/50-arcamav.conf deleted file mode 100644 index 534663a..0000000 --- a/50-arcamav.conf +++ /dev/null @@ -1,10 +0,0 @@ -# arcam-av plugin configuration -# $Id$ - -ctl.arcam_av { - type arcam_av - port /dev/ttyS0 - hint { - description "Arcam-AV Amplifier" - } -} diff --git a/50-jack.conf b/50-jack.conf deleted file mode 100644 index e74f5fc..0000000 --- a/50-jack.conf +++ /dev/null @@ -1,17 +0,0 @@ -# The jack plugin configuration -# $Id: jack.conf,v 1.3 2008/03/19 20:01:04 emoret Exp $ - -pcm.jack { - type jack - playback_ports { - 0 alsa_pcm:playback_1 - 1 alsa_pcm:playback_2 - } - capture_ports { - 0 alsa_pcm:capture_1 - 1 alsa_pcm:capture_2 - } - hint { - description "JACK Audio Connection Kit" - } -} diff --git a/50-pcm-oss.conf b/50-pcm-oss.conf deleted file mode 100644 index b5aac44..0000000 --- a/50-pcm-oss.conf +++ /dev/null @@ -1,9 +0,0 @@ -# pcm-oss plugin configuration - -pcm.oss { - type oss - device /dev/dsp - hint { - description "Open Sound System" - } -} diff --git a/50-upmix.conf b/50-upmix.conf deleted file mode 100644 index e15055e..0000000 --- a/50-upmix.conf +++ /dev/null @@ -1,10 +0,0 @@ -# upmix plugin configuration -# $Id: upmix.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $ - -pcm.upmix51 { - type upmix - slave.pcm "surround51" - hint { - description "Upmixer channel expander" - } -} diff --git a/97-vdownmix.conf b/97-vdownmix.conf deleted file mode 100644 index 95786b8..0000000 --- a/97-vdownmix.conf +++ /dev/null @@ -1,18 +0,0 @@ -# vdownmix plugin configuration -# $Id$ - -pcm.!surround51 { - type vdownmix - slave.pcm "default" - hint { - description "Downmixer to stereo from surround51" - } -} - -pcm.!surround40 { - type vdownmix - slave.pcm "default" - hint { - description "Downmixer to stereo from surround40" - } -} diff --git a/98-maemo.conf b/98-maemo.conf deleted file mode 100644 index 737890f..0000000 --- a/98-maemo.conf +++ /dev/null @@ -1,13 +0,0 @@ -# PCM -pcm.!default { - type alsa_dsp - playback_device_file ["/dev/dsptask/pcm2"] - recording_device_file ["/dev/dsptask/pcm_rec"] -} - -# Mixer -ctl.!default { - type dsp_ctl - playback_devices ["/dev/dsptask/pcm2"] - recording_devices ["/dev/dsptask/pcm_rec"] -} diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 5d2686b..fc4c2ee 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -14,14 +14,7 @@ License: GPLv2+ and LGPLv2+ and BSD Group: System Environment/Libraries URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 -Source1: 50-jack.conf -Source2: 50-pcm-oss.conf -Source3: 10-speex.conf -Source4: 10-samplerate.conf -Source5: 50-upmix.conf -Source6: 97-vdownmix.conf -Source8: 50-arcamav.conf -Source9: 98-maemo.conf +Patch0: plugin-config.patch BuildRequires: alsa-lib-devel @@ -132,7 +125,6 @@ The rate plugin is an external rate converter using the Speex resampler pre-processing of a mono stream like denoise using libspeex DSP API. %package maemo -#BuildRequires: alsa-lib-devel = %{version} BuildRequires: dbus-devel Summary: Maemo plugin for ALSA Group: System Environment/Libraries @@ -143,6 +135,7 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %prep %setup -q -n %{name}-%{version}%{?prever} +%patch0 -p1 -n .plugin-config %build %configure --disable-static \ @@ -188,7 +181,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files oss %doc COPYING COPYING.GPL doc/README-pcm-oss %dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/50-pcm-oss.conf +%config(noreplace) /etc/alsa/conf.d/50-oss.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_oss.so @@ -217,26 +210,28 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files upmix %doc COPYING COPYING.GPL doc/upmix.txt %dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/50-upmix.conf +%config(noreplace) /etc/alsa/conf.d/60-upmix.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %files vdownmix %doc COPYING COPYING.GPL doc/vdownmix.txt %dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/97-vdownmix.conf +%config(noreplace) /etc/alsa/conf.d/60-vdownmix.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %files usbstream %doc COPYING COPYING.GPL +%dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/98-usb-stream.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so %files arcamav %doc COPYING COPYING.GPL doc/README-arcam-av %dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/50-arcamav.conf +%config(noreplace) /etc/alsa/conf.d/50-arcam-av-ctl.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so @@ -262,6 +257,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog * Wed Apr 04 2018 Jaroslav Kysela - 1.1.6-2 - Changed the add-on config directory to /etc/alsa/conf.d +- Changed the config files * Tue Apr 03 2018 Jaroslav Kysela - 1.1.6-1 - Updated to 1.1.6 diff --git a/plugin-config.patch b/plugin-config.patch new file mode 100644 index 0000000..a48069b --- /dev/null +++ b/plugin-config.patch @@ -0,0 +1,750 @@ +From e8fabec7adc70220f52588dc170d90d146b92ba7 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 5 Apr 2018 09:23:09 +0200 +Subject: [PATCH 1/2] samplerate: fix unused variable warning + +Signed-off-by: Jaroslav Kysela +--- + rate/rate_samplerate.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rate/rate_samplerate.c b/rate/rate_samplerate.c +index 0b14a59..100d6f2 100644 +--- a/rate/rate_samplerate.c ++++ b/rate/rate_samplerate.c +@@ -154,14 +154,14 @@ static void pcm_src_close(void *obj) + } + + #if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002 +-static int get_supported_rates(void *obj, unsigned int *rate_min, ++static int get_supported_rates(void *obj ATTRIBUTE_UNUSED, unsigned int *rate_min, + unsigned int *rate_max) + { + *rate_min = *rate_max = 0; /* both unlimited */ + return 0; + } + +-static void dump(void *obj, snd_output_t *out) ++static void dump(void *obj ATTRIBUTE_UNUSED, snd_output_t *out) + { + snd_output_printf(out, "Converter: libsamplerate\n"); + } +-- +2.13.6 + + +From 6e40eb5fd346207021a95d06bc30205a537926ea Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 4 Apr 2018 19:57:56 +0200 +Subject: [PATCH 2/2] configure: add --with-alsaaddondir, add default config + files for plugins + +Signed-off-by: Jaroslav Kysela +--- + a52/60-a52-encoder.conf | 38 ++++++++++++++++++++++++++ + a52/Makefile.am | 4 +++ + a52/pcm_a52.c | 2 +- + arcam-av/50-arcam-av-ctl.conf | 16 +++++++++++ + arcam-av/Makefile.am | 4 +++ + configure.ac | 12 +++++++++ + jack/50-jack.conf | 18 +++++++++++++ + jack/Makefile.am | 4 +++ + maemo/98-maemo.conf | 11 ++++++++ + maemo/Makefile.am | 4 +++ + mix/60-upmix.conf | 26 ++++++++++++++++++ + mix/60-vdownmix.conf | 24 +++++++++++++++++ + mix/Makefile.am | 5 +++- + oss/50-oss.conf | 26 ++++++++++++++++++ + oss/Makefile.am | 4 +++ + pph/10-speexrate.conf | 28 +++++++++++++++++++ + pph/Makefile.am | 4 +++ + pulse/50-pulseaudio.conf | 15 ++++++----- + pulse/Makefile.am | 4 +-- + rate-lavc/10-rate-lavc.conf | 28 +++++++++++++++++++ + rate-lavc/Makefile.am | 4 +++ + rate/10-samplerate.conf | 28 +++++++++++++++++++ + rate/Makefile.am | 4 +++ + speex/60-speex.conf | 63 +++++++++++++++++++++++++++++++++++++++++++ + speex/Makefile.am | 4 +++ + usb_stream/98-usb-stream.conf | 27 +++++++++++++++++++ + usb_stream/Makefile.am | 4 +++ + 27 files changed, 401 insertions(+), 10 deletions(-) + create mode 100644 a52/60-a52-encoder.conf + create mode 100644 arcam-av/50-arcam-av-ctl.conf + create mode 100644 jack/50-jack.conf + create mode 100644 maemo/98-maemo.conf + create mode 100644 mix/60-upmix.conf + create mode 100644 mix/60-vdownmix.conf + create mode 100644 oss/50-oss.conf + create mode 100644 pph/10-speexrate.conf + create mode 100644 rate-lavc/10-rate-lavc.conf + create mode 100644 rate/10-samplerate.conf + create mode 100644 speex/60-speex.conf + create mode 100644 usb_stream/98-usb-stream.conf + +diff --git a/a52/60-a52-encoder.conf b/a52/60-a52-encoder.conf +new file mode 100644 +index 0000000..346c94f +--- /dev/null ++++ b/a52/60-a52-encoder.conf +@@ -0,0 +1,38 @@ ++pcm.a52 { ++ @args [ CARD SLAVE RATE BITRATE CHANNELS ] ++ @args.CARD { ++ type integer ++ default { ++ @func refer ++ name defaults.pcm.card ++ } ++ } ++ @args.SLAVE { ++ type string ++ } ++ @args.RATE { ++ type integer ++ default 48000 ++ } ++ @args.BITRATE { ++ type integer ++ default 448 ++ } ++ @args.CHANNELS { ++ type string ++ default 6 ++ } ++ type a52 ++ card $CARD ++ slavepcm $SLAVE ++ rate $RATE ++ bitrate $BITRATE ++ channels $CHANNELS ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Plugin to convert multichannel stream to A52 (AC3) bitstream" ++ } ++} +diff --git a/a52/Makefile.am b/a52/Makefile.am +index 48567b4..cbc1497 100644 +--- a/a52/Makefile.am ++++ b/a52/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 60-a52-encoder.conf ++ + asound_module_pcm_a52_LTLIBRARIES = libasound_module_pcm_a52.la ++asound_module_addon_DATA = 60-a52-encoder.conf + + asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@ \ + -DAVCODEC_HEADER="@AVCODEC_HEADER@" +diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c +index 348d58f..155da36 100644 +--- a/a52/pcm_a52.c ++++ b/a52/pcm_a52.c +@@ -937,7 +937,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52) + goto error; + } + +- if (! pcm_string) { ++ if (! pcm_string || pcm_string[0] == '\0') { + snprintf(devstr, sizeof(devstr), + "iec958:{AES0 0x%x AES1 0x%x AES2 0x%x AES3 0x%x %s%s}", + IEC958_AES0_CON_EMPHASIS_NONE | IEC958_AES0_NONAUDIO | +diff --git a/arcam-av/50-arcam-av-ctl.conf b/arcam-av/50-arcam-av-ctl.conf +new file mode 100644 +index 0000000..b76caa9 +--- /dev/null ++++ b/arcam-av/50-arcam-av-ctl.conf +@@ -0,0 +1,16 @@ ++ctl.arcam_av { ++ @args [ PORT ] ++ @args.PORT { ++ type string ++ default "/dev/ttyUSB0" ++ } ++ type arcam_av ++ port $PORT ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Arcam-AV Amplifier" ++ } ++} +diff --git a/arcam-av/Makefile.am b/arcam-av/Makefile.am +index 5c7855f..4a54ccd 100644 +--- a/arcam-av/Makefile.am ++++ b/arcam-av/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 50-arcam-av-ctl.conf ++ + asound_module_ctl_arcam_av_LTLIBRARIES = libasound_module_ctl_arcam_av.la ++asound_module_addon_DATA = 50-arcam-av-ctl.conf + + asound_module_ctl_arcam_avdir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined +diff --git a/configure.ac b/configure.ac +index ecc265b..ae98caa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,6 +206,18 @@ AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA dat + ALSA_DATA_DIR="$alsadatadir" + AC_SUBST(ALSA_DATA_DIR) + ++dnl ALSA add-on config directory ++AC_ARG_WITH(alsaaddondir, ++ AS_HELP_STRING([--with-alsaaddondir=dir], ++ [path where ALSA add-on config files are stored]), ++ alsaaddondir="$withval", alsaaddondir="") ++if test -z "$alsaaddondir"; then ++ alsaaddondir="/etc/alsa/conf.d" ++fi ++AC_DEFINE_UNQUOTED(ALSA_ADDON_DIR, "$alsaaddondir", [directory containing ALSA add-on config files]) ++ALSA_ADDON_DIR="$alsaaddondir" ++AC_SUBST(ALSA_ADDON_DIR) ++ + SAVE_PLUGINS_VERSION + + AC_OUTPUT([ +diff --git a/jack/50-jack.conf b/jack/50-jack.conf +new file mode 100644 +index 0000000..d780dfc +--- /dev/null ++++ b/jack/50-jack.conf +@@ -0,0 +1,18 @@ ++pcm.jack { ++ type jack ++ playback_ports { ++ 0 alsa_pcm:playback_1 ++ 1 alsa_pcm:playback_2 ++ } ++ capture_ports { ++ 0 alsa_pcm:capture_1 ++ 1 alsa_pcm:capture_2 ++ } ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "JACK Audio Connection Kit" ++ } ++} +diff --git a/jack/Makefile.am b/jack/Makefile.am +index f913cb6..0a3d6ae 100644 +--- a/jack/Makefile.am ++++ b/jack/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 50-jack.conf ++ + asound_module_pcm_jack_LTLIBRARIES = libasound_module_pcm_jack.la ++asound_module_addon_DATA = 50-jack.conf + + asound_module_pcm_jackdir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @JACK_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +diff --git a/maemo/98-maemo.conf b/maemo/98-maemo.conf +new file mode 100644 +index 0000000..a9ad6a0 +--- /dev/null ++++ b/maemo/98-maemo.conf +@@ -0,0 +1,11 @@ ++pcm.!default { ++ type alsa_dsp ++ playback_device_file [ "/dev/dsptask/pcm2" ] ++ recording_device_file [ "/dev/dsptask/pcm_rec" ] ++} ++ ++ctl.!default { ++ type dsp_ctl ++ playback_devices [ "/dev/dsptask/pcm2" ] ++ recording_devices [ "/dev/dsptask/pcm_rec" ] ++} +diff --git a/maemo/Makefile.am b/maemo/Makefile.am +index 2684781..aca481d 100644 +--- a/maemo/Makefile.am ++++ b/maemo/Makefile.am +@@ -1,8 +1,12 @@ ++EXTRA_DIST = 98-maemo.conf ++ + asound_module_pcm_alsa_dsp_LTLIBRARIES = libasound_module_pcm_alsa_dsp.la + asound_module_ctl_dsp_ctl_LTLIBRARIES = libasound_module_ctl_dsp_ctl.la ++asound_module_addon_DATA = 98-maemo.conf + + asound_module_pcm_alsa_dspdir = @ALSA_PLUGIN_DIR@ + asound_module_ctl_dsp_ctldir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -O2 @ALSA_CFLAGS@ $(DBUS_CFLAGS) + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +diff --git a/mix/60-upmix.conf b/mix/60-upmix.conf +new file mode 100644 +index 0000000..028cfe1 +--- /dev/null ++++ b/mix/60-upmix.conf +@@ -0,0 +1,26 @@ ++pcm.upmix { ++ @args [ SLAVE CHANNELS DELAY ] ++ @args.SLAVE { ++ type string ++ default "plug:hw" ++ } ++ @args.CHANNELS { ++ type integer ++ default 6 ++ } ++ @args.DELAY { ++ type integer ++ default 0 ++ } ++ type upmix ++ channels $CHANNELS ++ delay $DELAY ++ slave.pcm $SLAVE ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Plugin for channel upmix (4,6,8)" ++ } ++} +diff --git a/mix/60-vdownmix.conf b/mix/60-vdownmix.conf +new file mode 100644 +index 0000000..32e9c56 +--- /dev/null ++++ b/mix/60-vdownmix.conf +@@ -0,0 +1,24 @@ ++pcm.vdownmix { ++ @args [ SLAVE CHANNELS DELAY ] ++ @args.SLAVE { ++ type string ++ default "plug:hw" ++ } ++ @args.CHANNELS { ++ type integer ++ default 6 ++ } ++ @args.DELAY { ++ type integer ++ default 0 ++ } ++ type vdownmix ++ slave.pcm $SLAVE ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Plugin for channel downmix (stereo) with a simple spacialization" ++ } ++} +diff --git a/mix/Makefile.am b/mix/Makefile.am +index e31839a..710606c 100644 +--- a/mix/Makefile.am ++++ b/mix/Makefile.am +@@ -1,8 +1,12 @@ ++EXTRA_DIST = 60-upmix.conf 60-vdownmix.conf ++ + asound_module_pcm_upmix_LTLIBRARIES = libasound_module_pcm_upmix.la + asound_module_pcm_vdownmix_LTLIBRARIES = libasound_module_pcm_vdownmix.la ++asound_module_addon_DATA = 60-upmix.conf 60-vdownmix.conf + + asound_module_pcm_upmixdir = @ALSA_PLUGIN_DIR@ + asound_module_pcm_vdownmixdir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -11,4 +15,3 @@ libasound_module_pcm_upmix_la_SOURCES = pcm_upmix.c + libasound_module_pcm_upmix_la_LIBADD = @ALSA_LIBS@ + libasound_module_pcm_vdownmix_la_SOURCES = pcm_vdownmix.c + libasound_module_pcm_vdownmix_la_LIBADD = @ALSA_LIBS@ +- +diff --git a/oss/50-oss.conf b/oss/50-oss.conf +new file mode 100644 +index 0000000..5b2817b +--- /dev/null ++++ b/oss/50-oss.conf +@@ -0,0 +1,26 @@ ++pcm.oss { ++ @args [ DEVICE ] ++ @args.DEVICE { ++ type string ++ default "/dev/dsp" ++ } ++ type oss ++ port $DEVICE ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Open Sound System" ++ } ++} ++ ++ctl.oss { ++ @args [ DEVICE ] ++ @args.DEVICE { ++ type string ++ default "/dev/mixer" ++ } ++ type oss ++ device $DEVICE ++} +diff --git a/oss/Makefile.am b/oss/Makefile.am +index 302538b..df83d20 100644 +--- a/oss/Makefile.am ++++ b/oss/Makefile.am +@@ -1,8 +1,12 @@ ++EXTRA_DIST = 50-oss.conf ++ + asound_module_pcm_oss_LTLIBRARIES = libasound_module_pcm_oss.la + asound_module_ctl_oss_LTLIBRARIES = libasound_module_ctl_oss.la ++asound_module_addon_DATA = 50-oss.conf + + asound_module_pcm_ossdir = @ALSA_PLUGIN_DIR@ + asound_module_ctl_ossdir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +diff --git a/pph/10-speexrate.conf b/pph/10-speexrate.conf +new file mode 100644 +index 0000000..1d9eae9 +--- /dev/null ++++ b/pph/10-speexrate.conf +@@ -0,0 +1,28 @@ ++pcm.speexrate { ++ @args [ SLAVE RATE CONVERTER ] ++ @args.SLAVE { ++ type string ++ default "plug:hw" ++ } ++ @args.RATE { ++ type integer ++ default 48000 ++ } ++ @args.CONVERTER { ++ type string ++ default "speexrate" ++ } ++ type rate ++ converter $CONVERTER ++ slave { ++ pcm $SLAVE ++ rate $RATE ++ } ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Rate Converter Plugin Using Speex Resampler" ++ } ++} +diff --git a/pph/Makefile.am b/pph/Makefile.am +index 551e5bd..abb950b 100644 +--- a/pph/Makefile.am ++++ b/pph/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 10-speexrate.conf ++ + asound_module_rate_speexrate_LTLIBRARIES = libasound_module_rate_speexrate.la ++asound_module_addon_DATA = 10-speexrate.conf + + asound_module_rate_speexratedir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -DVAR_ARRAYS -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +diff --git a/pulse/50-pulseaudio.conf b/pulse/50-pulseaudio.conf +index dd85dab..62da207 100644 +--- a/pulse/50-pulseaudio.conf ++++ b/pulse/50-pulseaudio.conf +@@ -1,13 +1,16 @@ + # Add a specific named PulseAudio pcm and ctl (typically useful for testing) + + pcm.pulse { +- type pulse +- hint { +- show on +- description "PulseAudio Sound Server" +- } ++ type pulse ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "PulseAudio Sound Server" ++ } + } + + ctl.pulse { +- type pulse ++ type pulse + } +diff --git a/pulse/Makefile.am b/pulse/Makefile.am +index a5550b9..835808c 100644 +--- a/pulse/Makefile.am ++++ b/pulse/Makefile.am +@@ -3,12 +3,12 @@ EXTRA_DIST = 50-pulseaudio.conf 99-pulseaudio-default.conf.example + asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la + asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la + asound_module_conf_LTLIBRARIES = libasound_module_conf_pulse.la +-asound_module_data_DATA = 50-pulseaudio.conf 99-pulseaudio-default.conf.example ++asound_module_addon_DATA = 50-pulseaudio.conf 99-pulseaudio-default.conf.example + + asound_module_pcmdir = @ALSA_PLUGIN_DIR@ + asound_module_ctldir = @ALSA_PLUGIN_DIR@ + asound_module_confdir = @ALSA_PLUGIN_DIR@ +-asound_module_datadir = @ALSA_DATA_DIR@/alsa.conf.d ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +diff --git a/rate-lavc/10-rate-lavc.conf b/rate-lavc/10-rate-lavc.conf +new file mode 100644 +index 0000000..bab1694 +--- /dev/null ++++ b/rate-lavc/10-rate-lavc.conf +@@ -0,0 +1,28 @@ ++pcm.lavcrate { ++ @args [ SLAVE RATE CONVERTER ] ++ @args.SLAVE { ++ type string ++ default "plug:hw" ++ } ++ @args.RATE { ++ type integer ++ default 48000 ++ } ++ @args.CONVERTER { ++ type string ++ default "lavcrate" ++ } ++ type rate ++ converter $CONVERTER ++ slave { ++ pcm $SLAVE ++ rate $RATE ++ } ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Rate Converter Plugin Using AVC Library" ++ } ++} +diff --git a/rate-lavc/Makefile.am b/rate-lavc/Makefile.am +index 5cffd44..5f66472 100644 +--- a/rate-lavc/Makefile.am ++++ b/rate-lavc/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 10-rate-lavc.conf ++ + asound_module_rate_lavcrate_LTLIBRARIES = libasound_module_rate_lavcrate.la ++asound_module_addon_DATA = 10-rate-lavc.conf + + asound_module_rate_lavcratedir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@ \ + -DAVCODEC_HEADER="@AVCODEC_HEADER@" +diff --git a/rate/10-samplerate.conf b/rate/10-samplerate.conf +new file mode 100644 +index 0000000..0d2e604 +--- /dev/null ++++ b/rate/10-samplerate.conf +@@ -0,0 +1,28 @@ ++pcm.samplerate { ++ @args [ SLAVE RATE CONVERTER ] ++ @args.SLAVE { ++ type string ++ default "plug:hw" ++ } ++ @args.RATE { ++ type integer ++ default 48000 ++ } ++ @args.CONVERTER { ++ type string ++ default "samplerate" ++ } ++ type rate ++ converter $CONVERTER ++ slave { ++ pcm $SLAVE ++ rate $RATE ++ } ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Rate Converter Plugin Using Samplerate Library" ++ } ++} +diff --git a/rate/Makefile.am b/rate/Makefile.am +index 0605bfd..25014d8 100644 +--- a/rate/Makefile.am ++++ b/rate/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 10-samplerate.conf ++ + asound_module_rate_samplerate_LTLIBRARIES = libasound_module_rate_samplerate.la ++asound_module_addon_DATA = 10-samplerate.conf + + asound_module_rate_sampleratedir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(samplerate_CFLAGS) + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +diff --git a/speex/60-speex.conf b/speex/60-speex.conf +new file mode 100644 +index 0000000..bf2ce95 +--- /dev/null ++++ b/speex/60-speex.conf +@@ -0,0 +1,63 @@ ++pcm.speex { ++ @args [ SLAVE AGC AGC_LEVEL DENOISE ECHO ++ DEREVERB DEREVERB_DECAY DEREVERB_LEVEL ++ FRAMES FILTER_LENGTH ] ++ @args.SLAVE { ++ type string ++ default "plug:hw" ++ } ++ @args.AGC { ++ type string ++ default off ++ } ++ @args.AGC_LEVEL { ++ type integer ++ default 8000 ++ } ++ @args.DENOISE { ++ type string ++ default on ++ } ++ @args.ECHO { ++ type string ++ default off ++ } ++ @args.DEREVERB { ++ type string ++ default off ++ } ++ @args.DEREVERB_DECAY { ++ type real ++ default 0 ++ } ++ @args.DEREVERB_LEVEL { ++ type real ++ default 0 ++ } ++ @args.FRAMES { ++ type integer ++ default 64 ++ } ++ @args.FILTER_LENGTH { ++ type integer ++ default 256 ++ } ++ type speex ++ agc $AGC ++ agc_level $AGC_LEVEL ++ denoise $DENOISE ++ echo $ECHO ++ dereverb $DEREVERB ++ dereverb_decay $DEREVERB_DECAY ++ dereverb_level $DEREVERB_LEVEL ++ frames $FRAMES ++ filter_length $FILTER_LENGTH ++ slave.pcm $SLAVE ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "Plugin using Speex DSP (resample, agc, denoise, echo, dereverb)" ++ } ++} +diff --git a/speex/Makefile.am b/speex/Makefile.am +index 7d84190..7891954 100644 +--- a/speex/Makefile.am ++++ b/speex/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 60-speex.conf ++ + asound_module_pcm_speex_LTLIBRARIES = libasound_module_pcm_speex.la ++asound_module_addon_DATA = 60-speex.conf + + asound_module_pcm_speexdir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @speexdsp_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +diff --git a/usb_stream/98-usb-stream.conf b/usb_stream/98-usb-stream.conf +new file mode 100644 +index 0000000..2efc95f +--- /dev/null ++++ b/usb_stream/98-usb-stream.conf +@@ -0,0 +1,27 @@ ++pcm.usbstream { ++ @args [ CARD RATE PERIOD_SIZE ] ++ @args.CARD { ++ type string ++ default { ++ func refer ++ name defaults.pcm.card ++ } ++ } ++ @args.RATE { ++ type integer ++ } ++ @args.PERIOD_SIZE { ++ type integer ++ } ++ type usb_stream ++ card $CARD ++ rate $RATE ++ period_size $PERIOD_SIZE ++ hint { ++ show { ++ @func refer ++ name defaults.namehint.basic ++ } ++ description "USB Stream Output" ++ } ++} +diff --git a/usb_stream/Makefile.am b/usb_stream/Makefile.am +index 50a98a0..b606d3d 100644 +--- a/usb_stream/Makefile.am ++++ b/usb_stream/Makefile.am +@@ -1,6 +1,10 @@ ++EXTRA_DIST = 98-usb-stream.conf ++ + asound_module_pcm_usb_stream_LTLIBRARIES = libasound_module_pcm_usb_stream.la ++asound_module_addon_DATA = 98-usb-stream.conf + + asound_module_pcm_usb_streamdir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic $(LDFLAGS_NOUNDEFINED) +-- +2.13.6 + From f98565a07dd502d9a360766d537b4cb4dca10392 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 17:10:35 +0200 Subject: [PATCH 11/70] rpmlint fixes --- alsa-plugins.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index fc4c2ee..9c008df 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -135,7 +135,7 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %prep %setup -q -n %{name}-%{version}%{?prever} -%patch0 -p1 -n .plugin-config +%patch0 -p1 -b .plugin-config %build %configure --disable-static \ @@ -160,7 +160,7 @@ install -m 644 %SOURCE2 \ %SOURCE9 \ %{buildroot}/etc/alsa/conf.d mv %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf.example \ - %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf + %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf find %{buildroot} -name "*.la" -exec rm {} \; @@ -347,7 +347,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; * Mon Feb 07 2011 Fedora Release Engineering - 1.0.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Thu Jan 28 2011 Jaroslav Kysela - 1.0.24-1 +* Fri Jan 28 2011 Jaroslav Kysela - 1.0.24-1 - Updated to 1.0.24 * Thu Jan 14 2010 Jaroslav Kysela - 1.0.22-1 From 33cef9200a268fe43a58be9cc647dd44c1881738 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 17:16:51 +0200 Subject: [PATCH 12/70] remove dead sources --- alsa-plugins.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 9c008df..1207868 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -147,18 +147,6 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -install -d %{buildroot}/etc/alsa/conf.d -%if 0%{?with_jack} -install -m 644 %SOURCE1 %{buildroot}/etc/alsa/conf.d -%endif -install -m 644 %SOURCE2 \ - %SOURCE3 \ - %SOURCE4 \ - %SOURCE5 \ - %SOURCE6 \ - %SOURCE8 \ - %SOURCE9 \ - %{buildroot}/etc/alsa/conf.d mv %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf.example \ %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf From 8f26d8b7baf681164f206e8214bf5ee1c4f5fbcd Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 17:43:00 +0200 Subject: [PATCH 13/70] add autoreconf (configure.ac updated) --- alsa-plugins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 1207868..fbd14fd 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -138,6 +138,7 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %patch0 -p1 -b .plugin-config %build +autoreconf -vif %configure --disable-static \ --with-speex=lib \ --enable-maemo-plugin \ From 0311a22941b85ee52a426a7bea197789c354c2bc Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 17:48:21 +0200 Subject: [PATCH 14/70] add missing autoconf/automake/libtool BuildRequires --- alsa-plugins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index fbd14fd..ca9c4bd 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -16,6 +16,7 @@ URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 Patch0: plugin-config.patch +BuildRequires: autoconf automake libtool BuildRequires: alsa-lib-devel %description From eca0400e24625a8aa0a9ccaaa7204e15e66ceb64 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 17:57:33 +0200 Subject: [PATCH 15/70] 10-speex.conf was renamed to 60-speex.conf --- alsa-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index ca9c4bd..51cd6f1 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -228,7 +228,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files speex %doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt %dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/10-speex.conf +%config(noreplace) /etc/alsa/conf.d/60-speex.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_speex.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate.so From a04c140570d3648cf99b3ff2712f7a39809b8902 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 18:08:41 +0200 Subject: [PATCH 16/70] add back 10-speexrate.conf --- alsa-plugins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 51cd6f1..bb70a68 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -228,6 +228,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files speex %doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt %dir /etc/alsa/conf.d +%config(noreplace) /etc/alsa/conf.d/10-speexrate.conf %config(noreplace) /etc/alsa/conf.d/60-speex.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_speex.so From 8cedb2d8f487394d5c0c4067ccb719b736c9860e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 16 Apr 2018 18:04:48 +0200 Subject: [PATCH 17/70] /etc/alsa/conf.d contains symlinks to /usr/share/alsa/alsa.conf.d templates --- alsa-plugins.spec | 26 +- plugin-config.patch | 1524 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 1547 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index bb70a68..0e669fd 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -164,6 +164,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/README-jack %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/50-jack.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/50-jack.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_jack.so %endif @@ -172,6 +174,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/README-pcm-oss %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/50-oss.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/50-oss.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_oss.so @@ -185,11 +189,15 @@ find %{buildroot} -name "*.la" -exec rm {} \; %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/50-pulseaudio.conf %config(noreplace) /etc/alsa/conf.d/99-pulseaudio-default.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf %files samplerate %doc COPYING COPYING.GPL doc/samplerate.txt %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/10-samplerate.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/10-samplerate.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so @@ -201,6 +209,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/upmix.txt %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/60-upmix.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/60-upmix.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so @@ -208,6 +218,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/vdownmix.txt %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/60-vdownmix.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/60-vdownmix.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so @@ -215,6 +227,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/98-usb-stream.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/98-usb-stream.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so @@ -222,6 +236,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/README-arcam-av %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/50-arcam-av-ctl.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/50-arcam-av-ctl.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so @@ -230,6 +246,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/10-speexrate.conf %config(noreplace) /etc/alsa/conf.d/60-speex.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/10-speexrate.conf +%{_datadir}/alsa/alsa.conf.d/10-speex.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_speex.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate.so @@ -240,12 +259,17 @@ find %{buildroot} -name "*.la" -exec rm {} \; %doc COPYING COPYING.GPL doc/README-maemo %dir /etc/alsa/conf.d %config(noreplace) /etc/alsa/conf.d/98-maemo.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/98-maemo.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so %changelog +* Mon Apr 16 2018 Jaroslav Kysela - 1.1.6-3 +- /etc/alsa/conf.d contains symlinks to /usr/share/alsa/alsa.conf.d templates + * Wed Apr 04 2018 Jaroslav Kysela - 1.1.6-2 - Changed the add-on config directory to /etc/alsa/conf.d - Changed the config files diff --git a/plugin-config.patch b/plugin-config.patch index a48069b..2ccfb8f 100644 --- a/plugin-config.patch +++ b/plugin-config.patch @@ -1,7 +1,7 @@ From e8fabec7adc70220f52588dc170d90d146b92ba7 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 09:23:09 +0200 -Subject: [PATCH 1/2] samplerate: fix unused variable warning +Subject: [PATCH 1/5] samplerate: fix unused variable warning Signed-off-by: Jaroslav Kysela --- @@ -36,7 +36,7 @@ index 0b14a59..100d6f2 100644 From 6e40eb5fd346207021a95d06bc30205a537926ea Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 4 Apr 2018 19:57:56 +0200 -Subject: [PATCH 2/2] configure: add --with-alsaaddondir, add default config +Subject: [PATCH 2/5] configure: add --with-alsaaddondir, add default config files for plugins Signed-off-by: Jaroslav Kysela @@ -748,3 +748,1523 @@ index 50a98a0..b606d3d 100644 -- 2.13.6 + +From cc6bed233a3167d806834460befca2c6d655f0fb Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 13 Apr 2018 13:37:36 +0200 +Subject: [PATCH 3/5] config/Makefile: make everything modular + +Signed-off-by: Jaroslav Kysela +--- + Makefile.am | 21 ++++++++++++++++++--- + configure.ac | 20 +++++++++++++++++++- + doc/Makefile.am | 37 ++++++++++++++++++++++++++++++++++--- + 3 files changed, 71 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 69cfe0d..303bc83 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,10 @@ +-SUBDIRS = oss mix usb_stream arcam-av doc ++SUBDIRS = doc ++if HAVE_OSS ++SUBDIRS += oss ++endif ++if HAVE_MIX ++SUBDIRS += mix ++endif + if HAVE_JACK + SUBDIRS += jack + endif +@@ -8,8 +14,17 @@ endif + if HAVE_SAMPLERATE + SUBDIRS += rate + endif +-if HAVE_AVCODEC +-SUBDIRS += a52 rate-lavc ++if HAVE_A52 ++SUBDIRS += a52 ++endif ++if HAVE_AVCRATE ++SUBDIRS += rate-lavc ++endif ++if HAVE_USBSTREAM ++SUBDIRS += usb_stream ++endif ++if HAVE_ARCAMAV ++SUBDIRS += arcam-av + endif + if HAVE_MAEMO_PLUGIN + SUBDIRS += maemo +diff --git a/configure.ac b/configure.ac +index ae98caa..2d7e6aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -135,6 +135,22 @@ AC_SUBST(AVCODEC_CFLAGS) + AC_SUBST(AVCODEC_LIBS) + AC_SUBST(AVCODEC_HEADER) + ++AC_ARG_ENABLE([a52], ++ AS_HELP_STRING([--disable-a52], [Disable building of A52 encoder plugin])) ++ ++if test "x$enable_a52" != "xno" -a "$HAVE_AVCODEC" = "yes"; then ++ HAVE_A52=yes ++fi ++AM_CONDITIONAL(HAVE_A52, test x$HAVE_A52 = xyes) ++ ++AC_ARG_ENABLE([avcrate], ++ AS_HELP_STRING([--disable-avcrate], [Disable building of AVC rate plugin])) ++ ++if test "x$enable_avcrate" != "xno" -a "$HAVE_AVCODEC" = "yes"; then ++ HAVE_AVCRATE=yes ++fi ++AM_CONDITIONAL(HAVE_AVCRATE, test x$HAVE_AVCRATE = xyes) ++ + AC_ARG_ENABLE([speexdsp], + AS_HELP_STRING([--disable-speexdsp], [Disable building of speexdsp plugin])) + +@@ -260,12 +276,14 @@ if test "$HAVE_SAMPLERATE" = "yes"; then + fi + echo "Maemo plugin: $HAVE_MAEMO_PLUGIN" + echo " Using Osso resource manager: $use_maemo_rm" +-echo "A52, lavc plugins: $HAVE_AVCODEC" + if test "$HAVE_AVCODEC" = "yes"; then ++ echo "AVCodec config:" + echo " AVCODEC_CFLAGS: $AVCODEC_CFLAGS" + echo " AVCODEC_LIBS: $AVCODEC_LIBS" + echo " AVCODEC_HEADER: $AVCODEC_HEADER" + fi ++echo "A52 plugin: $HAVE_A52" ++echo "AVC rate plugin: $HAVE_AVCRATE" + echo "Speex rate plugin: $PPH" + echo "Speex preprocess plugin: $HAVE_SPEEXDSP" + if test "$HAVE_SPEEX" = "yes"; then +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 19fa0d2..0d6f6e5 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,4 +1,35 @@ +-EXTRA_DIST = README-pcm-oss README-jack README-pulse README-maemo \ +- upmix.txt vdownmix.txt samplerate.txt a52.txt lavcrate.txt \ +- speexrate.txt speexdsp.txt README-arcam-av ++EXTRA_DIST = + ++if HAVE_OSS ++EXTRA_DIST += README-pcm-oss ++endif ++if HAVE_MIX ++EXTRA_DIST += upmix.txt vdownmix.txt ++endif ++if HAVE_JACK ++EXTRA_DIST += README-jack ++endif ++if HAVE_PULSE ++EXTRA_DIST += README-pulse ++endif ++if HAVE_MAEMO_PLUGIN ++EXTRA_DIST += README-maemo ++endif ++if HAVE_SAMPLERATE ++EXTRA_DIST += samplerate.txt ++endif ++if HAVE_A52 ++EXTRA_DIST += a52.txt ++endif ++if HAVE_AVCRATE ++EXTRA_DIST += lavcrate.txt ++endif ++if HAVE_PPH ++EXTRA_DIST += speexrate.txt ++endif ++if HAVE_SPEEXDSP ++EXTRA_DIST += speexdsp.txt ++endif ++if HAVE_ARCAMAV ++EXTRA_DIST += README-arcam-av ++endif +-- +2.13.6 + + +From 24db7f59d76984e2901f2834a297735853cab776 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 16 Apr 2018 16:24:29 +0200 +Subject: [PATCH 4/5] Move rate-lavc to rate-lav subdirectory and update to use + libavresample + +- --disable-avcodec renamed to --disable-libav +- --avcodec-includedir renamed to --libav-includedir +- --avcodec-libdir renamed to --libav-libdir +- --disable-lavcrate renamed to --disable-lavrate + +The .c changes are from Anton Khirnov. The rest is from Jaroslav Kysela. + +From: Anton Khirnov +Signed-off-by: Jaroslav Kysela +--- + Makefile.am | 4 +- + a52/Makefile.am | 5 +- + a52/pcm_a52.c | 2 +- + configure.ac | 85 +++--- + doc/Makefile.am | 4 +- + doc/{lavcrate.txt => lavrate.txt} | 10 +- + .../10-rate-lavc.conf => rate-lav/10-rate-lav.conf | 6 +- + rate-lav/Makefile.am | 25 ++ + {rate-lavc => rate-lav}/gcd.h | 0 + rate-lav/rate_lavrate.c | 235 +++++++++++++++++ + rate-lavc/Makefile.am | 26 -- + rate-lavc/rate_lavcrate.c | 291 --------------------- + 12 files changed, 311 insertions(+), 382 deletions(-) + rename doc/{lavcrate.txt => lavrate.txt} (76%) + rename rate-lavc/10-rate-lavc.conf => rate-lav/10-rate-lav.conf (73%) + create mode 100644 rate-lav/Makefile.am + rename {rate-lavc => rate-lav}/gcd.h (100%) + create mode 100644 rate-lav/rate_lavrate.c + delete mode 100644 rate-lavc/Makefile.am + delete mode 100644 rate-lavc/rate_lavcrate.c + +diff --git a/Makefile.am b/Makefile.am +index 303bc83..27f61a4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -17,8 +17,8 @@ endif + if HAVE_A52 + SUBDIRS += a52 + endif +-if HAVE_AVCRATE +-SUBDIRS += rate-lavc ++if HAVE_LAVRATE ++SUBDIRS += rate-lav + endif + if HAVE_USBSTREAM + SUBDIRS += usb_stream +diff --git a/a52/Makefile.am b/a52/Makefile.am +index cbc1497..4ac8edd 100644 +--- a/a52/Makefile.am ++++ b/a52/Makefile.am +@@ -6,9 +6,8 @@ asound_module_addon_DATA = 60-a52-encoder.conf + asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@ + asound_module_addondir = @ALSA_ADDON_DIR@ + +-AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@ \ +- -DAVCODEC_HEADER="@AVCODEC_HEADER@" ++AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @LIBAV_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) + + libasound_module_pcm_a52_la_SOURCES = pcm_a52.c +-libasound_module_pcm_a52_la_LIBADD = @ALSA_LIBS@ @AVCODEC_LIBS@ ++libasound_module_pcm_a52_la_LIBADD = @ALSA_LIBS@ @LIBAV_LIBS@ @LIBAV_CODEC_LIBS@ +diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c +index 155da36..29ce45f 100644 +--- a/a52/pcm_a52.c ++++ b/a52/pcm_a52.c +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include AVCODEC_HEADER ++#include + #include + + /* some compatibility wrappers */ +diff --git a/configure.ac b/configure.ac +index 2d7e6aa..cb1ae2d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,67 +89,55 @@ if test "$use_maemo_rm" = "yes"; then + fi + fi + +-AC_ARG_ENABLE([avcodec], +- AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)])) ++AC_ARG_ENABLE([libav], ++ AS_HELP_STRING([--disable-avlib], [Do not build plugins depending on libav/ffmpeg (a52,lavrate...)])) + +-if test "x$enable_avcodec" != "xno"; then +- PKG_CHECK_MODULES(AVCODEC, [libavcodec libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) ++if test "x$enable_libav" != "xno"; then ++ PKG_CHECK_MODULES(LIBAV, [libavcodec libavutil libavresample], [HAVE_LIBAV=yes], [HAVE_LIBAV=no]) + fi + +-if test "x$HAVE_AVCODEC" = "xno"; then +- AC_ARG_WITH([avcodec-includedir], +- AS_HELP_STRING([--with-avcodec-includedir=dir], +- [AVcodec include directory]), +- [AVCODEC_CFLAGS="-I$withval"], [AVCODEC_CFLAGS=""]) +- AC_ARG_WITH([avcodec-libdir], +- AS_HELP_STRING([--with-avcodec-libdir=dir], +- [AVcodec library directory]), +- [AVCODEC_LIBS="-L$withval"], [AVCODEC_LIBS=""]) ++if test "x$HAVE_LIBAV" = "xno"; then ++ AC_ARG_WITH([libav-includedir], ++ AS_HELP_STRING([--with-libav-includedir=dir], ++ [Libav/ffmpeg include directory]), ++ [LIBAV_CFLAGS="-I$(withval)"], [LIBAV_CFLAGS=""]) ++ AC_ARG_WITH([libav-libdir], ++ AS_HELP_STRING([--with-libav-libdir=dir], ++ [Libav/ffmpeg library directory]), ++ [LIBAV_LIBS="-L$withval"], [LIBAV_LIBS=""]) + + CFLAGS_saved="$CFLAGS" + LDFLAGS_saved="$LDFLAGS" +- CFLAGS="$CFLAGS $AVCODEC_CFLAGS" +- LDFLAGS="$LDFLAGS $AVCODEC_LIBS" +- AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec" +- AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) ++ CFLAGS="$CFLAGS $LIBAV_CFLAGS" ++ LDFLAGS="$LDFLAGS $LIBAV_LIBS" ++ AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_LIBAV=yes], [HAVE_LIBAV=no]) + CFLAGS="$CFLAGS_saved" + LDFLAGS="$LDFLAGS_saved" ++ LIBAV_CODEC_LIBS="-lavcodec" ++ LIBAV_RESAMPLE_LIBS="-lavresample -lavutil" + fi + +-if test $HAVE_AVCODEC = yes; then +- AVCODEC_HEADER="" +- CFLAGS_saved="$CFLAGS" +- CFLAGS="$CFLAGS $AVCODEC_CFLAGS" +- AC_CHECK_HEADER([ffmpeg/avcodec.h], [AVCODEC_HEADER='']) +- if test -z "$AVCODEC_HEADER"; then +- AC_CHECK_HEADER([libavcodec/avcodec.h], [AVCODEC_HEADER='']) +- fi +- if test -z "$AVCODEC_HEADER"; then +- HAVE_AVCODEC=no +- fi +- CFLAGS="$CFLAGS_saved" +-fi +- +-AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes) +-AC_SUBST(AVCODEC_CFLAGS) +-AC_SUBST(AVCODEC_LIBS) +-AC_SUBST(AVCODEC_HEADER) ++AM_CONDITIONAL(HAVE_LIBAV, test x$HAVE_LIBAV = xyes) ++AC_SUBST(LIBAV_CFLAGS) ++AC_SUBST(LIBAV_LIBS) ++AC_SUBST(LIBAV_CODEC_LIBS) ++AC_SUBST(LIBAV_RESAMPLE_LIBS) + + AC_ARG_ENABLE([a52], + AS_HELP_STRING([--disable-a52], [Disable building of A52 encoder plugin])) + +-if test "x$enable_a52" != "xno" -a "$HAVE_AVCODEC" = "yes"; then ++if test "x$enable_a52" != "xno" -a "$HAVE_LIBAV" = "yes"; then + HAVE_A52=yes + fi + AM_CONDITIONAL(HAVE_A52, test x$HAVE_A52 = xyes) + +-AC_ARG_ENABLE([avcrate], +- AS_HELP_STRING([--disable-avcrate], [Disable building of AVC rate plugin])) ++AC_ARG_ENABLE([lavrate], ++ AS_HELP_STRING([--disable-lavrate], [Disable building of libav/ffmpeg rate plugin])) + +-if test "x$enable_avcrate" != "xno" -a "$HAVE_AVCODEC" = "yes"; then +- HAVE_AVCRATE=yes ++if test "x$enable_lavrate" != "xno" -a "$HAVE_LIBAV" = "yes"; then ++ HAVE_LAVRATE=yes + fi +-AM_CONDITIONAL(HAVE_AVCRATE, test x$HAVE_AVCRATE = xyes) ++AM_CONDITIONAL(HAVE_LAVRATE, test x$HAVE_LAVRATE = xyes) + + AC_ARG_ENABLE([speexdsp], + AS_HELP_STRING([--disable-speexdsp], [Disable building of speexdsp plugin])) +@@ -245,7 +233,7 @@ AC_OUTPUT([ + mix/Makefile + rate/Makefile + a52/Makefile +- rate-lavc/Makefile ++ rate-lav/Makefile + maemo/Makefile + doc/Makefile + usb_stream/Makefile +@@ -276,14 +264,13 @@ if test "$HAVE_SAMPLERATE" = "yes"; then + fi + echo "Maemo plugin: $HAVE_MAEMO_PLUGIN" + echo " Using Osso resource manager: $use_maemo_rm" +-if test "$HAVE_AVCODEC" = "yes"; then +- echo "AVCodec config:" +- echo " AVCODEC_CFLAGS: $AVCODEC_CFLAGS" +- echo " AVCODEC_LIBS: $AVCODEC_LIBS" +- echo " AVCODEC_HEADER: $AVCODEC_HEADER" ++if test "$HAVE_LIBAV" = "yes"; then ++ echo "Libav/ffmpeg config:" ++ echo " LIBAV_CFLAGS: $LIBAV_CFLAGS" ++ echo " LIBAV_LIBS: $LIBAV_LIBS / $LIBAV_CODEC_LIBS / $LIBAV_RESAMPLE_LIBS" + fi +-echo "A52 plugin: $HAVE_A52" +-echo "AVC rate plugin: $HAVE_AVCRATE" ++echo "Libav A52 plugin: $HAVE_A52" ++echo "Libav rate plugin: $HAVE_LAVRATE" + echo "Speex rate plugin: $PPH" + echo "Speex preprocess plugin: $HAVE_SPEEXDSP" + if test "$HAVE_SPEEX" = "yes"; then +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 0d6f6e5..7c004e5 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -21,8 +21,8 @@ endif + if HAVE_A52 + EXTRA_DIST += a52.txt + endif +-if HAVE_AVCRATE +-EXTRA_DIST += lavcrate.txt ++if HAVE_LAVRATE ++EXTRA_DIST += lavrate.txt + endif + if HAVE_PPH + EXTRA_DIST += speexrate.txt +diff --git a/doc/lavcrate.txt b/doc/lavrate.txt +similarity index 76% +rename from doc/lavcrate.txt +rename to doc/lavrate.txt +index faf3e25..6575183 100644 +--- a/doc/lavcrate.txt ++++ b/doc/lavrate.txt +@@ -1,14 +1,14 @@ +-Rate Converter Plugin Using libavcodec +-====================================== ++Rate Converter Plugin Using libavresample ++=========================================0 + +-The plugin in rate-lavc subdirectory is an external rate converter using +-libavcodec's resampler. You can use this rate converter plugin by defining a ++The plugin in rate-lavr subdirectory is an external rate converter using ++libavresample library. You can use this rate converter plugin by defining a + rate PCM with "converter" parameter, such as: + + pcm.my_rate { + type rate + slave.pcm "hw" +- converter "lavcrate" ++ converter "lavrate" + } + + The plug plugin has also a similar field, "rate_converter". +diff --git a/rate-lavc/10-rate-lavc.conf b/rate-lav/10-rate-lav.conf +similarity index 73% +rename from rate-lavc/10-rate-lavc.conf +rename to rate-lav/10-rate-lav.conf +index bab1694..48ede62 100644 +--- a/rate-lavc/10-rate-lavc.conf ++++ b/rate-lav/10-rate-lav.conf +@@ -1,4 +1,4 @@ +-pcm.lavcrate { ++pcm.lavrate { + @args [ SLAVE RATE CONVERTER ] + @args.SLAVE { + type string +@@ -10,7 +10,7 @@ pcm.lavcrate { + } + @args.CONVERTER { + type string +- default "lavcrate" ++ default "lavrate" + } + type rate + converter $CONVERTER +@@ -23,6 +23,6 @@ pcm.lavcrate { + @func refer + name defaults.namehint.basic + } +- description "Rate Converter Plugin Using AVC Library" ++ description "Rate Converter Plugin Using Libav/FFmpeg Library" + } + } +diff --git a/rate-lav/Makefile.am b/rate-lav/Makefile.am +new file mode 100644 +index 0000000..0f6ecb6 +--- /dev/null ++++ b/rate-lav/Makefile.am +@@ -0,0 +1,25 @@ ++EXTRA_DIST = 10-rate-lav.conf ++ ++asound_module_rate_lavrate_LTLIBRARIES = libasound_module_rate_lavrate.la ++asound_module_addon_DATA = 10-rate-lav.conf ++ ++asound_module_rate_lavratedir = @ALSA_PLUGIN_DIR@ ++asound_module_addondir = @ALSA_ADDON_DIR@ ++ ++AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @LIBAV_CFLAGS@ ++AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) ++ ++libasound_module_rate_lavrate_la_SOURCES = rate_lavrate.c ++libasound_module_rate_lavrate_la_LIBADD = @ALSA_LIBS@ @LIBAV_LIBS@ @LIBAV_RESAMPLE_LIBS@ ++ ++noinst_HEADERS = gcd.h ++ ++install-exec-hook: ++ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_*.so ++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_higher.so ++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_high.so ++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_fast.so ++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_faster.so ++ ++uninstall-hook: ++ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_*.so +diff --git a/rate-lavc/gcd.h b/rate-lav/gcd.h +similarity index 100% +rename from rate-lavc/gcd.h +rename to rate-lav/gcd.h +diff --git a/rate-lav/rate_lavrate.c b/rate-lav/rate_lavrate.c +new file mode 100644 +index 0000000..2b992c5 +--- /dev/null ++++ b/rate-lav/rate_lavrate.c +@@ -0,0 +1,235 @@ ++/* ++ * Rate converter plugin using libavresample ++ * Copyright (c) 2014 by Anton Khirnov ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++ ++static unsigned int filter_size = 16; ++static unsigned int phase_shift = 10; /* auto-adjusts */ ++static double cutoff = 0; /* auto-adjusts */ ++ ++struct rate_src { ++ AVAudioResampleContext *avr; ++ ++ unsigned int in_rate; ++ unsigned int out_rate; ++ unsigned int channels; ++}; ++ ++static snd_pcm_uframes_t input_frames(void *obj ATTRIBUTE_UNUSED, ++ snd_pcm_uframes_t frames) ++{ ++ return frames; ++} ++ ++static snd_pcm_uframes_t output_frames(void *obj ATTRIBUTE_UNUSED, ++ snd_pcm_uframes_t frames) ++{ ++ return frames; ++} ++ ++static void pcm_src_free(void *obj) ++{ ++ struct rate_src *rate = obj; ++ avresample_free(&rate->avr); ++} ++ ++static int pcm_src_init(void *obj, snd_pcm_rate_info_t *info) ++{ ++ struct rate_src *rate = obj; ++ int i, ir, or; ++ ++ if (!rate->avr || rate->channels != info->channels) { ++ int ret; ++ ++ pcm_src_free(rate); ++ rate->channels = info->channels; ++ ir = rate->in_rate = info->in.rate; ++ or = rate->out_rate = info->out.rate; ++ i = av_gcd(or, ir); ++ if (or > ir) { ++ phase_shift = or/i; ++ } else { ++ phase_shift = ir/i; ++ } ++ if (cutoff <= 0.0) { ++ cutoff = 1.0 - 1.0/filter_size; ++ if (cutoff < 0.80) ++ cutoff = 0.80; ++ } ++ ++ rate->avr = avresample_alloc_context(); ++ if (!rate->avr) ++ return -ENOMEM; ++ ++ av_opt_set_int(rate->avr, "in_sample_rate", info->in.rate, 0); ++ av_opt_set_int(rate->avr, "out_sample_rate", info->out.rate, 0); ++ av_opt_set_int(rate->avr, "in_sample_format", AV_SAMPLE_FMT_S16, 0); ++ av_opt_set_int(rate->avr, "out_sample_format", AV_SAMPLE_FMT_S16, 0); ++ av_opt_set_int(rate->avr, "in_channel_layout", av_get_default_channel_layout(rate->channels), 0); ++ av_opt_set_int(rate->avr, "out_channel_layout", av_get_default_channel_layout(rate->channels), 0); ++ ++ av_opt_set_int(rate->avr, "filter_size", filter_size, 0); ++ av_opt_set_int(rate->avr, "phase_shift", phase_shift, 0); ++ av_opt_set_double(rate->avr, "cutoff", cutoff, 0); ++ ++ ret = avresample_open(rate->avr); ++ if (ret < 0) { ++ avresample_free(&rate->avr); ++ return -EINVAL; ++ } ++ } ++ ++ return 0; ++} ++ ++static int pcm_src_adjust_pitch(void *obj, snd_pcm_rate_info_t *info) ++{ ++ struct rate_src *rate = obj; ++ ++ if (info->out.rate != rate->out_rate || info->in.rate != rate->in_rate) ++ pcm_src_init(obj, info); ++ return 0; ++} ++ ++static void pcm_src_reset(void *obj) ++{ ++ struct rate_src *rate = obj; ++ ++ if (rate->avr) { ++#if 0 ++ avresample_close(rate->avr); ++ avresample_open(rate->avr); ++#endif ++ } ++} ++ ++static void pcm_src_convert_s16(void *obj, int16_t *dst, ++ unsigned int dst_frames, ++ const int16_t *src, ++ unsigned int src_frames) ++{ ++ struct rate_src *rate = obj; ++ int chans = rate->channels; ++ unsigned int total_in = avresample_get_delay(rate->avr) + src_frames; ++ ++ avresample_convert(rate->avr, (uint8_t **)&dst, dst_frames * chans * 2, dst_frames, ++ (uint8_t **)&src, src_frames * chans * 2, src_frames); ++ ++ avresample_set_compensation(rate->avr, ++ total_in - src_frames > filter_size ? 0 : 1, src_frames); ++} ++ ++static void pcm_src_close(void *obj) ++{ ++ pcm_src_free(obj); ++} ++ ++#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002 ++static int get_supported_rates(void *obj ATTRIBUTE_UNUSED, ++ unsigned int *rate_min, ++ unsigned int *rate_max) ++{ ++ *rate_min = *rate_max = 0; /* both unlimited */ ++ return 0; ++} ++ ++static void dump(void *obj ATTRIBUTE_UNUSED, snd_output_t *out) ++{ ++ snd_output_printf(out, "Converter: libavr\n"); ++} ++#endif ++ ++static snd_pcm_rate_ops_t pcm_src_ops = { ++ .close = pcm_src_close, ++ .init = pcm_src_init, ++ .free = pcm_src_free, ++ .reset = pcm_src_reset, ++ .adjust_pitch = pcm_src_adjust_pitch, ++ .convert_s16 = pcm_src_convert_s16, ++ .input_frames = input_frames, ++ .output_frames = output_frames, ++#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002 ++ .version = SND_PCM_RATE_PLUGIN_VERSION, ++ .get_supported_rates = get_supported_rates, ++ .dump = dump, ++#endif ++}; ++ ++int pcm_src_open(unsigned int version, void **objp, snd_pcm_rate_ops_t *ops) ++ ++{ ++ struct rate_src *rate; ++ ++#if SND_PCM_RATE_PLUGIN_VERSION < 0x010002 ++ if (version != SND_PCM_RATE_PLUGIN_VERSION) { ++ fprintf(stderr, "Invalid rate plugin version %x\n", version); ++ return -EINVAL; ++ } ++#endif ++ rate = calloc(1, sizeof(*rate)); ++ if (!rate) ++ return -ENOMEM; ++ ++ *objp = rate; ++ rate->avr = NULL; ++#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002 ++ if (version == 0x010001) ++ memcpy(ops, &pcm_src_ops, sizeof(snd_pcm_rate_old_ops_t)); ++ else ++#endif ++ *ops = pcm_src_ops; ++ return 0; ++} ++ ++int SND_PCM_RATE_PLUGIN_ENTRY(lavrate)(unsigned int version, void **objp, ++ snd_pcm_rate_ops_t *ops) ++{ ++ return pcm_src_open(version, objp, ops); ++} ++int SND_PCM_RATE_PLUGIN_ENTRY(lavrate_higher)(unsigned int version, ++ void **objp, snd_pcm_rate_ops_t *ops) ++{ ++ filter_size = 64; ++ return pcm_src_open(version, objp, ops); ++} ++int SND_PCM_RATE_PLUGIN_ENTRY(lavrate_high)(unsigned int version, ++ void **objp, snd_pcm_rate_ops_t *ops) ++{ ++ filter_size = 32; ++ return pcm_src_open(version, objp, ops); ++} ++int SND_PCM_RATE_PLUGIN_ENTRY(lavrate_fast)(unsigned int version, ++ void **objp, snd_pcm_rate_ops_t *ops) ++{ ++ filter_size = 8; ++ return pcm_src_open(version, objp, ops); ++} ++int SND_PCM_RATE_PLUGIN_ENTRY(lavrate_faster)(unsigned int version, ++ void **objp, snd_pcm_rate_ops_t *ops) ++{ ++ filter_size = 4; ++ return pcm_src_open(version, objp, ops); ++} ++ ++ +diff --git a/rate-lavc/Makefile.am b/rate-lavc/Makefile.am +deleted file mode 100644 +index 5f66472..0000000 +--- a/rate-lavc/Makefile.am ++++ /dev/null +@@ -1,26 +0,0 @@ +-EXTRA_DIST = 10-rate-lavc.conf +- +-asound_module_rate_lavcrate_LTLIBRARIES = libasound_module_rate_lavcrate.la +-asound_module_addon_DATA = 10-rate-lavc.conf +- +-asound_module_rate_lavcratedir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ +- +-AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@ \ +- -DAVCODEC_HEADER="@AVCODEC_HEADER@" +-AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +- +-libasound_module_rate_lavcrate_la_SOURCES = rate_lavcrate.c +-libasound_module_rate_lavcrate_la_LIBADD = @ALSA_LIBS@ @AVCODEC_LIBS@ +- +-noinst_HEADERS = gcd.h +- +-install-exec-hook: +- rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so +- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_higher.so +- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_high.so +- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_fast.so +- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_faster.so +- +-uninstall-hook: +- rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so +diff --git a/rate-lavc/rate_lavcrate.c b/rate-lavc/rate_lavcrate.c +deleted file mode 100644 +index 14a2198..0000000 +--- a/rate-lavc/rate_lavcrate.c ++++ /dev/null +@@ -1,291 +0,0 @@ +-/* +- * Rate converter plugin using libavcodec's resampler +- * Copyright (c) 2007 by Nicholas Kain +- * +- * based on rate converter that uses libsamplerate +- * Copyright (c) 2006 by Takashi Iwai +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2.1 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- */ +- +-#include +-#include +-#include +-#include AVCODEC_HEADER +-#include "gcd.h" +- +-static int filter_size = 16; +-static int phase_shift = 10; /* auto-adjusts */ +-static double cutoff = 0; /* auto-adjusts */ +- +-struct rate_src { +- struct AVResampleContext *context; +- int in_rate; +- int out_rate; +- int stored; +- int point; +- int16_t **out; +- int16_t **in; +- unsigned int channels; +-}; +- +-static snd_pcm_uframes_t input_frames(void *obj, snd_pcm_uframes_t frames) +-{ +- return frames; +-} +- +-static snd_pcm_uframes_t output_frames(void *obj, snd_pcm_uframes_t frames) +-{ +- return frames; +-} +- +-static void pcm_src_free(void *obj) +-{ +- struct rate_src *rate = obj; +- int i; +- +- if (rate->out) { +- for (i=0; ichannels; i++) { +- free(rate->out[i]); +- } +- free(rate->out); +- } +- if (rate->in) { +- for (i=0; ichannels; i++) { +- free(rate->in[i]); +- } +- free(rate->in); +- } +- rate->out = rate->in = NULL; +- +- if (rate->context) { +- av_resample_close(rate->context); +- rate->context = NULL; +- } +-} +- +-static int pcm_src_init(void *obj, snd_pcm_rate_info_t *info) +-{ +- struct rate_src *rate = obj; +- int i, ir, or; +- +- if (! rate->context || rate->channels != info->channels) { +- pcm_src_free(rate); +- rate->channels = info->channels; +- ir = rate->in_rate = info->in.rate; +- or = rate->out_rate = info->out.rate; +- i = gcd(or, ir); +- if (or > ir) { +- phase_shift = or/i; +- } else { +- phase_shift = ir/i; +- } +- if (cutoff <= 0.0) { +- cutoff = 1.0 - 1.0/filter_size; +- if (cutoff < 0.80) +- cutoff = 0.80; +- } +- rate->context = av_resample_init(info->out.rate, info->in.rate, +- filter_size, phase_shift, +- (info->out.rate >= info->in.rate ? 0 : 1), cutoff); +- if (!rate->context) +- return -EINVAL; +- } +- +- rate->out = malloc(rate->channels * sizeof(int16_t *)); +- rate->in = malloc(rate->channels * sizeof(int16_t *)); +- for (i=0; ichannels; i++) { +- rate->out[i] = calloc(info->out.period_size * 2, +- sizeof(int16_t)); +- rate->in[i] = calloc(info->in.period_size * 2, +- sizeof(int16_t)); +- } +- rate->point = info->in.period_size / 2; +- if (!rate->out || !rate->in) { +- pcm_src_free(rate); +- return -ENOMEM; +- } +- +- return 0; +-} +- +-static int pcm_src_adjust_pitch(void *obj, snd_pcm_rate_info_t *info) +-{ +- struct rate_src *rate = obj; +- +- if (info->out.rate != rate->out_rate || info->in.rate != rate->in_rate) +- pcm_src_init(obj, info); +- return 0; +-} +- +-static void pcm_src_reset(void *obj) +-{ +- struct rate_src *rate = obj; +- rate->stored = 0; +-} +- +-static void deinterleave(const int16_t *src, int16_t **dst, unsigned int frames, +- unsigned int chans, int overflow) +-{ +- int i, j; +- +- if (chans == 1) { +- memcpy(dst + overflow, src, frames*sizeof(int16_t)); +- } else if (chans == 2) { +- for (j=overflow; j<(frames + overflow); j++) { +- dst[0][j] = *(src++); +- dst[1][j] = *(src++); +- } +- } else { +- for (j=overflow; j<(frames + overflow); j++) { +- for (i=0; ichannels, ret=0, i; +- int total_in = rate->stored + src_frames, new_stored; +- +- deinterleave(src, rate->in, src_frames, chans, rate->point); +- for (i=0; icontext, rate->out[i], +- rate->in[i]+rate->point-rate->stored, &consumed, +- total_in, dst_frames, i == (chans - 1)); +- new_stored = total_in-consumed; +- memmove(rate->in[i]+rate->point-new_stored, +- rate->in[i]+rate->point-rate->stored+consumed, +- new_stored*sizeof(int16_t)); +- } +- av_resample_compensate(rate->context, +- total_in-src_frames>filter_size?0:1, src_frames); +- reinterleave(rate->out, dst, ret, chans); +- rate->stored = total_in-consumed; +-} +- +-static void pcm_src_close(void *obj) +-{ +- pcm_src_free(obj); +-} +- +-#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002 +-static int get_supported_rates(void *obj, unsigned int *rate_min, +- unsigned int *rate_max) +-{ +- *rate_min = *rate_max = 0; /* both unlimited */ +- return 0; +-} +- +-static void dump(void *obj, snd_output_t *out) +-{ +- snd_output_printf(out, "Converter: liblavc\n"); +-} +-#endif +- +-static snd_pcm_rate_ops_t pcm_src_ops = { +- .close = pcm_src_close, +- .init = pcm_src_init, +- .free = pcm_src_free, +- .reset = pcm_src_reset, +- .adjust_pitch = pcm_src_adjust_pitch, +- .convert_s16 = pcm_src_convert_s16, +- .input_frames = input_frames, +- .output_frames = output_frames, +-#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002 +- .version = SND_PCM_RATE_PLUGIN_VERSION, +- .get_supported_rates = get_supported_rates, +- .dump = dump, +-#endif +-}; +- +-int pcm_src_open(unsigned int version, void **objp, snd_pcm_rate_ops_t *ops) +- +-{ +- struct rate_src *rate; +- +-#if SND_PCM_RATE_PLUGIN_VERSION < 0x010002 +- if (version != SND_PCM_RATE_PLUGIN_VERSION) { +- fprintf(stderr, "Invalid rate plugin version %x\n", version); +- return -EINVAL; +- } +-#endif +- rate = calloc(1, sizeof(*rate)); +- if (!rate) +- return -ENOMEM; +- +- *objp = rate; +- rate->context = NULL; +-#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002 +- if (version == 0x010001) +- memcpy(ops, &pcm_src_ops, sizeof(snd_pcm_rate_old_ops_t)); +- else +-#endif +- *ops = pcm_src_ops; +- return 0; +-} +- +-int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate)(unsigned int version, void **objp, +- snd_pcm_rate_ops_t *ops) +-{ +- return pcm_src_open(version, objp, ops); +-} +-int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_higher)(unsigned int version, +- void **objp, snd_pcm_rate_ops_t *ops) +-{ +- filter_size = 64; +- return pcm_src_open(version, objp, ops); +-} +-int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_high)(unsigned int version, +- void **objp, snd_pcm_rate_ops_t *ops) +-{ +- filter_size = 32; +- return pcm_src_open(version, objp, ops); +-} +-int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_fast)(unsigned int version, +- void **objp, snd_pcm_rate_ops_t *ops) +-{ +- filter_size = 8; +- return pcm_src_open(version, objp, ops); +-} +-int SND_PCM_RATE_PLUGIN_ENTRY(lavcrate_faster)(unsigned int version, +- void **objp, snd_pcm_rate_ops_t *ops) +-{ +- filter_size = 4; +- return pcm_src_open(version, objp, ops); +-} +- +- +-- +2.13.6 + + +From 4afd4ab0b276b26b965bae3aadaa31cdb52b1df0 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 16 Apr 2018 17:49:36 +0200 +Subject: [PATCH 5/5] configure: change --with-alsaaddondir to + --with-alsagconfdir and --with-alsalconfdir + +The local add-on configuration directory (/etc/alsa/conf.d) contains +links to the global configuration directory (/usr/share/alsa/alsa.conf.d) now. + +Signed-off-by: Jaroslav Kysela +--- + a52/Makefile.am | 14 +++++++++++--- + arcam-av/Makefile.am | 14 +++++++++++--- + configure.ac | 32 ++++++++++++++++++++++---------- + install-hooks.am | 16 ++++++++++++++++ + jack/Makefile.am | 14 +++++++++++--- + maemo/Makefile.am | 14 +++++++++++--- + mix/Makefile.am | 14 +++++++++++--- + oss/Makefile.am | 14 +++++++++++--- + pph/Makefile.am | 16 ++++++++++++---- + pulse/Makefile.am | 17 ++++++++++++++--- + rate-lav/Makefile.am | 13 ++++++++++--- + rate/Makefile.am | 14 +++++++++++--- + speex/Makefile.am | 14 +++++++++++--- + usb_stream/Makefile.am | 14 +++++++++++--- + 14 files changed, 173 insertions(+), 47 deletions(-) + create mode 100644 install-hooks.am + +diff --git a/a52/Makefile.am b/a52/Makefile.am +index 4ac8edd..cd5ce45 100644 +--- a/a52/Makefile.am ++++ b/a52/Makefile.am +@@ -1,13 +1,21 @@ +-EXTRA_DIST = 60-a52-encoder.conf ++GCONF_FILES = 60-a52-encoder.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_pcm_a52_LTLIBRARIES = libasound_module_pcm_a52.la +-asound_module_addon_DATA = 60-a52-encoder.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @LIBAV_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) + + libasound_module_pcm_a52_la_SOURCES = pcm_a52.c + libasound_module_pcm_a52_la_LIBADD = @ALSA_LIBS@ @LIBAV_LIBS@ @LIBAV_CODEC_LIBS@ ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/arcam-av/Makefile.am b/arcam-av/Makefile.am +index 4a54ccd..c16aec0 100644 +--- a/arcam-av/Makefile.am ++++ b/arcam-av/Makefile.am +@@ -1,13 +1,21 @@ +-EXTRA_DIST = 50-arcam-av-ctl.conf ++GCONF_FILES = 50-arcam-av-ctl.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_ctl_arcam_av_LTLIBRARIES = libasound_module_ctl_arcam_av.la +-asound_module_addon_DATA = 50-arcam-av-ctl.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_ctl_arcam_avdir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined + + libasound_module_ctl_arcam_av_la_SOURCES = ctl_arcam_av.c arcam_av.c arcam_av.h + libasound_module_ctl_arcam_av_la_LIBADD = @ALSA_LIBS@ ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/configure.ac b/configure.ac +index cb1ae2d..f49bb6b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -210,17 +210,29 @@ AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA dat + ALSA_DATA_DIR="$alsadatadir" + AC_SUBST(ALSA_DATA_DIR) + +-dnl ALSA add-on config directory +-AC_ARG_WITH(alsaaddondir, +- AS_HELP_STRING([--with-alsaaddondir=dir], +- [path where ALSA add-on config files are stored]), +- alsaaddondir="$withval", alsaaddondir="") +-if test -z "$alsaaddondir"; then +- alsaaddondir="/etc/alsa/conf.d" ++dnl ALSA add-on global config directory ++AC_ARG_WITH(alsagconfdir, ++ AS_HELP_STRING([--with-alsagconfdir=dir], ++ [path where ALSA global add-on config files are stored]), ++ alsagconfdir="$withval", alsagconfdir="") ++if test -z "$alsagconfdir"; then ++ alsagconfdir="$ALSA_DATA_DIR/alsa.conf.d" + fi +-AC_DEFINE_UNQUOTED(ALSA_ADDON_DIR, "$alsaaddondir", [directory containing ALSA add-on config files]) +-ALSA_ADDON_DIR="$alsaaddondir" +-AC_SUBST(ALSA_ADDON_DIR) ++AC_DEFINE_UNQUOTED(ALSA_GCONF_DIR, "$alsagconfdir", [directory containing global ALSA add-on config files]) ++ALSA_GCONF_DIR="$alsagconfdir" ++AC_SUBST(ALSA_GCONF_DIR) ++ ++dnl ALSA add-on local config directory ++AC_ARG_WITH(alsalconfdir, ++ AS_HELP_STRING([--with-alsalconfdir=dir], ++ [path where ALSA local add-on config files are stored]), ++ alsalconfdir="$withval", alsalconfdir="") ++if test -z "$alsalconfdir"; then ++ alsalconfdir="/etc/alsa/conf.d" ++fi ++AC_DEFINE_UNQUOTED(ALSA_LCONF_DIR, "$alsalconfdir", [directory containing local ALSA add-on config files]) ++ALSA_LCONF_DIR="$alsalconfdir" ++AC_SUBST(ALSA_LCONF_DIR) + + SAVE_PLUGINS_VERSION + +diff --git a/install-hooks.am b/install-hooks.am +new file mode 100644 +index 0000000..2d6d383 +--- /dev/null ++++ b/install-hooks.am +@@ -0,0 +1,16 @@ ++install-conf-hook: ++ mkdir -p $(DESTDIR)$(ALSA_LCONF_DIR) ++ @(echo cd $(DESTDIR)$(ALSA_LCONF_DIR); \ ++ cd $(DESTDIR)$(ALSA_LCONF_DIR); \ ++ for i in $(GCONF_FILES); do \ ++ echo $(RM) $$i";" ln -s $(ALSA_GCONF_DIR)/$$i .; \ ++ $(RM) $$i; \ ++ ln -s $(ALSA_GCONF_DIR)/$$i .; \ ++ done) ++uninstall-conf-hook: ++ @(echo cd $(DESTDIR)$(ALSA_LCONF_DIR); \ ++ cd $(DESTDIR)$(ALSA_LCONF_DIR); \ ++ for i in $(GCONF_FILES); do \ ++ echo $(RM) $$i; \ ++ $(RM) $$i; \ ++ done) +diff --git a/jack/Makefile.am b/jack/Makefile.am +index 0a3d6ae..7801194 100644 +--- a/jack/Makefile.am ++++ b/jack/Makefile.am +@@ -1,13 +1,21 @@ +-EXTRA_DIST = 50-jack.conf ++GCONF_FILES = 50-jack.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_pcm_jack_LTLIBRARIES = libasound_module_pcm_jack.la +-asound_module_addon_DATA = 50-jack.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_pcm_jackdir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @JACK_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) + + libasound_module_pcm_jack_la_SOURCES = pcm_jack.c + libasound_module_pcm_jack_la_LIBADD = @ALSA_LIBS@ @JACK_LIBS@ ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/maemo/Makefile.am b/maemo/Makefile.am +index aca481d..7749926 100644 +--- a/maemo/Makefile.am ++++ b/maemo/Makefile.am +@@ -1,12 +1,14 @@ +-EXTRA_DIST = 98-maemo.conf ++GCONF_FILES = 98-maemo.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_pcm_alsa_dsp_LTLIBRARIES = libasound_module_pcm_alsa_dsp.la + asound_module_ctl_dsp_ctl_LTLIBRARIES = libasound_module_ctl_dsp_ctl.la +-asound_module_addon_DATA = 98-maemo.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_pcm_alsa_dspdir = @ALSA_PLUGIN_DIR@ + asound_module_ctl_dsp_ctldir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -O2 @ALSA_CFLAGS@ $(DBUS_CFLAGS) + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -19,3 +21,9 @@ libasound_module_ctl_dsp_ctl_la_LIBADD = @ALSA_LIBS@ $(DBUS_LIBS) -lpthread + + noinst_HEADERS = constants.h debug.h dsp-protocol.h list.h reporting.h \ + types.h ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/mix/Makefile.am b/mix/Makefile.am +index 710606c..a74c200 100644 +--- a/mix/Makefile.am ++++ b/mix/Makefile.am +@@ -1,12 +1,14 @@ +-EXTRA_DIST = 60-upmix.conf 60-vdownmix.conf ++GCONF_FILES = 60-upmix.conf 60-vdownmix.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_pcm_upmix_LTLIBRARIES = libasound_module_pcm_upmix.la + asound_module_pcm_vdownmix_LTLIBRARIES = libasound_module_pcm_vdownmix.la +-asound_module_addon_DATA = 60-upmix.conf 60-vdownmix.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_pcm_upmixdir = @ALSA_PLUGIN_DIR@ + asound_module_pcm_vdownmixdir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -15,3 +17,9 @@ libasound_module_pcm_upmix_la_SOURCES = pcm_upmix.c + libasound_module_pcm_upmix_la_LIBADD = @ALSA_LIBS@ + libasound_module_pcm_vdownmix_la_SOURCES = pcm_vdownmix.c + libasound_module_pcm_vdownmix_la_LIBADD = @ALSA_LIBS@ ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/oss/Makefile.am b/oss/Makefile.am +index df83d20..46dfcac 100644 +--- a/oss/Makefile.am ++++ b/oss/Makefile.am +@@ -1,12 +1,14 @@ +-EXTRA_DIST = 50-oss.conf ++GCONF_FILEs = 50-oss.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_pcm_oss_LTLIBRARIES = libasound_module_pcm_oss.la + asound_module_ctl_oss_LTLIBRARIES = libasound_module_ctl_oss.la +-asound_module_addon_DATA = 50-oss.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_pcm_ossdir = @ALSA_PLUGIN_DIR@ + asound_module_ctl_ossdir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -16,3 +18,9 @@ libasound_module_pcm_oss_la_LIBADD = @ALSA_LIBS@ + + libasound_module_ctl_oss_la_SOURCES = ctl_oss.c + libasound_module_ctl_oss_la_LIBADD = @ALSA_LIBS@ ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/pph/Makefile.am b/pph/Makefile.am +index abb950b..6938b74 100644 +--- a/pph/Makefile.am ++++ b/pph/Makefile.am +@@ -1,10 +1,12 @@ +-EXTRA_DIST = 10-speexrate.conf ++GCONF_FILES = 10-speexrate.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_rate_speexrate_LTLIBRARIES = libasound_module_rate_speexrate.la +-asound_module_addon_DATA = 10-speexrate.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_rate_speexratedir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -DVAR_ARRAYS -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -20,6 +22,10 @@ libasound_module_rate_speexrate_la_SOURCES += resample.c + libasound_module_rate_speexrate_la_LIBADD += -lm + endif + ++noinst_HEADERS = speex_resampler.h arch.h fixed_generic.h ++ ++include ../install-hooks.am ++ + install-exec-hook: + rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so + $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_best.so +@@ -28,4 +34,6 @@ install-exec-hook: + uninstall-hook: + rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so + +-noinst_HEADERS = speex_resampler.h arch.h fixed_generic.h ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/pulse/Makefile.am b/pulse/Makefile.am +index 835808c..c33e702 100644 +--- a/pulse/Makefile.am ++++ b/pulse/Makefile.am +@@ -1,14 +1,19 @@ +-EXTRA_DIST = 50-pulseaudio.conf 99-pulseaudio-default.conf.example ++GCONF_FILES = 50-pulseaudio.conf ++LCONF_FILES = 99-pulseaudio-default.conf.example ++ ++EXTRA_DIST = $(GCONF_FILES) $(LCONF_FILES) + + asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la + asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la + asound_module_conf_LTLIBRARIES = libasound_module_conf_pulse.la +-asound_module_addon_DATA = 50-pulseaudio.conf 99-pulseaudio-default.conf.example ++asound_module_gconf_DATA = $(GCONF_FILES) ++asound_module_lconf_DATA = $(LCONF_FILES) + + asound_module_pcmdir = @ALSA_PLUGIN_DIR@ + asound_module_ctldir = @ALSA_PLUGIN_DIR@ + asound_module_confdir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ ++asound_module_lconfdir = @ALSA_LCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -21,3 +26,9 @@ libasound_module_ctl_pulse_la_LIBADD = @ALSA_LIBS@ $(PTHREAD_LIBS) $(pulseaudio_ + + libasound_module_conf_pulse_la_SOURCES = conf_pulse.c + libasound_module_conf_pulse_la_LIBADD = @ALSA_LIBS@ $(PTHREAD_LIBS) $(pulseaudio_LIBS) ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/rate-lav/Makefile.am b/rate-lav/Makefile.am +index 0f6ecb6..eb672b5 100644 +--- a/rate-lav/Makefile.am ++++ b/rate-lav/Makefile.am +@@ -1,10 +1,12 @@ +-EXTRA_DIST = 10-rate-lav.conf ++GCONF_FILES = 10-rate-lav.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_rate_lavrate_LTLIBRARIES = libasound_module_rate_lavrate.la +-asound_module_addon_DATA = 10-rate-lav.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_rate_lavratedir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @LIBAV_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -14,6 +16,8 @@ libasound_module_rate_lavrate_la_LIBADD = @ALSA_LIBS@ @LIBAV_LIBS@ @LIBAV_RESAMP + + noinst_HEADERS = gcd.h + ++include ../install-hooks.am ++ + install-exec-hook: + rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_*.so + $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_higher.so +@@ -23,3 +27,6 @@ install-exec-hook: + + uninstall-hook: + rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavrate_*.so ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/rate/Makefile.am b/rate/Makefile.am +index 25014d8..488c12a 100644 +--- a/rate/Makefile.am ++++ b/rate/Makefile.am +@@ -1,10 +1,12 @@ +-EXTRA_DIST = 10-samplerate.conf ++GCONF_FILES = 10-samplerate.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_rate_samplerate_LTLIBRARIES = libasound_module_rate_samplerate.la +-asound_module_addon_DATA = 10-samplerate.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_rate_sampleratedir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(samplerate_CFLAGS) + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) +@@ -12,6 +14,8 @@ AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUN + libasound_module_rate_samplerate_la_SOURCES = rate_samplerate.c + libasound_module_rate_samplerate_la_LIBADD = @ALSA_LIBS@ @samplerate_LIBS@ + ++include ../install-hooks.am ++ + install-exec-hook: + rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_*.so + $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_best.so +@@ -21,3 +25,7 @@ install-exec-hook: + + uninstall-hook: + rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_*.so ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/speex/Makefile.am b/speex/Makefile.am +index 7891954..27c4ea5 100644 +--- a/speex/Makefile.am ++++ b/speex/Makefile.am +@@ -1,13 +1,21 @@ +-EXTRA_DIST = 60-speex.conf ++GCONF_FILES = 60-speex.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_pcm_speex_LTLIBRARIES = libasound_module_pcm_speex.la +-asound_module_addon_DATA = 60-speex.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_pcm_speexdir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @speexdsp_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED) + + libasound_module_pcm_speex_la_SOURCES = pcm_speex.c + libasound_module_pcm_speex_la_LIBADD = @ALSA_LIBS@ @speexdsp_LIBS@ ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +diff --git a/usb_stream/Makefile.am b/usb_stream/Makefile.am +index b606d3d..203618b 100644 +--- a/usb_stream/Makefile.am ++++ b/usb_stream/Makefile.am +@@ -1,10 +1,12 @@ +-EXTRA_DIST = 98-usb-stream.conf ++GCONF_FILES = 98-usb-stream.conf ++ ++EXTRA_DIST = $(GCONF_FILES) + + asound_module_pcm_usb_stream_LTLIBRARIES = libasound_module_pcm_usb_stream.la +-asound_module_addon_DATA = 98-usb-stream.conf ++asound_module_gconf_DATA = $(GCONF_FILES) + + asound_module_pcm_usb_streamdir = @ALSA_PLUGIN_DIR@ +-asound_module_addondir = @ALSA_ADDON_DIR@ ++asound_module_gconfdir = @ALSA_GCONF_DIR@ + + AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ + AM_LDFLAGS = -module -avoid-version -export-dynamic $(LDFLAGS_NOUNDEFINED) +@@ -13,3 +15,9 @@ libasound_module_pcm_usb_stream_la_SOURCES = pcm_usb_stream.c + libasound_module_pcm_usb_stream_la_LIBADD = @ALSA_LIBS@ + + noinst_HEADERS = usb_stream.h ++ ++include ../install-hooks.am ++ ++install-data-hook: install-conf-hook ++ ++uninstall-local: uninstall-conf-hook +-- +2.13.6 + From 8bab1d91f278426ada550cd657493002e3febe7f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 16 Apr 2018 18:15:02 +0200 Subject: [PATCH 18/70] plugin-config.patch: fix typo --- plugin-config.patch | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/plugin-config.patch b/plugin-config.patch index 2ccfb8f..f84dd45 100644 --- a/plugin-config.patch +++ b/plugin-config.patch @@ -1,7 +1,7 @@ From e8fabec7adc70220f52588dc170d90d146b92ba7 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 5 Apr 2018 09:23:09 +0200 -Subject: [PATCH 1/5] samplerate: fix unused variable warning +Subject: [PATCH 1/6] samplerate: fix unused variable warning Signed-off-by: Jaroslav Kysela --- @@ -36,7 +36,7 @@ index 0b14a59..100d6f2 100644 From 6e40eb5fd346207021a95d06bc30205a537926ea Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 4 Apr 2018 19:57:56 +0200 -Subject: [PATCH 2/5] configure: add --with-alsaaddondir, add default config +Subject: [PATCH 2/6] configure: add --with-alsaaddondir, add default config files for plugins Signed-off-by: Jaroslav Kysela @@ -752,7 +752,7 @@ index 50a98a0..b606d3d 100644 From cc6bed233a3167d806834460befca2c6d655f0fb Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 13 Apr 2018 13:37:36 +0200 -Subject: [PATCH 3/5] config/Makefile: make everything modular +Subject: [PATCH 3/6] config/Makefile: make everything modular Signed-off-by: Jaroslav Kysela --- @@ -890,7 +890,7 @@ index 19fa0d2..0d6f6e5 100644 From 24db7f59d76984e2901f2834a297735853cab776 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 16 Apr 2018 16:24:29 +0200 -Subject: [PATCH 4/5] Move rate-lavc to rate-lav subdirectory and update to use +Subject: [PATCH 4/6] Move rate-lavc to rate-lav subdirectory and update to use libavresample - --disable-avcodec renamed to --disable-libav @@ -1783,7 +1783,7 @@ index 14a2198..0000000 From 4afd4ab0b276b26b965bae3aadaa31cdb52b1df0 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 16 Apr 2018 17:49:36 +0200 -Subject: [PATCH 5/5] configure: change --with-alsaaddondir to +Subject: [PATCH 5/6] configure: change --with-alsaaddondir to --with-alsagconfdir and --with-alsalconfdir The local add-on configuration directory (/etc/alsa/conf.d) contains @@ -2268,3 +2268,27 @@ index b606d3d..203618b 100644 -- 2.13.6 + +From beb24e58763e3b1d831fcd7ef87a478e6ac74fcc Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 16 Apr 2018 18:14:18 +0200 +Subject: [PATCH 6/6] oss/Makefile.am: fix typo + +Signed-off-by: Jaroslav Kysela +--- + oss/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/oss/Makefile.am b/oss/Makefile.am +index 46dfcac..bff4443 100644 +--- a/oss/Makefile.am ++++ b/oss/Makefile.am +@@ -1,4 +1,4 @@ +-GCONF_FILEs = 50-oss.conf ++GCONF_FILES = 50-oss.conf + + EXTRA_DIST = $(GCONF_FILES) + +-- +2.13.6 + From 2f36816dad756dbba26ce795c32a3c018ff3e39e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 16 Apr 2018 18:19:39 +0200 Subject: [PATCH 19/70] fix another typo 10-speex.conf --- alsa-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 0e669fd..0b7b17e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -248,7 +248,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %config(noreplace) /etc/alsa/conf.d/60-speex.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/10-speexrate.conf -%{_datadir}/alsa/alsa.conf.d/10-speex.conf +%{_datadir}/alsa/alsa.conf.d/60-speex.conf %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_speex.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate.so From 3808a0af7cb0f6e5abdc773597ade6993119e8e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:09:37 +0000 Subject: [PATCH 20/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 0b7b17e..130dd17 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -267,6 +267,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 16 2018 Jaroslav Kysela - 1.1.6-3 - /etc/alsa/conf.d contains symlinks to /usr/share/alsa/alsa.conf.d templates From 6f99b96ed824c410843336de641ebf86b51df6d0 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 11:51:49 +0200 Subject: [PATCH 21/70] updated to 1.1.7 --- alsa-plugins.spec | 5 +++-- sources | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 130dd17..73c02b1 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -14,7 +14,6 @@ License: GPLv2+ and LGPLv2+ and BSD Group: System Environment/Libraries URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 -Patch0: plugin-config.patch BuildRequires: autoconf automake libtool BuildRequires: alsa-lib-devel @@ -136,7 +135,6 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %prep %setup -q -n %{name}-%{version}%{?prever} -%patch0 -p1 -b .plugin-config %build autoreconf -vif @@ -267,6 +265,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 +- Updated to 1.1.7 + * Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 194f06c..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -SHA512 (alsa-plugins-1.1.6.tar.bz2) = f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b From 9907bd3b68312e826f43a2312b0df3b29f38714b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 11:53:59 +0200 Subject: [PATCH 22/70] fix version --- alsa-plugins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 73c02b1..dd26bbe 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.6 -Release: 4%{?dist} +Version: 1.1.7 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed From 0b72f0af80424cc9fa647ab7e18b2f48f80e0a00 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 11:57:50 +0200 Subject: [PATCH 23/70] updated sources --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index e69de29..a1b2659 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (alsa-plugins-1.1.7.tar.bz2) = 16b29333fa7a4aa5be347a95afac238d701fc897e23d314dca15730440aaeda35813803aef098e822c5768b52172f1ac3faf179d9a81c3a77ab10ed4db7a02e4 From 8e316f03bf90ac57c36e3dfb7c8cbe4e0723cd83 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 14:21:17 +0200 Subject: [PATCH 24/70] updated sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a1b2659..39f36d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.1.7.tar.bz2) = 16b29333fa7a4aa5be347a95afac238d701fc897e23d314dca15730440aaeda35813803aef098e822c5768b52172f1ac3faf179d9a81c3a77ab10ed4db7a02e4 +SHA512 (alsa-plugins-1.1.7.tar.bz2) = c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e From 601dba6976a002736ca669727bfd4ab36fa09ab8 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 24 Oct 2018 12:46:04 +0200 Subject: [PATCH 25/70] fixed some regressions (double free) --- alsa-git.patch | 237 ++++++++++++++++++++++++++++++++++++++++++++++ alsa-plugins.spec | 6 +- 2 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 alsa-git.patch diff --git a/alsa-git.patch b/alsa-git.patch new file mode 100644 index 0000000..7cb40b7 --- /dev/null +++ b/alsa-git.patch @@ -0,0 +1,237 @@ +From 68c4cd3a471ed1f4a367830eb31881d3e5815813 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 08:39:16 +0200 +Subject: [PATCH 1/7] pcm_usb_stream: fix another leak in snd_pcm_us_open() + +Signed-off-by: Jaroslav Kysela +--- + usb_stream/pcm_usb_stream.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c +index eb4ca98..5ca1c0f 100644 +--- a/usb_stream/pcm_usb_stream.c ++++ b/usb_stream/pcm_usb_stream.c +@@ -424,8 +424,10 @@ static int snd_pcm_us_open(snd_pcm_t **pcmp, const char *name, + } + VDBG("%i %s", stream, us_name); + us->uus = get_uus(card); +- if (!us->uus) ++ if (!us->uus) { ++ free(us); + return -ENOMEM; ++ } + err = snd_hwdep_open(&us->hwdep, us_name, O_RDWR); + if (err < 0) { + us_free(us); +-- +2.13.6 + + +From 9ff42e4baf03a84eca83b8c25e0165572259d253 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 08:47:16 +0200 +Subject: [PATCH 2/7] pcm_usb_stream: remove unused parameter in + snd_pcm_us_read() + +Signed-off-by: Jaroslav Kysela +--- + usb_stream/pcm_usb_stream.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c +index 5ca1c0f..6d08c37 100644 +--- a/usb_stream/pcm_usb_stream.c ++++ b/usb_stream/pcm_usb_stream.c +@@ -297,7 +297,7 @@ static snd_pcm_sframes_t snd_pcm_us_write(snd_pcm_ioplug_t *io, + return size; + } + +-static int usb_stream_read(struct user_usb_stream *uus, void *to, unsigned bytes) ++static int usb_stream_read(struct user_usb_stream *uus, void *to) + { + struct usb_stream *s = uus->s; + int p = s->inpacket_split, l = 0; +@@ -337,8 +337,7 @@ static snd_pcm_sframes_t snd_pcm_us_read(snd_pcm_ioplug_t *io, + return -EINVAL; + } + if (us->uus->s->periods_done - us->periods_done == 1) { +- red = usb_stream_read(us->uus, to, size * frame_size) / +- frame_size; ++ red = usb_stream_read(us->uus, to) / frame_size; + us->periods_done++; + return red; + } +-- +2.13.6 + + +From cbe7907f46ce9dcd73be392f6660c76767ce3c99 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 08:49:23 +0200 +Subject: [PATCH 3/7] pcm_usb_stream: fix signess issues + +Signed-off-by: Jaroslav Kysela +--- + usb_stream/pcm_usb_stream.c | 4 ++-- + usb_stream/usb_stream.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c +index 6d08c37..3f74aba 100644 +--- a/usb_stream/pcm_usb_stream.c ++++ b/usb_stream/pcm_usb_stream.c +@@ -300,9 +300,9 @@ static snd_pcm_sframes_t snd_pcm_us_write(snd_pcm_ioplug_t *io, + static int usb_stream_read(struct user_usb_stream *uus, void *to) + { + struct usb_stream *s = uus->s; +- int p = s->inpacket_split, l = 0; ++ unsigned p = s->inpacket_split, l = 0; + void *i = (void *)s + s->inpacket[p].offset + s->inpacket_split_at; +- int il = s->inpacket[p].length - s->inpacket_split_at; ++ unsigned il = s->inpacket[p].length - s->inpacket_split_at; + + do { + if (l + il > s->period_size) +diff --git a/usb_stream/usb_stream.h b/usb_stream/usb_stream.h +index 4dd74ab..96f8d9e 100644 +--- a/usb_stream/usb_stream.h ++++ b/usb_stream/usb_stream.h +@@ -39,7 +39,7 @@ struct usb_stream { + unsigned read_size; + unsigned write_size; + +- int period_size; ++ unsigned period_size; + + unsigned state; + +-- +2.13.6 + + +From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 09:32:46 +0200 +Subject: [PATCH 4/7] a52_close: set slave to NULL to avoid double pcm free in + open fcn + +Signed-off-by: Jaroslav Kysela +--- + a52/pcm_a52.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c +index e431fd0..b005bc2 100644 +--- a/a52/pcm_a52.c ++++ b/a52/pcm_a52.c +@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd, + static int a52_close(snd_pcm_ioplug_t *io) + { + struct a52_ctx *rec = io->private_data; ++ snd_pcm_t *slave = rec->slave; + + a52_free(rec); +- if (rec->slave) +- return snd_pcm_close(rec->slave); ++ if (slave) { ++ rec->slave = NULL; ++ return snd_pcm_close(slave); ++ } + return 0; + } + +-- +2.13.6 + + +From a244a37076cec8c7a65b844e334518c393fbdc5b Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 24 Oct 2018 12:18:42 +0200 +Subject: [PATCH 5/7] Revert "jack: Fix leaks when jack_set_hw_constraint() + fails" + +This reverts commit f4746667a4a2490f17c2a82b6f421bc3c9bd6de8. + +snd_pcm_ioplug_delete() already calls snd_pcm_close()! + +Signed-off-by: Jaroslav Kysela +--- + jack/pcm_jack.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c +index 6aaecac..b39835e 100644 +--- a/jack/pcm_jack.c ++++ b/jack/pcm_jack.c +@@ -538,7 +538,6 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name, + err = jack_set_hw_constraint(jack); + if (err < 0) { + snd_pcm_ioplug_delete(&jack->io); +- snd_pcm_jack_free(jack); + return err; + } + +-- +2.13.6 + + +From 434c83d5c422dd4367711e08b3538e366fcc469e Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 24 Oct 2018 12:23:11 +0200 +Subject: [PATCH 6/7] Revert "usb_stream: Fix leaks when us_set_hw_constraint() + fails" + +This reverts commit 6b996865126dd559ef186002e45dc6e1594291e7. + +snd_pcm_ioplug_delete() already calls snd_pcm_close()! + +Signed-off-by: Jaroslav Kysela +--- + usb_stream/pcm_usb_stream.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c +index 3f74aba..2a93d1f 100644 +--- a/usb_stream/pcm_usb_stream.c ++++ b/usb_stream/pcm_usb_stream.c +@@ -456,7 +456,6 @@ static int snd_pcm_us_open(snd_pcm_t **pcmp, const char *name, + err = us_set_hw_constraint(us); + if (err < 0) { + snd_pcm_ioplug_delete(&us->io); +- us_free(us); + return err; + } + +-- +2.13.6 + + +From 7dfd3c4fe073319f21192c89a44c16f8b68af3ad Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 24 Oct 2018 12:27:16 +0200 +Subject: [PATCH 7/7] Revert "oss: Fix leaks when oss_hw_constraint() fails" + +This reverts commit b8bcd458b79146547fc6dae1645832695545da44. + +snd_pcm_ioplug_delete() already calls snd_pcm_close()! +--- + oss/pcm_oss.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/oss/pcm_oss.c b/oss/pcm_oss.c +index 8ab4fb0..dadbb5b 100644 +--- a/oss/pcm_oss.c ++++ b/oss/pcm_oss.c +@@ -413,7 +413,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) + + if ((err = oss_hw_constraint(oss)) < 0) { + snd_pcm_ioplug_delete(&oss->io); +- goto error; ++ return err; + } + + *pcmp = oss->io.pcm; +-- +2.13.6 + diff --git a/alsa-plugins.spec b/alsa-plugins.spec index dd26bbe..c6cf4db 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -14,6 +14,7 @@ License: GPLv2+ and LGPLv2+ and BSD Group: System Environment/Libraries URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 +Patch0: alsa-git.patch BuildRequires: autoconf automake libtool BuildRequires: alsa-lib-devel @@ -135,6 +136,7 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %prep %setup -q -n %{name}-%{version}%{?prever} +%patch0 -p1 -b .alsa-git %build autoreconf -vif @@ -265,7 +267,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog -* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 +* Wed Oct 24 2018 Jaroslav Kysela - 1.1.7-2 - Updated to 1.1.7 * Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-4 From 603df8e5645b0c712a05e584b8606ee1077c19bc Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 7 Jan 2019 19:24:42 +0100 Subject: [PATCH 26/70] updated to 1.1.8 --- alsa-git.patch | 237 ---------------------------------------------- alsa-plugins.spec | 7 +- sources | 2 +- 3 files changed, 6 insertions(+), 240 deletions(-) diff --git a/alsa-git.patch b/alsa-git.patch index 7cb40b7..e69de29 100644 --- a/alsa-git.patch +++ b/alsa-git.patch @@ -1,237 +0,0 @@ -From 68c4cd3a471ed1f4a367830eb31881d3e5815813 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 08:39:16 +0200 -Subject: [PATCH 1/7] pcm_usb_stream: fix another leak in snd_pcm_us_open() - -Signed-off-by: Jaroslav Kysela ---- - usb_stream/pcm_usb_stream.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c -index eb4ca98..5ca1c0f 100644 ---- a/usb_stream/pcm_usb_stream.c -+++ b/usb_stream/pcm_usb_stream.c -@@ -424,8 +424,10 @@ static int snd_pcm_us_open(snd_pcm_t **pcmp, const char *name, - } - VDBG("%i %s", stream, us_name); - us->uus = get_uus(card); -- if (!us->uus) -+ if (!us->uus) { -+ free(us); - return -ENOMEM; -+ } - err = snd_hwdep_open(&us->hwdep, us_name, O_RDWR); - if (err < 0) { - us_free(us); --- -2.13.6 - - -From 9ff42e4baf03a84eca83b8c25e0165572259d253 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 08:47:16 +0200 -Subject: [PATCH 2/7] pcm_usb_stream: remove unused parameter in - snd_pcm_us_read() - -Signed-off-by: Jaroslav Kysela ---- - usb_stream/pcm_usb_stream.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c -index 5ca1c0f..6d08c37 100644 ---- a/usb_stream/pcm_usb_stream.c -+++ b/usb_stream/pcm_usb_stream.c -@@ -297,7 +297,7 @@ static snd_pcm_sframes_t snd_pcm_us_write(snd_pcm_ioplug_t *io, - return size; - } - --static int usb_stream_read(struct user_usb_stream *uus, void *to, unsigned bytes) -+static int usb_stream_read(struct user_usb_stream *uus, void *to) - { - struct usb_stream *s = uus->s; - int p = s->inpacket_split, l = 0; -@@ -337,8 +337,7 @@ static snd_pcm_sframes_t snd_pcm_us_read(snd_pcm_ioplug_t *io, - return -EINVAL; - } - if (us->uus->s->periods_done - us->periods_done == 1) { -- red = usb_stream_read(us->uus, to, size * frame_size) / -- frame_size; -+ red = usb_stream_read(us->uus, to) / frame_size; - us->periods_done++; - return red; - } --- -2.13.6 - - -From cbe7907f46ce9dcd73be392f6660c76767ce3c99 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 08:49:23 +0200 -Subject: [PATCH 3/7] pcm_usb_stream: fix signess issues - -Signed-off-by: Jaroslav Kysela ---- - usb_stream/pcm_usb_stream.c | 4 ++-- - usb_stream/usb_stream.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c -index 6d08c37..3f74aba 100644 ---- a/usb_stream/pcm_usb_stream.c -+++ b/usb_stream/pcm_usb_stream.c -@@ -300,9 +300,9 @@ static snd_pcm_sframes_t snd_pcm_us_write(snd_pcm_ioplug_t *io, - static int usb_stream_read(struct user_usb_stream *uus, void *to) - { - struct usb_stream *s = uus->s; -- int p = s->inpacket_split, l = 0; -+ unsigned p = s->inpacket_split, l = 0; - void *i = (void *)s + s->inpacket[p].offset + s->inpacket_split_at; -- int il = s->inpacket[p].length - s->inpacket_split_at; -+ unsigned il = s->inpacket[p].length - s->inpacket_split_at; - - do { - if (l + il > s->period_size) -diff --git a/usb_stream/usb_stream.h b/usb_stream/usb_stream.h -index 4dd74ab..96f8d9e 100644 ---- a/usb_stream/usb_stream.h -+++ b/usb_stream/usb_stream.h -@@ -39,7 +39,7 @@ struct usb_stream { - unsigned read_size; - unsigned write_size; - -- int period_size; -+ unsigned period_size; - - unsigned state; - --- -2.13.6 - - -From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 09:32:46 +0200 -Subject: [PATCH 4/7] a52_close: set slave to NULL to avoid double pcm free in - open fcn - -Signed-off-by: Jaroslav Kysela ---- - a52/pcm_a52.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c -index e431fd0..b005bc2 100644 ---- a/a52/pcm_a52.c -+++ b/a52/pcm_a52.c -@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd, - static int a52_close(snd_pcm_ioplug_t *io) - { - struct a52_ctx *rec = io->private_data; -+ snd_pcm_t *slave = rec->slave; - - a52_free(rec); -- if (rec->slave) -- return snd_pcm_close(rec->slave); -+ if (slave) { -+ rec->slave = NULL; -+ return snd_pcm_close(slave); -+ } - return 0; - } - --- -2.13.6 - - -From a244a37076cec8c7a65b844e334518c393fbdc5b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 24 Oct 2018 12:18:42 +0200 -Subject: [PATCH 5/7] Revert "jack: Fix leaks when jack_set_hw_constraint() - fails" - -This reverts commit f4746667a4a2490f17c2a82b6f421bc3c9bd6de8. - -snd_pcm_ioplug_delete() already calls snd_pcm_close()! - -Signed-off-by: Jaroslav Kysela ---- - jack/pcm_jack.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c -index 6aaecac..b39835e 100644 ---- a/jack/pcm_jack.c -+++ b/jack/pcm_jack.c -@@ -538,7 +538,6 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name, - err = jack_set_hw_constraint(jack); - if (err < 0) { - snd_pcm_ioplug_delete(&jack->io); -- snd_pcm_jack_free(jack); - return err; - } - --- -2.13.6 - - -From 434c83d5c422dd4367711e08b3538e366fcc469e Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 24 Oct 2018 12:23:11 +0200 -Subject: [PATCH 6/7] Revert "usb_stream: Fix leaks when us_set_hw_constraint() - fails" - -This reverts commit 6b996865126dd559ef186002e45dc6e1594291e7. - -snd_pcm_ioplug_delete() already calls snd_pcm_close()! - -Signed-off-by: Jaroslav Kysela ---- - usb_stream/pcm_usb_stream.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c -index 3f74aba..2a93d1f 100644 ---- a/usb_stream/pcm_usb_stream.c -+++ b/usb_stream/pcm_usb_stream.c -@@ -456,7 +456,6 @@ static int snd_pcm_us_open(snd_pcm_t **pcmp, const char *name, - err = us_set_hw_constraint(us); - if (err < 0) { - snd_pcm_ioplug_delete(&us->io); -- us_free(us); - return err; - } - --- -2.13.6 - - -From 7dfd3c4fe073319f21192c89a44c16f8b68af3ad Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 24 Oct 2018 12:27:16 +0200 -Subject: [PATCH 7/7] Revert "oss: Fix leaks when oss_hw_constraint() fails" - -This reverts commit b8bcd458b79146547fc6dae1645832695545da44. - -snd_pcm_ioplug_delete() already calls snd_pcm_close()! ---- - oss/pcm_oss.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/oss/pcm_oss.c b/oss/pcm_oss.c -index 8ab4fb0..dadbb5b 100644 ---- a/oss/pcm_oss.c -+++ b/oss/pcm_oss.c -@@ -413,7 +413,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) - - if ((err = oss_hw_constraint(oss)) < 0) { - snd_pcm_ioplug_delete(&oss->io); -- goto error; -+ return err; - } - - *pcmp = oss->io.pcm; --- -2.13.6 - diff --git a/alsa-plugins.spec b/alsa-plugins.spec index c6cf4db..d63ee28 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.7 -Release: 2%{?dist} +Version: 1.1.8 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -267,6 +267,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Mon Jan 7 2019 Jaroslav Kysela - 1.1.8-1 +- Updated to 1.1.8 + * Wed Oct 24 2018 Jaroslav Kysela - 1.1.7-2 - Updated to 1.1.7 diff --git a/sources b/sources index 39f36d1..dfafc67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.1.7.tar.bz2) = c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e +SHA512 (alsa-plugins-1.1.8.tar.bz2) = bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd From d4fe1a07c3accdcc9334efd917935b5b1c801a97 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 27/70] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- alsa-plugins.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index d63ee28..ce48ce9 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -11,7 +11,6 @@ Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed License: GPLv2+ and LGPLv2+ and BSD -Group: System Environment/Libraries URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 Patch0: alsa-git.patch @@ -31,7 +30,6 @@ Requires: alsa-utils Requires: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA -Group: System Environment/Libraries License: LGPLv2+ %description jack This plugin converts the ALSA API over JACK (Jack Audio Connection @@ -44,7 +42,6 @@ This plugin provides the PCM type "jack" Requires: alsa-utils BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA -Group: System Environment/Libraries License: LGPLv2+ %description oss This plugin converts the ALSA API over OSS API. With this plugin, @@ -57,7 +54,6 @@ Requires: alsa-utils Requires: pulseaudio BuildRequires: pulseaudio-libs-devel Summary: Alsa to PulseAudio backend -Group: System Environment/Libraries License: LGPLv2+ %description pulseaudio This plugin allows any program that uses the ALSA API to access a PulseAudio @@ -69,7 +65,6 @@ one for mixer control. Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA -Group: System Environment/Libraries License: GPLv2+ %description samplerate This plugin is an external rate converter using libsamplerate by Erik de @@ -79,7 +74,6 @@ Castro Lopo. Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA -Group: System Environment/Libraries License: LGPLv2+ %description upmix The upmix plugin is an easy-to-use plugin for upmixing to 4 or @@ -90,7 +84,6 @@ by the slave PCM or explicitly via channel option. Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA -Group: System Environment/Libraries License: LGPLv2+ %description vdownmix The vdownmix plugin is a downmixer from 4-6 channels to 2-channel @@ -100,7 +93,6 @@ surround". %package usbstream Summary: USB stream plugin for ALSA -Group: System Environment/Libraries License: LGPLv2+ %description usbstream The usbstream plugin is for snd-usb-us122l driver. It converts PCM @@ -108,7 +100,6 @@ stream to USB specific stream. %package arcamav Summary: Arcam AV amplifier plugin for ALSA -Group: System Environment/Libraries License: LGPLv2+ %description arcamav This plugin exposes the controls for an Arcam AV amplifier @@ -118,7 +109,6 @@ This plugin exposes the controls for an Arcam AV amplifier Requires: speex speexdsp BuildRequires: speex-devel speexdsp-devel Summary: Rate Converter Plugin Using Speex Resampler -Group: System Environment/Libraries License: LGPLv2+ %description speex The rate plugin is an external rate converter using the Speex resampler @@ -128,7 +118,6 @@ pre-processing of a mono stream like denoise using libspeex DSP API. %package maemo BuildRequires: dbus-devel Summary: Maemo plugin for ALSA -Group: System Environment/Libraries License: LGPLv2+ %description maemo This plugin converts the ALSA API over PCM task nodes protocol. In this way, From 32ecc30f9825369a56fbbefc30a110ee9fef3747 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:13:07 +0000 Subject: [PATCH 28/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index ce48ce9..7029754 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 7 2019 Jaroslav Kysela - 1.1.8-1 - Updated to 1.1.8 From fb10cdc15e498b8332f022ecc8371348a131a027 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 10 May 2019 10:25:32 +0200 Subject: [PATCH 29/70] updated to 1.1.9 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 7029754..db9deb4 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.8 -Release: 2%{?dist} +Version: 1.1.9 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Fri May 10 2019 Jaroslav Kysela - 1.1.9-1 +- Updated to 1.1.9 + * Thu Jan 31 2019 Fedora Release Engineering - 1.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index dfafc67..395d02f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.1.8.tar.bz2) = bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd +SHA512 (alsa-plugins-1.1.9.tar.bz2) = 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9 From fed87f5be2c851ef327be5cc1d6b0301bb01a4f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:47:49 +0000 Subject: [PATCH 30/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index db9deb4..41255bb 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 10 2019 Jaroslav Kysela - 1.1.9-1 - Updated to 1.1.9 From bfaf0a02cd4fc33603ee5490c85acafb22a9fb1b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 20 Aug 2019 14:00:51 -0500 Subject: [PATCH 31/70] Macroize %{_sysconfdir} --- alsa-plugins.spec | 53 +++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 41255bb..19dd8ae 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -138,8 +138,8 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -mv %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf.example \ - %{buildroot}/etc/alsa/conf.d/99-pulseaudio-default.conf +mv %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example \ + %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf find %{buildroot} -name "*.la" -exec rm {} \; @@ -151,8 +151,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %if 0%{?with_jack} %files jack %doc COPYING COPYING.GPL doc/README-jack -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/50-jack.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-jack.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/50-jack.conf %dir %{_libdir}/alsa-lib @@ -161,8 +161,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files oss %doc COPYING COPYING.GPL doc/README-pcm-oss -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/50-oss.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-oss.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/50-oss.conf %dir %{_libdir}/alsa-lib @@ -175,16 +175,16 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so %{_libdir}/alsa-lib/libasound_module_conf_pulse.so -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/50-pulseaudio.conf -%config(noreplace) /etc/alsa/conf.d/99-pulseaudio-default.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pulseaudio.conf +%config(noreplace) %{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf %files samplerate %doc COPYING COPYING.GPL doc/samplerate.txt -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/10-samplerate.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/10-samplerate.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/10-samplerate.conf %dir %{_libdir}/alsa-lib @@ -196,8 +196,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files upmix %doc COPYING COPYING.GPL doc/upmix.txt -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/60-upmix.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-upmix.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/60-upmix.conf %dir %{_libdir}/alsa-lib @@ -205,8 +205,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files vdownmix %doc COPYING COPYING.GPL doc/vdownmix.txt -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/60-vdownmix.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-vdownmix.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/60-vdownmix.conf %dir %{_libdir}/alsa-lib @@ -214,8 +214,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files usbstream %doc COPYING COPYING.GPL -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/98-usb-stream.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/98-usb-stream.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/98-usb-stream.conf %dir %{_libdir}/alsa-lib @@ -223,8 +223,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files arcamav %doc COPYING COPYING.GPL doc/README-arcam-av -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/50-arcam-av-ctl.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/50-arcam-av-ctl.conf %dir %{_libdir}/alsa-lib @@ -232,9 +232,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files speex %doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/10-speexrate.conf -%config(noreplace) /etc/alsa/conf.d/60-speex.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/10-speexrate.conf +%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-speex.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/10-speexrate.conf %{_datadir}/alsa/alsa.conf.d/60-speex.conf @@ -246,8 +246,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files maemo %doc COPYING COPYING.GPL doc/README-maemo -%dir /etc/alsa/conf.d -%config(noreplace) /etc/alsa/conf.d/98-maemo.conf +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/98-maemo.conf %dir %{_datadir}/alsa/alsa.conf.d %{_datadir}/alsa/alsa.conf.d/98-maemo.conf %dir %{_libdir}/alsa-lib @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Tue Aug 20 2019 Gwyn Ciesla - 1.1.9-3 +- macroize %{_sysconfdir}. + * Wed Jul 24 2019 Fedora Release Engineering - 1.1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ee58480d3b05e61a78851cc65059a3d3d0345f3c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 13 Nov 2019 16:59:51 +0100 Subject: [PATCH 32/70] updated to 1.2.1 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 19dd8ae..baf10fc 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.1.9 -Release: 3%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Wed Nov 13 2019 Jaroslav Kysela - 1.2.1-1 +- Updated to 1.2.1 + * Tue Aug 20 2019 Gwyn Ciesla - 1.1.9-3 - macroize %{_sysconfdir}. diff --git a/sources b/sources index 395d02f..0be1a1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.1.9.tar.bz2) = 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9 +SHA512 (alsa-plugins-1.2.1.tar.bz2) = a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de From 51f4f651b45bf06cb86c034550386e4f2ea1ba53 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 13 Nov 2019 21:44:03 +0100 Subject: [PATCH 33/70] correctly escape macro start in changelog --- alsa-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index baf10fc..42c7129 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -260,7 +260,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; - Updated to 1.2.1 * Tue Aug 20 2019 Gwyn Ciesla - 1.1.9-3 -- macroize %{_sysconfdir}. +- macroize %%{_sysconfdir}. * Wed Jul 24 2019 Fedora Release Engineering - 1.1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f1c7a00d5aa59a056cb1a2f3001352cd2676f153 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:27:42 +0000 Subject: [PATCH 34/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 42c7129..4ae111d 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Nov 13 2019 Jaroslav Kysela - 1.2.1-1 - Updated to 1.2.1 From b31e35e3338c086ec43336ef9e68d8b4ea88b7a2 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 19 Feb 2020 13:25:58 +0100 Subject: [PATCH 35/70] updated to 1.2.2 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 4ae111d..2477880 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Wed Feb 19 2020 Jaroslav Kysela - 1.2.2-1 +- Updated to 1.2.2 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0be1a1c..d350ed8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.2.1.tar.bz2) = a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de +SHA512 (alsa-plugins-1.2.2.tar.bz2) = 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb From 688a0502e4f5b5b6a752fe74274a29ae0237a863 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 3 Mar 2020 10:19:28 +0100 Subject: [PATCH 36/70] add simple tests --- tests/run_tests.sh | 12 ++++++++++++ tests/tests.yml | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100755 tests/run_tests.sh create mode 100644 tests/tests.yml diff --git a/tests/run_tests.sh b/tests/run_tests.sh new file mode 100755 index 0000000..ff02118 --- /dev/null +++ b/tests/run_tests.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -ex + +# create patest user +adduser patest + +# run pulseaudio daemon +su - patest -c "pulseaudio --start --log-target=stderr" + +# run pulseaudio test (null sink) +su - patest -c "speaker-test -D pulse -l 1" diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..d18fdf5 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,11 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - pulseaudio + tests: + - simple: + dir: . + run: ./run_tests.sh From 64af59dd12410e4f8b749206a90975f2fca197fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:57:27 +0000 Subject: [PATCH 37/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 2477880..f5a3614 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Feb 19 2020 Jaroslav Kysela - 1.2.2-1 - Updated to 1.2.2 From 5ae51c83bb280041a39b3233a6ba7c6ae99fcb52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:55:53 +0000 Subject: [PATCH 38/70] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index f5a3614..8ec8ec3 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -256,6 +256,10 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 1.2.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0da4153b24ddc9ef43d29d30e79a5ba5815550fe Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:24:49 +0000 Subject: [PATCH 39/70] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- alsa-plugins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 8ec8ec3..2548e1e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -117,6 +117,7 @@ pre-processing of a mono stream like denoise using libspeex DSP API. %package maemo BuildRequires: dbus-devel +BuildRequires: make Summary: Maemo plugin for ALSA License: LGPLv2+ %description maemo From 34f8d7dacfbb57c49ec99967f711bc1ecaf6f7e8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Jan 2021 11:41:33 -0600 Subject: [PATCH 40/70] -pulseaudio: Requires: pulseaudio-daemon --- alsa-plugins.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 2548e1e..ee34d8d 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -51,7 +51,7 @@ This plugin provides the PCM type "oss". %package pulseaudio Requires: alsa-utils -Requires: pulseaudio +Requires: pulseaudio-daemon BuildRequires: pulseaudio-libs-devel Summary: Alsa to PulseAudio backend License: LGPLv2+ @@ -257,6 +257,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Mon Jan 04 2021 Rex Dieter - 1.2.2-4 +- -pulseaudio: Requires: pulseaudio-daemon + * Fri Jul 31 2020 Fedora Release Engineering - 1.2.2-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 874eabbcffca1a30bcb444b52566e2a8adccb184 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:00:44 +0000 Subject: [PATCH 41/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index ee34d8d..f8cccde 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -257,6 +257,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 04 2021 Rex Dieter - 1.2.2-4 - -pulseaudio: Requires: pulseaudio-daemon From 8495dc43dd2c0014f2374b00a116a2bb39a55e51 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 10 May 2021 06:27:10 +0000 Subject: [PATCH 42/70] Modernize the spec file - Use bconds for conditional build logic - Use autosetup macro for unpacking + patch application - Use standard macros for building and installing files - Minor formatting fixups - Stop installing license files as documentation - Remove unnecessary scriptlets --- alsa-plugins.spec | 60 +++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index f8cccde..20a610b 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,7 +1,7 @@ %if 0%{?rhel} -%define with_jack 0 +%bcond_with jack %else -%define with_jack 1 +%bcond_without jack %endif Name: alsa-plugins @@ -24,13 +24,14 @@ functionality to the Linux operating system. This package includes plugins for ALSA. -%if 0%{?with_jack} +%if %{with jack} %package jack Requires: alsa-utils Requires: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA License: LGPLv2+ + %description jack This plugin converts the ALSA API over JACK (Jack Audio Connection Kit, http://jackit.sf.net) API. ALSA native applications can work @@ -42,7 +43,8 @@ This plugin provides the PCM type "jack" Requires: alsa-utils BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA -License: LGPLv2+ +License: LGPLv2+ + %description oss This plugin converts the ALSA API over OSS API. With this plugin, ALSA native apps can run on OSS drivers. @@ -55,6 +57,7 @@ Requires: pulseaudio-daemon BuildRequires: pulseaudio-libs-devel Summary: Alsa to PulseAudio backend License: LGPLv2+ + %description pulseaudio This plugin allows any program that uses the ALSA API to access a PulseAudio sound daemon. In other words, native ALSA applications can play and record @@ -66,6 +69,7 @@ Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA License: GPLv2+ + %description samplerate This plugin is an external rate converter using libsamplerate by Erik de Castro Lopo. @@ -75,6 +79,7 @@ Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA License: LGPLv2+ + %description upmix The upmix plugin is an easy-to-use plugin for upmixing to 4 or 6-channel stream. The number of channels to be expanded is determined @@ -85,6 +90,7 @@ Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA License: LGPLv2+ + %description vdownmix The vdownmix plugin is a downmixer from 4-6 channels to 2-channel stereo headphone output. This plugin processes the input signals with @@ -94,6 +100,7 @@ surround". %package usbstream Summary: USB stream plugin for ALSA License: LGPLv2+ + %description usbstream The usbstream plugin is for snd-usb-us122l driver. It converts PCM stream to USB specific stream. @@ -101,6 +108,7 @@ stream to USB specific stream. %package arcamav Summary: Arcam AV amplifier plugin for ALSA License: LGPLv2+ + %description arcamav This plugin exposes the controls for an Arcam AV amplifier (see: http://www.arcam.co.uk/) as an ALSA mixer device. @@ -110,6 +118,7 @@ Requires: speex speexdsp BuildRequires: speex-devel speexdsp-devel Summary: Rate Converter Plugin Using Speex Resampler License: LGPLv2+ + %description speex The rate plugin is an external rate converter using the Speex resampler (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides @@ -120,13 +129,13 @@ BuildRequires: dbus-devel BuildRequires: make Summary: Maemo plugin for ALSA License: LGPLv2+ + %description maemo This plugin converts the ALSA API over PCM task nodes protocol. In this way, ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %prep -%setup -q -n %{name}-%{version}%{?prever} -%patch0 -p1 -b .alsa-git +%autosetup -n %{name}-%{version}%{?prever} -p1 %build autoreconf -vif @@ -134,10 +143,10 @@ autoreconf -vif --with-speex=lib \ --enable-maemo-plugin \ --enable-maemo-resource-manager -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install mv %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example \ %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf @@ -145,13 +154,10 @@ mv %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example \ find %{buildroot} -name "*.la" -exec rm {} \; -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%if 0%{?with_jack} +%if %{with jack} %files jack -%doc COPYING COPYING.GPL doc/README-jack +%license COPYING COPYING.GPL +%doc doc/README-jack %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-jack.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -161,7 +167,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %endif %files oss -%doc COPYING COPYING.GPL doc/README-pcm-oss +%license COPYING COPYING.GPL +%doc doc/README-pcm-oss %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-oss.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -171,7 +178,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_oss.so %files pulseaudio -%doc COPYING COPYING.GPL doc/README-pulse +%license COPYING COPYING.GPL +%doc doc/README-pulse %dir %{_libdir}/alsa-lib %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so @@ -183,7 +191,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf %files samplerate -%doc COPYING COPYING.GPL doc/samplerate.txt +%license COPYING COPYING.GPL +%doc doc/samplerate.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/10-samplerate.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -196,7 +205,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_rate_samplerate_order.so %files upmix -%doc COPYING COPYING.GPL doc/upmix.txt +%license COPYING COPYING.GPL +%doc doc/upmix.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-upmix.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -205,7 +215,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %files vdownmix -%doc COPYING COPYING.GPL doc/vdownmix.txt +%license COPYING COPYING.GPL +%doc doc/vdownmix.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-vdownmix.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -214,7 +225,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %files usbstream -%doc COPYING COPYING.GPL +%license COPYING COPYING.GPL %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/98-usb-stream.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -223,7 +234,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so %files arcamav -%doc COPYING COPYING.GPL doc/README-arcam-av +%license COPYING COPYING.GPL +%doc doc/README-arcam-av %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -232,7 +244,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so %files speex -%doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt +%license COPYING COPYING.GPL +%doc doc/speexdsp.txt doc/speexrate.txt %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/10-speexrate.conf %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-speex.conf @@ -246,7 +259,8 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so %files maemo -%doc COPYING COPYING.GPL doc/README-maemo +%license COPYING COPYING.GPL +%doc doc/README-maemo %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/98-maemo.conf %dir %{_datadir}/alsa/alsa.conf.d From cd50c48b4a6ed5e070de3a51caf51979165267bf Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 30 May 2021 10:18:20 +0200 Subject: [PATCH 43/70] updated to 1.2.5 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 20a610b..d7b28db 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.2.2 -Release: 5%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Sun May 30 2021 Jaroslav Kysela - 1.2.5-1 +- Updated to 1.2.5 + * Tue Jan 26 2021 Fedora Release Engineering - 1.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d350ed8..e980921 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.2.2.tar.bz2) = 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb +SHA512 (alsa-plugins-1.2.5.tar.bz2) = 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf From f759f274460986cfc9ac5e70f53fee16355f5fe9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 30 May 2021 10:20:32 +0200 Subject: [PATCH 44/70] fix spec file (add modernize line to changelog) --- alsa-plugins.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index d7b28db..b752485 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -273,6 +273,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog * Sun May 30 2021 Jaroslav Kysela - 1.2.5-1 - Updated to 1.2.5 +- Modernize the spec file (Neal Gompa) * Tue Jan 26 2021 Fedora Release Engineering - 1.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From c10788ff7f678b96d48246dc0ab5460c4193b9b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:32:55 +0000 Subject: [PATCH 45/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e81a95290080a2eda54570fb9db9763bf78408cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:28:20 +0000 Subject: [PATCH 46/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index b752485..2615d3e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun May 30 2021 Jaroslav Kysela - 1.2.5-1 - Updated to 1.2.5 - Modernize the spec file (Neal Gompa) From b145fad81df75fdd50a5221ca65bc595b8a2637a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 6 Dec 2021 13:37:45 +0100 Subject: [PATCH 47/70] updated to 1.2.6 --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 2615d3e..4868e2b 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.2.5 -Release: 2%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Mon Dec 6 2021 Jaroslav Kysela - 1.2.6-1 +- Updated to 1.2.6 + * Wed Jul 21 2021 Fedora Release Engineering - 1.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index e980921..d101b57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.2.5.tar.bz2) = 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf +SHA512 (alsa-plugins-1.2.6.tar.bz2) = ac54a6f227f1ca5f6e01e08d869e7c06f4bcd68f148932e1902a6fcf3e5ccd3667ac4d8c1a00b77e4b5cb27e17c01cf7526ded4aaf35c4b26fc69e14e6e341f9 From 1bbea1628b113f1a67ce3fb4f99f861ab0b72e33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:09:22 +0000 Subject: [PATCH 48/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 4868e2b..c26df0e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 6 2021 Jaroslav Kysela - 1.2.6-1 - Updated to 1.2.6 From a40cc5bfa98d284035fbe5abd85c9572eddb527f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 17 Jun 2022 12:11:41 +0200 Subject: [PATCH 49/70] updated to 1.2.7.1 Signed-off-by: Jaroslav Kysela --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index c26df0e..292f91f 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -5,8 +5,8 @@ %endif Name: alsa-plugins -Version: 1.2.6 -Release: 2%{?dist} +Version: 1.2.7.1 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Fri Jun 17 2022 Jaroslav Kysela - 1.2.7.1-1 +- Updated to 1.2.7.1 + * Wed Jan 19 2022 Fedora Release Engineering - 1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index d101b57..5daf78e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.2.6.tar.bz2) = ac54a6f227f1ca5f6e01e08d869e7c06f4bcd68f148932e1902a6fcf3e5ccd3667ac4d8c1a00b77e4b5cb27e17c01cf7526ded4aaf35c4b26fc69e14e6e341f9 +SHA512 (alsa-plugins-1.2.7.1.tar.bz2) = 437c05a7e0175594768fd6a9a6d1a158bb4a01a7de6a42c2bd468d9381e01b64d385ddfac7d87baf84fe13cb4e65dc24da643940f416d4b191c528728822d964 From 72b3db12ecb13ec8d81c1de6f9a41aca3252ef98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:41:04 +0000 Subject: [PATCH 50/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 292f91f..d337f13 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jun 17 2022 Jaroslav Kysela - 1.2.7.1-1 - Updated to 1.2.7.1 From cdeba9c07877756aa4fff34f91abf0980d9eecfd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:37:46 +0000 Subject: [PATCH 51/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index d337f13..4c49e53 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -6,7 +6,7 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -271,6 +271,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.2.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 77a574b655abac5c165471b9bb946182cae2c0d6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 1 Mar 2023 01:45:44 +0000 Subject: [PATCH 52/70] Remove or soften excess dependencies The alsa-utils dependencies were added to resolve directory ownership, but the plugins do not require the utils. Instead, just have the plugins co-own /etc/alsa. The hard requires on JACK and PulseAudio daemons (nowadays both provided by PipeWire) are not strictly necessary, e.g. in flatpak builds where the host instance is used over a socket connection. Fixes: https://src.fedoraproject.org/rpms/alsa-plugins/pull-request/6 --- alsa-plugins.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 4c49e53..3be9afa 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -26,8 +26,7 @@ This package includes plugins for ALSA. %if %{with jack} %package jack -Requires: alsa-utils -Requires: jack-audio-connection-kit +Recommends: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA License: LGPLv2+ @@ -40,7 +39,6 @@ This plugin provides the PCM type "jack" %endif %package oss -Requires: alsa-utils BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA License: LGPLv2+ @@ -52,8 +50,7 @@ ALSA native apps can run on OSS drivers. This plugin provides the PCM type "oss". %package pulseaudio -Requires: alsa-utils -Requires: pulseaudio-daemon +Recommends: pulseaudio-daemon BuildRequires: pulseaudio-libs-devel Summary: Alsa to PulseAudio backend License: LGPLv2+ @@ -65,7 +62,6 @@ sound across a network. There are two plugins in the suite, one for PCM and one for mixer control. %package samplerate -Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA License: GPLv2+ @@ -75,7 +71,6 @@ This plugin is an external rate converter using libsamplerate by Erik de Castro Lopo. %package upmix -Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA License: LGPLv2+ @@ -86,7 +81,6 @@ The upmix plugin is an easy-to-use plugin for upmixing to 4 or by the slave PCM or explicitly via channel option. %package vdownmix -Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA License: LGPLv2+ @@ -158,6 +152,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files jack %license COPYING COPYING.GPL %doc doc/README-jack +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-jack.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -169,6 +164,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files oss %license COPYING COPYING.GPL %doc doc/README-pcm-oss +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-oss.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -184,6 +180,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so %{_libdir}/alsa-lib/libasound_module_conf_pulse.so +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pulseaudio.conf %config(noreplace) %{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf @@ -193,6 +190,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files samplerate %license COPYING COPYING.GPL %doc doc/samplerate.txt +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/10-samplerate.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -207,6 +205,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files upmix %license COPYING COPYING.GPL %doc doc/upmix.txt +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-upmix.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -217,6 +216,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files vdownmix %license COPYING COPYING.GPL %doc doc/vdownmix.txt +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-vdownmix.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -226,6 +226,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files usbstream %license COPYING COPYING.GPL +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/98-usb-stream.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -236,6 +237,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files arcamav %license COPYING COPYING.GPL %doc doc/README-arcam-av +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf %dir %{_datadir}/alsa/alsa.conf.d @@ -246,6 +248,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files speex %license COPYING COPYING.GPL %doc doc/speexdsp.txt doc/speexrate.txt +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/10-speexrate.conf %config(noreplace) %{_sysconfdir}/alsa/conf.d/60-speex.conf @@ -261,6 +264,7 @@ find %{buildroot} -name "*.la" -exec rm {} \; %files maemo %license COPYING COPYING.GPL %doc doc/README-maemo +%dir %{_sysconfdir}/alsa %dir %{_sysconfdir}/alsa/conf.d %config(noreplace) %{_sysconfdir}/alsa/conf.d/98-maemo.conf %dir %{_datadir}/alsa/alsa.conf.d From 2dd8d24116dc8b595cce672b928946975ddf9a68 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 1 Mar 2023 10:25:00 +0100 Subject: [PATCH 53/70] Install alsa-utils in the run_tests.sh The previous patch removed the hard alsa-utils dependency, so the alsa-utils package must be installed manually. --- tests/run_tests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/run_tests.sh b/tests/run_tests.sh index ff02118..8148361 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -2,6 +2,9 @@ set -ex +# install speaker-test +dnf install -y alsa-utils + # create patest user adduser patest From 004813eb8f6782aa839eadbd9554ce536e59269b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 17 Aug 2021 14:46:42 +0000 Subject: [PATCH 54/70] Enable support for AVTP Fixes: https://src.fedoraproject.org/rpms/alsa-plugins/pull-request/4 --- alsa-plugins.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 3be9afa..d557e1d 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -16,6 +16,7 @@ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz Patch0: alsa-git.patch BuildRequires: autoconf automake libtool +BuildRequires: make BuildRequires: alsa-lib-devel %description @@ -39,7 +40,6 @@ This plugin provides the PCM type "jack" %endif %package oss -BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA License: LGPLv2+ @@ -120,7 +120,6 @@ pre-processing of a mono stream like denoise using libspeex DSP API. %package maemo BuildRequires: dbus-devel -BuildRequires: make Summary: Maemo plugin for ALSA License: LGPLv2+ @@ -128,6 +127,15 @@ License: LGPLv2+ This plugin converts the ALSA API over PCM task nodes protocol. In this way, ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. +%package avtp +BuildRequires: libavtp-devel +Summary: Audio Video Transport Protocol (AVTP) plugin for ALSA +License: LGPLv2+ + +%description avtp +This plugin supports Audio Video Transport Protocol (AVTP) as specified in +IEEE 1722-2016 spec. AVTP is part of the Audio/Video Broadcast using TSN. + %prep %autosetup -n %{name}-%{version}%{?prever} -p1 @@ -145,7 +153,7 @@ autoreconf -vif mv %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example \ %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf -find %{buildroot} -name "*.la" -exec rm {} \; +find %{buildroot} -name "*.la" -delete %if %{with jack} @@ -273,6 +281,9 @@ find %{buildroot} -name "*.la" -exec rm {} \; %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so +%files avtp +%license COPYING COPYING.GPL +%{_libdir}/alsa-lib/libasound_module_pcm_aaf.so %changelog * Wed Jan 18 2023 Fedora Release Engineering - 1.2.7.1-3 From 113c4a7a2a0cd075d72c4994a2e2c07e3c04e4a0 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 15 Feb 2023 03:30:38 +0000 Subject: [PATCH 55/70] Enable a52 and lavrate plugins Fixes: https://src.fedoraproject.org/rpms/alsa-plugins/pull-request/5 --- alsa-plugins.spec | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index d557e1d..dee2e0e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -136,6 +136,26 @@ License: LGPLv2+ This plugin supports Audio Video Transport Protocol (AVTP) as specified in IEEE 1722-2016 spec. AVTP is part of the Audio/Video Broadcast using TSN. +%package a52 +BuildRequires: ffmpeg-free-devel +Obsoletes: alsa-plugins-freeworld-a52 <= %{version}-%{release} +Summary: A52 output plugin for ALSA using libavcodec +License: LGPLv2+ + +%description a52 +This plugin converts S16 linear format to A52 compressed stream and +send to an SPDIF output. It requires libavcodec for encoding the +audio stream. + +%package lavrate +BuildRequires: ffmpeg-free-devel +Obsoletes: alsa-plugins-freeworld-lavrate <= %{version}-%{release} +Summary: Rate converter plugin for ALSA using libavcodec +License: LGPLv2+ + +%description lavrate +The plugin uses ffmpeg audio resample library to convert audio rates. + %prep %autosetup -n %{name}-%{version}%{?prever} -p1 @@ -285,6 +305,32 @@ find %{buildroot} -name "*.la" -delete %license COPYING COPYING.GPL %{_libdir}/alsa-lib/libasound_module_pcm_aaf.so +%files a52 +%license COPYING COPYING.GPL +%doc doc/a52.txt +%dir %{_sysconfdir}/alsa +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/60-a52-encoder.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/60-a52-encoder.conf +%dir %{_libdir}/alsa-lib +%{_libdir}/alsa-lib/libasound_module_pcm_a52.so + +%files lavrate +%license COPYING COPYING.GPL +%doc doc/lavrate.txt +%dir %{_sysconfdir}/alsa +%dir %{_sysconfdir}/alsa/conf.d +%config(noreplace) %{_sysconfdir}/alsa/conf.d/10-rate-lav.conf +%dir %{_datadir}/alsa/alsa.conf.d +%{_datadir}/alsa/alsa.conf.d/10-rate-lav.conf +%dir %{_libdir}/alsa-lib +%{_libdir}/alsa-lib/libasound_module_rate_lavrate.so +%{_libdir}/alsa-lib/libasound_module_rate_lavrate_fast.so +%{_libdir}/alsa-lib/libasound_module_rate_lavrate_faster.so +%{_libdir}/alsa-lib/libasound_module_rate_lavrate_high.so +%{_libdir}/alsa-lib/libasound_module_rate_lavrate_higher.so + %changelog * Wed Jan 18 2023 Fedora Release Engineering - 1.2.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4960e7e66a154f856101d4a48d6092970b4fcd9a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 6 Mar 2023 16:57:52 +0100 Subject: [PATCH 56/70] Do not build ffmpeg plugins for RHEL --- alsa-plugins.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index dee2e0e..99b18c4 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,7 +1,9 @@ %if 0%{?rhel} %bcond_with jack +%bcond_with ffmpeg %else %bcond_without jack +%bcond_without ffmpeg %endif Name: alsa-plugins @@ -136,6 +138,7 @@ License: LGPLv2+ This plugin supports Audio Video Transport Protocol (AVTP) as specified in IEEE 1722-2016 spec. AVTP is part of the Audio/Video Broadcast using TSN. +%if %{with ffmpeg} %package a52 BuildRequires: ffmpeg-free-devel Obsoletes: alsa-plugins-freeworld-a52 <= %{version}-%{release} @@ -155,6 +158,7 @@ License: LGPLv2+ %description lavrate The plugin uses ffmpeg audio resample library to convert audio rates. +%endif %prep %autosetup -n %{name}-%{version}%{?prever} -p1 @@ -305,6 +309,7 @@ find %{buildroot} -name "*.la" -delete %license COPYING COPYING.GPL %{_libdir}/alsa-lib/libasound_module_pcm_aaf.so +%if %{with ffmpeg} %files a52 %license COPYING COPYING.GPL %doc doc/a52.txt @@ -330,6 +335,7 @@ find %{buildroot} -name "*.la" -delete %{_libdir}/alsa-lib/libasound_module_rate_lavrate_faster.so %{_libdir}/alsa-lib/libasound_module_rate_lavrate_high.so %{_libdir}/alsa-lib/libasound_module_rate_lavrate_higher.so +%endif %changelog * Wed Jan 18 2023 Fedora Release Engineering - 1.2.7.1-3 From c2a6e842a68b92a91a23ad5203a9e33f97e5049b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 6 Mar 2023 17:10:14 +0100 Subject: [PATCH 57/70] 1.2.7.1-4 release --- alsa-plugins.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 99b18c4..60e6f2d 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -8,7 +8,7 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -338,6 +338,12 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Mon Mar 6 2023 Jaroslav Kysela - 1.2.7.1-4 +- Enable avtp plugin - Peter Robinson +- Enable a52 and livrate plugins - Yaakov Selkowitz +- Remove or soften excess dependendencies - Yaakov Selkowitz +- CI test & RHEL cleanups + * Wed Jan 18 2023 Fedora Release Engineering - 1.2.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 815faf58a930d97de5f8f6978e1ac6c2179fa58a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 7 Mar 2023 17:23:48 +0100 Subject: [PATCH 58/70] fix typo in changelog --- alsa-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 60e6f2d..67f539c 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -340,7 +340,7 @@ find %{buildroot} -name "*.la" -delete %changelog * Mon Mar 6 2023 Jaroslav Kysela - 1.2.7.1-4 - Enable avtp plugin - Peter Robinson -- Enable a52 and livrate plugins - Yaakov Selkowitz +- Enable a52 and lavrate plugins - Yaakov Selkowitz - Remove or soften excess dependendencies - Yaakov Selkowitz - CI test & RHEL cleanups From ebbf01ca9cb82319548d0a3a2a182f27517eec07 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 12 Mar 2023 11:40:30 -0400 Subject: [PATCH 59/70] Rebuild for ffmpeg 6.0 --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 67f539c..33bdf0e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -8,7 +8,7 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ # pph plugin is BSD-like licensed @@ -338,6 +338,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Sun Mar 12 2023 Neal Gompa - 1.2.7.1-5 +- Rebuild for ffmpeg 6.0 + * Mon Mar 6 2023 Jaroslav Kysela - 1.2.7.1-4 - Enable avtp plugin - Peter Robinson - Enable a52 and lavrate plugins - Yaakov Selkowitz From 1794a4347c0a1d4b83c768197e7b7b4e24712115 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 6 Jun 2023 20:19:07 +0200 Subject: [PATCH 60/70] update to SPDX licenses --- alsa-plugins.spec | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 33bdf0e..a5bb52e 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -8,11 +8,11 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins -# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ -# pph plugin is BSD-like licensed -License: GPLv2+ and LGPLv2+ and BSD +# All packages are LGPL-2.1-or-later with the exception of samplerate +# which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed +License: GPL-2.0-or-later and LGPL-2.1-or-later and BSD-3-Clause URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 Patch0: alsa-git.patch @@ -32,7 +32,7 @@ This package includes plugins for ALSA. Recommends: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description jack This plugin converts the ALSA API over JACK (Jack Audio Connection @@ -43,7 +43,7 @@ This plugin provides the PCM type "jack" %package oss Summary: Oss PCM output plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description oss This plugin converts the ALSA API over OSS API. With this plugin, @@ -55,7 +55,7 @@ This plugin provides the PCM type "oss". Recommends: pulseaudio-daemon BuildRequires: pulseaudio-libs-devel Summary: Alsa to PulseAudio backend -License: LGPLv2+ +License: LGPL-2.1-or-later %description pulseaudio This plugin allows any program that uses the ALSA API to access a PulseAudio @@ -66,7 +66,7 @@ one for mixer control. %package samplerate BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA -License: GPLv2+ +License: GPL-2.0-or-later %description samplerate This plugin is an external rate converter using libsamplerate by Erik de @@ -75,7 +75,7 @@ Castro Lopo. %package upmix BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description upmix The upmix plugin is an easy-to-use plugin for upmixing to 4 or @@ -85,7 +85,7 @@ by the slave PCM or explicitly via channel option. %package vdownmix BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description vdownmix The vdownmix plugin is a downmixer from 4-6 channels to 2-channel @@ -95,7 +95,7 @@ surround". %package usbstream Summary: USB stream plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description usbstream The usbstream plugin is for snd-usb-us122l driver. It converts PCM @@ -103,7 +103,7 @@ stream to USB specific stream. %package arcamav Summary: Arcam AV amplifier plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description arcamav This plugin exposes the controls for an Arcam AV amplifier @@ -113,7 +113,7 @@ This plugin exposes the controls for an Arcam AV amplifier Requires: speex speexdsp BuildRequires: speex-devel speexdsp-devel Summary: Rate Converter Plugin Using Speex Resampler -License: LGPLv2+ +License: LGPL-2.1-or-later %description speex The rate plugin is an external rate converter using the Speex resampler @@ -123,7 +123,7 @@ pre-processing of a mono stream like denoise using libspeex DSP API. %package maemo BuildRequires: dbus-devel Summary: Maemo plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description maemo This plugin converts the ALSA API over PCM task nodes protocol. In this way, @@ -132,7 +132,7 @@ ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. %package avtp BuildRequires: libavtp-devel Summary: Audio Video Transport Protocol (AVTP) plugin for ALSA -License: LGPLv2+ +License: LGPL-2.1-or-later %description avtp This plugin supports Audio Video Transport Protocol (AVTP) as specified in @@ -143,7 +143,7 @@ IEEE 1722-2016 spec. AVTP is part of the Audio/Video Broadcast using TSN. BuildRequires: ffmpeg-free-devel Obsoletes: alsa-plugins-freeworld-a52 <= %{version}-%{release} Summary: A52 output plugin for ALSA using libavcodec -License: LGPLv2+ +License: LGPL-2.1-or-later %description a52 This plugin converts S16 linear format to A52 compressed stream and @@ -154,7 +154,7 @@ audio stream. BuildRequires: ffmpeg-free-devel Obsoletes: alsa-plugins-freeworld-lavrate <= %{version}-%{release} Summary: Rate converter plugin for ALSA using libavcodec -License: LGPLv2+ +License: LGPL-2.1-or-later %description lavrate The plugin uses ffmpeg audio resample library to convert audio rates. @@ -338,6 +338,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Tue Jun 6 2023 Jaroslav Kysela - 1.2.7.1-6 +- change to SPDX licenses + * Sun Mar 12 2023 Neal Gompa - 1.2.7.1-5 - Rebuild for ffmpeg 6.0 From fd88ccdb6dc5c77e1ba676bfff8158822e38bd0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:09:44 +0000 Subject: [PATCH 61/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index a5bb52e..4e52d88 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -8,7 +8,7 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -338,6 +338,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.2.7.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 6 2023 Jaroslav Kysela - 1.2.7.1-6 - change to SPDX licenses From 443ab57436436e74b0bb8eaa8ddc5b134f069fcd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 25 Aug 2023 00:25:07 -0400 Subject: [PATCH 62/70] Disable avtp plugin in RHEL builds This avoids the libavtp build dependency for a plugin that is not due to be shipped in RHEL. --- alsa-plugins.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 4e52d88..0fda53f 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,14 +1,16 @@ %if 0%{?rhel} +%bcond_with avtp %bcond_with jack %bcond_with ffmpeg %else +%bcond_without avtp %bcond_without jack %bcond_without ffmpeg %endif Name: alsa-plugins Version: 1.2.7.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -129,6 +131,7 @@ License: LGPL-2.1-or-later This plugin converts the ALSA API over PCM task nodes protocol. In this way, ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. +%if %{with avtp} %package avtp BuildRequires: libavtp-devel Summary: Audio Video Transport Protocol (AVTP) plugin for ALSA @@ -137,6 +140,7 @@ License: LGPL-2.1-or-later %description avtp This plugin supports Audio Video Transport Protocol (AVTP) as specified in IEEE 1722-2016 spec. AVTP is part of the Audio/Video Broadcast using TSN. +%endif %if %{with ffmpeg} %package a52 @@ -305,9 +309,11 @@ find %{buildroot} -name "*.la" -delete %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so +%if %{with avtp} %files avtp %license COPYING COPYING.GPL %{_libdir}/alsa-lib/libasound_module_pcm_aaf.so +%endif %if %{with ffmpeg} %files a52 @@ -338,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Fri Aug 25 2023 Yaakov Selkowitz - 1.2.7.1-8 +- Disable avtp plugin in RHEL builds + * Wed Jul 19 2023 Fedora Release Engineering - 1.2.7.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 274e99c7fa02dcafdec5f3568a2f756970beeca8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:45:03 +0000 Subject: [PATCH 63/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 0fda53f..1337c98 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -10,7 +10,7 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.2.7.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Aug 25 2023 Yaakov Selkowitz - 1.2.7.1-8 - Disable avtp plugin in RHEL builds From d6eaddf0d79dd72d20097be6422d69e880971167 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:56:18 +0000 Subject: [PATCH 64/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 1337c98..0dd9c51 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -10,7 +10,7 @@ Name: alsa-plugins Version: 1.2.7.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.2.7.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.2.7.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2a044274ea36eb021879f55ce45ec4af655d464e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 11 Jun 2024 13:37:50 +0200 Subject: [PATCH 65/70] Updated to 1.2.12 Signed-off-by: Jaroslav Kysela --- alsa-plugins.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 0dd9c51..37cd2ae 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -9,8 +9,8 @@ %endif Name: alsa-plugins -Version: 1.2.7.1 -Release: 10%{?dist} +Version: 1.2.12 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Tue Jun 11 2024 Jaroslav Kysela - 1.2.12-1 +- Updated to 1.2.12 + * Mon Jan 22 2024 Fedora Release Engineering - 1.2.7.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 5daf78e..53faed0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-plugins-1.2.7.1.tar.bz2) = 437c05a7e0175594768fd6a9a6d1a158bb4a01a7de6a42c2bd468d9381e01b64d385ddfac7d87baf84fe13cb4e65dc24da643940f416d4b191c528728822d964 +SHA512 (alsa-plugins-1.2.12.tar.bz2) = b2064eb32662662f422f6e7c71f503d82c68d7a7059c8197bdd61ee08735b3ee104c6a5f9e3451e81124634514b91fc89d05d33041d9c2bb0f55b3c2ac3271b1 From 36290d6324f0a102c989efac412ff8afd15bfb5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:52:50 +0000 Subject: [PATCH 66/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 37cd2ae..41be1b7 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -10,7 +10,7 @@ Name: alsa-plugins Version: 1.2.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 11 2024 Jaroslav Kysela - 1.2.12-1 - Updated to 1.2.12 From 2cebe39166b19045ed59b2d801f797588bdfc277 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 23 Sep 2024 16:45:53 +0200 Subject: [PATCH 67/70] Rebuild for ffmpeg 7 --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 41be1b7..1bd79bf 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -10,7 +10,7 @@ Name: alsa-plugins Version: 1.2.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Mon Sep 23 2024 Fabio Valentini - 1.2.12-3 +- Rebuild for ffmpeg 7 + * Wed Jul 17 2024 Fedora Release Engineering - 1.2.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2ad7204c9a8813e6bc1253314b4dc25a6ceec4f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:54:22 +0000 Subject: [PATCH 68/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 1bd79bf..601c3e8 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -10,7 +10,7 @@ Name: alsa-plugins Version: 1.2.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.2.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 23 2024 Fabio Valentini - 1.2.12-3 - Rebuild for ffmpeg 7 From 47c675eb8b07867c62f1fe1380adcfbb78c7d6b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:55:09 +0000 Subject: [PATCH 69/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 601c3e8..addf603 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -10,7 +10,7 @@ Name: alsa-plugins Version: 1.2.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.2.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.2.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 992760550591940b1204f9cb6730630e3190f320 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Wed, 1 Oct 2025 11:53:34 +0200 Subject: [PATCH 70/70] Rebuilt for FFmpeg 8 --- alsa-plugins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index addf603..8230da3 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -10,7 +10,7 @@ Name: alsa-plugins Version: 1.2.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPL-2.1-or-later with the exception of samplerate # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed @@ -344,6 +344,9 @@ find %{buildroot} -name "*.la" -delete %endif %changelog +* Wed Oct 01 2025 Dominik Mierzejewski - 1.2.12-6 +- Rebuilt for FFmpeg 8 + * Wed Jul 23 2025 Fedora Release Engineering - 1.2.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild