Accepting request 390178 from home:tiwai:branches:multimedia:libs
- Use /etc/pulse/client.conf.d/50-system.conf as a system setup by setup-pulseaudio script instead of modifying the global config. OBS-URL: https://build.opensuse.org/request/show/390178 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=170
This commit is contained in:
parent
cd66ccea24
commit
b5073d1e26
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 14 12:45:13 CEST 2016 - tiwai@suse.de
|
||||||
|
|
||||||
|
- Use /etc/pulse/client.conf.d/50-system.conf as a system setup by
|
||||||
|
setup-pulseaudio script instead of modifying the global config.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 4 14:06:06 CEST 2016 - tiwai@suse.de
|
Mon Apr 4 14:06:06 CEST 2016 - tiwai@suse.de
|
||||||
|
|
||||||
|
@ -392,6 +392,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/pulse/client.conf.d
|
|||||||
mkdir -p %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d
|
mkdir -p %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d
|
||||||
# Install disable_flat_volumes.conf
|
# Install disable_flat_volumes.conf
|
||||||
install -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d
|
install -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d
|
||||||
|
# created by setup-pulseaudio script
|
||||||
|
touch %{buildroot}%{_sysconfdir}/pulse/client.conf.d/50-system.conf
|
||||||
%fdupes doxygen/html
|
%fdupes doxygen/html
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
@ -551,6 +553,7 @@ exit 0
|
|||||||
# created by setup-pulseaudio script
|
# created by setup-pulseaudio script
|
||||||
%ghost %{_sysconfdir}/profile.d/pulseaudio.sh
|
%ghost %{_sysconfdir}/profile.d/pulseaudio.sh
|
||||||
%ghost %{_sysconfdir}/profile.d/pulseaudio.csh
|
%ghost %{_sysconfdir}/profile.d/pulseaudio.csh
|
||||||
|
%ghost %{_sysconfdir}/pulse/client.conf.d/50-system.conf
|
||||||
|
|
||||||
%files esound-compat
|
%files esound-compat
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
@ -28,6 +28,7 @@ check_root() {
|
|||||||
|
|
||||||
PROFNAME=/etc/profile.d/pulseaudio.sh
|
PROFNAME=/etc/profile.d/pulseaudio.sh
|
||||||
CPROFNAME=/etc/profile.d/pulseaudio.csh
|
CPROFNAME=/etc/profile.d/pulseaudio.csh
|
||||||
|
pulse_client_conf=/etc/pulse/client.conf.d/50-system.conf
|
||||||
|
|
||||||
MPLAYER_CONF=/etc/mplayer/mplayer.conf
|
MPLAYER_CONF=/etc/mplayer/mplayer.conf
|
||||||
|
|
||||||
@ -199,10 +200,10 @@ enable_qemu () {
|
|||||||
|
|
||||||
enable_autospawn() {
|
enable_autospawn() {
|
||||||
echo "Enabling PulseAudio autospawn..."
|
echo "Enabling PulseAudio autospawn..."
|
||||||
if grep -q ^autospawn /etc/pulse/client.conf; then
|
if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then
|
||||||
sed -i -e "s|^autospawn.*|autospawn = yes|g" /etc/pulse/client.conf
|
sed -i -e "s|^autospawn.*|autospawn = yes|g" $pulse_client_conf
|
||||||
else
|
else
|
||||||
echo "autospawn = yes" >> /etc/pulse/client.conf
|
echo "autospawn = yes" >> $pulse_client_conf
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -306,10 +307,10 @@ disable_qemu () {
|
|||||||
|
|
||||||
disable_autospawn() {
|
disable_autospawn() {
|
||||||
echo "Disabling PulseAudio autospawn..."
|
echo "Disabling PulseAudio autospawn..."
|
||||||
if grep -q ^autospawn /etc/pulse/client.conf; then
|
if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then
|
||||||
sed -i -e "s|^autospawn.*|autospawn = no|g" /etc/pulse/client.conf
|
sed -i -e "s|^autospawn.*|autospawn = no|g" $pulse_client_conf
|
||||||
else
|
else
|
||||||
echo "autospawn = no" >> /etc/pulse/client.conf
|
echo "autospawn = no" >> $pulse_client_conf
|
||||||
fi
|
fi
|
||||||
# kill leftover PA processes
|
# kill leftover PA processes
|
||||||
killall pulseaudio > /dev/null 2>&1
|
killall pulseaudio > /dev/null 2>&1
|
||||||
|
Loading…
Reference in New Issue
Block a user