git » pipewire.git » commit 0eecf3e

diff --git a/PKGBUILD b/PKGBUILD
index 06bbc61..b9ae2dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,9 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pipewire
-pkgname=(pipewire alsa-card-profiles pipewire-docs pipewire-media-session
-         pipewire-alsa pipewire-jack pipewire-pulse gst-plugin-pipewire
-         pipewire-zeroconf)
-pkgver=0.3.38
+pkgname=(pipewire alsa-card-profiles pipewire-docs pipewire-alsa pipewire-jack
+         pipewire-pulse gst-plugin-pipewire pipewire-zeroconf pipewire-v4l2)
+pkgver=0.3.39
 pkgrel=1
 epoch=1
 pkgdesc="Low-latency audio/video router and processor"
@@ -17,7 +16,7 @@ makedepends=(git meson doxygen graphviz python-docutils valgrind libpulse
              bluez-libs sbc libldac libfreeaptx libfdk-aac avahi
              webrtc-audio-processing)
 checkdepends=(desktop-file-utils)
-_commit=47a294c5bf52656998a7f43b13068c02001add77  # tags/0.3.38
+_commit=5b7ef959d1fed35f6ddfcf94b6f57891fae23b31  # tags/0.3.39
 source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -37,6 +36,7 @@ build() {
     -D libcamera=disabled
     -D udevrulesdir=/usr/lib/udev/rules.d
     -D roc=disabled
+    -D session-managers=[]
   )
 
   arch-meson pipewire build "${meson_options[@]}"
@@ -66,12 +66,13 @@ package_pipewire() {
            libsbc.so libldacBT_enc.so libfreeaptx.so libfdk-aac.so
            libwebrtc_audio_processing.so)
   optdepends=('pipewire-docs: Documentation'
-              'pipewire-media-session: Default session manager'
+              'pipewire-session-manager: Session manager'
               'pipewire-alsa: ALSA configuration'
               'pipewire-jack: JACK support'
               'pipewire-pulse: PulseAudio replacement'
-              'gst-plugin-pipewire: GStreamer support'
-              'pipewire-zeroconf: Zeroconf support')
+              'gst-plugin-pipewire: GStreamer plugin'
+              'pipewire-zeroconf: Zeroconf support'
+              'pipewire-v4l2: V4L2 interceptor')
   provides=(libpipewire-$_ver.so)
   install=pipewire.install
 
@@ -84,23 +85,20 @@ package_pipewire() {
 
     _pick docs usr/share/doc
 
-    _pick pms usr/bin/pipewire-media-session
-    _pick pms usr/lib/systemd/user/pipewire-media-session.service
-    _pick pms usr/share/pipewire/media-session.d/*.conf
-
     _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
     _pick jack usr/share/man/man1/pw-jack.1
-    _pick jack usr/share/pipewire/{jack.conf,media-session.d/with-jack}
+    _pick jack usr/share/pipewire/jack.conf
 
     _pick pulse usr/bin/pipewire-pulse
     _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-protocol-pulse.so
     _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-pulse-tunnel.so
     _pick pulse usr/lib/systemd/user/pipewire-pulse.*
-    _pick pulse usr/share/pipewire/media-session.d/with-pulseaudio
 
     _pick gst usr/lib/gstreamer-1.0
 
     _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-zeroconf-discover.so
+
+    _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_ver/v4l2
   )
 
   mkdir -p "$pkgdir/etc/alsa/conf.d"
@@ -125,19 +123,9 @@ package_pipewire-docs() {
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
-package_pipewire-media-session() {
-  pkgdesc+=" - Session manager"
-  depends=(pipewire libpipewire-$_ver.so)
-  install=pipewire-media-session.install
-
-  mv pms/* "$pkgdir"
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
-}
-
 package_pipewire-alsa() {
   pkgdesc+=" - ALSA configuration"
-  depends=(pipewire-media-session)
+  depends=(pipewire-session-manager)
   provides=(pulseaudio-alsa)
 
   mkdir -p "$pkgdir/etc/alsa/conf.d"
@@ -153,16 +141,19 @@ package_pipewire-alsa() {
 package_pipewire-jack() {
   pkgdesc+=" - JACK support"
   license+=(GPL2)  # libjackserver
-  depends=(pipewire-media-session libpipewire-$_ver.so)
+  depends=(pipewire-session-manager libpipewire-$_ver.so)
 
   mv jack/* "$pkgdir"
 
+  install -Dm644 /dev/null \
+    "$pkgdir/usr/share/pipewire/media-session.d/with-jack"
+
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_pipewire-pulse() {
   pkgdesc+=" - PulseAudio replacement"
-  depends=(pipewire-media-session libpipewire-$_ver.so libpulse.so
+  depends=(pipewire-session-manager libpipewire-$_ver.so libpulse.so
            libavahi-{client,common}.so)
   provides=(pulseaudio pulseaudio-bluetooth)
   conflicts=(pulseaudio pulseaudio-bluetooth)
@@ -170,12 +161,15 @@ package_pipewire-pulse() {
 
   mv pulse/* "$pkgdir"
 
+  install -Dm644 /dev/null \
+    "$pkgdir/usr/share/pipewire/media-session.d/with-pulseaudio"
+
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
 package_gst-plugin-pipewire() {
   pkgdesc="Multimedia graph framework - pipewire plugin"
-  depends=(pipewire-media-session libpipewire-$_ver.so gst-plugins-base-libs)
+  depends=(pipewire-session-manager libpipewire-$_ver.so gst-plugins-base-libs)
 
   mv gst/* "$pkgdir"
 
@@ -191,4 +185,13 @@ package_pipewire-zeroconf() {
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
 }
 
+package_pipewire-v4l2() {
+  pkgdesc+=" - V4L2 interceptor"
+  depends=(pipewire-session-manager libpipewire-$_ver.so)
+
+  mv v4l2/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING
+}
+
 # vim:set sw=2 et:
diff --git a/pipewire-media-session.install b/pipewire-media-session.install
deleted file mode 100644
index af304d1..0000000
--- a/pipewire-media-session.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-  # Enable service by default
-  # WantedBy=pipewire.service, which is itself socket-activated
-  systemctl --global enable pipewire-media-session.service
-}
-
-post_upgrade() {
-  if (( $(vercmp "$2" '0.3.23-1') < 0)); then
-    systemctl --global enable pipewire-media-session.service
-  fi
-
-  if (( $(vercmp "$2" '1:0.3.38-1') < 0)); then
-    printf "\tReenable any per-user enabled pipewire-media-session.service\n \
-      \tmanually to establish a new service alias for\n \
-      \tpipewire-session-manager.service added with 0.3.38.\n"
-    # reenable already enabled global pipewire-media-session.service, as an alias is introduced with 0.3.38
-    if systemctl --global is-enabled -q pipewire-media-session.service; then
-      systemctl --global reenable pipewire-media-session.service
-    fi
-  fi
-}
-
-pre_remove() {
-  systemctl --global disable pipewire-media-session.service
-}