rpm/pulseaudio
SHA256
1
0
Fork 0
forked from pool/pulseaudio
Code Pull Requests Activity

Accepting request 649306 from home:tiwai:branches:multimedia:libs

Browse Source 
- Fix setup-pulseaudio script to deal with the new alsa/conf.d
  setup that was introduced since alsa-lib 1.1.7 (bsc#1116153)

OBS-URL: https://build.opensuse.org/request/show/649306
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=196
This commit is contained in:
Takashi Iwai 2018-11-15 14:56:32 +00:00 committed by Git OBS Bridge
parent 158f79b217
commit 6f1cb5c8a8
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pulseaudio.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 15 12:48:41 CET 2018 - tiwai@suse.de
- Fix setup-pulseaudio script to deal with the new alsa/conf.d
setup that was introduced since alsa-lib 1.1.7 (bsc#1116153)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 19 11:07:58 UTC 2018 - Antonio Larrosa <alarrosa@suse.com> Fri Oct 19 11:07:58 UTC 2018 - Antonio Larrosa <alarrosa@suse.com>

14
setup-pulseaudio
View File

@ -78,10 +78,19 @@ enable_kmix() {
enable_alsa() { enable_alsa() {
echo "Enabling PulseAudio for ALSA..." echo "Enabling PulseAudio for ALSA..."
if [ -f /etc/alsa-pulse.conf ]; then if [ -f /etc/alsa/conf.d/99-pulseaudio-default.conf ]; then
return 0
fi
if [ -f /etc/alsa/conf.d/99-pulseaudio-default.conf.example ]; then
ln -s 99-pulseaudio-default.conf.example /etc/alsa/conf.d/99-pulseaudio-default.conf
delete_variable ALSA_CONFIG_PATH
elif [ -f /usr/share/alsa/conf.d/99-pulseaudio-default.conf.example ]; then
ln -s /usr/share/alsa/conf.d/99-pulseaudio-default.conf.example /etc/alsa/conf.d/99-pulseaudio-default.conf
delete_variable ALSA_CONFIG_PATH
elif [ -f /etc/alsa-pulse.conf ]; then
set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf
else else
echo "Missing /etc/alsa-pluse.conf; please install alsa-plugins-pulse package" echo "Please install alsa-plugins-pulse package"
delete_variable ALSA_CONFIG_PATH delete_variable ALSA_CONFIG_PATH
fi fi
} }
@ -210,6 +219,7 @@ enable_autospawn() {
disable_alsa() { disable_alsa() {
echo "Disabling PulseAudio for ALSA..." echo "Disabling PulseAudio for ALSA..."
delete_variable ALSA_CONFIG_PATH delete_variable ALSA_CONFIG_PATH
rm -f /etc/alsa/conf.d/99-pulseaudio-default.conf
} }
disable_phonon() { disable_phonon() {