extra/pipewire to 0.3.4-1

extra/pipewire/0001-atomic.patch

@@ -1,4 +1,4 @@
-From 412858de9094de06047a33237ebf12753324636e Mon Sep 17 00:00:00 2001
+From 83d5286fec3ed5828d468c2b4ff2a961a54a054e Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Wed, 11 Mar 2020 07:28:28 -0600
 Subject: [PATCH] atomic
@@ -8,12 +8,12 @@ Subject: [PATCH] atomic
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
-index 68821a1b..70bdd21b 100644
+index e52349ed..c42a792d 100644
 --- a/pipewire-jack/src/meson.build
 +++ b/pipewire-jack/src/meson.build
-@@ -13,12 +13,33 @@ pipewire_jack_c_args = [
+@@ -31,13 +31,34 @@ configure_file(input : 'pw-jack.in',
- #optional dependencies
+                install: true,
- jack_dep = dependency('jack', version : '>= 1.9.10', required : false)
+                install_dir : pipewire_bindir)
  
 +# Check for GCC style atomics
 +dep_atomic = declare_dependency()
@@ -36,16 +36,17 @@ index 68821a1b..70bdd21b 100644
 +  endif
 +endif
 +
- pipewire_jack = shared_library('jack-pw',
+ pipewire_jack = shared_library('jack',
      pipewire_jack_sources,
-     soversion : pipewire_version,
+     soversion : soversion,
+     version : libversion,
      c_args : pipewire_jack_c_args,
      include_directories : [configinc],
 -    dependencies : [pipewire_dep, jack_dep, mathlib],
 +    dependencies : [pipewire_dep, jack_dep, mathlib, dep_atomic],
      install : true,
+     install_dir : libjack_path,
  )
- 
 -- 
-2.24.1
+2.26.2
 

extra/pipewire/PKGBUILD

@@ -7,7 +7,7 @@
 
 pkgbase=pipewire
 pkgname=(pipewire pipewire-docs pipewire-jack pipewire-pulse)
-pkgver=0.3.2
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="Server and user space API to deal with multimedia pipelines"
 url="https://pipewire.org"
@@ -16,11 +16,11 @@ arch=(x86_64)
 makedepends=(git meson doxygen graphviz xmltoman jack2 libpulse
              alsa-lib gstreamer gst-plugins-base sbc rtkit vulkan-icd-loader
              dbus libsndfile bluez-libs vulkan-headers)
-_commit=f0f3a0a66032cf693a979dae6187cac07fa353ee  # tags/0.3.2
+_commit=33398d7de83fad1c67c691e0712e3e0108c5e966  # tags/0.3.4
 source=("git+https://github.com/PipeWire/pipewire#commit=$_commit"
         0001-atomic.patch)
 sha256sums=('SKIP'
-            '2e22f850618fcd77cab357ce8d8c2382ccf37a4fd0f782d999a81202bfabc503')
+            '3ae386bc7ad38177e7f1729668a5d035535dc4f234b97a5f60ab774316a3a82c')
 
 pkgver() {
   cd $pkgbase
@@ -57,13 +57,16 @@ _pick() {
   done
 }
 
+_ver=${pkgver:0:3}
+
 package_pipewire() {
   depends=(gstreamer gst-plugins-base sbc rtkit vulkan-icd-loader bluez-libs
-           libdbus-1.so libsndfile.so)
+           libdbus-1.so libsndfile.so libudev.so libasound.so libsystemd.so
+           libglib-2.0.so libgobject-2.0.so)
   optdepends=('pipewire-docs: Documentation'
               'pipewire-jack: JACK support'
               'pipewire-pulse: PulseAudio support')
-  provides=(libpipewire-${pkgver:0:3}.so)
+  provides=(libpipewire-$_ver.so)
   backup=(etc/pipewire/pipewire.conf)
   install=pipewire.install
 
@@ -73,10 +76,10 @@ package_pipewire() {
 
   _pick docs usr/share/doc
 
-  _pick pulse usr/lib/libpulse*
+  _pick pulse usr/bin/pw-pulse usr/lib/pipewire-$_ver/pulse
 
+  _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack
   _pick jack usr/lib/spa-0.2/jack
-  _pick jack usr/lib/libjack*
 }
 
 package_pipewire-docs() {
@@ -86,14 +89,12 @@ package_pipewire-docs() {
 
 package_pipewire-jack() {
   pkgdesc+=" (JACK support)"
-  depends=(libpipewire-${pkgver:0:3}.so libjack.so)
+  depends=(libpipewire-$_ver.so libjack.so)
-  provides=(libjack-pw.so)
   mv jack/* "$pkgdir"
 }
 
 package_pipewire-pulse() {
   pkgdesc+=" (PulseAudio support)"
-  depends=(libpipewire-${pkgver:0:3}.so libpulse.so libglib-2.0.so)
+  depends=(libpipewire-$_ver.so libglib-2.0.so)
-  provides=(libpulse{,-simple,-mainloop-glib}-pw.so)
   mv pulse/* "$pkgdir"
 }