From 6d23af036761c66669d524c3258141925d9dd488 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 29 Jan 2022 19:36:10 +0100
Subject: [PATCH] pipewire: update to 0.3.44, remove unneeded patch, add musl
 patch

---
 .../patches/fix-compilation-with-musl.patch   | 42 ++++++++++++++
 .../pipewire/patches/fix-neon-detection.patch | 56 -------------------
 srcpkgs/pipewire/template                     |  6 +-
 3 files changed, 45 insertions(+), 59 deletions(-)
 create mode 100644 srcpkgs/pipewire/patches/fix-compilation-with-musl.patch
 delete mode 100644 srcpkgs/pipewire/patches/fix-neon-detection.patch

diff --git a/srcpkgs/pipewire/patches/fix-compilation-with-musl.patch b/srcpkgs/pipewire/patches/fix-compilation-with-musl.patch
new file mode 100644
index 000000000000..1d01d09d1c32
--- /dev/null
+++ b/srcpkgs/pipewire/patches/fix-compilation-with-musl.patch
@@ -0,0 +1,42 @@
+From 3256c6e5e7e2cef1f765dc05a001114359cc3134 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 27 Jan 2022 14:59:11 +0100
+Subject: [PATCH] tools: fix compilation with musl
+
+---
+ src/tools/pw-cli.c  | 4 ++++
+ src/tools/pw-dump.c | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/tools/pw-cli.c b/src/tools/pw-cli.c
+index 7c1a5ae68..8cb67f0b8 100644
+--- a/src/tools/pw-cli.c
++++ b/src/tools/pw-cli.c
+@@ -36,6 +36,10 @@
+ #include <readline/readline.h>
+ #include <readline/history.h>
+ 
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
++
+ #define spa_debug(...) fprintf(stdout,__VA_ARGS__);fputc('\n', stdout)
+ 
+ #include <spa/utils/result.h>
+diff --git a/src/tools/pw-dump.c b/src/tools/pw-dump.c
+index d9d9e144c..9597a6ce1 100644
+--- a/src/tools/pw-dump.c
++++ b/src/tools/pw-dump.c
+@@ -32,6 +32,10 @@
+ #include <math.h>
+ #include <fnmatch.h>
+ 
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
++
+ #include <spa/utils/result.h>
+ #include <spa/utils/string.h>
+ #include <spa/pod/iter.h>
+-- 
+GitLab
diff --git a/srcpkgs/pipewire/patches/fix-neon-detection.patch b/srcpkgs/pipewire/patches/fix-neon-detection.patch
deleted file mode 100644
index cf65d1b4cdfd..000000000000
--- a/srcpkgs/pipewire/patches/fix-neon-detection.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Workaround for NEON detection for armv6l/armv7l
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/235
-
-diff --git meson.build meson.build
-index 29b4b892..0d048a1f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -116,37 +116,17 @@
- have_avx2 = cc.has_argument(avx2_args)
- 
- have_neon = false
--if host_machine.cpu_family() == 'aarch64'
--  if cc.compiles('''
--    #include <arm_neon.h>
--    int main () {
--      float *s;
--      asm volatile(
--        "      ld1 { v0.4s }, [%[s]], #16\n"
--        "      fcvtzs v0.4s, v0.4s, #31\n"
--        : [s] "+r" (s) : :);
--    }
--    ''',
--    name : 'aarch64 Neon Support')
--      neon_args = []
--      have_neon = true
--
--  endif
--elif cc.has_argument('-mfpu=neon')
--  if cc.compiles('''
--    #include <arm_neon.h>
--    int main () {
--      float *s;
--      asm volatile(
--        "      vld1.32 { q0 }, [%[s]]!\n"
--        "      vcvt.s32.f32 q0, q0, #31\n"
--        : [s] "+r" (s) : :);
--    }
--    ''',
--    args: '-mfpu=neon',
--    name : 'arm Neon Support')
--      neon_args = ['-mfpu=neon']
--      have_neon = true
-+neon_args = []
-+if host_machine.cpu_family() == 'arm' or host_machine.cpu_family() == 'aarch64'
-+  if cc.compiles(
-+'''
-+#include <arm_neon.h>
-+int32x4_t testfunc(int16_t *a, int16_t *b) {
-+return vmull_s16(vld1_s16(a), vld1_s16(b));
-+}
-+''',
-+   name : 'NEON support')
-+    have_neon = true
-   endif
- endif
- 
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index cb2aac730c29..d20f3978b6b8 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.43
+version=0.3.44
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -21,7 +21,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
  libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers
  vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel
- readline-devel openssl-devel lilv-devel "
+ readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
  libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}
  libspa-v4l2>=${version}_${revision}"
@@ -32,7 +32,7 @@ homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="87f692a2cb5b14ee900e102502b5e078a0cd3f7836f03a2e7cb30690ead37b50
+checksum="680e986d74e1639724fc9192fed987ba143e9964bb36dc4d2c6d323f6d627f29
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"