update to 1.21.1

5 files changed, 34 insertions, 129 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 976a18a4926a..faa66fc539d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-gstreamer-git
 	pkgdesc = Multimedia graph framework (32-bit)
-	pkgver = 1.20.0+r1244+g3385ea3481
+	pkgver = 1.21.1+r44+g430ec0d860
 	pkgrel = 1
 	url = https://gstreamer.freedesktop.org/
 	arch = x86_64
@@ -104,13 +104,7 @@ pkgbase = lib32-gstreamer-git
 	makedepends = lib32-libxrandr
 	options = debug
 	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git
-	source = 0001-meson-Allow-building-with-system-orc.patch
-	source = 0002-HACK-meson-Disable-broken-tests.patch
-	source = 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
 	sha256sums = SKIP
-	sha256sums = 292edebc224557db08404b0d53e2824413f0aad2a99c991de2cb8ccc6e9a7683
-	sha256sums = cdb0b056d8a1d31394fb3cf23dcfa8e7345cac6671dacdee8029b380ef30640d
-	sha256sums = 79d3038a0ba0c3958ffa8b5aec8431336b372906c07c0c878c3767bec0acb46f
 
 pkgname = lib32-gstreamer-git
 	pkgdesc = Multimedia graph framework (32-bit) - core
@@ -120,35 +114,35 @@ pkgname = lib32-gstreamer-git
 	depends = lib32-libunwind
 	depends = lib32-libelf
 	depends = gstreamer
-	provides = lib32-gstreamer=1.20.0+r1244+g3385ea3481
+	provides = lib32-gstreamer=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gstreamer
 
 pkgname = lib32-gst-plugins-bad-libs-git
 	pkgdesc = Multimedia graph framework (32-bit) - bad
-	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-base-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-orc
 	depends = lib32-libdrm
 	depends = lib32-libx11
 	depends = lib32-libgudev
 	depends = lib32-libusb
 	depends = lib32-libxkbcommon-x11
-	provides = lib32-gst-plugins-bad-libs=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugins-bad-libs=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugins-bad-libs
 
 pkgname = lib32-gst-plugins-base-libs-git
 	pkgdesc = Multimedia graph framework (32-bit) - base
-	depends = lib32-gstreamer-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gstreamer-git=1.21.1+r44+g430ec0d860
 	depends = lib32-orc
 	depends = lib32-libxv
 	depends = lib32-libgudev
 	depends = lib32-libgl
 	depends = lib32-mesa
-	provides = lib32-gst-plugins-base-libs=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugins-base-libs=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugins-base-libs
 
 pkgname = lib32-gst-plugins-base-git
 	pkgdesc = Multimedia graph framework (32-bit) - base plugins
-	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-base-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-alsa-lib
 	depends = lib32-cdparanoia
 	depends = lib32-libvisual
@@ -158,12 +152,12 @@ pkgname = lib32-gst-plugins-base-git
 	depends = lib32-opus
 	depends = lib32-libpng
 	depends = lib32-libjpeg
-	provides = lib32-gst-plugins-base=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugins-base=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugins-base
 
 pkgname = lib32-gst-plugins-good-git
 	pkgdesc = Multimedia graph framework (32-bit) - good plugins
-	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-base-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-libpulse
 	depends = lib32-libsoup3
 	depends = lib32-gst-plugins-base-libs
@@ -188,12 +182,12 @@ pkgname = lib32-gst-plugins-good-git
 	depends = lib32-mpg123
 	depends = lib32-twolame
 	depends = libjack.so
-	provides = lib32-gst-plugins-good=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugins-good=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugins-good
 
 pkgname = lib32-gst-plugins-bad-git
 	pkgdesc = Multimedia graph framework (32-bit) - bad plugins
-	depends = lib32-gst-plugins-bad-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-bad-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-aom
 	depends = lib32-libass
 	depends = lib32-libbs2b
@@ -248,26 +242,26 @@ pkgname = lib32-gst-plugins-bad-git
 	depends = lib32-json-glib
 	depends = lib32-libavtp
 	optdepends = lib32-nvidia-utils: nvcodec plugin
-	provides = lib32-gst-plugins-bad=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugins-bad=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugins-bad
 
 pkgname = lib32-gst-plugin-gtk-git
 	pkgdesc = Multimedia graph framework (32-bit) - gtk plugin
-	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-base-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-gtk3
-	provides = lib32-gst-plugin-gtk=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugin-gtk=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugin-gtk
 
 pkgname = lib32-gst-plugin-va-git
 	pkgdesc = Multimedia graph framework (32-bit) - va plugin
-	depends = lib32-gst-plugins-bad-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-bad-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-libva
-	provides = lib32-gst-plugin-va=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugin-va=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugin-va
 
 pkgname = lib32-gst-plugins-ugly-git
 	pkgdesc = Multimedia graph framework (32-bit) - ugly plugins
-	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-base-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-libdvdread
 	depends = lib32-libmpeg2
 	depends = lib32-a52dec
@@ -275,27 +269,27 @@ pkgname = lib32-gst-plugins-ugly-git
 	depends = lib32-libcdio
 	depends = lib32-x264
 	depends = lib32-opencore-amr
-	provides = lib32-gst-plugins-ugly=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-plugins-ugly=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-plugins-ugly
 
 pkgname = lib32-gst-libav-git
 	pkgdesc = Multimedia graph framework (32-bit) - libav plugin
-	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-base-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-bzip2
 	depends = lib32-ffmpeg
-	provides = lib32-gst-ffmpeg=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-ffmpeg=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-libav
 
 pkgname = lib32-gst-rtsp-server-git
 	pkgdesc = Multimedia graph framework (32-bit) - rtsp server
-	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
-	provides = lib32-gst-rtsp-server=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-base-libs-git=1.21.1+r44+g430ec0d860
+	provides = lib32-gst-rtsp-server=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gst-rtsp-server
 
 pkgname = lib32-gstreamer-vaapi-git
 	pkgdesc = Multimedia graph framework (32-bit) - vaapi plugin
-	depends = lib32-gst-plugins-bad-libs-git=1.20.0+r1244+g3385ea3481
+	depends = lib32-gst-plugins-bad-libs-git=1.21.1+r44+g430ec0d860
 	depends = lib32-libva
 	depends = lib32-libxrandr
-	provides = lib32-gstreamer-vaapi=1.20.0+r1244+g3385ea3481
+	provides = lib32-gstreamer-vaapi=1.21.1+r44+g430ec0d860
 	conflicts = lib32-gstreamer-vaapi
diff --git a/0001-meson-Allow-building-with-system-orc.patch b/0001-meson-Allow-building-with-system-orc.patch
deleted file mode 100644
index 908174a48f80..000000000000
--- a/0001-meson-Allow-building-with-system-orc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Mon, 6 Jun 2022 00:29:08 +0200
-Subject: [PATCH] meson: Allow building with system orc
-
----
- meson.build | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 617ba8a41461..509565e90891 100644
---- a/meson.build
-+++ b/meson.build
-@@ -112,7 +112,13 @@ elif build_system == 'darwin'
-   subproject('macos-bison-binary')
- endif
- 
--orc_subproject = subproject('orc', required: get_option('orc'))
-+orc_subproject_required = get_option('orc')
-+if orc_subproject_required.allowed()
-+  # Download if possible, otherwise use system orc
-+  orc_subproject_required = false
-+endif
-+
-+orc_subproject = subproject('orc', required: orc_subproject_required)
- 
- foreach custom_subproj: get_option('custom_subprojects').split(',')
-     if custom_subproj != ''
diff --git a/0002-HACK-meson-Disable-broken-tests.patch b/0002-HACK-meson-Disable-broken-tests.patch
deleted file mode 100644
index a64bef60055e..000000000000
--- a/0002-HACK-meson-Disable-broken-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/subprojects/gst-rtsp-server/tests/check/meson.build b/subprojects/gst-rtsp-server/tests/check/meson.build
-index 229af32f81..b9372c125d 100644
---- a/subprojects/gst-rtsp-server/tests/check/meson.build
-+++ b/subprojects/gst-rtsp-server/tests/check/meson.build
-@@ -27,7 +27,6 @@ rtsp_server_tests = [
-   'gst/mediafactory',
-   'gst/media',
-   'gst/permissions',
--  'gst/rtspserver',
-   'gst/sessionmedia',
-   'gst/sessionpool',
-   'gst/stream',
-diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
-index 4440d7a03c..60822c7b32 100644
---- a/subprojects/gstreamer-vaapi/meson.build
-+++ b/subprojects/gstreamer-vaapi/meson.build
-@@ -218,7 +218,7 @@ plugins = []
- 
- subdir('gst-libs')
- subdir('gst')
--subdir('tests')
-+# subdir('tests')
- subdir('docs')
- 
- # Set release date
diff --git a/0003-HACK-meson-Work-around-broken-detection-of-underscor.patch b/0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
deleted file mode 100644
index 6883c6fed194..000000000000
--- a/0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Mon, 6 Jun 2022 00:30:08 +0200
-Subject: [PATCH] HACK: meson: Work around broken detection of underscore
- prefixes
-
-See: https://github.com/mesonbuild/meson/issues/5482
----
- subprojects/gst-plugins-good/gst/deinterlace/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/subprojects/gst-plugins-good/gst/deinterlace/meson.build b/subprojects/gst-plugins-good/gst/deinterlace/meson.build
-index e86bebe613fc..96a961107ab6 100644
---- a/subprojects/gst-plugins-good/gst/deinterlace/meson.build
-+++ b/subprojects/gst-plugins-good/gst/deinterlace/meson.build
-@@ -54,8 +54,6 @@ if have_nasm and host_cpu == 'x86_64'
-   # https://github.com/mesonbuild/meson/issues/5482
-   if ['darwin', 'ios'].contains(host_system)
-     asm_prefix_def = '-DPREFIX'
--  elif cc.symbols_have_underscore_prefix()
--    asm_prefix_def = '-DPREFIX'
-   else
-     asm_prefix_def = '-UPREFIX'
-   endif
diff --git a/PKGBUILD b/PKGBUILD
index 971c2f4f687f..b6d6fb7c7d91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ pkgname=(
 
   lib32-gstreamer-vaapi-git
 )
-pkgver=1.20.0+r1244+g3385ea3481
+pkgver=1.21.1+r44+g430ec0d860
 pkgrel=1
 pkgdesc="Multimedia graph framework (32-bit)"
 url="https://gstreamer.freedesktop.org/"
@@ -63,14 +63,8 @@ checkdepends=(xorg-server-xvfb)
 options=(debug)
 source=(
   "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git"
-  0001-meson-Allow-building-with-system-orc.patch
-  0002-HACK-meson-Disable-broken-tests.patch
-  0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
 )
-sha256sums=('SKIP'
-            '292edebc224557db08404b0d53e2824413f0aad2a99c991de2cb8ccc6e9a7683'
-            'cdb0b056d8a1d31394fb3cf23dcfa8e7345cac6671dacdee8029b380ef30640d'
-            '79d3038a0ba0c3958ffa8b5aec8431336b372906c07c0c878c3767bec0acb46f')
+sha256sums=('SKIP')
 
 pkgver() {
   cd gstreamer
@@ -79,16 +73,6 @@ pkgver() {
 
 prepare() {
   cd gstreamer
-
-  # Fix linking with system orc
-  git apply -3 ../0001-meson-Allow-building-with-system-orc.patch
-
-  # Disable broken tests
-  git apply -3 ../0002-HACK-meson-Disable-broken-tests.patch
-  
-  # Workaround broken detection of underscore prefixes
-  # https://github.com/mesonbuild/meson/issues/5482
-  git apply -3 ../0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
 }
 
 build() {
@@ -100,9 +84,11 @@ build() {
     -D gpl=enabled
     -D gst-examples=disabled
     -D libnice=disabled
+    -D omx=disabled # fix
+    -D orc=enabled # fix
+    -D orc-source="system" # fix
     -D vaapi=enabled
     -D python=disabled # fix
-    -D omx=disabled # fix
     -D sharp=disabled # fix
     -D rs=disabled # fix
     -D tls=disabled # fix
@@ -253,10 +239,9 @@ package_lib32-gst-plugins-bad-libs-git() {
   conflicts=("lib32-gst-plugins-bad-libs")
 
   cd root; local files=(
-    usr/lib32/libgst{adaptivedemux,badaudio,basecamerabinsrc,codecparsers,codecs,cuda,insertbin,isoff,mpegts,photography,play,player,sctp,transcoder,uridownloader,vulkan,wayland,webrtc}-1.0.so*
-    usr/lib32/pkgconfig/gstreamer-{bad-audio,codecparsers,insertbin,mpegts,photography,play,player,sctp,transcoder,vulkan{,-wayland,-xcb},wayland,webrtc}-1.0.pc
+    usr/lib32/libgst{adaptivedemux,badaudio,basecamerabinsrc,codecparsers,codecs,cuda,insertbin,isoff,mpegts,photography,play,player,sctp,transcoder,uridownloader,vulkan,wayland,webrtc,webrtcnice}-1.0.so*
+    usr/lib32/pkgconfig/gstreamer-{bad-audio,codecparsers,cuda,insertbin,mpegts,photography,play,player,plugins-bad,sctp,transcoder,va,vulkan{,-wayland,-xcb},wayland,webrtc{,-nice}}-1.0.pc
 
-    usr/lib32/pkgconfig/gstreamer-plugins-bad-1.0.pc
     usr/lib32/gstreamer-1.0/libgstaccurip.so
     usr/lib32/gstreamer-1.0/libgstadpcmdec.so
     usr/lib32/gstreamer-1.0/libgstadpcmenc.so
@@ -272,6 +257,7 @@ package_lib32-gst-plugins-bad-libs-git() {
     usr/lib32/gstreamer-1.0/libgstbluez.so
     usr/lib32/gstreamer-1.0/libgstcamerabin.so
     usr/lib32/gstreamer-1.0/libgstcodecalpha.so
+    usr/lib32/gstreamer-1.0/libgstcodectimestamper.so
     usr/lib32/gstreamer-1.0/libgstcoloreffects.so
     usr/lib32/gstreamer-1.0/libgstdebugutilsbad.so
     usr/lib32/gstreamer-1.0/libgstdecklink.so
@@ -288,6 +274,7 @@ package_lib32-gst-plugins-bad-libs-git() {
     usr/lib32/gstreamer-1.0/libgstgaudieffects.so
     usr/lib32/gstreamer-1.0/libgstgdp.so
     usr/lib32/gstreamer-1.0/libgstgeometrictransform.so
+    usr/lib32/gstreamer-1.0/libgstgtkwayland.so
     usr/lib32/gstreamer-1.0/libgstid3tag.so
     usr/lib32/gstreamer-1.0/libgstinter.so
     usr/lib32/gstreamer-1.0/libgstinterlace.so
@@ -644,6 +631,7 @@ package_lib32-gstreamer-vaapi-git() {
   conflicts=("lib32-gstreamer-vaapi")
 
   cd root; local files=(
+    usr/lib32/gstreamer-1.0/pkgconfig/gstvaapi.pc
     usr/lib32/gstreamer-1.0/libgstvaapi.so
   ); _install
 }