Merge pull request #5244 from lrusak/pulseaudio-updates

Pulseaudio fixes and changes

packages/audio/pulseaudio/config/pulseaudio-system.conf

@@ -1,33 +0,0 @@
-<?xml version="1.0"?><!--*-nxml-*-->
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
-This file is part of PulseAudio.
-
-PulseAudio is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of the
-License, or (at your option) any later version.
-
-PulseAudio is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
-Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
--->
-
-<busconfig>
-
-  <!-- System-wide PulseAudio runs as 'root' user. This fragment is
-       not necessary for user PulseAudio instances. -->
-
-  <policy user="root">
-    <allow own="org.pulseaudio.Server"/>
-    <allow send_destination="org.pulseaudio.Server"/>
-    <allow receive_sender="org.pulseaudio.Server"/>
-  </policy>
-
-</busconfig>

packages/audio/pulseaudio/config/system.pa

@@ -19,14 +19,12 @@
 # mode.
 
 ### Load several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
 load-module module-native-protocol-unix
 
 ### Automatically restore the volume of streams and devices
 load-module module-stream-restore
 load-module module-device-restore
+load-module module-card-restore
 
 ### Automatically restore the default sink/source when changed by the user
 ### during runtime
@@ -40,9 +38,6 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle
 
-### Enable positioned event sounds
-load-module module-position-event-sounds
-
 ### Automatically load modules for dbus
 .ifexists module-dbus-protocol.so
  load-module module-dbus-protocol

packages/audio/pulseaudio/package.mk

@@ -80,7 +80,8 @@ post_makeinstall_target() {
   safe_remove ${INSTALL}/usr/share/bash-completion
 
   cp ${PKG_DIR}/config/system.pa ${INSTALL}/etc/pulse/
-  cp ${PKG_DIR}/config/pulseaudio-system.conf ${INSTALL}/etc/dbus-1/system.d/
+
+  sed 's/user="pulse"/user="root"/' -i ${INSTALL}/etc/dbus-1/system.d/pulseaudio-system.conf
 
   mkdir -p ${INSTALL}/usr/config
     cp -PR ${PKG_DIR}/config/pulse-daemon.conf.d ${INSTALL}/usr/config

packages/audio/pulseaudio/system.d/pulseaudio.service

@@ -5,8 +5,10 @@ After=syslog.target local-fs.target
 [Service]
 Type=dbus
 BusName=org.pulseaudio.Server
-ExecStart=/usr/bin/pulseaudio --system --disallow-exit --exit-idle-time=-1 --disable-shm
+ExecStart=/usr/bin/pulseaudio --system --disallow-exit --exit-idle-time=-1 --disable-shm --enable-memfd --realtime
 Restart=on-failure
+Environment=PULSE_STATE_PATH=/storage/.config/pulse
+Environment=PULSE_CONFIG_PATH=/storage/.config/pulse
 
 [Install]
 WantedBy=multi-user.target