updated to 1.0.25

This commit is contained in:
Jaroslav Kysela 2012-02-01 10:46:06 +01:00
parent b7ad7e8cfe
commit c0b183c5c4
12 changed files with 41 additions and 68 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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@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@redhat.com> - 1.0.24-4
- 761244 - please disable JACK for RHEL

View File

@ -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"
}
}

View File

@ -1 +1 @@
e4d4c90e11ab9d1a117afbbc1edd2b16 alsa-plugins-1.0.24.tar.bz2
038c023eaa51171f018fbf7141255185 alsa-plugins-1.0.25.tar.bz2