dist-git conversion

#2781)

.cvsignore

@@ -1,3 +0,0 @@
-alsa-plugins-1.0.16.tar.bz2
-alsa-plugins-1.0.17.tar.bz2
-alsa-plugins-1.0.18rc3.tar.bz2

.gitignore

@@ -0,0 +1 @@
+alsa-plugins-1.0.21.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: alsa-plugins
-# $Id$
-NAME := alsa-plugins
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

alsa-plugins.spec

@@ -1,21 +1,21 @@
-%define		prever		rc3
-%define		prever_dot	.%{prever}
-
 Name:           alsa-plugins
-Version:        1.0.18
+Version:        1.0.21
-Release:        1%{?prever_dot}%{?dist}
+Release:        3%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.alsa-project.org/
-Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}%{?prever}.tar.bz2
+Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
 Source1:        jack.conf
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -27,6 +27,7 @@ functionality to the Linux operating system.
 This package includes plugins for ALSA.
 
 %package jack
+Requires:       alsa-utils
 Requires:       jack-audio-connection-kit
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
@@ -36,13 +37,10 @@ License:        LGPLv2+
 This plugin converts the ALSA API over JACK (Jack Audio Connection
 Kit, http://jackit.sf.net) API.  ALSA native applications can work
 transparently together with jackd for both playback and capture.
-
-    ALSA apps (playback) -> ALSA-lib -> JACK plugin -> JACK daemon
-    ALSA apps (capture) <- ALSA-lib <- JACK plugin <- JACK daemon
-
 This plugin provides the PCM type "jack"
 
 %package oss
+Requires:       alsa-utils
 BuildRequires:  alsa-lib-devel
 Summary:        Oss PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -54,8 +52,9 @@ ALSA native apps can run on OSS drivers.
 This plugin provides the PCM type "oss".
 
 %package pulseaudio
-BuildRequires:  pulseaudio-lib-devel
+Requires:       alsa-utils
 Requires:       pulseaudio
+BuildRequires:  pulseaudio-lib-devel
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -66,6 +65,7 @@ sound across a network. There are two plugins in the suite, one for PCM and
 one for mixer control.
 
 %package samplerate
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        External rate converter plugin for ALSA
 Group:          System Environment/Libraries
@@ -75,6 +75,7 @@ This plugin is an external rate converter using libsamplerate by Erik de
 Castro Lopo.
 
 %package upmix
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        Upmixer channel expander plugin for ALSA
 Group:          System Environment/Libraries
@@ -85,6 +86,7 @@ The upmix plugin is an easy-to-use plugin for upmixing to 4 or
 by the slave PCM or explicitly via channel option.
 
 %package vdownmix
+Requires:       alsa-utils
 BuildRequires:  libsamplerate-devel
 Summary:        Downmixer to stereo plugin for ALSA
 Group:          System Environment/Libraries
@@ -103,12 +105,43 @@ License:        LGPLv2+
 The usbstream plugin is for snd-usb-us122l driver. It converts PCM
 stream to USB specific stream.
 
+%package arcamav
+Summary:        Arcam AV amplifier plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description arcamav
+This plugin exposes the controls for an Arcam AV amplifier
+(see: http://www.arcam.co.uk/) as an ALSA mixer device.
+
+%package speex
+Requires:       speex
+BuildRequires:  speex-devel
+Summary:        Rate Converter Plugin Using Speex Resampler
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description speex
+The rate plugin is an external rate converter using the Speex resampler
+(aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
+pre-processing of a mono stream like denoise using libspeex DSP API.
+
+%package maemo
+BuildRequires:  alsa-lib-devel = %{version}
+BuildRequires:  dbus-devel
+Summary:        Maemo plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description maemo
+This plugin converts the ALSA API over PCM task nodes protocol. In this way,
+ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
+
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
 %build
 %configure --disable-static \
-           --without-speex
+           --with-speex=lib \
+           --enable-maemo-plugin \
+           --enable-maemo-resource-manager
 make %{?_smp_mflags}
 
 %install
@@ -116,18 +149,21 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-install -m 644 %SOURCE1 %SOURCE2 \
+install -m 644 %SOURCE1 \
-               %SOURCE4 %SOURCE5 %SOURCE6 \
+               %SOURCE2 \
-                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+               %SOURCE3 \
+               %SOURCE4 \
+               %SOURCE5 \
+               %SOURCE6 \
+               %SOURCE8 \
+               %SOURCE9 \
+               ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+# pulseaudio configuration file
 install -m 644 %SOURCE7 \
-                   ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
+               ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
-# Removing the maemo plugins
-find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \
-                        -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \;
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -138,12 +174,14 @@ 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
 %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
 
 %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
 %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %{_libdir}/alsa-lib/libasound_module_pcm_oss.so
@@ -159,6 +197,7 @@ rm -rf $RPM_BUILD_ROOT
 %files samplerate
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/samplerate.txt
+%dir %{_sysconfdir}/alsa/pcm
 %config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so
@@ -169,12 +208,14 @@ 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
 %{_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
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
@@ -183,7 +224,69 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYING.GPL
 %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
 
+%files arcamav
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-arcam-av
+%config(noreplace) %{_sysconfdir}/alsa/pcm/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
+%{_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
+%{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so
+
+%files maemo
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-maemo
+%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf
+%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
+%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
+
+
 %changelog
+* Mon Sep 7 2009 Eric Moret <eric.moret@gmail.com> - 1.0.21-3
+- Added arcamav.conf and speex.conf missing in F-10 branch
+
+* Mon Sep 7 2009 Eric Moret <eric.moret@gmail.com> - 1.0.21-2
+- Added missing dbus-devel dependency to maemo subpackage
+
+* Mon Sep 7 2009 Eric Moret <eric.moret@gmail.com> - 1.0.21-1
+- Updated to 1.0.21
+- Patch clean up
+- Added maemo subpackage
+
+* Tue Aug 4 2009 Lennart Poettering <lpoetter@redhat.com> - 1.0.20-5
+- Add a couple of more clean up patches for the pulse plugin
+
+* Fri Jul 31 2009 Lennart Poettering <lpoetter@redhat.com> - 1.0.20-4
+- Add a couple of clean up patches for the pulse plugin
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 24 2009 Eric Moret <eric.moret@gmail.com> - 1.0.20-2
+- Added speex subpackage
+- Removed ascii-art from jack's plugin description
+
+* Fri May 8 2009 Eric Moret <eric.moret@gmail.com> - 1.0.20-1
+- Updated to 1.0.20
+- Added arcam-av subpackage
+
+* Fri Apr 24 2009 Eric Moret <eric.moret@gmail.com> - 1.0.19-1
+- Updated to 1.0.19
+- Added Requires: alsa-utils to address #483322
+- Added dir {_sysconfdir}/alsa/pcm to address #483322
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 28 2008 Eric Moret <eric.moret@gmail.com> - 1.0.18-2
+- Updated to 1.0.18 final
+
 * Thu Sep 11 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.18-1.rc3
 - Updated to 1.0.18rc3
 - Added usbstream subpackage

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

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"]
+}

sources

@@ -1 +1 @@
-e3b7bcd92d1bb380d7de13e61af996e9  alsa-plugins-1.0.18rc3.tar.bz2
+392d016c0948c54978c0505f24271e01  alsa-plugins-1.0.21.tar.bz2

speex.conf

@@ -0,0 +1,11 @@
+# samplerate plugin configuration
+# $Id: speex.conf,v 1.1 2009/07/03 00:50:10 emoret Exp $
+
+pcm.my_rate {
+	type rate
+	slave.pcm "hw"
+	converter "speexrate"
+	hint {
+		description "Rate Converter Plugin Using Speex Resampler"
+	}
+}