From 408477f59640a2fb3dfd86f2e1d7eab1f807e89b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 13 May 2020 13:08:09 +0000
Subject: [PATCH] extra/pipewire: fix

---
 extra/pipewire/0001-atomic.patch       |  4 ++--
 extra/pipewire/0002-disable-neon.patch | 26 --------------------------
 extra/pipewire/PKGBUILD                |  7 ++-----
 3 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 extra/pipewire/0002-disable-neon.patch

diff --git a/extra/pipewire/0001-atomic.patch b/extra/pipewire/0001-atomic.patch
index 4569d39cd..57996b25a 100644
--- a/extra/pipewire/0001-atomic.patch
+++ b/extra/pipewire/0001-atomic.patch
@@ -1,7 +1,7 @@
-From 2528f437b43a3611c7174b3b31af014337b4d3e0 Mon Sep 17 00:00:00 2001
+From 0d037e8f639471f388581926877556fd6d882d28 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Wed, 11 Mar 2020 07:28:28 -0600
-Subject: [PATCH 1/2] atomic
+Subject: [PATCH] atomic
 
 ---
  pipewire-jack/src/meson.build | 23 ++++++++++++++++++++++-
diff --git a/extra/pipewire/0002-disable-neon.patch b/extra/pipewire/0002-disable-neon.patch
deleted file mode 100644
index e2fac68be..000000000
--- a/extra/pipewire/0002-disable-neon.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ead322cc7a7c401f2d10f2585ec021ed7365aa73 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Fri, 1 May 2020 20:17:39 -0600
-Subject: [PATCH 2/2] disable neon
-
----
- meson.build | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 74142587..e7844cd0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -100,9 +100,6 @@ have_neon = false
- if host_machine.cpu_family() == 'aarch64'
-   neon_args = []
-   have_neon = true
--elif cc.has_argument('-mfpu=neon')
--  neon_args = ['-mfpu=neon']
--  have_neon = true
- endif
- 
- 
--- 
-2.26.2
-
diff --git a/extra/pipewire/PKGBUILD b/extra/pipewire/PKGBUILD
index 5dd20bb1e..c966e3e60 100644
--- a/extra/pipewire/PKGBUILD
+++ b/extra/pipewire/PKGBUILD
@@ -19,11 +19,9 @@ makedepends=(git meson doxygen graphviz xmltoman jack2 libpulse
              dbus libsndfile bluez-libs vulkan-headers)
 _commit=ba215efed0da8d6c9f3f2414d76a8e2c75352501  # tags/0.3.5
 source=("git+https://github.com/PipeWire/pipewire#commit=$_commit"
-        0001-atomic.patch
-        0002-disable-neon.patch)
+        0001-atomic.patch)
 sha256sums=('SKIP'
-            '012c545b4f17b7b4f08ff4994dfe01b1ba125be9f71563a0e2a094e0fb72cec5'
-            '6e465e8413f4c20b2015f4168ca4e9fd07b1186c405b613657f95796fd3fd473')
+            '5ff6323570a6a4956a073861015ee90793617affb52892dbfacb8c2424605813')
 
 pkgver() {
   cd $pkgbase
@@ -33,7 +31,6 @@ pkgver() {
 prepare() {
   cd $pkgbase
   patch -p1 -i ../0001-atomic.patch
-  patch -p1 -i ../0002-disable-neon.patch
 }
 
 build() {