lib32-gst-bad-ugly: Release v1.22.0

Signed-off-by: Mubashshir <ahmubashshir@gmail.com>

6 files changed, 51 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af7182ab38d0..a67c302d1525 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-gst-bad-ugly
 	pkgdesc = Multimedia graph framework (32-bit)
-	pkgver = 1.20.5
-	pkgrel = 4
+	pkgver = 1.22.0
+	pkgrel = 1
 	url = https://gstreamer.freedesktop.org/
 	arch = x86_64
 	license = LGPL
@@ -66,26 +66,24 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-x264
 	makedepends = lib32-ffmpeg
 	options = !debug
-	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git#tag=1.20.5
+	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.22.0
 	source = 0001-Allow-disabling-gstreamer.patch
 	source = 0002-HACK-meson-Disable-broken-tests.patch
-	source = 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
 	validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
 	sha256sums = SKIP
-	sha256sums = 79b4d76bdb1ccf05099eff677d72cdf9df50788261891be41065aca21b4ea8b6
-	sha256sums = 11971a978e37fda3822f95fb61b59ba3ded6487066dc59fcbde7b72a3a9cfe70
-	sha256sums = 79d3038a0ba0c3958ffa8b5aec8431336b372906c07c0c878c3767bec0acb46f
+	sha256sums = 0cfce6cad2d9fc55fe36e4ca48ec8aa33106cc1f778ddf0ae47362d230e5539b
+	sha256sums = 9fda6342fb1cbb29dab7ac46e277eee7272b119efee770e72e7d972621fc1e7e
 
 pkgname = lib32-gst-libav
 	pkgdesc = Multimedia graph framework (32-bit) - libav plugin
-	depends = lib32-gst-plugins-base-libs=1.20.5
+	depends = lib32-gst-plugins-base-libs=1.22.0
 	depends = lib32-ffmpeg
-	provides = lib32-gst-ffmpeg=1.20.5
+	provides = lib32-gst-ffmpeg=1.22.0
 	replaces = lib32-gst-libav-latest
 
 pkgname = lib32-gst-plugins-ugly
 	pkgdesc = Multimedia graph framework (32-bit) - ugly plugins
-	depends = lib32-gst-plugins-base-libs=1.20.5
+	depends = lib32-gst-plugins-base-libs=1.22.0
 	depends = lib32-libdvdread
 	depends = lib32-libmpeg2
 	depends = lib32-a52dec
@@ -97,7 +95,7 @@ pkgname = lib32-gst-plugins-ugly
 
 pkgname = lib32-gst-plugins-bad-libs
 	pkgdesc = Multimedia graph framework (32-bit) - bad
-	depends = lib32-gst-plugins-base-libs=1.20.5
+	depends = lib32-gst-plugins-base-libs=1.22.0
 	depends = lib32-libxkbcommon-x11
 	depends = lib32-orc
 	depends = lib32-libva
@@ -109,7 +107,7 @@ pkgname = lib32-gst-plugins-bad-libs
 
 pkgname = lib32-gst-plugins-bad
 	pkgdesc = Multimedia graph framework (32-bit) - bad plugins
-	depends = lib32-gst-plugins-bad-libs=1.20.5
+	depends = lib32-gst-plugins-bad-libs=1.22.0
 	depends = lib32-aom
 	depends = lib32-libass
 	depends = lib32-libbs2b
diff --git a/.gitignore b/.gitignore
index c3d478557806..76f247a06618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,5 @@
 !PKGBUILD
 !.SRCINFO
 !0002-HACK-meson-Disable-broken-tests.patch
-!0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
 !.gitignore
 !0001-Allow-disabling-gstreamer.patch
diff --git a/0001-Allow-disabling-gstreamer.patch b/0001-Allow-disabling-gstreamer.patch
index 13377d55a32f..74248616c6dd 100644
--- a/0001-Allow-disabling-gstreamer.patch
+++ b/0001-Allow-disabling-gstreamer.patch
@@ -1,27 +1,18 @@
-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 | 2 +-
- meson_options.txt | 1 +
- 2 file changed, 2 insertions(+), 1 deletion(-)
-
 diff --git a/meson.build b/meson.build
-index 83eae5a482..31a12d7c7a 100644
+index 1c33e18084..8612d88e04 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -92,7 +92,7 @@ endif
+@@ -85,7 +85,7 @@ endif
  
  # Ordered list of subprojects (dict has no ordering guarantees)
  subprojects = [
--  ['gstreamer', {'build-hotdoc': true}],
-+  ['gstreamer', {'option': get_option('gstreamer'), 'build-hotdoc': true}],
+-  ['gstreamer', {'build-hotdoc': true, 'subproject_options': tools_option}],
++  ['gstreamer', {'option': get_option('gstreamer'), 'build-hotdoc': true, 'subproject_options': tools_option}],
    ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': true}],
    ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': true}],
    ['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}],
 diff --git a/meson_options.txt b/meson_options.txt
-index 7a43f34430..522e6662a7 100644
+index 49c20a0705..66ff309b1f 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -3,6 +3,7 @@ option('python', type : 'feature', value : 'auto')
@@ -32,3 +23,16 @@ index 7a43f34430..522e6662a7 100644
  option('good', type : 'feature', value : 'enabled')
  option('ugly', type : 'feature', value : 'auto')
  option('bad', type : 'feature', value : 'auto')
+diff --git a/meson.build b/meson.build
+index 8612d88e04..7fa8b5724d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -162,7 +162,7 @@ foreach sp : subprojects
+     subproj = subproject(project_name, required: is_required, default_options: default_options)
+   endif
+ 
+-  if project_name == 'gst-plugins-base'
++  if project_name == 'gst-plugins-base' and not is_required.disabled()
+     gst_base_orc_req = subproj.get_variable('orc_req', '')
+     if gst_base_orc_req != orc_req
+       error('orc_req is "@0@" but it should be "@1@" from subprojects/gst-plugins-base/meson.build'
diff --git a/0002-HACK-meson-Disable-broken-tests.patch b/0002-HACK-meson-Disable-broken-tests.patch
index 0aa801eacebd..74025b4847e3 100644
--- a/0002-HACK-meson-Disable-broken-tests.patch
+++ b/0002-HACK-meson-Disable-broken-tests.patch
@@ -11,22 +11,22 @@ Subject: [PATCH] HACK: meson: Disable broken tests
  4 files changed, 4 deletions(-)
 
 diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
-index 1a4a29b3657f..857290baf35f 100644
+index f97b65bfcbc4..c70d6a035355 100644
 --- a/subprojects/gst-editing-services/meson.build
 +++ b/subprojects/gst-editing-services/meson.build
-@@ -274,7 +274,6 @@ subdir('plugins')
- if not get_option('tools').disabled()
-   subdir('tools')
- endif
+@@ -270,7 +270,6 @@ subdir('ges')
+ subdir('plugins')
+ subdir('tools')
+ 
 -subdir('tests')
  if not get_option('examples').disabled()
    subdir('examples')
  endif
 diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build
-index dce5982e59d7..ed51d7e88f36 100644
+index d3d472fe0fdb..c1825e49f64d 100644
 --- a/subprojects/gst-python/meson.build
 +++ b/subprojects/gst-python/meson.build
-@@ -104,5 +104,4 @@ if not get_option('plugin').disabled()
+@@ -106,5 +106,4 @@ if not get_option('plugin').disabled()
    endif
  endif
  if not get_option('tests').disabled()
@@ -45,10 +45,10 @@ index 229af32f8117..b9372c125d77 100644
    'gst/sessionpool',
    'gst/stream',
 diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
-index 702441cb7b5c..9fff27ce91b9 100644
+index 9cd3fcf19cb7..4f8e6d27f9a3 100644
 --- a/subprojects/gstreamer-vaapi/meson.build
 +++ b/subprojects/gstreamer-vaapi/meson.build
-@@ -202,7 +202,6 @@ plugins = []
+@@ -219,7 +219,6 @@ plugins = []
  
  subdir('gst-libs')
  subdir('gst')
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 9afcbd6ac435..cebfa7be7c52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=(
     lib32-gst-plugins-bad-libs
     lib32-gst-plugins-bad
 )
-pkgver=1.20.5
-pkgrel=4
+pkgver=1.22.0
+pkgrel=1
 pkgdesc="Multimedia graph framework (32-bit)"
 url="https://gstreamer.freedesktop.org/"
 arch=(x86_64)
@@ -36,15 +36,13 @@ makedepends=(
 checkdepends=(xorg-server-xvfb)
 options=(!debug)
 source=(
-  "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git#tag=$pkgver"
+  "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=$pkgver"
   0001-Allow-disabling-gstreamer.patch
   0002-HACK-meson-Disable-broken-tests.patch
-  0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
 )
 sha256sums=('SKIP'
-            '79b4d76bdb1ccf05099eff677d72cdf9df50788261891be41065aca21b4ea8b6'
-            '11971a978e37fda3822f95fb61b59ba3ded6487066dc59fcbde7b72a3a9cfe70'
-            '79d3038a0ba0c3958ffa8b5aec8431336b372906c07c0c878c3767bec0acb46f')
+            '0cfce6cad2d9fc55fe36e4ca48ec8aa33106cc1f778ddf0ae47362d230e5539b'
+            '9fda6342fb1cbb29dab7ac46e277eee7272b119efee770e72e7d972621fc1e7e')
 validpgpkeys=(D637032E45B8C6585B9456565D2EEE6F6F349D7C) # Tim Müller <tim@gstreamer-foundation.org>
 
 pkgver() {
@@ -60,15 +58,16 @@ prepare() {
 
   # 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
 }
 
 _fix_pkgconf() {
   if $PKG_CONFIG --variable=libexecdir "$1" | grep -q /usr/libexec; then
+	mkdir -p pc
     sed 's@/libexec@/lib32@' "/usr/lib32/pkgconfig/$1.pc" > "$srcdir/pc/$1.pc"
+    case ":${PKG_CONFIG_PATH}:" in
+      *:"$srcdir/pc":*) return;;
+      *) export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH+:}${srcdir}/pc";;
+    esac
   fi
 }
 
@@ -76,8 +75,6 @@ build() {
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
-  export PKG_CONFIG_PATH="$srcdir/pc"
-  mkdir -p pc
   _fix_pkgconf gstreamer-1.0
   _fix_pkgconf gstreamer-base-1.0
 
@@ -128,6 +125,7 @@ build() {
     -D gst-plugins-bad:wasapi=disabled
     -D gst-plugins-bad:opencv=disabled # due to no lib32-opencv
     -D gst-plugins-bad:msdk=disabled # due to no msdk (32-bit) support
+    -D gst-plugins-bad:qsv=disabled # due to no x86 support
     -D gst-plugins-bad:ldac=disabled # due to no lib32-libdac support
     -D gst-plugins-bad:microdns=disabled # due to no lib32-microdns support
     -D gst-plugins-bad:openaptx=disabled # due to no lib32-Xaptx support
@@ -135,8 +133,11 @@ build() {
     -D gst-plugins-bad:openmpt=disabled # due to no lib32-openmpt support
     -D gst-plugins-bad:qroverlay=disabled # due to no lib32-qrencode support
     -D gst-plugins-bad:svthevcenc=disabled # due to no lib32-svthevcenc support
+#    -D gst-plugins-bad:svtav1=disabled # due to no lib32-svt-av1
     -D gst-plugins-bad:wpe=disabled # due to no lib32-wpe support
     -D gst-plugins-bad:zxing=disabled # due to no lib32-zxing support
+    -D gst-plugins-bad:amfcodec=disabled # only support windows
+    -D gst-plugins-bad:directshow=disabled # only support windows
 
     -D gst-plugins-ugly:gobject-cast-checks=disabled
     -D gst-plugins-ugly:package-name="Arch Linux gst-plugins-ugly $pkgver-$pkgrel"