dist-git conversion

#2781)

.cvsignore

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

.gitignore

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

1.0.14-pulse-SND_PCM_STATE_PREPARED.patch

@@ -0,0 +1,22 @@
+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;
+ 

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-1.0.15-pulseclose.patch

@@ -0,0 +1,23 @@
+If stream connection failes, don't assume that stream is connected upon closing.
+Lubomir Kundrak <lkundrak@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);
+ 

alsa-plugins.spec

@@ -1,6 +1,6 @@
 Name:           alsa-plugins
-Version:        1.0.14
-Release:        6%{?dist}
+Version:        1.0.15
+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+
@@ -12,9 +12,11 @@ Source2:        pcm-oss.conf
 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
+Patch3:         alsa-plugins-1.0.15-pulseclose.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -54,6 +56,7 @@ This plugin provides the PCM type "oss".
 
 %package pulseaudio
 BuildRequires:  pulseaudio-lib-devel
+Requires:       pulseaudio
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -97,6 +100,8 @@ surround".
 %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 .pulseclose
 
 %build
 %configure --disable-static \
@@ -123,6 +128,10 @@ find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \
 %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 +175,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 %changelog
+* Wed Mar 26 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.0.15-3.1
+- Merge the pulseaudio assert fix from devel
+
+* Wed Mar 19 2008 Eric Moret <eric.moret@gmail.com> - 1.0.15-3
+- Fix jack.conf (#435343)
+
+* Fri Jan 18 2008 Eric Moret <eric.moret@epita.fr> - 1.0.15-2
+- 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@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

jack.conf

@@ -4,10 +4,10 @@ pcm.jack {
 	type jack
 	playback_ports {
 		0 alsa_pcm:playback_1
-		1 alsa_pcm:playback_1
+		1 alsa_pcm:playback_2
 	}
 	capture_ports {
 		0 alsa_pcm:capture_1
-		1 alsa_pcm:pcapture_1
+		1 alsa_pcm:capture_2
 	}
 }

sources

@@ -1 +1 @@
-fa678da6b91c9f3c7204bc8d14e5b53f  alsa-plugins-1.0.14.tar.bz2
+908c2dd7ec33bc8e1fcd5e92c7e5e125  alsa-plugins-1.0.15.tar.bz2