rpms/alsa-plugins/devel alsa-plugins-1.0.16-pulseclose.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 alsa-plugins.spec, 1.10, 1.11 sources, 1.3, 1.4 1.0.14-buffer-attr.patch, 1.1, NONE 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch, 1.1, NONE 1.0.14-state-xrun.patch, 1.1, NONE

Lubomir Kundrak (lkundrak) fedora-extras-commits at redhat.com
Sat Mar 8 15:01:28 UTC 2008


Author: lkundrak

Update of /cvs/pkgs/rpms/alsa-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25699/devel

Modified Files:
	.cvsignore alsa-plugins.spec sources 
Added Files:
	alsa-plugins-1.0.16-pulseclose.patch 
Removed Files:
	1.0.14-buffer-attr.patch 
	1.0.14-pulse-SND_PCM_STATE_PREPARED.patch 
	1.0.14-state-xrun.patch 
Log Message:
Fix pidgin crash

alsa-plugins-1.0.16-pulseclose.patch:

--- NEW FILE alsa-plugins-1.0.16-pulseclose.patch ---
If stream connection failes, don't assume that stream is connected upon closing.

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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jan 2008 08:00:22 -0000	1.3
+++ .cvsignore	8 Mar 2008 15:00:45 -0000	1.4
@@ -1 +1 @@
-alsa-plugins-1.0.15.tar.bz2
+alsa-plugins-1.0.16.tar.bz2


Index: alsa-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/alsa-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- alsa-plugins.spec	4 Mar 2008 18:16:56 -0000	1.10
+++ alsa-plugins.spec	8 Mar 2008 15:00:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           alsa-plugins
-Version:        1.0.15
-Release:        4%{?dist}
+Version:        1.0.16
+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+
@@ -13,10 +13,8 @@
 Source5:        upmix.conf
 Source6:        vdownmix.conf
 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
 Patch3:         alsa-plugins-1.0.15-pulsehint.patch
+Patch4:         alsa-plugins-1.0.16-pulseclose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -98,10 +96,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .buffer_attr
-%patch1 -p1 -b .state_xrun
-%patch2 -p1 -b .pulse-SND_PCM_STATE_PREPARED
 %patch3 -p1 -b .pulsehint
+%patch4 -p1 -b .pulseclose
 
 %build
 %configure --disable-static \
@@ -175,6 +171,10 @@
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Sat Mar 08 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1.0.16-1
+- New upstream, dropping upstreamed patches
+- Do not assert fail when pulseaudio is unavailable (#435148)
+
 * Tue Mar 04 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1.0.15-4
 - Be more heplful when there's PulseAudio trouble.
 - This may save us some bogus bug reports


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-plugins/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jan 2008 08:00:22 -0000	1.3
+++ sources	8 Mar 2008 15:00:45 -0000	1.4
@@ -1 +1 @@
-908c2dd7ec33bc8e1fcd5e92c7e5e125  alsa-plugins-1.0.15.tar.bz2
+5906aff0d0dc84dee9624d395db4cfc6  alsa-plugins-1.0.16.tar.bz2


--- 1.0.14-buffer-attr.patch DELETED ---


--- 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch DELETED ---


--- 1.0.14-state-xrun.patch DELETED ---




More information about the fedora-extras-commits mailing list