[arch-commits] Commit in pipewire-media-session/trunk (2 files)

[Jan Steffens]

    Date: Thursday, November 11, 2021 @ 22:36:49
  Author: heftig
Revision: 427909

0.4.1-1

Modified:
  pipewire-media-session/trunk/PKGBUILD
  pipewire-media-session/trunk/pipewire-media-session.install

--------------------------------+
 PKGBUILD                       |   17 ++++++++---------
 pipewire-media-session.install |    7 +++----
 2 files changed, 11 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-11 20:16:06 UTC (rev 427908)
+++ PKGBUILD	2021-11-11 22:36:49 UTC (rev 427909)
@@ -2,16 +2,16 @@
 
 pkgbase=pipewire-media-session
 pkgname=(pipewire-media-session pipewire-media-session-docs)
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 epoch=1
-pkgdesc="Low-latency audio/video router and processor - Session manager"
-url="https://pipewire.org"
+pkgdesc="Example session manager for PipeWire"
+url="https://gitlab.freedesktop.org/pipewire/media-session"
 license=(MIT)
 arch=(x86_64)
 makedepends=(git meson doxygen graphviz 'pipewire>=0.3.39' systemd dbus
              alsa-lib)
-_commit=5fd4b081fecbdb250e2f7f6deb8e6ffaf68f6dca  # tags/0.4.0
+_commit=e5d5cf2404786af8bcc40bdb8a2962bef4ec18b6  # tags/0.4.1
 source=("$pkgbase::git+https://gitlab.freedesktop.org/pipewire/media-session.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -53,16 +53,15 @@
            libasound.so)
   optdepends=('pipewire-media-session-docs: Documentation')
   provides=(pipewire-session-manager)
+  conflicts=(wireplumber)
   install=pipewire-media-session.install
 
   meson install -C build --destdir "$pkgdir"
 
-  ( cd "$pkgdir"
+  _pick docs "$pkgdir"/usr/share/doc
 
-    _pick docs usr/share/doc
-  )
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgbase" -m644 $pkgbase/COPYING
+  install -Dt "$pkgdir/usr/share/doc/$pkgname" -m644 $pkgbase/{NEWS,README}*
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/COPYING
 }
 
 package_pipewire-media-session-docs() {

Modified: pipewire-media-session.install
===================================================================
--- pipewire-media-session.install	2021-11-11 20:16:06 UTC (rev 427908)
+++ pipewire-media-session.install	2021-11-11 22:36:49 UTC (rev 427909)
@@ -1,6 +1,6 @@
 post_install() {
-  # Enable service by default
-  # WantedBy=pipewire.service, which is itself socket-activated
+  # Enable service by default, creating an alias from
+  # pipewire-session-manager.service, which is required by pipewire.service
   systemctl --global enable pipewire-media-session.service
 }
 
@@ -9,9 +9,8 @@
     systemctl --global enable pipewire-media-session.service
   fi
 
+  # Reenable the service if needed so the alias gets created.
   if (( $(vercmp "$2" '1:0.3.38-1') < 0)); then
-    # 0.3.38 introduced a new alias. Reenable the
-    # service if needed so the alias gets created.
     if systemctl --global is-enabled -q pipewire-media-session.service; then
       systemctl --global reenable pipewire-media-session.service
     fi