From eb4a7cb47f78fbda34976d0e0549d9c77febe40c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 03:57:22 +0000 Subject: [PATCH 1/7] Initialize branch F-8 for alsa-plugins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From cc2ded432b0a8bad138794d971b5c925afbde690 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Sat, 19 Jan 2008 08:03:49 +0000 Subject: [PATCH 2/7] - 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 --- .cvsignore | 2 +- 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch | 22 ++++++++++++++++++++++ alsa-plugins.spec | 23 ++++++++++++++++++----- sources | 2 +- 4 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 1.0.14-pulse-SND_PCM_STATE_PREPARED.patch diff --git a/.cvsignore b/.cvsignore index 10f8af9..2ebeeb4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alsa-plugins-1.0.14.tar.bz2 +alsa-plugins-1.0.15.tar.bz2 diff --git a/1.0.14-pulse-SND_PCM_STATE_PREPARED.patch b/1.0.14-pulse-SND_PCM_STATE_PREPARED.patch new file mode 100644 index 0000000..56959d8 --- /dev/null +++ b/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; + diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 74ccc0b..3af2c9f 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -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 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -54,6 +55,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 +99,7 @@ surround". %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 @@ 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 +173,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Fri Jan 18 2008 Eric Moret - 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 - 1.0.14-6 - Merge the whole /etc/alsa/pcm/pulseaudio.conf stuff into /etc/alsa/pulse-default.conf, because the former is practically diff --git a/sources b/sources index 32b24ee..84280ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa678da6b91c9f3c7204bc8d14e5b53f alsa-plugins-1.0.14.tar.bz2 +908c2dd7ec33bc8e1fcd5e92c7e5e125 alsa-plugins-1.0.15.tar.bz2 From 9e2204b9fd4c832606fd4780cf24ccb42caaed5b Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Sat, 19 Jan 2008 08:41:14 +0000 Subject: [PATCH 3/7] Release update --- alsa-plugins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 3af2c9f..fa147f7 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.15 -Release: 1%{?dist} +Release: 2%{?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+ @@ -173,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog -* Fri Jan 18 2008 Eric Moret - 1.0.15-1 +* Fri Jan 18 2008 Eric Moret - 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) From 4fe5f4f68752e2d0dcd8929afc426516db0a5b62 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Wed, 19 Mar 2008 19:57:19 +0000 Subject: [PATCH 4/7] Fix jack.conf --- alsa-plugins.spec | 5 ++++- jack.conf | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/alsa-plugins.spec b/alsa-plugins.spec index fa147f7..a3cb991 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.15 -Release: 2%{?dist} +Release: 3%{?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+ @@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Wed Mar 19 2008 Eric Moret - 1.0.15-3 +- Fix jack.conf (#435343) + * Fri Jan 18 2008 Eric Moret - 1.0.15-2 - Update to upstream 1.0.15 (#429249) - Add "Requires: pulseaudio" to alsa-plugins-pulseaudio (#368891) diff --git a/jack.conf b/jack.conf index 3252405..32c5e59 100644 --- a/jack.conf +++ b/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 } } From b39f3d5428b3a8993dd0e535c41b1d822a0a2ba9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 26 Mar 2008 09:38:39 +0000 Subject: [PATCH 5/7] - Merge the pulseaudio assert fix from devel --- alsa-plugins-1.0.15-pulseclose.patch | 23 +++++++++++++++++++++++ alsa-plugins.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 alsa-plugins-1.0.15-pulseclose.patch diff --git a/alsa-plugins-1.0.15-pulseclose.patch b/alsa-plugins-1.0.15-pulseclose.patch new file mode 100644 index 0000000..87bb659 --- /dev/null +++ b/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 + +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); + diff --git a/alsa-plugins.spec b/alsa-plugins.spec index a3cb991..421e632 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -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 @@ 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 @@ -100,6 +101,7 @@ surround". %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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Wed Mar 26 2008 Lubomir Kundrak - 1.0.15-3.1 +- Merge the pulseaudio assert fix from devel + * Wed Mar 19 2008 Eric Moret - 1.0.15-3 - Fix jack.conf (#435343) From 88874f9c541c684cbc10c9aa155d6a2e8b8e5ee5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:53 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 36d8f08..b654d76 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alsa-plugins -# $Id$ +# $Id: Makefile,v 1.1 2007/08/07 23:46:58 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From df14212f336d2b86bfab9dff30c0bff99de88bd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:16 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b654d76..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-plugins -# $Id: Makefile,v 1.1 2007/08/07 23:46:58 kevin Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8