[notify] pulseaudio: adopted port, new dependency chain, now depends on meson/ninja, x11 is now optional among others, check the Pkgfile and revdep just in case

5 files changed, 50 insertions, 92 deletions

diff --git a/pulseaudio/.footprint b/pulseaudio/.footprint
index ff1a00fbf..8ade6a785 100644
--- a/pulseaudio/.footprint
+++ b/pulseaudio/.footprint
@@ -4,19 +4,16 @@ drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/pulseaudio-system.conf
 drwxr-xr-x	root/root	etc/pulse/
 -rw-r--r--	root/root	etc/pulse/client.conf
+drwxr-xr-x	root/root	etc/pulse/client.conf.d/
 -rw-r--r--	root/root	etc/pulse/daemon.conf
+drwxr-xr-x	root/root	etc/pulse/daemon.conf.d/
 -rw-r--r--	root/root	etc/pulse/default.pa
 -rw-r--r--	root/root	etc/pulse/system.pa
-drwxr-xr-x	root/root	etc/xdg/
-drwxr-xr-x	root/root	etc/xdg/autostart/
--rw-r--r--	root/root	etc/xdg/autostart/pulseaudio.desktop
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/udev/
-drwxr-xr-x	root/root	lib/udev/rules.d/
--rw-r--r--	root/root	lib/udev/rules.d/90-pulseaudio.rules
+drwxr-xr-x	root/root	etc/udev/
+drwxr-xr-x	root/root	etc/udev/rules.d/
+-rw-r--r--	root/root	etc/udev/rules.d/90-pulseaudio.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/esdcompat
 -rwxr-xr-x	root/root	usr/bin/pa-info
 -rwxr-xr-x	root/root	usr/bin/pacat
 -rwxr-xr-x	root/root	usr/bin/pacmd
@@ -27,9 +24,7 @@ lrwxrwxrwx	root/root	usr/bin/paplay -> pacat
 lrwxrwxrwx	root/root	usr/bin/parec -> pacat
 lrwxrwxrwx	root/root	usr/bin/parecord -> pacat
 -rwxr-xr-x	root/root	usr/bin/pasuspender
--rwxr-xr-x	root/root	usr/bin/pax11publish
 -rwxr-xr-x	root/root	usr/bin/pulseaudio
--rwxr-xr-x	root/root	usr/bin/start-pulseaudio-x11
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/pulse/
 -rw-r--r--	root/root	usr/include/pulse/cdecl.h
@@ -43,7 +38,6 @@ drwxr-xr-x	root/root	usr/include/pulse/
 -rw-r--r--	root/root	usr/include/pulse/ext-stream-restore.h
 -rw-r--r--	root/root	usr/include/pulse/format.h
 -rw-r--r--	root/root	usr/include/pulse/gccmacro.h
--rw-r--r--	root/root	usr/include/pulse/glib-mainloop.h
 -rw-r--r--	root/root	usr/include/pulse/introspect.h
 -rw-r--r--	root/root	usr/include/pulse/mainloop-api.h
 -rw-r--r--	root/root	usr/include/pulse/mainloop-signal.h
@@ -69,20 +63,13 @@ drwxr-xr-x	root/root	usr/lib/cmake/
 drwxr-xr-x	root/root	usr/lib/cmake/PulseAudio/
 -rw-r--r--	root/root	usr/lib/cmake/PulseAudio/PulseAudioConfig.cmake
 -rw-r--r--	root/root	usr/lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
--rwxr-xr-x	root/root	usr/lib/libpulse-mainloop-glib.la
-lrwxrwxrwx	root/root	usr/lib/libpulse-mainloop-glib.so -> libpulse-mainloop-glib.so.0.0.6
-lrwxrwxrwx	root/root	usr/lib/libpulse-mainloop-glib.so.0 -> libpulse-mainloop-glib.so.0.0.6
--rwxr-xr-x	root/root	usr/lib/libpulse-mainloop-glib.so.0.0.6
--rwxr-xr-x	root/root	usr/lib/libpulse-simple.la
-lrwxrwxrwx	root/root	usr/lib/libpulse-simple.so -> libpulse-simple.so.0.1.1
+lrwxrwxrwx	root/root	usr/lib/libpulse-simple.so -> libpulse-simple.so.0
 lrwxrwxrwx	root/root	usr/lib/libpulse-simple.so.0 -> libpulse-simple.so.0.1.1
 -rwxr-xr-x	root/root	usr/lib/libpulse-simple.so.0.1.1
--rwxr-xr-x	root/root	usr/lib/libpulse.la
-lrwxrwxrwx	root/root	usr/lib/libpulse.so -> libpulse.so.0.23.0
+lrwxrwxrwx	root/root	usr/lib/libpulse.so -> libpulse.so.0
 lrwxrwxrwx	root/root	usr/lib/libpulse.so.0 -> libpulse.so.0.23.0
 -rwxr-xr-x	root/root	usr/lib/libpulse.so.0.23.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libpulse-mainloop-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpulse-simple.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpulse.pc
 drwxr-xr-x	root/root	usr/lib/pulse-14.2/
@@ -91,10 +78,10 @@ drwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/libcli.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/liboss-util.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/libprotocol-cli.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/libprotocol-esound.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/libprotocol-http.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/libprotocol-native.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/libprotocol-simple.so
+-rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/libraop.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/librtp.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-allow-passthrough.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-alsa-card.so
@@ -116,14 +103,9 @@ drwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-device-manager.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-device-restore.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-echo-cancel.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-esound-compat-spawnfd.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-esound-compat-spawnpid.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-esound-protocol-tcp.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-esound-protocol-unix.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-esound-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-filter-apply.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-filter-heuristics.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-gsettings.so
+-rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-hal-detect.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-http-protocol-tcp.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-http-protocol-unix.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-intended-roles.so
@@ -140,6 +122,7 @@ drwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-pipe-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-pipe-source.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-position-event-sounds.so
+-rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-raop-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-remap-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-remap-source.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-rescue-streams.so
@@ -165,40 +148,13 @@ drwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-virtual-source.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-virtual-surround-sink.so
 -rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-volume-restore.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-x11-bell.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-x11-cork-request.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-x11-publish.so
--rwxr-xr-x	root/root	usr/lib/pulse-14.2/modules/module-x11-xsmp.so
 drwxr-xr-x	root/root	usr/lib/pulseaudio/
--rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsecommon-14.2.la
 -rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsecommon-14.2.so
--rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsecore-14.2.la
 -rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsecore-14.2.so
--rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsedsp.la
 -rwxr-xr-x	root/root	usr/lib/pulseaudio/libpulsedsp.so
-drwxr-xr-x	root/root	usr/lib/pulseaudio/pulse/
--rwxr-xr-x	root/root	usr/lib/pulseaudio/pulse/gsettings-helper
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/GConf/
-drwxr-xr-x	root/root	usr/share/GConf/gsettings/
--rw-r--r--	root/root	usr/share/GConf/gsettings/pulseaudio.convert
-drwxr-xr-x	root/root	usr/share/bash-completion/
-drwxr-xr-x	root/root	usr/share/bash-completion/completions/
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/pacat -> pulseaudio
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/pacmd -> pulseaudio
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/pactl -> pulseaudio
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/padsp -> pulseaudio
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/paplay -> pulseaudio
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/parec -> pulseaudio
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/parecord -> pulseaudio
-lrwxrwxrwx	root/root	usr/share/bash-completion/completions/pasuspender -> pulseaudio
--rw-r--r--	root/root	usr/share/bash-completion/completions/pulseaudio
-drwxr-xr-x	root/root	usr/share/glib-2.0/
-drwxr-xr-x	root/root	usr/share/glib-2.0/schemas/
--rw-r--r--	root/root	usr/share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/esdcompat.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/pacat.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/pacmd.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/pactl.1.gz
@@ -286,6 +242,3 @@ drwxr-xr-x	root/root	usr/share/vala/vapi/
 -rw-r--r--	root/root	usr/share/vala/vapi/libpulse-simple.vapi
 -rw-r--r--	root/root	usr/share/vala/vapi/libpulse.deps
 -rw-r--r--	root/root	usr/share/vala/vapi/libpulse.vapi
-drwxr-xr-x	root/root	usr/share/zsh/
-drwxr-xr-x	root/root	usr/share/zsh/site-functions/
--rw-r--r--	root/root	usr/share/zsh/site-functions/_pulseaudio
diff --git a/pulseaudio/.signature b/pulseaudio/.signature
index 543ed6159..f9b92e74b 100644
--- a/pulseaudio/.signature
+++ b/pulseaudio/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Sq8zA0aVWNSlG2wHer+D+4FAIx1FaJQhrD47VhC67PoZJZ4sRzYXBnOdgh40XMg3UARl7Mky//9qSmQEhwK1wg=
-SHA256 (Pkgfile) = 05f6c349406d764e3911b12d3b57b0fcac3d529aea10d86cb759bae196acdde6
-SHA256 (.footprint) = 2c17f0dcc99d0f84a9aa78a5d486ae3a3ff514fe21adc015553ca7ed8e79534a
+RWSE3ohX2g5d/V3kDIFx6PcDB6jzY0Y2ktIewBBtEKzCuxQC+XtjtAHkGgMHQLTnvkIBnw9hNNOkhogo726bLlcXYNo6AwXtmQs=
+SHA256 (Pkgfile) = b2321ed0ac13314408b98902fa6cd0ac75869f4e030c7805a686b17dde910389
+SHA256 (.footprint) = 8e87ccbecf0f7ff1b85cc4661fecdb68747fa7e339b71568c3b036ec8559016e
 SHA256 (pulseaudio-14.2.tar.xz) = 75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1
diff --git a/pulseaudio/Pkgfile b/pulseaudio/Pkgfile
index da5f8dced..f159f37c1 100644
--- a/pulseaudio/Pkgfile
+++ b/pulseaudio/Pkgfile
@@ -1,30 +1,36 @@
-# Description: A sound system for POSIX OSes
-# URL: http://www.freedesktop.org/wiki/Software/PulseAudio/
-# Maintainer: Fredrik Rinnestam, fredrik at crux dot guru
-# Depends on: dbus glib xorg-libsm xorg-libxtst libsndfile intltool consolekit
+# Description: PulseAudio is a cross-platform, networked sound server
+# URL: https://www.freedesktop.org/wiki/Software/PulseAudio/
+# Maintainer: Tim Biermann, tbier at posteo dot de
+# Depends on: dbus intltool libsndfile meson ninja
+# Optional: avahi bluez fftw glib orc sbc speexdsp xorg-libxtst xorg-libice xorg-libsm
 
 name=pulseaudio
 version=14.2
-release=1
-source=(https://freedesktop.org/software/$name/releases/$name-$version.tar.xz) 
+release=2
+source=(https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$version.tar.xz)
 
 build() {
-	cd $name-$version
+  [[ -e "/usr/lib/pkgconfig/xtst.pc" && -e "/usr/lib/pkgconfig/ice.pc" ]] || PKGMK_PULSEAUDIO+=' -D x11=disabled'
+  [[ -e /usr/lib/pkgconfig/gstreamer-1.0.pc ]] && PKGMK_PULSEAUDIO+=' -D gstreamer=enabled'
+  [[ -e /usr/lib/pkgconfig/bash-completion.pc ]] || PKGMK_PULSEAUDIO+=' -D bashcompletiondir=no'
+  [[ -e /usr/bin/zsh ]] || PKGMK_PULSEAUDIO+=' -D zshcompletiondir=no'
 
-	CONFIG_SHELL=/bin/bash \
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/$name \
-		--sysconfdir=/etc \
-		--disable-bluez5 \
-		--disable-default-build-tests \
-		--disable-gtk3 \
-		--disable-rpath \
-		--disable-tcpwrap \
-		--disable-hal-compat \
-		--disable-openssl
-	make
-	make -j1 DESTDIR=$PKG install
+   meson setup $name-$version build $PKGMK_PULSEAUDIO \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/$name \
+    -D buildtype=plain \
+    -D udevrulesdir=/etc/udev/rules.d \
+    -D database=gdbm \
+    -D tests=false
+  meson compile -C build
+  DESTDIR=$PKG meson install -C build
 
-	rm -r $PKG/usr/share/locale
+  rm -r $PKG/usr/share/locale
+
+  sed -e '/autospawn/iautospawn = no' -i $PKG/etc/pulse/client.conf
+  sed -e '/flat-volumes/iflat-volumes = no' -i $PKG/etc/pulse/daemon.conf
+  sed -e '/Load several protocols/aload-module module-dbus-protocol' \
+    -i $PKG/etc/pulse/default.pa
+
+  mkdir -p $PKG/etc/pulse/{client,daemon}.conf.d
 }
diff --git a/pulseaudio/post-install b/pulseaudio/post-install
index 21e60126d..ea19533cb 100755
--- a/pulseaudio/post-install
+++ b/pulseaudio/post-install
@@ -1,4 +1,2 @@
 #!/bin/sh
-# compile needed glib schemas
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
+[ -e /usr/share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml ] && glib-compile-schemas /usr/share/glib-2.0/schemas
diff --git a/pulseaudio/pre-install b/pulseaudio/pre-install
index 0bf1b2c62..cd610f73c 100755
--- a/pulseaudio/pre-install
+++ b/pulseaudio/pre-install
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-if [ -z "$(getent group pulse)" ]; then
-	/usr/sbin/groupadd -r pulse
-fi
+# check for pulseaudio group or add one
+getent group pulse || /usr/sbin/groupadd pulse
+getent group pulse-access || /usr/sbin/groupadd pulse-access
 
-if [ -z "$(getent passwd pulse)" ]; then
-	/usr/sbin/useradd -r -g pulse -d /var/run/pulse -s /bin/false -c "Pulseaudio System User" pulse
-	/usr/bin/passwd -l pulse
-fi
+# check for pulseaudio user or add one
+getent passwd pulse || /usr/sbin/useradd -g pulse -d /var/run/pulse -s /bin/false -c "Pulseaudio User" pulse
+
+# lock the account
+/usr/bin/passwd -l pulse