diff --git a/.cvsignore b/.cvsignore index 0ad8e8d..4ade7f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pulseaudio-0.9.5.tar.gz +pulseaudio-0.9.6.tar.gz diff --git a/pulseaudio-0.9.2-nochown.patch b/pulseaudio-0.9.2-nochown.patch deleted file mode 100644 index 878f958..0000000 --- a/pulseaudio-0.9.2-nochown.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pulseaudio-0.9.2/src/Makefile.in.orig 2006-07-08 15:26:11.000000000 +0200 -+++ pulseaudio-0.9.2/src/Makefile.in 2006-07-08 23:23:40.000000000 +0200 -@@ -4488,7 +4488,7 @@ - - suid: pulse - chown root $< -- chmod u+s $< -+# chmod u+s $< - - esdcompat: daemon/esdcompat.in Makefile - sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -@@ -4509,7 +4509,7 @@ - - install-exec-hook: - chown root $(DESTDIR)$(bindir)/pulseaudio ; true -- chmod u+s $(DESTDIR)$(bindir)/pulseaudio -+# chmod u+s $(DESTDIR)$(bindir)/pulseaudio - ln -sf pacat $(DESTDIR)$(bindir)/parec - rm -f $(DESTDIR)$(modlibexecdir)/*.a - rm -f $(DESTDIR)$(libdir)/libpulsedsp.a diff --git a/pulseaudio-0.9.5-framesize.patch b/pulseaudio-0.9.5-framesize.patch deleted file mode 100644 index 6f9b657..0000000 --- a/pulseaudio-0.9.5-framesize.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: src/modules/module-alsa-sink.c -=================================================================== ---- src/modules/module-alsa-sink.c (revision 1430) -+++ src/modules/module-alsa-sink.c (revision 1432) -@@ -415,6 +419,9 @@ - goto fail; - } - -+ /* ALSA might tweak the sample spec, so recalculate the frame size */ -+ frame_size = pa_frame_size(&ss); -+ - if (ss.channels != map.channels) - /* Seems ALSA didn't like the channel number, so let's fix the channel map */ - pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA); diff --git a/pulseaudio-0.9.5-suspend.patch b/pulseaudio-0.9.5-suspend.patch deleted file mode 100644 index 3fa3641..0000000 --- a/pulseaudio-0.9.5-suspend.patch +++ /dev/null @@ -1,127 +0,0 @@ -Index: src/modules/module-alsa-sink.c -=================================================================== ---- src/modules/module-alsa-sink.c (revision 1431) -+++ src/modules/module-alsa-sink.c (working copy) -@@ -141,6 +141,33 @@ - return ret; - } - -+static int suspend_recovery(struct userdata *u) { -+ int ret; -+ assert(u); -+ -+ pa_log_info("*** ALSA-SUSPEND (playback) ***"); -+ -+ if ((ret = snd_pcm_resume(u->pcm_handle)) < 0) { -+ if (ret == -EAGAIN) -+ return -1; -+ -+ if (ret != -ENOSYS) -+ pa_log("snd_pcm_resume() failed: %s", snd_strerror(-ret)); -+ else { -+ if ((ret = snd_pcm_prepare(u->pcm_handle)) < 0) -+ pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret)); -+ } -+ -+ if (ret < 0) { -+ clear_up(u); -+ pa_module_unload_request(u->module); -+ return -1; -+ } -+ } -+ -+ return ret; -+} -+ - static void do_write(struct userdata *u) { - assert(u); - -@@ -176,6 +203,13 @@ - continue; - } - -+ if (frames == -ESTRPIPE) { -+ if (suspend_recovery(u) < 0) -+ return; -+ -+ continue; -+ } -+ - pa_log("snd_pcm_writei() failed: %s", snd_strerror(-frames)); - - clear_up(u); -@@ -207,6 +241,10 @@ - if (xrun_recovery(u) < 0) - return; - -+ if (snd_pcm_state(u->pcm_handle) == SND_PCM_STATE_SUSPENDED) -+ if (suspend_recovery(u) < 0) -+ return; -+ - do_write(u); - } - -Index: src/modules/module-alsa-source.c -=================================================================== ---- src/modules/module-alsa-source.c (revision 1429) -+++ src/modules/module-alsa-source.c (working copy) -@@ -143,6 +143,34 @@ - return 0; - } - -+ -+static int suspend_recovery(struct userdata *u) { -+ int ret; -+ assert(u); -+ -+ pa_log_info("*** ALSA-SUSPEND (capture) ***"); -+ -+ if ((ret = snd_pcm_resume(u->pcm_handle)) < 0) { -+ if (ret == -EAGAIN) -+ return -1; -+ -+ if (ret != -ENOSYS) -+ pa_log("snd_pcm_resume() failed: %s", snd_strerror(-ret)); -+ else { -+ if ((ret = snd_pcm_prepare(u->pcm_handle)) < 0) -+ pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret)); -+ } -+ -+ if (ret < 0) { -+ clear_up(u); -+ pa_module_unload_request(u->module); -+ return -1; -+ } -+ } -+ -+ return ret; -+} -+ - static void do_read(struct userdata *u) { - assert(u); - -@@ -175,6 +203,13 @@ - continue; - } - -+ if (frames == -ESTRPIPE) { -+ if (suspend_recovery(u) < 0) -+ return; -+ -+ continue; -+ } -+ - pa_log("snd_pcm_readi() failed: %s", snd_strerror(-frames)); - - clear_up(u); -@@ -210,6 +245,10 @@ - if (xrun_recovery(u) < 0) - return; - -+ if (snd_pcm_state(u->pcm_handle) == SND_PCM_STATE_SUSPENDED) -+ if (suspend_recovery(u) < 0) -+ return; -+ - do_read(u); - } - diff --git a/pulseaudio-0.9.5-userconf.patch b/pulseaudio-0.9.5-userconf.patch deleted file mode 100644 index eca576c..0000000 --- a/pulseaudio-0.9.5-userconf.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: /trunk/src/pulsecore/core-util.c -=================================================================== ---- /trunk/src/pulsecore/core-util.c (revision 1418) -+++ /trunk/src/pulsecore/core-util.c (revision 1423) -@@ -185,5 +185,5 @@ - } - #else -- pa_log_warn("secure directory creation not supported on Win32."); -+ pa_log_warn("secure directory creation not supported on Win32."); - #endif - -@@ -954,5 +954,6 @@ - #endif - -- if ((f = fopen(fn, mode)) || errno != ENOENT) { -+ f = fopen(fn, mode); -+ if (f != NULL) { - if (result) - *result = pa_xstrdup(fn); -@@ -961,4 +962,9 @@ - } - -+ if (errno != ENOENT) { -+ pa_log_warn("WARNING: failed to open configuration file '%s': %s", -+ lfn, pa_cstrerror(errno)); -+ } -+ - pa_xfree(lfn); - } - diff --git a/pulseaudio-0.9.6-nochown.patch b/pulseaudio-0.9.6-nochown.patch new file mode 100644 index 0000000..0dd59f5 --- /dev/null +++ b/pulseaudio-0.9.6-nochown.patch @@ -0,0 +1,20 @@ +--- pulseaudio-0.9.6/src/Makefile.in.orig 2007-05-27 22:59:32.000000000 +0200 ++++ pulseaudio-0.9.6/src/Makefile.in 2007-05-29 11:30:19.000000000 +0200 +@@ -5028,7 +5028,7 @@ + + suid: pulseaudio .libs/lt-pulseaudio + chown root $^ +- chmod u+s $^ ++# chmod u+s $^ + + esdcompat: daemon/esdcompat.in Makefile + sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ +@@ -5052,7 +5052,7 @@ + + install-exec-hook: + chown root $(DESTDIR)$(bindir)/pulseaudio ; true +- chmod u+s $(DESTDIR)$(bindir)/pulseaudio ++# chmod u+s $(DESTDIR)$(bindir)/pulseaudio + ln -sf pacat $(DESTDIR)$(bindir)/parec + rm -f $(DESTDIR)$(modlibexecdir)/*.a + rm -f $(DESTDIR)$(libdir)/libpulsedsp.a diff --git a/pulseaudio.spec b/pulseaudio.spec index e7d3743..4d2add5 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -2,8 +2,8 @@ Name: pulseaudio Summary: Improved Linux sound server -Version: 0.9.5 -Release: 5%{?dist} +Version: 0.9.6 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz @@ -17,16 +17,9 @@ BuildRequires: hal-devel # Libtool is dragging in rpaths. Fedora's libtool should get rid of the # unneccessary ones. BuildRequires: libtool - -# FC 5 BuildRequires: libXt-devel, xorg-x11-proto-devel -# FC 4 -#BuildRequires: xorg-x11-devel -Patch1: pulseaudio-0.9.2-nochown.patch -Patch2: pulseaudio-0.9.5-userconf.patch -Patch3: pulseaudio-0.9.5-framesize.patch -Patch4: pulseaudio-0.9.5-suspend.patch +Patch1: pulseaudio-0.9.6-nochown.patch %description PulseAudio is a sound server for Linux and other Unix like operating @@ -145,9 +138,6 @@ This package contains command line utilities for the PulseAudio sound server. %prep %setup -q %patch1 -p1 -%patch2 -p2 -%patch3 -p0 -%patch4 -p0 %build %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -339,6 +329,9 @@ fi %{_libdir}/libpulsedsp.so %changelog +* Tue May 29 2007 Pierre Ossman 0.9.6-1 +- Upgrade to 0.9.6. + * Sat Mar 2 2007 Pierre Ossman 0.9.5-5 - Fix merge problems with patch. diff --git a/sources b/sources index 93bb3d2..bb91cd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99b5d9efd4fce35cabb4ae5d0ebb230d pulseaudio-0.9.5.tar.gz +669d52a70fb9a7a83c2507005bfa2a6f pulseaudio-0.9.6.tar.gz