[alsa-plugins] updated to 1.0.25
perex
perex at fedoraproject.org
Wed Feb 1 09:46:32 UTC 2012
commit c0b183c5c4e8fb61d889e7aa8bb85487f124f6f1
Author: Jaroslav Kysela <perex at perex.cz>
Date: Wed Feb 1 10:46:06 2012 +0100
updated to 1.0.25
.gitignore | 1 +
samplerate.conf => 10-samplerate.conf | 0
speex.conf => 10-speex.conf | 0
arcamav.conf => 50-arcamav.conf | 0
jack.conf => 50-jack.conf | 0
pcm-oss.conf => 50-pcm-oss.conf | 0
upmix.conf => 50-upmix.conf | 0
vdownmix.conf => 97-vdownmix.conf | 0
maemo.conf => 98-maemo.conf | 0
alsa-plugins.spec | 71 ++++++++++++++++++---------------
pulse-default.conf | 35 ----------------
sources | 2 +-
12 files changed, 41 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f26aef1..6c6b066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ alsa-plugins-1.0.21.tar.bz2
alsa-plugins-1.0.22.tar.bz2
/alsa-tools-1.0.24.tar.bz2
/alsa-plugins-1.0.24.tar.bz2
+/alsa-plugins-1.0.25.tar.bz2
diff --git a/samplerate.conf b/10-samplerate.conf
similarity index 100%
rename from samplerate.conf
rename to 10-samplerate.conf
diff --git a/speex.conf b/10-speex.conf
similarity index 100%
rename from speex.conf
rename to 10-speex.conf
diff --git a/arcamav.conf b/50-arcamav.conf
similarity index 100%
rename from arcamav.conf
rename to 50-arcamav.conf
diff --git a/jack.conf b/50-jack.conf
similarity index 100%
rename from jack.conf
rename to 50-jack.conf
diff --git a/pcm-oss.conf b/50-pcm-oss.conf
similarity index 100%
rename from pcm-oss.conf
rename to 50-pcm-oss.conf
diff --git a/upmix.conf b/50-upmix.conf
similarity index 100%
rename from upmix.conf
rename to 50-upmix.conf
diff --git a/vdownmix.conf b/97-vdownmix.conf
similarity index 100%
rename from vdownmix.conf
rename to 97-vdownmix.conf
diff --git a/maemo.conf b/98-maemo.conf
similarity index 100%
rename from maemo.conf
rename to 98-maemo.conf
diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index f0922fb..e4f1a37 100644
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -5,8 +5,8 @@
%endif
Name: alsa-plugins
-Version: 1.0.24
-Release: 4%{?dist}
+Version: 1.0.25
+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
@@ -15,16 +15,15 @@ Group: System Environment/Libraries
URL: http://www.alsa-project.org/
Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
%if 0%{?with_jack}
-Source1: jack.conf
+Source1: 50-jack.conf
%endif
-Source2: pcm-oss.conf
-Source3: speex.conf
-Source4: samplerate.conf
-Source5: upmix.conf
-Source6: vdownmix.conf
-Source7: pulse-default.conf
-Source8: arcamav.conf
-Source9: maemo.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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -136,7 +135,7 @@ 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: alsa-lib-devel = %{version}
BuildRequires: dbus-devel
Summary: Maemo plugin for ALSA
Group: System Environment/Libraries
@@ -159,9 +158,9 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+install -d ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d
%if 0%{?with_jack}
-install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_datadir}/alsa/alsa.conf.d
%endif
install -m 644 %SOURCE2 \
%SOURCE3 \
@@ -170,10 +169,9 @@ install -m 644 %SOURCE2 \
%SOURCE6 \
%SOURCE8 \
%SOURCE9 \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-# pulseaudio configuration file
-install -m 644 %SOURCE7 \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
+ ${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
find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
@@ -188,32 +186,34 @@ rm -rf $RPM_BUILD_ROOT
%files jack
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/README-jack
-%dir %{_sysconfdir}/alsa/pcm
-%config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-jack.conf
%{_libdir}/alsa-lib/libasound_module_pcm_jack.so
%endif
%files oss
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/README-pcm-oss
-%dir %{_sysconfdir}/alsa/pcm
-%config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-pcm-oss.conf
%{_libdir}/alsa-lib/libasound_module_ctl_oss.so
%{_libdir}/alsa-lib/libasound_module_pcm_oss.so
%files pulseaudio
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/README-pulse
-%config(noreplace) %{_sysconfdir}/alsa/pulse-default.conf
%{_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
%files samplerate
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/samplerate.txt
-%dir %{_sysconfdir}/alsa/pcm
-%config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-samplerate.conf
%{_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
@@ -223,15 +223,15 @@ rm -rf $RPM_BUILD_ROOT
%files upmix
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/upmix.txt
-%dir %{_sysconfdir}/alsa/pcm
-%config(noreplace) %{_sysconfdir}/alsa/pcm/upmix.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-upmix.conf
%{_libdir}/alsa-lib/libasound_module_pcm_upmix.so
%files vdownmix
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/vdownmix.txt
-%dir %{_sysconfdir}/alsa/pcm
-%config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/97-vdownmix.conf
%{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
%files usbstream
@@ -242,13 +242,15 @@ rm -rf $RPM_BUILD_ROOT
%files arcamav
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/README-arcam-av
-%config(noreplace) %{_sysconfdir}/alsa/pcm/arcamav.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-arcamav.conf
%{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so
%files speex
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt
-%config(noreplace) %{_sysconfdir}/alsa/pcm/speex.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/10-speex.conf
%{_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
@@ -257,12 +259,17 @@ rm -rf $RPM_BUILD_ROOT
%files maemo
%defattr(-,root,root,-)
%doc COPYING COPYING.GPL doc/README-maemo
-%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf
+%dir %{_datadir}/alsa/alsa.conf.d
+%config(noreplace) %{_datadir}/alsa/alsa.conf.d/98-maemo.conf
%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
%changelog
+* Wed Feb 1 2012 Jaroslav Kysela <jkysela at redhat.com> - 1.0.25-1
+- Updated to 1.0.25
+- Moved plugin specific configuration from /etc/alsa/pcm to /usr/share/alsa/alsa.conf.d
+
* Thu Jan 19 2012 Nikola Pajkovsky <npajkovs at redhat.com> - 1.0.24-4
- 761244 - please disable JACK for RHEL
diff --git a/sources b/sources
index 3ede6b6..dee95e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4d4c90e11ab9d1a117afbbc1edd2b16 alsa-plugins-1.0.24.tar.bz2
+038c023eaa51171f018fbf7141255185 alsa-plugins-1.0.25.tar.bz2
More information about the scm-commits
mailing list