OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=36

pulseaudio.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 27 14:26:30 CEST 2008 - rodrigo@novell.com
+
+- Fixed some bugs in setup-pulseaudio script (bnc#425475)
+
 -------------------------------------------------------------------
 Wed Oct 15 18:26:13 CDT 2008 - maw@novell.com
 

pulseaudio.spec

@@ -22,7 +22,7 @@ Name:           pulseaudio
 %define drvver 0.9
 Summary:        A Networked Sound Server
 Version:        0.9.12
-Release:        5
+Release:        6
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/Sound Daemons
 Source:         %{name}-%{version}.tar.bz2
@@ -30,7 +30,7 @@ Source1:        default.pa
 Source2:        setup-pulseaudio
 Url:            http://pulseaudio.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  PolicyKit-devel alsa-devel avahi-devel bluez-devel doxygen gconf2-devel gdbm-devel glib2-devel hal-devel intltool jack-devel libatomic-ops-devel liboil-devel libsamplerate-devel libsndfile-devel lirc-devel perl-XML-Parser speex-devel tcpd-devel update-desktop-files xorg-x11-devel
+BuildRequires:  PolicyKit-devel alsa-devel avahi-devel bluez-devel doxygen gconf2-devel gdbm-devel glib2-devel hal-devel intltool jack-devel libatomic-ops-devel liboil-devel libsamplerate-devel libsndfile-devel libtool lirc-devel perl-XML-Parser speex-devel tcpd-devel update-desktop-files xorg-x11-devel
 Requires:       libpulsecore4 = %{version}
 Recommends:     alsa-plugins-pulse
 PreReq:         pwdutils
@@ -542,7 +542,9 @@ groupadd -r pulse-access &>/dev/null || :
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
-* Wed Oct 15 2008 maw@novell.com
+* Mon Oct 27 2008 rodrigo@novell.com
+- Fixed some bugs in setup-pulseaudio script (bnc#425475)
+* Thu Oct 16 2008 maw@novell.com
 - Run autoreconf.
 * Sat Sep 20 2008 rodrigo@suse.de
 - Added pulseaudio-dot-pulse.patch from upstream to fix broken
@@ -584,7 +586,7 @@ groupadd -r pulse-access &>/dev/null || :
   + Additional stream attributes for libcanberra
 - Added new BuildRequires
 - Added new modules to list of installed files
-* Fri Jun 27 2008 maw@suse.de
+* Sat Jun 28 2008 maw@suse.de
 - Own some directories so that builds succeed.
 * Tue Jun 24 2008 rodrigo@suse.de
 - Added .desktop file for autostarting under GNOME (bnc#387052)
@@ -593,7 +595,7 @@ groupadd -r pulse-access &>/dev/null || :
 * Mon May 26 2008 rodrigo@suse.de
 - Depend on alsa-plugins-pulse to have ALSA-based applications
   work out of the box with PulseAudio (bnc#394177)
-* Fri May 23 2008 jpr@suse.de
+* Sat May 24 2008 jpr@suse.de
 - Generate 32bit libraries (bnc #338269)
 * Mon May 19 2008 rodrigo@suse.de
 - Removed pulseaudio-use-correct-socket-for-esd-375701.patch,
@@ -604,7 +606,7 @@ groupadd -r pulse-access &>/dev/null || :
 * Tue May 06 2008 rodrigo@suse.de
 - Added pulseaudio-use-correct-socket-for-esd-375701.patch to
   use correct esound socket (bnc375701)
-* Wed Apr 09 2008 maw@suse.de
+* Thu Apr 10 2008 maw@suse.de
 - Update to version 0.9.10:
   + Better compatibility in padsp with certain programs which like
   to pass NULL strings to libc functions
@@ -625,7 +627,7 @@ groupadd -r pulse-access &>/dev/null || :
   dependencies on esound
 * Wed Mar 12 2008 rodrigo@suse.de
 - Review and merge changes from public build service into FACTORY.
-* Sat Mar 08 2008 cyberorg@cyberorg.info
+* Sun Mar 09 2008 cyberorg@cyberorg.info
 - Update to 0.9.9
 - The only change from 0.9.8 is a fix for CVE-2008-0008
 - Need to add pulse user to audio group too
@@ -638,7 +640,7 @@ groupadd -r pulse-access &>/dev/null || :
 * Wed Jan 23 2008 rodrigo@suse.de
 - Reviewed changes from cyberorg@cyberorg.info submitted to
   home:rodrigomoya:pulseaudio BS service.
-* Wed Jan 09 2008 cyberorg@cyberorg.info
+* Thu Jan 10 2008 cyberorg@cyberorg.info
 - Update to 0.9.8
   * Man pages
   * Make real-time priority and nice level configurable
@@ -675,14 +677,14 @@ groupadd -r pulse-access &>/dev/null || :
 - Removed 'rm -rf $RPM_BUILD_ROOT' from %%install
 * Mon Dec 24 2007 rodrigo@suse.de
 - Use /var/lib/pulseaudio as home dir for pulseaudio user.
-* Tue Dec 11 2007 rodrigo@suse.de
+* Wed Dec 12 2007 rodrigo@suse.de
 - Removed special permissions for pulseaudio binary to make it
   buildable until the permissions thing is solved.
 * Tue Dec 11 2007 rodrigo@suse.de
 - Merged with package from home:rodrigomoya:pulseaudio BS project.
-* Wed Nov 21 2007 cyberorg@cyberorg.info
+* Thu Nov 22 2007 cyberorg@cyberorg.info
 - Remove Provides and Obsoletes from esound compat package
-* Tue Nov 20 2007 cyberorg@cyberorg.info
+* Wed Nov 21 2007 cyberorg@cyberorg.info
 - Restructured spec file to build more subpackages, like in Fedora 8.
 * Wed Oct 31 2007 tiwai@suse.de
 - updated to version 0.9.7:
@@ -734,7 +736,7 @@ groupadd -r pulse-access &>/dev/null || :
 - fix suspend/resume with alsa backend
 - fix the frame size handling in alsa backend
 - fix possible NULL dereference
-* Sun Oct 15 2006 schwab@suse.de
+* Mon Oct 16 2006 schwab@suse.de
 - Make sure config.rpath is present.
 * Wed Sep 06 2006 tiwai@suse.de
 - updated to version 0.9.5:

setup-pulseaudio

@@ -13,7 +13,9 @@ show_help() {
 }
 
 enable_alsa() {
+    echo "Enabling PulseAudio for ALSA..."
     # Add PCM PA device
+    if test -f /etc/asound.conf; then
 	if grep pcm.pulse /etc/asound.conf; then
 	    echo "pcm.pulse device already in /etc/asound.conf"
 	else
@@ -32,6 +34,17 @@ enable_alsa() {
 	    echo "    type pulse" >> /etc/asound.conf
 	    echo "}" >> /etc/asound.conf
 	fi
+    else
+	echo "" >> /etc/asound.conf
+	echo "pcm.pulse {" >> /etc/asound.conf
+	echo "    type pulse" >> /etc/asound.conf
+	echo "}" >> /etc/asound.conf
+
+	echo "" >> /etc/asound.conf
+	echo "ctl.pulse {" >> /etc/asound.conf
+	echo "    type pulse" >> /etc/asound.conf
+	echo "}" >> /etc/asound.conf
+    fi
 
     # Now set the default devices
     if grep "pcm.!default" /etc/asound.conf; then
@@ -54,34 +67,42 @@ enable_alsa() {
 }
 
 enable_libao() {
+    echo "Enabling PulseAudio for libao..."
+    if test -f /etc/libao.conf; then
 	if grep "default_driver=pulse" /etc/libao.conf; then
 	    echo "Default driver is pulse already in /etc/libao.conf"
 	else
 	    echo "default_driver=pulse" >> /etc/libao.conf
 	fi
+    else
+	echo "default_driver=pulse" >> /etc/libao.conf
+    fi
 }
 
 enable_mplayer() {
+    echo "Enabling PulseAudio for mplayer..."
     # Maybe it would be better to just add a alias mplayer=mplayer -ao pulse to /etc/environment?
+    if test -f /etc/mplayer/mplayer.conf; then
 	if grep "ao=pulse" /etc/mplayer/mplayer.conf; then
 	    echo "Default driver is pulse already in /etc/mplayer/mplayer.conf"
 	else
-	if grep "ao=" /etc/mplayer/mplayer.conf; then
 	    echo ""
+	fi
     else
 	echo "ao=pulse" >> /etc/mplayer/mplayer.conf
     fi
-    fi
 
     # FIXME: mplayerplug-in uses $HOME/.mplayer/mplayerplug-in.conf
 }
 
 enable_openal() {
+    echo "Enabling PulseAudio for openal..."
     # FIXME: openal uses ~/.openalrc
     echo ""
 }
 
 enable_oss() {
+    echo "Enabling PulseAudio for OSS..."
     for app in $LIST_OF_OSS_APPS; do
 	if grep "alias $app=padsp $app" /etc/environment; then
 	    echo "Application $app already setup for PulseAudio"
@@ -92,6 +113,7 @@ enable_oss() {
 }
 
 enable_sdl() {
+    echo "Enabling PulseAudio for SDL..."
     # For SDL, we just add an environment variable, so that apps use the PA audio driver
     if grep SDL_AUDIODRIVER /etc/environment; then
 	sed s/SDL_AUDIODRIVER*/SDL_AUDIODRIVER=pulse /etc/environment
@@ -101,6 +123,7 @@ enable_sdl() {
 }
 
 enable_timidity() {
+    echo "Enabling PulseAudio for Timidity..."
     # Use esound output for timidity
     if grep "alias timidity=timidity -Oe" /etc/environment; then
 	echo "Timidity already setup for using PulseAudio"
@@ -110,45 +133,58 @@ enable_timidity() {
 }
 
 enable_xine() {
+    echo "Enabling PulseAudio for Xine..."
     # FIXME: xine uses $HOME/.xine/config
     echo ""
 }
 
 disable_alsa() {
+    echo "Disabling PulseAudio for ALSA..."
     # FIXME: perl -pi -e ...
     echo ""
 }
 
 disable_libao() {
+    echo "Disabling PulseAudio for libao..."
+    if test -f /etc/libao.conf; then
 	perl -pi -e "s|default_driver=pulse||g;" /etc/libao.conf
+    fi
 }
 
 disable_mplayer() {
+    echo "Disabling PulseAudio for mplayer..."
+    if test -f /etc/mplayer/mplayer.conf; then
 	perl -pi -e "s|ao=pulse||g;" /etc/mplayer/mplayer.conf
+    fi
 }
 
 disable_openal() {
+    echo "Disabling PulseAudio for openal..."
     # FIXME: openal uses ~/.openalrc
     echo ""
 }
 
 disable_oss() {
+    echo "Disabling PulseAudio for OSS..."
     for app in $LIST_OF_OSS_APPS; do
 	perl -pi -e "s|alias $app=padsp $app||g;" /etc/environment
     done
 }
 
 disable_sdl() {
+    echo "Disabling PulseAudio for SDL..."
     if grep "SDL_AUDIODRIVER=pulse" /etc/environment; then
 	sed s/SDL_AUDIODRIVER=pulse// /etc/environment
     fi
 }
 
 disable_timidity() {
-    perl -pi -e "s|alias timidity=timidity -Oe||g:" /etc/environment
+    echo "Disabling PulseAudio for Timidity..."
+    perl -pi -e "s|alias timidity=timidity -Oe||g;" /etc/environment
 }
 
 disable_xine() {
+    echo "Disabling PulseAudio for Xine..."
     # FIXME: xine uses $HOME/.xine/config
     echo ""
 }
@@ -191,14 +227,6 @@ case $1 in
 esac
 
 # Now, update /etc/sysconfig/sound with the PA status
-if grep PULSEAUDIO_ENABLE /etc/sysconfig/sound; then
+perl -pi -e "s|PULSEAUDIO_ENABLE=\"no\"|PULSEAUDIO_ENABLE=\"yes\"|g;" /etc/sysconfig/sound
-    if grep "PULSEAUDIO_ENABLE=\"yes\"" /etc/sysconfig/sound; then
-	echo ""
-    fi
-else
-    if [ "x$ENABLE" = "x1" ]; then
-	echo "PULSEAUDIO_ENABLE=\"yes\"" >> /etc/sysconfig/sound
-    fi
-fi
 
 /sbin/SuSEconfig