[performous/f28] modernize spec file.
by Aurélien Bompard
Summary of changes:
f80902d... modernize spec file. (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[rpmfusion-nonfree-release/f28] Fix compatibility symlink
by Leigh Scott
commit a3cafa7a37f33089a238ec9de6ae77def996fe14
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Apr 17 13:00:38 2018 +0100
Fix compatibility symlink
rpmfusion-nonfree-release.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 51b7e57..979974f 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{repo}-release
Version: 28
-Release: 0.6
+Release: 0.7
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -74,7 +74,7 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE27}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE28}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Avoid using basearch in name for the key. Introduced in F18
ln -s $(basename %{SOURCE28}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-28
@@ -110,6 +110,9 @@ ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Tue Apr 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 28-0.7
+- Fix compatibility symlink
+
* Mon Apr 16 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 28-0.6
- Updates keys
- Enable metadata
6 years, 7 months
[rpmfusion-nonfree-release] Remove compatibility symlink
by Leigh Scott
commit b012d5668c2c752f855835309a22b1d5d91f3594
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Apr 17 12:59:14 2018 +0100
Remove compatibility symlink
rpmfusion-nonfree-release.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index f421f78..62fdbc4 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{repo}-release
Version: 29
-Release: 0.3
+Release: 0.4
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -72,9 +72,6 @@ install -d -m755 \
%{SOURCE30} \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
-# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE27}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
-
# Avoid using basearch in name for the key. Introduced in F18
ln -s $(basename %{SOURCE28}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-28
ln -s $(basename %{SOURCE29}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-29
@@ -109,6 +106,9 @@ ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Tue Apr 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 29-0.4
+- Remove compatibility symlink
+
* Mon Apr 16 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-0.3
- Enable metadata
- Remove f27 key
6 years, 7 months
[rpmfusion-free-release/f28] Fix compatibility symlink
by Leigh Scott
commit dd5d825931ec1c45d8573f27f18805855d6f91fa
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Apr 17 12:56:01 2018 +0100
Fix compatibility symlink
rpmfusion-free-release.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 8737621..178f04e 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{repo}-release
Version: 28
-Release: 0.6
+Release: 0.7
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -74,7 +74,7 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE27}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+ln -s $(basename %{SOURCE28}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
# Avoid using basearch in name for the key. Introduced in F18
ln -s $(basename %{SOURCE28}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-28
@@ -110,6 +110,9 @@ ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Tue Apr 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 28-0.7
+- Fix compatibility symlink
+
* Mon Apr 16 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 28-0.6
- Updates keys
- Enable metadata
6 years, 7 months
[rpmfusion-free-release] Remove compatibility symlink
by Leigh Scott
commit 8c864780a7514fde40200248a37c55d3e8ab166d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Apr 17 12:53:05 2018 +0100
Remove compatibility symlink
rpmfusion-free-release.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index e42e717..2e4278e 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{repo}-release
Version: 29
-Release: 0.3
+Release: 0.4
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -72,9 +72,6 @@ install -d -m755 \
%{SOURCE30} \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
-# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE27}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
-
# Avoid using basearch in name for the key. Introduced in F18
ln -s $(basename %{SOURCE28}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-28
ln -s $(basename %{SOURCE29}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-29
@@ -109,6 +106,9 @@ ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Tue Apr 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 29-0.4
+- Remove compatibility symlink
+
* Mon Apr 16 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 29-0.3
- Enable metadata
- Remove f27 key
6 years, 7 months
[amule] Rebuilt for libupnp
by Nicolas Chauvet
commit 068ea363adc1fbe7162bba51ef39de787326fe12
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Apr 17 08:23:22 2018 +0200
Rebuilt for libupnp
amule.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/amule.spec b/amule.spec
index eebfe79..0d3146b 100644
--- a/amule.spec
+++ b/amule.spec
@@ -7,7 +7,7 @@
Name: amule
Version: 2.3.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Source0: https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi...
@@ -143,6 +143,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
%changelog
+* Tue Apr 17 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.2-11
+- Rebuilt for libupnp
+
* Tue Feb 27 2018 Sérgio Basto <sergio(a)serjux.com> - 2.3.2-10
- Fix FTBFS with crypto++ 6.0.0
6 years, 7 months
[vlc] Rebuilt for libupnp
by Nicolas Chauvet
commit c12b53e0f40043cfcd5a2d4c37ba7de0630aaf60
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Apr 17 08:22:20 2018 +0200
Rebuilt for libupnp
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index f83838f..f2b7334 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -556,6 +556,9 @@ fi || :
%changelog
+* Tue Apr 17 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-6
+- Rebuilt for libupnp
+
* Fri Mar 23 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.1-5
- Rework version tag
- Add soxr
6 years, 7 months
[alsa-plugins-freeworld/f28] add obsoletes alsa-plugins-lavcrate
by Jaroslav Kysela
commit a9a5b988a54b143e7bdb1e7bb262f926e9623f6c
Author: Jaroslav Kysela <perex(a)perex.cz>
Date: Mon Apr 16 20:07:46 2018 +0200
add obsoletes alsa-plugins-lavcrate
alsa-plugins-freeworld.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/alsa-plugins-freeworld.spec b/alsa-plugins-freeworld.spec
index 608ed5d..b02a2e3 100644
--- a/alsa-plugins-freeworld.spec
+++ b/alsa-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
Version: 1.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -37,6 +37,7 @@ Summary: Rate converter plugin using libavcodec
License: LGPLv2+
#Compatibility with some foreign packaging scheme
Provides: alsa-plugins-lavrate = %{version}-%{release}
+Obsoletes: alsa-plugins-lavcrate < 1.1.6-3
%description lavrate
The plugin uses ffmpeg audio resample library to convert audio rates.
@@ -93,7 +94,7 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
%changelog
-* Mon Apr 16 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-4
+* Mon Apr 16 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-5
- Rename alsa-plugins-lavcrate to alsa-plugins-lavrate
- /etc/alsa/conf.d contains symlinks to /usr/share/alsa/alsa.conf.d templates
@@ -102,7 +103,7 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
* Fri Apr 13 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-2
- Use plugin config files from upstream, spec cleanups
-7
+
* Fri Apr 13 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-1
- Update to 1.1.6
6 years, 7 months
[alsa-plugins-freeworld] add obsoletes alsa-plugins-lavcrate
by Jaroslav Kysela
commit d08bca426d13a392d37c8d8e4e9d538e2f4a0560
Author: Jaroslav Kysela <perex(a)perex.cz>
Date: Mon Apr 16 20:07:46 2018 +0200
add obsoletes alsa-plugins-lavcrate
alsa-plugins-freeworld.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/alsa-plugins-freeworld.spec b/alsa-plugins-freeworld.spec
index 608ed5d..b02a2e3 100644
--- a/alsa-plugins-freeworld.spec
+++ b/alsa-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
Version: 1.1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -37,6 +37,7 @@ Summary: Rate converter plugin using libavcodec
License: LGPLv2+
#Compatibility with some foreign packaging scheme
Provides: alsa-plugins-lavrate = %{version}-%{release}
+Obsoletes: alsa-plugins-lavcrate < 1.1.6-3
%description lavrate
The plugin uses ffmpeg audio resample library to convert audio rates.
@@ -93,7 +94,7 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
%changelog
-* Mon Apr 16 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-4
+* Mon Apr 16 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-5
- Rename alsa-plugins-lavcrate to alsa-plugins-lavrate
- /etc/alsa/conf.d contains symlinks to /usr/share/alsa/alsa.conf.d templates
@@ -102,7 +103,7 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
* Fri Apr 13 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-2
- Use plugin config files from upstream, spec cleanups
-7
+
* Fri Apr 13 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-1
- Update to 1.1.6
6 years, 7 months
[alsa-plugins-freeworld] Rename alsa-plugins-lavcrate to alsa-plugins-lavrate
by Jaroslav Kysela
commit 13f6f8d70548d2e81b6b023e0c74ab493b62aac6
Author: Jaroslav Kysela <perex(a)perex.cz>
Date: Mon Apr 16 18:38:11 2018 +0200
Rename alsa-plugins-lavcrate to alsa-plugins-lavrate
alsa-plugins-freeworld.spec | 40 +-
ffmpeg35_buildfix.patch | 1417 +++++++++++++++++++++++++++++++++++++++----
2 files changed, 1307 insertions(+), 150 deletions(-)
---
diff --git a/alsa-plugins-freeworld.spec b/alsa-plugins-freeworld.spec
index 380ac91..608ed5d 100644
--- a/alsa-plugins-freeworld.spec
+++ b/alsa-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
Version: 1.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -31,16 +31,14 @@ 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 lavcrate
+%package lavrate
BuildRequires: ffmpeg-devel
Summary: Rate converter plugin using libavcodec
License: LGPLv2+
#Compatibility with some foreign packaging scheme
-Provides: alsa-plugins-lavcrate = %{version}-%{release}
-%description lavcrate
-The plugin in rate-lavc subdirectory is an external rate converter using
-libavcodec's resampler.
-
+Provides: alsa-plugins-lavrate = %{version}-%{release}
+%description lavrate
+The plugin uses ffmpeg audio resample library to convert audio rates.
%prep
%setup -q -n alsa-plugins-%{version}%{?prever}
@@ -74,27 +72,37 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
%doc doc/a52.txt
%dir /etc/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 lavcrate
+%files lavrate
%license COPYING COPYING.GPL
-%doc doc/lavcrate.txt
+%doc doc/lavrate.txt
%dir /etc/alsa/conf.d
-%config(noreplace) %{_sysconfdir}/alsa/conf.d/10-rate-lavc.conf
-%{_libdir}/alsa-lib/libasound_module_rate_lavcrate.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavcrate_fast.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavcrate_faster.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavcrate_high.so
-%{_libdir}/alsa-lib/libasound_module_rate_lavcrate_higher.so
+%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
+* Mon Apr 16 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-4
+- Rename alsa-plugins-lavcrate to alsa-plugins-lavrate
+- /etc/alsa/conf.d contains symlinks to /usr/share/alsa/alsa.conf.d templates
+
* Sat Apr 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.6-3
- Fix build
* Fri Apr 13 2018 Jaroslav Kysela <perex(a)perex.cz> - 1.1.6-2
- Use plugin config files from upstream, spec cleanups
-
+7
* Fri Apr 13 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-1
- Update to 1.1.6
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
index 982794f..e69642b 100644
--- a/ffmpeg35_buildfix.patch
+++ b/ffmpeg35_buildfix.patch
@@ -1,35 +1,346 @@
---- a/rate-lavc/Makefile.am
-+++ b/rate-lavc/Makefile.am
-@@ -7,7 +7,7 @@
+From 24db7f59d76984e2901f2834a297735853cab776 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex(a)perex.cz>
+Date: Mon, 16 Apr 2018 16:24:29 +0200
+Subject: [PATCH 1/3] 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 <perex(a)perex.cz>
+---
+ 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_rate_lavcrate_la_SOURCES = rate_lavcrate.c
--libasound_module_rate_lavcrate_la_LIBADD = @ALSA_LIBS@ @AVCODEC_LIBS@
-+libasound_module_rate_lavcrate_la_LIBADD = @ALSA_LIBS@ -lavresample -lavutil
+ 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 <alsa/asoundlib.h>
+ #include <alsa/pcm_external.h>
+ #include <alsa/pcm_plugin.h>
+-#include AVCODEC_HEADER
++#include <libavcodec/avcodec.h>
+ #include <libavutil/avutil.h>
- noinst_HEADERS = gcd.h
+ /* 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
-
---- a/rate-lavc/rate_lavcrate.c
-+++ b/rate-lavr/rate_lavcrate.c
-@@ -1,9 +1,6 @@
- /*
-- * Rate converter plugin using libavcodec's resampler
-- * Copyright (c) 2007 by Nicholas Kain <njkain(a)gmail.com>
-- *
-- * based on rate converter that uses libsamplerate
-- * Copyright (c) 2006 by Takashi Iwai <tiwai(a)suse.de>
+-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='<ffmpeg/avcodec.h>'])
+- if test -z "$AVCODEC_HEADER"; then
+- AC_CHECK_HEADER([libavcodec/avcodec.h], [AVCODEC_HEADER='<libavcodec/avcodec.h>'])
+- 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(a)/libasound_module_rate_lavrate_*.so
++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavrate_higher.so
++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavrate_high.so
++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavrate_fast.so
++ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavrate_faster.so
++
++uninstall-hook:
++ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR(a)/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
-@@ -19,21 +16,23 @@
- #include <stdio.h>
- #include <alsa/asoundlib.h>
- #include <alsa/pcm_rate.h>
--#include AVCODEC_HEADER
--#include "gcd.h"
++ *
++ * 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 <stdio.h>
++#include <alsa/asoundlib.h>
++#include <alsa/pcm_rate.h>
+
+#include <libavresample/avresample.h>
+#include <libavutil/channel_layout.h>
@@ -37,28 +348,306 @@
+#include <libavutil/mathematics.h>
+#include <libavutil/samplefmt.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;
++
++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;
+
- int in_rate;
- int out_rate;
++ 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(a)/libasound_module_rate_lavcrate_*.so
+- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavcrate_higher.so
+- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavcrate_high.so
+- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavcrate_fast.so
+- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavcrate_faster.so
+-
+-uninstall-hook:
+- rm -f $(DESTDIR)@ALSA_PLUGIN_DIR(a)/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 <njkain(a)gmail.com>
+- *
+- * based on rate converter that uses libsamplerate
+- * Copyright (c) 2006 by Takashi Iwai <tiwai(a)suse.de>
+- *
+- * 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 <stdio.h>
+-#include <alsa/asoundlib.h>
+-#include <alsa/pcm_rate.h>
+-#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;
- };
-
-@@ -50,26 +49,7 @@ static snd_pcm_uframes_t output_frames(void *obj, snd_pcm_uframes_t frames)
- static void pcm_src_free(void *obj)
- {
- struct rate_src *rate = obj;
+- 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) {
@@ -79,38 +668,36 @@
- av_resample_close(rate->context);
- rate->context = NULL;
- }
-+ avresample_free(&rate->avr);
- }
-
- static int pcm_src_init(void *obj, snd_pcm_rate_info_t *info)
-@@ -77,12 +57,14 @@ static int pcm_src_init(void *obj, snd_pcm_rate_info_t *info)
- struct rate_src *rate = obj;
- int i, ir, or;
-
+-}
+-
+-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) {
-+ 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;
+- 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);
-+ i = av_gcd(or, ir);
- if (or > ir) {
- phase_shift = or/i;
- } else {
-@@ -93,25 +75,27 @@ static int pcm_src_init(void *obj, snd_pcm_rate_info_t *info)
- if (cutoff < 0.80)
- cutoff = 0.80;
- }
+- 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; i<rate->channels; i++) {
@@ -123,36 +710,26 @@
- if (!rate->out || !rate->in) {
- pcm_src_free(rate);
- return -ENOMEM;
-+ 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;
-@@ -129,48 +113,10 @@ static int pcm_src_adjust_pitch(void *obj, snd_pcm_rate_info_t *info)
- static void pcm_src_reset(void *obj)
- {
- struct rate_src *rate = obj;
+- }
+-
+- 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)
-{
@@ -192,16 +769,14 @@
- *(dst++) = src[i][j];
- }
- }
-+ if (rate->avr) {
-+ avresample_close(rate->avr);
-+ avresample_open(rate->avr);
- }
- }
-
-@@ -179,22 +125,13 @@ static void pcm_src_convert_s16(void *obj, int16_t *dst, unsigned int
- {
- struct rate_src *rate = obj;
- int consumed = 0, chans=rate->channels, ret=0, i;
+- }
+-}
+-
+-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 consumed = 0, chans=rate->channels, ret=0, i;
- int total_in = rate->stored + src_frames, new_stored;
-
- deinterleave(src, rate->in, src_frames, chans, rate->point);
@@ -218,39 +793,613 @@
- total_in-src_frames>filter_size?0:1, src_frames);
- reinterleave(rate->out, dst, ret, chans);
- rate->stored = total_in-consumed;
-+ int total_in = avresample_get_delay(rate->avr) + 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, 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 <perex(a)perex.cz>
+Date: Mon, 16 Apr 2018 17:49:36 +0200
+Subject: [PATCH 2/3] 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 <perex(a)perex.cz>
+---
+ 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
+
-+ ret = avresample_convert(rate->avr, &dst, dst_frames * chans * 2, dst_frames,
-+ &src, src_frames * chans * 2, src_frames);
++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@
+
-+ avresample_set_compensation(rate->avr,
-+ total_in - src_frames > filter_size ? 0 : 1, src_frames);
- }
++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)
- static void pcm_src_close(void *obj)
-@@ -212,7 +149,7 @@ static int get_supported_rates(void *obj, unsigned int *rate_min,
+ 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)
- static void dump(void *obj, snd_output_t *out)
- {
-- snd_output_printf(out, "Converter: liblavc\n");
-+ snd_output_printf(out, "Converter: libavr\n");
- }
- #endif
+ asound_module_ctl_arcam_avdir = @ALSA_PLUGIN_DIR@
+-asound_module_addondir = @ALSA_ADDON_DIR@
++asound_module_gconfdir = @ALSA_GCONF_DIR@
-@@ -220,7 +157,6 @@ 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,
-@@ -248,7 +184,7 @@ int pcm_src_open(unsigned int version, void **objp, snd_pcm_rate_ops_t *ops)
- return -ENOMEM;
+ AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
+ AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined
- *objp = rate;
-- rate->context = NULL;
-+ 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));
+ 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(a)/libasound_module_rate_speexrate_*.so
+ $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_speexrate_best.so
+@@ -28,4 +34,6 @@ install-exec-hook:
+ uninstall-hook:
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR(a)/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(a)/libasound_module_rate_lavrate_*.so
+ $(LN_S) libasound_module_rate_lavrate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/libasound_module_rate_lavrate_higher.so
+@@ -23,3 +27,6 @@ install-exec-hook:
+
+ uninstall-hook:
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR(a)/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(a)/libasound_module_rate_samplerate_*.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR(a)/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 beb24e58763e3b1d831fcd7ef87a478e6ac74fcc Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex(a)perex.cz>
+Date: Mon, 16 Apr 2018 18:14:18 +0200
+Subject: [PATCH 3/3] oss/Makefile.am: fix typo
+
+Signed-off-by: Jaroslav Kysela <perex(a)perex.cz>
+---
+ 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
+
6 years, 7 months
