pool/pulseaudio
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 650126 from multimedia:libs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/650126
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=157
This commit is contained in:
Dominique Leuenberger 2018-11-20 21:28:51 +00:00 committed by Git OBS Bridge
commit 2f188967b8
5 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pulseaudio-gdm-hooks.tmpfiles Normal file
View File

@ -0,0 +1,2 @@
d /var/lib/gdm/.pulse 0755 - - -
C /var/lib/gdm/.pulse/default.pa 0644 - - - /usr/share/factory/var/lib/gdm/.pulse/default.pa

25
pulseaudio.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Sun Nov 18 11:34:25 CET 2018 - tiwai@suse.de
- Drop ghost from gdm hook dir to sync with gdm package itself
-------------------------------------------------------------------
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>
- Add a Supplements line to pulseaudio-gdm-hooks so it's selected
for installation when gdm and pulseaudio are installed.
-------------------------------------------------------------------
Thu Oct 18 15:25:34 UTC 2018 - Antonio Larrosa <alarrosa@suse.com>
- Don't create files under /var on package installation but using
systemd-tmpfiles to be friendly to transactional updates
(bsc#1098063, fate#325524)
- Add pulseaudio.tmpfiles and pulseaudio-gdm-hooks.tmpfiles
-------------------------------------------------------------------
Mon Jul 16 12:49:15 UTC 2018 - oholecek@suse.com

29
pulseaudio.spec
View File

@ -40,6 +40,8 @@ Source3: sysconfig.sound-pulseaudio
Source4: pulseaudio-server.fw
Source5: pulseaudio.service
Source6: disable_flat_volumes.conf
Source7: pulseaudio.tmpfiles
Source8: pulseaudio-gdm-hooks.tmpfiles
Source99: baselibs.conf
Patch0: disabled-start.diff
Patch1: suppress-socket-error-msg.diff
@ -306,6 +308,7 @@ Group: Productivity/Multimedia/Other
#!BuildIgnore: gdm
Requires: %{name} = %{version}
Requires: gdm >= 2.22
Supplements: packageand(pulseaudio:gdm)
#for the gdm user
Requires(pre): gdm
@ -397,8 +400,12 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.sh
touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.csh
mkdir -p %{buildroot}%{_localstatedir}/lib/gdm/.pulse
cp $RPM_SOURCE_DIR/default.pa-for-gdm %{buildroot}%{_localstatedir}/lib/gdm/.pulse/default.pa
mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
install -m 644 %{SOURCE7} %{buildroot}%{_prefix}/lib/tmpfiles.d/pulseaudio.conf
install -m 644 %{SOURCE8} %{buildroot}%{_prefix}/lib/tmpfiles.d/pulseaudio-gdm-hooks.conf
mkdir -p %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse
install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse/default.pa
mkdir -p %{buildroot}%{_localstatedir}/lib/gdm
ln -s esdcompat %{buildroot}%{_bindir}/esd
# install firewall rule on SUSE
%if %{defined suse_version}
@ -427,6 +434,7 @@ exit 0
%postun -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig
%post
/sbin/ldconfig
%tmpfiles_create pulseaudio.conf
%{fillup_only -an sound}
# Update the /etc/profile.d/pulseaudio.* files
setup-pulseaudio --auto > /dev/null
@ -448,8 +456,12 @@ exit 0
%service_del_postun pulseaudio.service
exit 0
%post gdm-hooks
%tmpfiles_create pulseaudio-gdm-hooks.conf
%files
%doc README LICENSE GPL LGPL
%doc README
%license LICENSE GPL LGPL
%{_bindir}/pulseaudio
%{_bindir}/setup-pulseaudio
%{_bindir}/qpaeq
@ -560,6 +572,7 @@ exit 0
%dir %{_libexecdir}/systemd/user
%{_libexecdir}/systemd/user/%{name}.service
%{_libexecdir}/systemd/user/%{name}.socket
%{_prefix}/lib/tmpfiles.d/pulseaudio.conf
%if %{defined suse_version}
%config(noreplace) %{_fwdefdir}/pulseaudio-server
@ -576,8 +589,14 @@ exit 0
%files gdm-hooks
%attr(0750, gdm, gdm) %dir %{_localstatedir}/lib/gdm
%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse
%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
%attr(0700, gdm, gdm) %ghost %dir %{_localstatedir}/lib/gdm/.pulse
%attr(0600, gdm, gdm) %ghost %{_localstatedir}/lib/gdm/.pulse/default.pa
%dir %{_prefix}/share/factory/var
%dir %{_prefix}/share/factory/var/lib
%dir %{_prefix}/share/factory/var/lib/gdm
%dir %{_prefix}/share/factory/var/lib/gdm/.pulse
%{_prefix}/share/factory/var/lib/gdm/.pulse/default.pa
%{_prefix}/lib/tmpfiles.d/pulseaudio-gdm-hooks.conf
%files -n libpulse%{soname}
%doc README LICENSE GPL LGPL

1
pulseaudio.tmpfiles Normal file
View File

@ -0,0 +1 @@
d /var/lib/pulseaudio 0755 - - -

14
setup-pulseaudio
View File

@ -78,10 +78,19 @@ enable_kmix() {
enable_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
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
fi
}
@ -210,6 +219,7 @@ enable_autospawn() {
disable_alsa() {
echo "Disabling PulseAudio for ALSA..."
delete_variable ALSA_CONFIG_PATH
rm -f /etc/alsa/conf.d/99-pulseaudio-default.conf
}
disable_phonon() {