rpms/pulseaudio/devel pulseaudio-0.9.5-userconf.patch, NONE, 1.1 pulseaudio.spec, 1.2, 1.3

[Pierre Ossman (drzeus)]

Author: drzeus

Update of /cvs/extras/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18617

Modified Files:
	pulseaudio.spec 
Added Files:
	pulseaudio-0.9.5-userconf.patch 
Log Message:
Add esound compatibility packet and backported fix for unopenable user configs.


pulseaudio-0.9.5-userconf.patch:

--- NEW FILE pulseaudio-0.9.5-userconf.patch ---
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);
         }



Index: pulseaudio.spec
===================================================================
RCS file: /cvs/extras/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pulseaudio.spec	23 Oct 2006 09:07:38 -0000	1.2
+++ pulseaudio.spec	7 Feb 2007 16:44:27 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		pulseaudio
 Summary: 	Improved Linux sound server
 Version:	0.9.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		System Environment/Daemons
 Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -24,12 +24,23 @@
 #BuildRequires:	xorg-x11-devel
 
 Patch1: 	pulseaudio-0.9.2-nochown.patch
+Patch2: 	pulseaudio-0.9.5-userconf.patch
 
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
 systems. It is intended to be an improved drop-in replacement for the 
 Enlightened Sound Daemon (ESOUND).
 
+%package esound-compat
+Summary:	PulseAudio EsounD daemon compatibility script
+Group:		System Environment/Daemons
+Requires:	%{name} = %{version}-%{release}
+Conflicts:	esound
+
+%description esound-compat
+A compatibility script that allows applications to call /usr/bin/esd
+and start PulseAudio with EsounD protocol modules.
+
 %package module-lirc
 Summary:	LIRC support for the PulseAudio sound server
 Group:		System Environment/Daemons
@@ -132,6 +143,7 @@
 %prep
 %setup -q 
 %patch1 -p1
+%patch2 -p2
 
 %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
@@ -146,6 +158,8 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio
 
+ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -183,7 +197,6 @@
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %attr(4755,root,root) %{_bindir}/pulseaudio
-%{_bindir}/esdcompat
 %{_libdir}/libpulsecore.so.*
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
@@ -247,6 +260,11 @@
 %{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
 %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so
 
+%files esound-compat
+%defattr(-,root,root)
+%{_bindir}/esdcompat
+%{_bindir}/esd
+
 %files module-lirc
 %defattr(-,root,root)
 %{_libdir}/pulse-%{drvver}/modules/module-lirc.so
@@ -317,6 +335,12 @@
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Mon Feb  5 2007 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-3
+- Add esound-compat subpackage that allows PulseAudio to be a drop-in
+  replacement for esd (based on patch by Matthias Clasen).
+- Backport patch allows startup to continue even when the users'
+  config cannot be read.
+
 * Wed Oct 23 2006 Pierre Ossman <drzeus at drzeus.cx> 0.9.5-2
 - Create user and groups for daemon.