- updated to 1.1.7

- removed obsolete no-lavcreate patch
- lavcrate renamed to lavrate (following upstream)

diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index 534f569b9355d865311e184a9c314ea2cd47be3c..47013f664a095d8d7eb0f5e7a403bbcbad66d268 100644 (file)
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -1,20 +1,19 @@
 #
 # Conditional build:
-%bcond_with    lavcrate        # build lavcrate plugin (requires ffmpeg < 4)
+%bcond_with    lavrate # build lavrate plugin (requires ffmpeg < 4)
 #
 Summary:       Advanced Linux Sound Architecture - plugins
 Summary(pl.UTF-8):     Advanced Linux Sound Architecture - wtyczki
 Name:          alsa-plugins
-Version:       1.1.6
-Release:       2
+Version:       1.1.7
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
-# Source0-md5: 8387279e99feeb2ecffaac5f293223d7
+# Source0-md5: c86cd9c069cfec2e8a491aaa7d3c584c
 Source1:       %{name}-pulse.conf
-Patch0:                no-lavcreate.patch
 URL:           http://www.alsa-project.org/
-BuildRequires: alsa-lib-devel >= 1.0.18
+BuildRequires: alsa-lib-devel >= 1.1.6
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: dbus-devel >= 0.35
@@ -39,7 +38,7 @@ Wtyczki ALSA.
 Summary:       A52 output plugin for ALSA
 Summary(pl.UTF-8):     Wtyczka wyjściowa A52 dla systemu ALSA
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 
 %description a52
 A52 output plugin for ALSA.
@@ -51,7 +50,7 @@ Wtyczka wyjściowa A52 dla systemu ALSA.
 Summary:       Controls for an Arcam AV amplifier
 Summary(pl.UTF-8):     Kontrolki do wzmacniacza Arcam AV
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 
 %description arcam-av
 This plugin exposes the controls for an Arcam AV amplifier (see:
@@ -65,7 +64,7 @@ Wtyczka ta umożliwia kontrolę nad wzmacniaczem Arcam AV
 Summary:       JACK <--> ALSA PCM plugin
 Summary(pl.UTF-8):     Wtyczka PCM JACK <--> ALSA
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 Requires:      jack-audio-connection-kit >= 0.98
 
 %description jack
@@ -79,23 +78,24 @@ Kit). Aplikacje korzystające natywnie z biblioteki ALSA mogą w sposób
 przezroczysty działać z jackd zarówno przy odtwarzaniu dźwięku, jak i
 nagrywaniu.
 
-%package lavcrate
+%package lavrate
 Summary:       libavcodec-based rate converter plugin for ALSA
 Summary(pl.UTF-8):     Wtyczka konwertera tempa dla systemu ALSA oparta na libavcodec
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
+Obsoletes:     alsa-plugins-lavcrate < 1.1.7
 
-%description lavcrate
+%description lavrate
 libavcodec-based rate converter plugin for ALSA.
 
-%description lavcrate -l pl.UTF-8
+%description lavrate -l pl.UTF-8
 Wtyczka konwertera tempa dla systemu ALSA oparta na libavcodec.
 
 %package maemo
 Summary:       ALSA plugins for Nokia DSP
 Summary(pl.UTF-8):     Wtyczki systemu ALSA dla DSP Nokii
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 
 %description maemo
 ALSA plugins for Nokia DSP.
@@ -107,7 +107,7 @@ Wtyczki systemu ALSA dla DSP Nokii.
 Summary:       Up/down mixing plugins for ALSA
 Summary(pl.UTF-8):     Wtyczki up/down-mix dla systemu ALSA
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 
 %description mix
 Up/down mixing plugins for ALSA.
@@ -119,7 +119,7 @@ Wtyczki up/down-mix dla systemu ALSA.
 Summary:       OSS <--> ALSA plugins
 Summary(pl.UTF-8):     Wtyczki OSS <--> ALSA
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 
 %description oss
 These plugins converts the ALSA API over OSS API. ALSA native
@@ -133,7 +133,7 @@ natywnie z biblioteki ALSA mogą działać na sterownikach OSS.
 Summary:       PulseAudio <--> ALSA plugins
 Summary(pl.UTF-8):     Wtyczki PulseAudio <--> ALSA
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 Requires:      pulseaudio-libs >= 0.9.11
 Obsoletes:     alsa-plugins-polyp
 
@@ -151,7 +151,7 @@ odtwarzać i nagrywać dźwięk poprzez sieć.
 Summary:       libsamplerate-based rate converter plugin for ALSA
 Summary(pl.UTF-8):     Wtyczka konwertera tempa dla systemu ALSA oparta na libsamplerate
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 
 %description samplerate
 libsamplerate-based rate converter plugin for ALSA.
@@ -164,7 +164,7 @@ Summary:    speex-based PCM plugin for ALSA
 Summary(pl.UTF-8):     Wtyczka PCM speex dla systemu ALSA
 License:       BSD
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 Requires:      speexdsp >= 1:1.2
 
 %description speex
@@ -178,7 +178,7 @@ Summary:    speex-based rate converter plugin for ALSA
 Summary(pl.UTF-8):     Wtyczka konwertera tempa dla systemu ALSA oparta na bibliotece speex
 License:       BSD
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 Requires:      speexdsp >= 1:1.2
 
 %description speexrate
@@ -191,7 +191,7 @@ Wtyczka konwertera tempa dla systemu ALSA oparta na bibliotece speex.
 Summary:       usb_stream PCM I/O plugin for ALSA
 Summary(pl.UTF-8):     Wtyczka wejścia-wyjścia PCM usb_stream dla systemu ALSA
 Group:         Libraries
-Requires:      alsa-lib >= 1.0.18
+Requires:      alsa-lib >= 1.1.6
 
 %description usb_stream
 usb_stream PCM I/O plugin for ALSA.
@@ -201,7 +201,6 @@ Wtyczka wejścia-wyjścia PCM usb_stream dla systemu ALSA.
 
 %prep
 %setup -q
-%{!?with_lavcrate:%patch0 -p1}
 
 %build
 %{__libtoolize}
@@ -210,6 +209,7 @@ Wtyczka wejścia-wyjścia PCM usb_stream dla systemu ALSA.
 %{__autoheader}
 %{__automake}
 %configure \
+       %{!?with_lavrate:--disable-lavrate} \
        --enable-maemo-plugin \
        --enable-maemo-resource-manager \
        --with-speex=lib
@@ -232,43 +232,59 @@ rm -rf $RPM_BUILD_ROOT
 %files a52
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_a52.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/60-a52-encoder.conf
+%{_datadir}/alsa/alsa.conf.d/60-a52-encoder.conf
 
 %files arcam-av
 %defattr(644,root,root,755)
 %doc doc/README-arcam-av
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf
+%{_datadir}/alsa/alsa.conf.d/50-arcam-av-ctl.conf
 
 %files jack
 %defattr(644,root,root,755)
 %doc doc/README-jack
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/50-jack.conf
+%{_datadir}/alsa/alsa.conf.d/50-jack.conf
 
-%if %{with lavcrate}
-%files lavcrate
+%if %{with lavrate}
+%files lavrate
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate.so
-%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate_fast.so
-%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate_faster.so
-%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate_high.so
-%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavcrate_higher.so
+%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavrate.so
+%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavrate_fast.so
+%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavrate_faster.so
+%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavrate_high.so
+%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_lavrate_higher.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/10-rate-lav.conf
+%{_datadir}/alsa/alsa.conf.d/10-rate-lav.conf
 %endif
 
 %files maemo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/98-maemo.conf
+%{_datadir}/alsa/alsa.conf.d/98-maemo.conf
 
 %files mix
 %defattr(644,root,root,755)
 %doc doc/{upmix,vdownmix}.txt
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/60-upmix.conf
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/60-vdownmix.conf
+%{_datadir}/alsa/alsa.conf.d/60-upmix.conf
+%{_datadir}/alsa/alsa.conf.d/60-vdownmix.conf
 
 %files oss
 %defattr(644,root,root,755)
 %doc doc/README-pcm-oss
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_oss.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/50-oss.conf
+%{_datadir}/alsa/alsa.conf.d/50-oss.conf
 
 %files pulse
 %defattr(644,root,root,755)
@@ -277,8 +293,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/alsa/pulse-default.conf
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/50-pulseaudio.conf
+#%{_sysconfdir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
 %{_datadir}/alsa/alsa.conf.d/50-pulseaudio.conf
-#%{_datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
 
 %files samplerate
 %defattr(644,root,root,755)
@@ -288,17 +305,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_samplerate_linear.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_samplerate_medium.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_samplerate_order.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/10-samplerate.conf
+%{_datadir}/alsa/alsa.conf.d/10-samplerate.conf
 
 %files speex
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_speex.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/60-speex.conf
+%{_datadir}/alsa/alsa.conf.d/60-speex.conf
 
 %files speexrate
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_speexrate.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/10-speexrate.conf
+%{_datadir}/alsa/alsa.conf.d/10-speexrate.conf
 
 %files usb_stream
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
+%config(noreplace,missingok) %verify(not link) %{_sysconfdir}/alsa/conf.d/98-usb-stream.conf
+%{_datadir}/alsa/alsa.conf.d/98-usb-stream.conf

diff --git a/no-lavcreate.patch b/no-lavcreate.patch
deleted file mode 100644 (file)
index 2d9bdbb..0000000
--- a/no-lavcreate.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-plugins-1.1.6/Makefile.am~    2018-04-03 09:01:38.000000000 +0200
-+++ alsa-plugins-1.1.6/Makefile.am     2018-04-30 00:47:42.414947728 +0200
-@@ -9,7 +9,7 @@
- SUBDIRS += rate
- endif
- if HAVE_AVCODEC
--SUBDIRS += a52 rate-lavc
-+SUBDIRS += a52
- endif
- if HAVE_MAEMO_PLUGIN
- SUBDIRS += maemo