rpms/alsa-plugins/F-8 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 alsa-plugins.spec, 1.6, 1.7 sources, 1.2, 1.3

[Eric Moret (emoret)]

Author: emoret

Update of /cvs/pkgs/rpms/alsa-plugins/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27996/F-8

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Added Files:
	1.0.14-pulse-SND_PCM_STATE_PREPARED.patch 
Log Message:
- Update to upstream 1.0.15 (#429249)
- Add "Requires: pulseaudio" to alsa-plugins-pulseaudio (#368891)
- Fix pulse_hw_params() when state is SND_PCM_STATE_PREPARED (#428030)
- run /sbin/ldconfig on post and postun macros



1.0.14-pulse-SND_PCM_STATE_PREPARED.patch:

--- NEW FILE 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch ---
diff -up alsa-plugins-1.0.14/pulse/pcm_pulse.c.pulse alsa-plugins-1.0.14/pulse/pcm_pulse.c
--- alsa-plugins-1.0.14/pulse/pcm_pulse.c.pulse	2008-01-08 09:34:40.000000000 -1000
+++ alsa-plugins-1.0.14/pulse/pcm_pulse.c	2008-01-08 09:38:25.000000000 -1000
@@ -512,14 +512,16 @@ finish:
 static int pulse_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params)
 {
     snd_pcm_pulse_t *pcm = io->private_data;
+    snd_pcm_t *base = io->pcm;
 	int err = 0;
 
     assert(pcm);
     assert(pcm->p);
 
-    pa_threaded_mainloop_lock(pcm->p->mainloop);
+    if (!(base && snd_pcm_state(base) == SND_PCM_STATE_PREPARED))
+	assert(!pcm->stream);
 
-    assert(!pcm->stream);
+    pa_threaded_mainloop_lock(pcm->p->mainloop);
 
     pcm->frame_size = (snd_pcm_format_physical_width(io->format) * io->channels) / 8;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Aug 2007 05:40:33 -0000	1.2
+++ .cvsignore	19 Jan 2008 08:03:49 -0000	1.3
@@ -1 +1 @@
-alsa-plugins-1.0.14.tar.bz2
+alsa-plugins-1.0.15.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-8/alsa-plugins.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsa-plugins.spec	18 Oct 2007 12:52:05 -0000	1.6
+++ alsa-plugins.spec	19 Jan 2008 08:03:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
-Version:        1.0.14
-Release:        6%{?dist}
+Version:        1.0.15
+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+
@@ -12,9 +12,10 @@
 Source4:        samplerate.conf
 Source5:        upmix.conf
 Source6:        vdownmix.conf
-Source7:	pulse-default.conf
-Patch0:		1.0.14-buffer-attr.patch
-Patch1:		1.0.14-state-xrun.patch
+Source7:        pulse-default.conf
+Patch0:         1.0.14-buffer-attr.patch
+Patch1:         1.0.14-state-xrun.patch
+Patch2:         1.0.14-pulse-SND_PCM_STATE_PREPARED.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -54,6 +55,7 @@
 
 %package pulseaudio
 BuildRequires:  pulseaudio-lib-devel
+Requires:       pulseaudio
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -97,6 +99,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .buffer_attr
 %patch1 -p1 -b .state_xrun
+%patch2 -p1 -b .pulse-SND_PCM_STATE_PREPARED
 
 %build
 %configure --disable-static \
@@ -123,6 +126,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files jack
 %defattr(-,root,root,-)
 %doc COPYING COPYING.GPL doc/README-jack
@@ -166,6 +173,12 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Fri Jan 18 2008 Eric Moret <eric.moret at epita.fr> - 1.0.15-1
+- Update to upstream 1.0.15 (#429249)
+- Add "Requires: pulseaudio" to alsa-plugins-pulseaudio (#368891)
+- Fix pulse_hw_params() when state is SND_PCM_STATE_PREPARED (#428030)
+- run /sbin/ldconfig on post and postun macros
+
 * Thu Oct 18 2007 Lennart Poettering <lpoetter at redhat.com> - 1.0.14-6
 - Merge the whole /etc/alsa/pcm/pulseaudio.conf stuff into
   /etc/alsa/pulse-default.conf, because the former is practically


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Aug 2007 05:40:33 -0000	1.2
+++ sources	19 Jan 2008 08:03:49 -0000	1.3
@@ -1 +1 @@
-fa678da6b91c9f3c7204bc8d14e5b53f  alsa-plugins-1.0.14.tar.bz2
+908c2dd7ec33bc8e1fcd5e92c7e5e125  alsa-plugins-1.0.15.tar.bz2