diff --git a/.cvsignore b/.cvsignore index 6755293..dbb252e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ alsa-plugins-1.0.16.tar.bz2 alsa-plugins-1.0.17.tar.bz2 +alsa-plugins-1.0.18rc3.tar.bz2 diff --git a/alsa-plugins-1.0.15-pulsehint.patch b/alsa-plugins-1.0.15-pulsehint.patch deleted file mode 100644 index 1a7c990..0000000 --- a/alsa-plugins-1.0.15-pulsehint.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- alsa-plugins-1.0.15/pulse/pulse.c.orig 2008-03-04 18:56:22.000000000 +0100 -+++ alsa-plugins-1.0.15/pulse/pulse.c 2008-03-04 18:58:33.000000000 +0100 -@@ -204,7 +204,10 @@ int pulse_connect(snd_pulse_t *p, const - return 0; - - error: -- fprintf(stderr, "*** PULSEAUDIO: Unable to connect: %s\n", -+ fprintf(stderr, -+ "*** PULSEAUDIO: Unable to connect: %s\n" -+ "*** Is your sound server running?\n" -+ "*** See: http://www.pulseaudio.org/wiki/Troubleshooting\n", - pa_strerror(pa_context_errno(p->context))); - - pa_threaded_mainloop_unlock(p->mainloop); diff --git a/alsa-plugins-1.0.17-pulsenoassert.patch b/alsa-plugins-1.0.17-pulsenoassert.patch deleted file mode 100644 index ff736b7..0000000 --- a/alsa-plugins-1.0.17-pulsenoassert.patch +++ /dev/null @@ -1,72 +0,0 @@ -From cf23b804e022e6d9c0e1894fed887a735963a127 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Wed, 16 Jul 2008 15:15:42 +0200 -Subject: [PATCH] pulse - Returns errors instead of assert() - -Some sanity checks in pcm_pulse.c with assert() causes the program to -abort unexpectedly when the pulseaudio daemon is dead. This is -suboptimal. Examples: - https://bugzilla.novell.com/show_bug.cgi?id=409532 - -Now fixed to return an error instead. - -Signed-off-by: Takashi Iwai ---- - pulse/pcm_pulse.c | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c -index e4a6232..efff509 100644 ---- a/pulse/pcm_pulse.c -+++ b/pulse/pcm_pulse.c -@@ -83,7 +83,10 @@ static int pulse_start(snd_pcm_ioplug_t *io) - goto finish; - - o = pa_stream_cork(pcm->stream, 0, pulse_stream_success_cb, pcm->p); -- assert(o); -+ if (!o) { -+ err = -EIO; -+ goto finish; -+ } - - err = pulse_wait_operation(pcm->p, o); - -@@ -122,7 +125,10 @@ static int pulse_stop(snd_pcm_ioplug_t *io) - goto finish; - - o = pa_stream_flush(pcm->stream, pulse_stream_success_cb, pcm->p); -- assert(o); -+ if (!o) { -+ err = -EIO; -+ goto finish; -+ } - - err = pulse_wait_operation(pcm->p, o); - -@@ -134,7 +140,10 @@ static int pulse_stop(snd_pcm_ioplug_t *io) - } - - o = pa_stream_cork(pcm->stream, 1, pulse_stream_success_cb, pcm->p); -- assert(o); -+ if (!o) { -+ err = -EIO; -+ goto finish; -+ } - - err = pulse_wait_operation(pcm->p, o); - -@@ -169,7 +178,10 @@ int pulse_drain(snd_pcm_ioplug_t *io) - goto finish; - - o = pa_stream_drain(pcm->stream, pulse_stream_success_cb, pcm->p); -- assert(o); -+ if (!o) { -+ err = -EIO; -+ goto finish; -+ } - - err = pulse_wait_operation(pcm->p, o); - --- -1.5.5.1 - diff --git a/alsa-plugins-1.0.17-pulsetrigger.patch b/alsa-plugins-1.0.17-pulsetrigger.patch deleted file mode 100644 index a893986..0000000 --- a/alsa-plugins-1.0.17-pulsetrigger.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 90c32999189cf6f5c63f40dadb8076eca379713b Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Fri, 18 Jul 2008 21:45:47 +0200 -Subject: [PATCH] send both an uncork and a trigger in _start() - -Heya! - -Here's a patch for alsa-plugins: - -When playing very short streams, the pulse plugin needs call -pa_stream_trigger() in snd_pcm_start() to make sure the stream is -actually started, in addition to uncorking the stream. - -Lennart - -Signed-off-by: Takashi Iwai ---- - pulse/pcm_pulse.c | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c -index efff509..7edd157 100644 ---- a/pulse/pcm_pulse.c -+++ b/pulse/pcm_pulse.c -@@ -67,8 +67,8 @@ static void update_ptr(snd_pcm_pulse_t *pcm) - static int pulse_start(snd_pcm_ioplug_t *io) - { - snd_pcm_pulse_t *pcm = io->private_data; -- pa_operation *o; -- int err = 0; -+ pa_operation *o, *u; -+ int err = 0, err_o = 0, err_u = 0; - - assert(pcm); - assert(pcm->p); -@@ -88,11 +88,20 @@ static int pulse_start(snd_pcm_ioplug_t *io) - goto finish; - } - -- err = pulse_wait_operation(pcm->p, o); -+ u = pa_stream_trigger(pcm->stream, pulse_stream_success_cb, pcm->p); -+ if (!u) { -+ pa_operation_unref(o); -+ err = -EIO; -+ goto finish; -+ } -+ -+ err_o = pulse_wait_operation(pcm->p, o); -+ err_u = pulse_wait_operation(pcm->p, u); - - pa_operation_unref(o); -+ pa_operation_unref(u); - -- if (err < 0) { -+ if (err_o < 0 || err_u < 0) { - err = -EIO; - goto finish; - } else -@@ -543,7 +552,7 @@ static int pulse_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params) - break; - } - } -- -+ - pa_threaded_mainloop_lock(pcm->p->mainloop); - - pcm->frame_size = (snd_pcm_format_physical_width(io->format) * io->channels) / 8; -@@ -761,7 +770,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) - pcm->io.callback = stream == SND_PCM_STREAM_PLAYBACK ? - &pulse_playback_callback : &pulse_capture_callback; - pcm->io.private_data = pcm; -- -+ - err = snd_pcm_ioplug_create(&pcm->io, name, stream, mode); - if (err < 0) - goto error; --- -1.5.5.1 - diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 5842e44..29e9483 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,21 +1,21 @@ +%define prever rc3 +%define prever_dot .%{prever} + Name: alsa-plugins -Version: 1.0.17 -Release: 1%{?dist} +Version: 1.0.18 +Release: 1%{?prever_dot}%{?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+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ -Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}%{?prever}.tar.bz2 Source1: jack.conf Source2: pcm-oss.conf Source4: samplerate.conf Source5: upmix.conf Source6: vdownmix.conf Source7: pulse-default.conf -Patch3: alsa-plugins-1.0.15-pulsehint.patch -Patch4: alsa-plugins-1.0.17-pulsenoassert.patch -Patch5: alsa-plugins-1.0.17-pulsetrigger.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -95,11 +95,16 @@ stereo headphone output. This plugin processes the input signals with a simple spacialization, so the output sounds like a kind of "virtual surround". +%package usbstream +Summary: USB stream plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description usbstream +The usbstream plugin is for snd-usb-us122l driver. It converts PCM +stream to USB specific stream. + %prep -%setup -q -n %{name}-%{version} -%patch3 -p1 -b .pulsehint -%patch4 -p1 -b .pulsenoassert -%patch5 -p1 -b .pulsetrigger +%setup -q -n %{name}-%{version}%{?prever} %build %configure --disable-static \ @@ -173,7 +178,16 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so +%files usbstream +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL +%{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so + %changelog +* Thu Sep 11 2008 Jaroslav Kysela - 1.0.18-1.rc3 +- Updated to 1.0.18rc3 +- Added usbstream subpackage + * Mon Jul 21 2008 Jaroslav Kysela - 1.0.17-1 - Updated to 1.0.17 diff --git a/sources b/sources index caac122..7f05f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f37d0b2b19dfbe215144941ab8bb6e49 alsa-plugins-1.0.17.tar.bz2 +e3b7bcd92d1bb380d7de13e61af996e9 alsa-plugins-1.0.18rc3.tar.bz2