Attachment 377259 Details for Bug 623837

[patch] setup-pulseaudio patch to remove /etc/environment setting

setup-pulseaudio.patch (text/plain), 2.55 KB, created by Rafał Miłecki on 2010-07-20 18:03:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafał Miłecki

Created: 2010-07-20 18:03:32 UTC

Size: 2.55 KB

patch

obsolete

>--- /usr/bin/setup-pulseaudio.old	2010-07-05 23:36:19.000000000 +0200
>+++ /usr/bin/setup-pulseaudio	2010-07-20 19:30:37.711230619 +0200
>@@ -25,20 +25,6 @@
>     fi
> }
> 
>-enable_phonon() {
>-    echo "Enabling PulseAudio for Phonon..."
>-    perl -pi -e "s|PHONON_PULSEAUDIO_DISABLE=1||g;" /etc/environment
>-}
>-
>-enable_alsa() {
>-    echo "Enabling PulseAudio for ALSA..."
>-    if grep "ALSA_CONFIG_PATH" /etc/environment; then
>-	echo "PulseAudio config for ALSA already in use"
>-    else
>-	echo "ALSA_CONFIG_PATH=/etc/alsa-pulse.conf" >> /etc/environment
>-    fi
>-}
>-
> enable_libao() {
>     echo "Enabling PulseAudio for libao..."
>     if test -f /etc/libao.conf; then
>@@ -86,16 +72,6 @@
>     done
> }
> 
>-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
>-	echo "SDL already setup to use PulseAudio"
>-    else
>-	echo "SDL_AUDIODRIVER=pulse" >> /etc/environment
>-    fi
>-}
>-
> enable_timidity() {
>     # this is broken. /etc/environment must only contain environment
>     # variables. It's not a shell script
>@@ -125,20 +101,6 @@
>     fi
> }
> 
>-disable_alsa() {
>-    echo "Disabling PulseAudio for ALSA..."
>-    perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment
>-}
>-
>-disable_phonon() {
>-    echo "Disabling PulseAudio for Phonon..."
>-    if grep "PHONON_PULSEAUDIO_DISABLE" /etc/environment; then
>-	echo "PulseAudio config for Phonon already in use"
>-    else
>-	echo "PHONON_PULSEAUDIO_DISABLE=1" >> /etc/environment
>-    fi
>-}
>-
> disable_libao() {
>     if test -f /etc/libao.conf; then
> 	echo "Disabling PulseAudio for libao..."
>@@ -169,13 +131,6 @@
>     done
> }
> 
>-disable_sdl() {
>-    echo "Disabling PulseAudio for SDL..."
>-    if grep "SDL_AUDIODRIVER=pulse" /etc/environment; then
>-	perl -pi -e "s|SDL_AUDIODRIVER=pulse||g;" /etc/environment
>-    fi
>-}
>-
> disable_timidity() {
>     # this is broken. /etc/environment must only contain environment
>     # variables. It's not a shell script
>@@ -204,30 +159,24 @@
>     --enable)
> 	check_root || exit
> 	ENABLE=1
>-	enable_alsa
> 	enable_libao
> 	enable_mplayer
> 	enable_openal
> 	enable_oss
>-	enable_sdl
> 	enable_timidity
> 	enable_xine
> 	enable_autospawn
>-	enable_phonon
> 	;;
>     --disable)
> 	check_root || exit
> 	ENABLE=0
>-	disable_alsa
> 	disable_libao
> 	disable_mplayer
> 	disable_openal
> 	disable_oss
>-	disable_sdl
> 	disable_timidity
> 	disable_xine
> 	disable_autospawn
>-	disable_phonon
> 	;;
>     --status)
> 	STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"`

Actions: View | Diff

Attachments on bug 623837: 377259 | 377260