Accepting request 35933 from home:perosb:branches:multimedia:libs

Copy from home:perosb:branches:multimedia:libs/pulseaudio via accept of submit request 35933 revision 2.
Request was accepted with message:
Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/35933
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=43
This commit is contained in:
Vincent Untz 2010-03-31 13:41:56 +00:00 committed by Git OBS Bridge
parent a5c306cbd4
commit 511fc63bab
2 changed files with 21 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 29 07:10:31 UTC 2010 - per@osbeck.com
- add support for phonon in setup-pulseaudio
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 8 22:24:00 UTC 2010 - sreeves@novell.com Mon Mar 8 22:24:00 UTC 2010 - sreeves@novell.com

View File

@ -25,6 +25,11 @@ check_root() {
fi fi
} }
enable_phonon() {
echo "Enabling PulseAudio for Phonon..."
perl -pi -e "s|PHONON_PULSEAUDIO_DISABLE=1||g;" /etc/environment
}
enable_alsa() { enable_alsa() {
echo "Enabling PulseAudio for ALSA..." echo "Enabling PulseAudio for ALSA..."
if grep "ALSA_CONFIG_PATH" /etc/environment; then if grep "ALSA_CONFIG_PATH" /etc/environment; then
@ -125,6 +130,15 @@ disable_alsa() {
perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment 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() { disable_libao() {
if test -f /etc/libao.conf; then if test -f /etc/libao.conf; then
echo "Disabling PulseAudio for libao..." echo "Disabling PulseAudio for libao..."
@ -199,6 +213,7 @@ case $1 in
enable_timidity enable_timidity
enable_xine enable_xine
enable_autospawn enable_autospawn
enable_phonon
;; ;;
--disable) --disable)
check_root || exit check_root || exit
@ -212,6 +227,7 @@ case $1 in
disable_timidity disable_timidity
disable_xine disable_xine
disable_autospawn disable_autospawn
disable_phonon
;; ;;
--status) --status)
STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"` STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"`