Mon Sep 7 23:54:29 UTC 2009

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24665

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Added Files:
	maemo.conf 
Removed Files:
	0001-alsa-plugins-pulse-Implement-pause.patch 
	0002-pulse-get-rid-of-a-number-of-assert-s.patch 
	0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch 
	0004-pulse-unify-destruction-of-snd_pulse_t.patch 
	0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch 
	0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch 
	0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch 
	0008-pulse-get-rid-of-redundant-state-variable.patch 
	0009-pulse-unify-stream-context-state-checks.patch 
	0010-pulse-rework-object-destruction-paths-a-bit.patch 
	0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch 
Log Message:
Updated to 1.0.21
Patch clean up
Added maemo subpackage

--- NEW FILE maemo.conf ---
# 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"]
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	9 May 2009 05:51:46 -0000	1.9
+++ .cvsignore	7 Sep 2009 23:54:27 -0000	1.10
@@ -1 +1 @@
-alsa-plugins-1.0.20.tar.bz2
+alsa-plugins-1.0.21.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- alsa-plugins.spec	4 Aug 2009 22:15:24 -0000	1.26
+++ alsa-plugins.spec	7 Sep 2009 23:54:28 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
-Version:        1.0.20
-Release:        5%{?dist}
+Version:        1.0.21
+Release:        1%{?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+
@@ -15,18 +15,8 @@ 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)
-Patch1:		0001-alsa-plugins-pulse-Implement-pause.patch
-Patch2:		0002-pulse-get-rid-of-a-number-of-assert-s.patch
-Patch3:		0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch
-Patch4:		0004-pulse-unify-destruction-of-snd_pulse_t.patch
-Patch5:		0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch
-Patch6:		0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch
-Patch7:		0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch
-Patch8:		0008-pulse-get-rid-of-redundant-state-variable.patch
-Patch9:		0009-pulse-unify-stream-context-state-checks.patch
-Patch10:	0010-pulse-rework-object-destruction-paths-a-bit.patch
-Patch11:	0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch
 
 BuildRequires:  alsa-lib-devel
 
@@ -37,7 +27,8 @@ functionality to the Linux operating sys
 This package includes plugins for ALSA.
 
 %package jack
-Requires:       jack-audio-connection-kit, alsa-utils
+Requires:       alsa-utils
+Requires:       jack-audio-connection-kit
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -61,7 +52,8 @@ ALSA native apps can run on OSS drivers.
 This plugin provides the PCM type "oss".
 
 %package pulseaudio
-Requires:       pulseaudio, alsa-utils
+Requires:       alsa-utils
+Requires:       pulseaudio
 BuildRequires:  pulseaudio-lib-devel
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
@@ -132,23 +124,23 @@ The rate plugin is an external rate conv
 (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}
+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}
-%patch1 -p1 
-%patch2 -p1 
-%patch3 -p1 
-%patch4 -p1 
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 %configure --disable-static \
-           --with-speex=lib
+           --with-speex=lib \
+           --enable-maemo-plugin \
+           --enable-maemo-resource-manager
 make %{?_smp_mflags}
 
 %install
@@ -156,20 +148,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 \
-               %SOURCE3 %SOURCE4 \
-               %SOURCE5 %SOURCE6 \
+install -m 644 %SOURCE1 \
+               %SOURCE2 \
+               %SOURCE3 \
+               %SOURCE4 \
+               %SOURCE5 \
+               %SOURCE6 \
                %SOURCE8 \
+               %SOURCE9 \
                ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+# pulseaudio configuration file
 install -m 644 %SOURCE7 \
                ${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
 
@@ -245,8 +238,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_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 at gmail.com> - 1.0.21-1
+- Updated to 1.0.21
+- Patch clean up
+- Added maemo subpackage
+
 * Tue Aug 4 2009 Lennart Poettering <lpoetter at redhat.com> - 1.0.20-5
 - Add a couple of more clean up patches for the pulse plugin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 May 2009 05:51:46 -0000	1.9
+++ sources	7 Sep 2009 23:54:28 -0000	1.10
@@ -1 +1 @@
-819c4f21e3e913eacefd32993a8fbed7  alsa-plugins-1.0.20.tar.bz2
+392d016c0948c54978c0505f24271e01  alsa-plugins-1.0.21.tar.bz2


--- 0001-alsa-plugins-pulse-Implement-pause.patch DELETED ---


--- 0002-pulse-get-rid-of-a-number-of-assert-s.patch DELETED ---


--- 0003-pulse-use-PA_CONTEXT_IS_GOOD-where-applicable.patch DELETED ---


--- 0004-pulse-unify-destruction-of-snd_pulse_t.patch DELETED ---


--- 0005-pulse-call-pa_threaded_mainloop_wait-to-handle-spuri.patch DELETED ---


--- 0006-pulse-replace-manual-mainloop-by-pa_mainloop_iterate.patch DELETED ---


--- 0007-pulse-move-a-couple-of-PCM-related-functions-from-pu.patch DELETED ---


--- 0008-pulse-get-rid-of-redundant-state-variable.patch DELETED ---


--- 0009-pulse-unify-stream-context-state-checks.patch DELETED ---


--- 0010-pulse-rework-object-destruction-paths-a-bit.patch DELETED ---


--- 0011-pulse-immediately-trigger-EIO-when-connection-is-dro.patch DELETED ---


