From f5edb52170eaced1136122456aefe06c4c0c70be Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 4 Nov 2021 00:25:15 +0000
Subject: [PATCH] extra/gst-plugins-bad to 1.18.5-3

---
 extra/gst-plugins-bad/1267.patch   | 25 +++++++++++++++++++++++++
 extra/gst-plugins-bad/PKGBUILD     | 15 +++++++++++----
 extra/gst-plugins-bad/wpe-1.1.diff | 13 +++++++++++++
 3 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 extra/gst-plugins-bad/1267.patch
 create mode 100644 extra/gst-plugins-bad/wpe-1.1.diff

diff --git a/extra/gst-plugins-bad/1267.patch b/extra/gst-plugins-bad/1267.patch
new file mode 100644
index 000000000..e467053c0
--- /dev/null
+++ b/extra/gst-plugins-bad/1267.patch
@@ -0,0 +1,25 @@
+From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sun, 26 Sep 2021 21:34:30 +0200
+Subject: [PATCH] neon: Allow building against neon 0.32.x
+
+No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267>
+---
+ subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/subprojects/gst-plugins-bad/ext/neon/meson.build b/subprojects/gst-plugins-bad/ext/neon/meson.build
+index bf49be9111..abd9763649 100644
+--- a/subprojects/gst-plugins-bad/ext/neon/meson.build
++++ b/subprojects/gst-plugins-bad/ext/neon/meson.build
+@@ -1,4 +1,4 @@
+-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'],
++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'],
+                       required : get_option('neon'))
+ 
+ if neon_dep.found()
+-- 
+GitLab
+
diff --git a/extra/gst-plugins-bad/PKGBUILD b/extra/gst-plugins-bad/PKGBUILD
index 5dc681f80..24258a019 100644
--- a/extra/gst-plugins-bad/PKGBUILD
+++ b/extra/gst-plugins-bad/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=gst-plugins-bad
 pkgname=(gst-plugins-bad-libs gst-plugins-bad gst-plugin-opencv gst-plugin-wpe)
 pkgver=1.18.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Multimedia graph framework - bad plugins"
 url="https://gstreamer.freedesktop.org/"
 arch=(x86_64)
@@ -29,9 +29,10 @@ checkdepends=(xorg-server-xvfb)
 options=(!emptydirs)
 _commit=d3af58d5b31941caa26c3ded85d7a7b84a91f0cc  # tags/1.18.5^0
 source=("git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git#commit=$_commit"
-         gst-plugins-bad-neon-0.32.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2547.patch)
+        1267.patch wpe-1.1.diff)
 sha256sums=('SKIP'
-            'bbd9b8bcc12ad86ddb58bb93df18777675f3a390e80bf60177fefbf034faa22c')
+            '6b44a256d1ce3ed788d689a9abc5d8a2c4f992ce3c6c60f7a1efb4aa5cc3deb1'
+            '841988d7dffaf98adeff046cfeed97505a66d268c156361ac29c2b7a112cf984')
 
 pkgver() {
   cd $pkgbase
@@ -40,7 +41,13 @@ pkgver() {
 
 prepare() {
   cd $pkgbase
-  patch -p1 -i ../gst-plugins-bad-neon-0.32.patch # Accept neon 0.32
+
+  # Neon 0.32.x
+  # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267
+  patch -Np3 -i ../1267.patch
+
+  # wpe-webkit-1.1 (libsoup3)
+  patch -Np1 -i ../wpe-1.1.diff
 }
 
 build() {
diff --git a/extra/gst-plugins-bad/wpe-1.1.diff b/extra/gst-plugins-bad/wpe-1.1.diff
new file mode 100644
index 000000000..61de56752
--- /dev/null
+++ b/extra/gst-plugins-bad/wpe-1.1.diff
@@ -0,0 +1,13 @@
+diff --git i/ext/wpe/meson.build w/ext/wpe/meson.build
+index 9381e9b08..e94965c02 100644
+--- i/ext/wpe/meson.build
++++ w/ext/wpe/meson.build
+@@ -6,7 +6,7 @@ if not gstgl_dep.found()
+   subdir_done()
+ endif
+ 
+-wpe_dep = dependency('wpe-webkit-1.0', version : '>= 2.24', required : get_option('wpe'))
++wpe_dep = dependency('wpe-webkit-1.1', version : '>= 2.24', required : get_option('wpe'))
+ wpe_fdo_dep = dependency('wpebackend-fdo-1.0', required : get_option('wpe'))
+ egl_dep = dependency('egl', required : get_option('wpe'))
+ xkbcommon_dep = dependency('xkbcommon', version : '>= 0.8', required : get_option('wpe'))