git » pipewire.git » commit 69b79ce

0.3.17-1

author Jan Alexander Steffens
2020-11-30 13:38:06 UTC
committer Jan Alexander Steffens
2020-11-30 13:38:06 UTC
parent 74071905eb96063840952a494e684da848f2f69d

0.3.17-1

PKGBUILD +9 -6

diff --git a/PKGBUILD b/PKGBUILD
index 56c1c76..ab15971 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 pkgbase=pipewire
 pkgname=(pipewire pipewire-docs pipewire-jack pipewire-pulse pipewire-alsa
          gst-plugin-pipewire)
-pkgver=0.3.16
-pkgrel=5
+pkgver=0.3.17
+pkgrel=1
 pkgdesc="Server and user space API to deal with multimedia pipelines"
 url="https://pipewire.org"
 license=(LGPL2.1)
@@ -13,7 +13,7 @@ arch=(x86_64)
 makedepends=(git meson doxygen graphviz xmltoman valgrind jack2 libpulse
              alsa-lib gst-plugins-base sbc rtkit vulkan-icd-loader dbus
              libsndfile bluez-libs vulkan-headers)
-_commit=09d373f094f0e6797aef3d97cde2c0167dccc986  # tags/0.3.16
+_commit=f5f5beb0ece64c7d08edb5413dde537ec5b6c3e2  # tags/0.3.17
 source=("git+https://github.com/PipeWire/pipewire#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -54,8 +54,7 @@ _ver=${pkgver:0:3}
 
 package_pipewire() {
   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)
+           libdbus-1.so libsndfile.so libudev.so libasound.so libsystemd.so)
   optdepends=('pipewire-docs: Documentation'
               'pipewire-jack: JACK support'
               'pipewire-pulse: PulseAudio support')
@@ -72,10 +71,13 @@ package_pipewire() {
 
   _pick docs usr/share/doc
 
+  _pick jack etc/pipewire/media-session.d/with-jack
   _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 pulse etc/pipewire/media-session.d/with-pulseaudio
+
   _pick gst usr/lib/gstreamer-1.0
 
   # Use alsa-card-profiles built with Pulseaudio
@@ -97,8 +99,9 @@ package_pipewire-pulse() {
   pkgdesc+=" (PulseAudio replacement)"
   depends=(pipewire libpulse)
   provides=(pulseaudio pulseaudio-bluetooth)
-  conflicts=(pulseaudio)  # Sockets conflict
+  conflicts=(pulseaudio pulseaudio-bluetooth)
   install=pipewire-pulse.install
+  mv pulse/* "$pkgdir"
 }
 
 package_pipewire-alsa() {