diff --git a/.cvsignore b/.cvsignore index 0cfb126..6755293 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ alsa-plugins-1.0.16.tar.bz2 +alsa-plugins-1.0.17.tar.bz2 diff --git a/alsa-plugins-1.0.16-hints.patch b/alsa-plugins-1.0.16-hints.patch deleted file mode 100644 index 314eb32..0000000 --- a/alsa-plugins-1.0.16-hints.patch +++ /dev/null @@ -1,123 +0,0 @@ -Ignore hint sections defined by hand. -Those are heplful to get listed in various places, such as aplay -L - -diff -urp alsa-plugins-1.0.16.orig/a52/pcm_a52.c alsa-plugins-1.0.16/a52/pcm_a52.c ---- alsa-plugins-1.0.16.orig/a52/pcm_a52.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/a52/pcm_a52.c 2008-03-09 17:16:37.000000000 +0100 -@@ -581,7 +581,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "card") == 0) { - if (snd_config_get_string(n, &card) < 0) { -diff -urp alsa-plugins-1.0.16.orig/jack/pcm_jack.c alsa-plugins-1.0.16/jack/pcm_jack.c ---- alsa-plugins-1.0.16.orig/jack/pcm_jack.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/jack/pcm_jack.c 2008-03-09 17:16:48.000000000 +0100 -@@ -403,7 +403,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(jack) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "playback_ports") == 0) { - if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { -diff -urp alsa-plugins-1.0.16.orig/maemo/alsa-dsp.c alsa-plugins-1.0.16/maemo/alsa-dsp.c ---- alsa-plugins-1.0.16.orig/maemo/alsa-dsp.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/maemo/alsa-dsp.c 2008-03-09 17:17:01.000000000 +0100 -@@ -664,7 +664,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(alsa_dsp) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "playback_device_file") == 0) { - if (snd_config_get_type(n) == SND_CONFIG_TYPE_COMPOUND){ -diff -urp alsa-plugins-1.0.16.orig/maemo/dsp-ctl.c alsa-plugins-1.0.16/maemo/dsp-ctl.c ---- alsa-plugins-1.0.16.orig/maemo/dsp-ctl.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/maemo/dsp-ctl.c 2008-03-09 17:17:10.000000000 +0100 -@@ -545,7 +545,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(dsp_ctl) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "playback_devices") == 0) { - if (snd_config_get_type(n) == SND_CONFIG_TYPE_COMPOUND){ -diff -urp alsa-plugins-1.0.16.orig/mix/pcm_upmix.c alsa-plugins-1.0.16/mix/pcm_upmix.c ---- alsa-plugins-1.0.16.orig/mix/pcm_upmix.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/mix/pcm_upmix.c 2008-03-09 17:17:23.000000000 +0100 -@@ -338,7 +338,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(upmix) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "slave") == 0) { - sconf = n; -diff -urp alsa-plugins-1.0.16.orig/mix/pcm_vdownmix.c alsa-plugins-1.0.16/mix/pcm_vdownmix.c ---- alsa-plugins-1.0.16.orig/mix/pcm_vdownmix.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/mix/pcm_vdownmix.c 2008-03-09 17:17:32.000000000 +0100 -@@ -295,7 +295,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(vdownmix) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "slave") == 0) { - sconf = n; -diff -urp alsa-plugins-1.0.16.orig/oss/ctl_oss.c alsa-plugins-1.0.16/oss/ctl_oss.c ---- alsa-plugins-1.0.16.orig/oss/ctl_oss.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/oss/ctl_oss.c 2008-03-09 17:17:38.000000000 +0100 -@@ -357,7 +357,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "device") == 0) { - if (snd_config_get_string(n, &device) < 0) { -diff -urp alsa-plugins-1.0.16.orig/oss/pcm_oss.c alsa-plugins-1.0.16/oss/pcm_oss.c ---- alsa-plugins-1.0.16.orig/oss/pcm_oss.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/oss/pcm_oss.c 2008-03-09 17:17:45.000000000 +0100 -@@ -364,7 +364,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "device") == 0) { - if (snd_config_get_string(n, &device) < 0) { -diff -urp alsa-plugins-1.0.16.orig/pulse/ctl_pulse.c alsa-plugins-1.0.16/pulse/ctl_pulse.c ---- alsa-plugins-1.0.16.orig/pulse/ctl_pulse.c 2008-02-05 10:25:00.000000000 +0100 -+++ alsa-plugins-1.0.16/pulse/ctl_pulse.c 2008-03-09 17:17:50.000000000 +0100 -@@ -599,7 +599,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pulse) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "server") == 0) { - if (snd_config_get_string(n, &server) < 0) { -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-03-09 17:12:32.000000000 +0100 -+++ alsa-plugins-1.0.16/pulse/pcm_pulse.c 2008-03-09 17:15:41.000000000 +0100 -@@ -705,7 +705,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) - const char *id; - if (snd_config_get_id(n, &id) < 0) - continue; -- if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) -+ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) - continue; - if (strcmp(id, "server") == 0) { - if (snd_config_get_string(n, &server) < 0) { diff --git a/alsa-plugins-1.0.16-pulseclose.patch b/alsa-plugins-1.0.16-pulseclose.patch deleted file mode 100644 index e023081..0000000 --- a/alsa-plugins-1.0.16-pulseclose.patch +++ /dev/null @@ -1,22 +0,0 @@ -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); - diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 567673e..4daec4f 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins -Version: 1.0.16 -Release: 4%{?dist} +Version: 1.0.17 +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+ @@ -14,8 +14,6 @@ Source5: upmix.conf Source6: vdownmix.conf Source7: pulse-default.conf Patch3: alsa-plugins-1.0.15-pulsehint.patch -Patch4: alsa-plugins-1.0.16-pulseclose.patch -Patch5: alsa-plugins-1.0.16-hints.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -98,8 +96,6 @@ surround". %prep %setup -q -n %{name}-%{version} %patch3 -p1 -b .pulsehint -%patch4 -p1 -b .pulseclose -%patch5 -p1 -b .hints %build %configure --disable-static \ @@ -173,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so %changelog +* Mon Jul 21 2008 Jaroslav Kysela - 1.0.17-1 +- Updated to 1.0.17 + * Tue Mar 25 2008 Lubomir Kundrak - 1.0.16-4 - Kind of fix the plugins not to complain about the hints diff --git a/sources b/sources index 58987a1..caac122 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5906aff0d0dc84dee9624d395db4cfc6 alsa-plugins-1.0.16.tar.bz2 +f37d0b2b19dfbe215144941ab8bb6e49 alsa-plugins-1.0.17.tar.bz2