From c0b183c5c4e8fb61d889e7aa8bb85487f124f6f1 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Feb 01 2012 09:46:06 +0000 Subject: updated to 1.0.25 --- 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/10-samplerate.conf b/10-samplerate.conf new file mode 100644 index 0000000..8bf7b9a --- /dev/null +++ b/10-samplerate.conf @@ -0,0 +1,11 @@ +# 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 new file mode 100644 index 0000000..c4f23e3 --- /dev/null +++ b/10-speex.conf @@ -0,0 +1,11 @@ +# 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 new file mode 100644 index 0000000..534663a --- /dev/null +++ b/50-arcamav.conf @@ -0,0 +1,10 @@ +# 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 new file mode 100644 index 0000000..e74f5fc --- /dev/null +++ b/50-jack.conf @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 0000000..b5aac44 --- /dev/null +++ b/50-pcm-oss.conf @@ -0,0 +1,9 @@ +# 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 new file mode 100644 index 0000000..e15055e --- /dev/null +++ b/50-upmix.conf @@ -0,0 +1,10 @@ +# 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 new file mode 100644 index 0000000..95786b8 --- /dev/null +++ b/97-vdownmix.conf @@ -0,0 +1,18 @@ +# 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 new file mode 100644 index 0000000..737890f --- /dev/null +++ b/98-maemo.conf @@ -0,0 +1,13 @@ +# 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 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 - 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 - 1.0.24-4 - 761244 - please disable JACK for RHEL diff --git a/arcamav.conf b/arcamav.conf deleted file mode 100644 index 534663a..0000000 --- a/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/jack.conf b/jack.conf deleted file mode 100644 index e74f5fc..0000000 --- a/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/maemo.conf b/maemo.conf deleted file mode 100644 index 737890f..0000000 --- a/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/pcm-oss.conf b/pcm-oss.conf deleted file mode 100644 index b5aac44..0000000 --- a/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/pulse-default.conf b/pulse-default.conf deleted file mode 100644 index a84bede..0000000 --- a/pulse-default.conf +++ /dev/null @@ -1,35 +0,0 @@ -# PulseAudio plugin configuration -# $Id$ - -# Let's create a virtual device "pulse" for mixer and PCM - -pcm.pulse { - type pulse - hint { - description "PulseAudio Sound Server" - } -} - -ctl.pulse { - type pulse - hint { - description "PulseAudio Sound Server" - } -} - -# Let's make it the default! - -pcm.!default { - type pulse - hint { - description "Default" - } -} - -ctl.!default { - type pulse - hint { - description "Default" - } -} - diff --git a/samplerate.conf b/samplerate.conf deleted file mode 100644 index 8bf7b9a..0000000 --- a/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/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 diff --git a/speex.conf b/speex.conf deleted file mode 100644 index c4f23e3..0000000 --- a/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/upmix.conf b/upmix.conf deleted file mode 100644 index e15055e..0000000 --- a/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/vdownmix.conf b/vdownmix.conf deleted file mode 100644 index 95786b8..0000000 --- a/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" - } -}