git » pipewire.git » commit 3930e18

diff --git a/PKGBUILD b/PKGBUILD
index 8984d53..d57c3c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,18 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pipewire
-pkgname=(pipewire pipewire-docs pipewire-jack pipewire-pulse pipewire-alsa)
-pkgver=0.3.15
-pkgrel=2
+pkgname=(pipewire pipewire-docs pipewire-jack pipewire-pulse pipewire-alsa
+         gst-plugin-pipewire)
+pkgver=0.3.16
+pkgrel=1
 pkgdesc="Server and user space API to deal with multimedia pipelines"
 url="https://pipewire.org"
 license=(LGPL2.1)
 arch=(x86_64)
 makedepends=(git meson doxygen graphviz xmltoman valgrind jack2 libpulse
-             alsa-lib gstreamer gst-plugins-base sbc rtkit vulkan-icd-loader
-             dbus libsndfile bluez-libs vulkan-headers)
-_commit=16872549e3a2433f49f27c1875dfd432377ca0be  # tags/0.3.15
+             alsa-lib gst-plugins-base sbc rtkit vulkan-icd-loader dbus
+             libsndfile bluez-libs vulkan-headers)
+_commit=09d373f094f0e6797aef3d97cde2c0167dccc986  # tags/0.3.16
 source=("git+https://github.com/PipeWire/pipewire#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -52,8 +53,7 @@ _pick() {
 _ver=${pkgver:0:3}
 
 package_pipewire() {
-  depends=(gstreamer gst-plugins-base sbc rtkit vulkan-icd-loader bluez-libs
-           alsa-card-profiles
+  depends=(sbc rtkit vulkan-icd-loader bluez-libs alsa-card-profiles
            libdbus-1.so libsndfile.so libudev.so libasound.so libsystemd.so
            libglib-2.0.so libgobject-2.0.so)
   optdepends=('pipewire-docs: Documentation'
@@ -72,14 +72,16 @@ package_pipewire() {
 
   _pick docs usr/share/doc
 
-  _pick pulse usr/bin/pw-pulse usr/lib/pipewire-$_ver/pulse
+  _pick pulse usr/bin/pipewire-pulse
   _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-protocol-pulse.so
-  _pick pulse usr/share/man/man1/pw-pulse.1
+  _pick pulse usr/lib/systemd/user/pipewire-pulse.*
 
   _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
   _pick jack usr/lib/spa-0.2/jack
   _pick jack usr/share/man/man1/pw-jack.1
 
+  _pick gst usr/lib/gstreamer-1.0
+
   # Use alsa-card-profiles built with Pulseaudio
   rm -rv "$pkgdir"/usr/share/alsa-card-profile
 }
@@ -97,14 +99,24 @@ package_pipewire-jack() {
 
 package_pipewire-pulse() {
   pkgdesc+=" (PulseAudio support)"
-  depends=(libpipewire-$_ver.so libglib-2.0.so)
+  depends=(libpipewire-$_ver.so libpulse.so)
+  provides=(pulseaudio)
+  conflicts=(pulseaudio)
+  install=pipewire-pulse.install
   mv pulse/* "$pkgdir"
 }
 
 package_pipewire-alsa() {
   pkgdesc="ALSA Configuration for PipeWire"
   depends=(libpipewire-$_ver.so)
+  provides=(pulseaudio-alsa)
 
   mkdir -p "$pkgdir/etc/alsa/conf.d"
   ln -st "$pkgdir/etc/alsa/conf.d" /usr/share/alsa/alsa.conf.d/99-pipewire-default.conf
 }
+
+package_gst-plugin-pipewire() {
+  pkgdesc="Multimedia graph framework - pipewire plugin"
+  depends=(libpipewire-$_ver.so gst-plugins-base-libs)
+  mv gst/* "$pkgdir"
+}
diff --git a/pipewire-pulse.install b/pipewire-pulse.install
new file mode 100644
index 0000000..051abb3
--- /dev/null
+++ b/pipewire-pulse.install
@@ -0,0 +1,14 @@
+post_install() {
+  # Enable socket by default
+  systemctl --global enable pipewire-pulse.socket
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 0.3.16-1) < 0)); then
+    systemctl --global enable pipewire-pulse.socket
+  fi
+}
+
+pre_remove() {
+  systemctl --global disable pipewire-pulse.socket
+}