rpms/alsa-plugins/F-8 alsa-plugins-1.0.15-pulseclose.patch, NONE, 1.1 alsa-plugins.spec, 1.9, 1.10

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	alsa-plugins.spec 
Added Files:
	alsa-plugins-1.0.15-pulseclose.patch 
Log Message:
* Wed Mar 26 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1.0.15-3.1
- Merge the pulseaudio assert fix from devel


alsa-plugins-1.0.15-pulseclose.patch:

--- NEW FILE alsa-plugins-1.0.15-pulseclose.patch ---
If stream connection failes, don't assume that stream is connected upon closing.
Lubomir Kundrak <lkundrak at redhat.com>

diff -urp alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c alsa-plugins-1.0.16/pulse/pcm_pulse.c
--- alsa-plugins-1.0.16.orig/pulse/pcm_pulse.c	2008-02-05 10:25:00.000000000 +0100
+++ alsa-plugins-1.0.16/pulse/pcm_pulse.c	2008-03-08 14:33:43.000000000 +0100
@@ -112,12 +112,14 @@ static int pulse_stop(snd_pcm_ioplug_t *
 
     pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-    assert(pcm->stream);
-
     err = pulse_check_connection(pcm->p);
     if (err < 0)
         goto finish;
 
+    /* If stream connection fails, this gets called anyway */
+    if (pcm->stream == NULL)
+        goto finish;
+
     o = pa_stream_flush(pcm->stream, pulse_stream_success_cb, pcm->p);
     assert(o);
 


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/F-8/alsa-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alsa-plugins.spec	19 Mar 2008 19:57:19 -0000	1.9
+++ alsa-plugins.spec	26 Mar 2008 09:38:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
 Version:        1.0.15
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
 License:        GPLv2+ and LGPLv2+
@@ -16,6 +16,7 @@
 Patch0:         1.0.14-buffer-attr.patch
 Patch1:         1.0.14-state-xrun.patch
 Patch2:         1.0.14-pulse-SND_PCM_STATE_PREPARED.patch
+Patch3:         alsa-plugins-1.0.15-pulseclose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -100,6 +101,7 @@
 %patch0 -p1 -b .buffer_attr
 %patch1 -p1 -b .state_xrun
 %patch2 -p1 -b .pulse-SND_PCM_STATE_PREPARED
+%patch3 -p1 -b .pulseclose
 
 %build
 %configure --disable-static \
@@ -173,6 +175,9 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Wed Mar 26 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1.0.15-3.1
+- Merge the pulseaudio assert fix from devel
+
 * Wed Mar 19 2008 Eric Moret <eric.moret at gmail.com> - 1.0.15-3
 - Fix jack.conf (#435343)