lib32-gst-bad-ugly: Publish v1.22.4

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

3 files changed, 68 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1be831139e95..ac8e53d9aca0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-gst-bad-ugly
 	pkgdesc = Multimedia graph framework (32-bit)
-	pkgver = 1.22.3
+	pkgver = 1.22.4
 	pkgrel = 1
 	url = https://gstreamer.freedesktop.org/
 	arch = x86_64
@@ -12,12 +12,17 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-gst-plugins-base
 	makedepends = lib32-gst-plugins-good
 	makedepends = wayland-protocols
+	makedepends = lib32-gst-plugins-base-libs
+	makedepends = lib32-libgudev
+	makedepends = lib32-openjpeg2
+	makedepends = lib32-orc
 	makedepends = lib32-vulkan-icd-loader
 	makedepends = vulkan-headers
 	makedepends = lib32-vulkan-validation-layers
 	makedepends = lib32-shaderc
 	makedepends = lib32-libusb
 	makedepends = lib32-libdc1394
+	makedepends = lib32-srt
 	makedepends = libltc
 	makedepends = lib32-bluez-libs
 	makedepends = lib32-libavtp
@@ -44,12 +49,15 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-rtmpdump
 	makedepends = lib32-sbc
 	makedepends = lib32-soundtouch
+	makedepends = lib32-x265
 	makedepends = lib32-spandsp
 	makedepends = lib32-libsrtp
 	makedepends = lib32-zvbi
 	makedepends = lib32-libnice
 	makedepends = lib32-webrtc-audio-processing
 	makedepends = lib32-wildmidi
+	makedepends = lib32-libass
+	makedepends = lib32-libwebp
 	makedepends = lib32-zbar
 	makedepends = lib32-nettle
 	makedepends = lib32-libxml2
@@ -57,37 +65,37 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-json-glib
 	makedepends = lib32-libva
 	makedepends = lib32-libxkbcommon-x11
+	makedepends = lib32-libmodplug
+	makedepends = lib32-aom
 	makedepends = lib32-a52dec
 	makedepends = lib32-opencore-amr
 	makedepends = lib32-libcdio
 	makedepends = lib32-libdvdread
 	makedepends = lib32-libmpeg2
-	makedepends = lib32-libsidplay
 	makedepends = lib32-x264
 	makedepends = lib32-ffmpeg
 	options = !debug
-	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.22.3
+	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.22.4
 	source = 0001-Allow-disabling-gstreamer.patch
 	source = 0002-HACK-meson-Disable-broken-tests.patch
 	validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
 	sha256sums = SKIP
 	sha256sums = 0cfce6cad2d9fc55fe36e4ca48ec8aa33106cc1f778ddf0ae47362d230e5539b
-	sha256sums = 9fda6342fb1cbb29dab7ac46e277eee7272b119efee770e72e7d972621fc1e7e
+	sha256sums = 951edc965cce062b3a08048297c9d66ff264eed5d8e884170706e4854c9f92df
 
 pkgname = lib32-gst-libav
 	pkgdesc = Multimedia graph framework (32-bit) - libav plugin
-	depends = lib32-gst-plugins-base-libs>=1.22.3
+	depends = lib32-gst-plugins-base-libs>=1.22.4
 	depends = lib32-ffmpeg
-	provides = lib32-gst-ffmpeg=1.22.3
+	provides = lib32-gst-ffmpeg=1.22.4
 	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.22.3
+	depends = lib32-gst-plugins-base-libs>=1.22.4
 	depends = lib32-libdvdread
 	depends = lib32-libmpeg2
 	depends = lib32-a52dec
-	depends = lib32-libsidplay
 	depends = lib32-libcdio
 	depends = lib32-x264
 	depends = lib32-opencore-amr
@@ -95,7 +103,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.22.3
+	depends = lib32-gst-plugins-base-libs>=1.22.4
 	depends = lib32-libxkbcommon-x11
 	depends = lib32-orc
 	depends = lib32-libva
@@ -107,7 +115,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.22.3
+	depends = lib32-gst-plugins-bad-libs>=1.22.4
 	depends = lib32-aom
 	depends = lib32-libass
 	depends = lib32-libbs2b
diff --git a/0002-HACK-meson-Disable-broken-tests.patch b/0002-HACK-meson-Disable-broken-tests.patch
index 74025b4847e3..fecc2efdd740 100644
--- a/0002-HACK-meson-Disable-broken-tests.patch
+++ b/0002-HACK-meson-Disable-broken-tests.patch
@@ -4,14 +4,15 @@ Date: Mon, 6 Jun 2022 00:30:08 +0200
 Subject: [PATCH] HACK: meson: Disable broken tests
 
 ---
- subprojects/gst-editing-services/meson.build        | 1 -
- subprojects/gst-python/meson.build                  | 1 -
- subprojects/gst-rtsp-server/tests/check/meson.build | 1 -
- subprojects/gstreamer-vaapi/meson.build             | 1 -
- 4 files changed, 4 deletions(-)
+ subprojects/gst-editing-services/meson.build               | 1 -
+ subprojects/gst-plugins-good/tests/check/elements/flvmux.c | 1 -
+ subprojects/gst-python/meson.build                         | 1 -
+ subprojects/gst-rtsp-server/tests/check/meson.build        | 1 -
+ subprojects/gstreamer-vaapi/meson.build                    | 1 -
+ 5 files changed, 5 deletions(-)
 
 diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
-index f97b65bfcbc4..c70d6a035355 100644
+index eb05471af7f2..1d97a018fc00 100644
 --- a/subprojects/gst-editing-services/meson.build
 +++ b/subprojects/gst-editing-services/meson.build
 @@ -270,7 +270,6 @@ subdir('ges')
@@ -22,11 +23,23 @@ index f97b65bfcbc4..c70d6a035355 100644
  if not get_option('examples').disabled()
    subdir('examples')
  endif
+diff --git a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c b/subprojects/gst-plugins-good/tests/check/elements/flvmux.c
+index 53a8e634e41a..f270c1d11bfb 100644
+--- a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c
++++ b/subprojects/gst-plugins-good/tests/check/elements/flvmux.c
+@@ -1162,7 +1162,6 @@ flvmux_suite (void)
+ 
+   tcase_add_test (tc_chain, test_speex_streamable);
+   tcase_add_test (tc_chain, test_increasing_timestamp_when_pts_none);
+-  tcase_add_test (tc_chain, test_video_caps_late);
+   tcase_add_test (tc_chain, test_audio_caps_change_streamable);
+   tcase_add_test (tc_chain, test_video_caps_change_streamable);
+   tcase_add_test (tc_chain, test_audio_caps_change_streamable_single);
 diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build
-index d3d472fe0fdb..c1825e49f64d 100644
+index 25898b4c9607..fa6c4285af9c 100644
 --- a/subprojects/gst-python/meson.build
 +++ b/subprojects/gst-python/meson.build
-@@ -106,5 +106,4 @@ if not get_option('plugin').disabled()
+@@ -107,5 +107,4 @@ if not get_option('plugin').disabled()
    endif
  endif
  if not get_option('tests').disabled()
@@ -45,7 +58,7 @@ index 229af32f8117..b9372c125d77 100644
    'gst/sessionpool',
    'gst/stream',
 diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
-index 9cd3fcf19cb7..4f8e6d27f9a3 100644
+index dd04729188b6..f5302bf20837 100644
 --- a/subprojects/gstreamer-vaapi/meson.build
 +++ b/subprojects/gstreamer-vaapi/meson.build
 @@ -219,7 +219,6 @@ plugins = []
diff --git a/PKGBUILD b/PKGBUILD
index f72684d0566b..c002d3c6b3f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=(
     lib32-gst-plugins-bad-libs
     lib32-gst-plugins-bad
 )
-pkgver=1.22.3
+pkgver=1.22.4
 pkgrel=1
 pkgdesc="Multimedia graph framework (32-bit)"
 url="https://gstreamer.freedesktop.org/"
@@ -19,16 +19,19 @@ makedepends=(
     # superproject
     git meson lib32-gstreamer lib32-gst-plugins-{base,good} wayland-protocols
 
+	# gst-plugins-bad-libs
+	lib32-gst-plugins-base-libs lib32-libgudev lib32-openjpeg2 lib32-orc
+
     # gst-plugins-bad
-    lib32-vulkan-icd-loader vulkan-headers lib32-vulkan-validation-layers lib32-shaderc lib32-libusb lib32-libdc1394
+    lib32-vulkan-icd-loader vulkan-headers lib32-vulkan-validation-layers lib32-shaderc lib32-libusb lib32-libdc1394 lib32-srt
     libltc lib32-bluez-libs lib32-libavtp lib32-libbs2b lib32-bzip2 lib32-chromaprint lib32-libdca lib32-faac lib32-faad2
     lib32-libfdk-aac lib32-fluidsynth lib32-libgme lib32-libkate lib32-liblrdf lib32-ladspa lib32-libde265 lib32-lilv lib32-lv2
-    lib32-mjpegtools lib32-libmpcdec lib32-neon lib32-openal lib32-libdvdnav lib32-rtmpdump lib32-sbc lib32-soundtouch
-    lib32-spandsp lib32-libsrtp lib32-zvbi lib32-libnice lib32-webrtc-audio-processing lib32-wildmidi
-    lib32-zbar lib32-nettle lib32-libxml2 lib32-gsm lib32-json-glib lib32-libva lib32-libxkbcommon-x11
+    lib32-mjpegtools lib32-libmpcdec lib32-neon lib32-openal lib32-libdvdnav lib32-rtmpdump lib32-sbc lib32-soundtouch lib32-x265
+    lib32-spandsp lib32-libsrtp lib32-zvbi lib32-libnice lib32-webrtc-audio-processing lib32-wildmidi lib32-libass lib32-libwebp
+    lib32-zbar lib32-nettle lib32-libxml2 lib32-gsm lib32-json-glib lib32-libva lib32-libxkbcommon-x11 lib32-libmodplug lib32-aom
 
     # gst-plugins-ugly
-    lib32-a52dec lib32-opencore-amr lib32-libcdio lib32-libdvdread lib32-libmpeg2 lib32-libsidplay lib32-x264
+    lib32-a52dec lib32-opencore-amr lib32-libcdio lib32-libdvdread lib32-libmpeg2 lib32-x264
 
     # gst-libav
     lib32-ffmpeg
@@ -42,7 +45,7 @@ source=(
 )
 sha256sums=('SKIP'
             '0cfce6cad2d9fc55fe36e4ca48ec8aa33106cc1f778ddf0ae47362d230e5539b'
-            '9fda6342fb1cbb29dab7ac46e277eee7272b119efee770e72e7d972621fc1e7e')
+            '951edc965cce062b3a08048297c9d66ff264eed5d8e884170706e4854c9f92df')
 validpgpkeys=(D637032E45B8C6585B9456565D2EEE6F6F349D7C) # Tim Müller <tim@gstreamer-foundation.org>
 
 pkgver() {
@@ -81,9 +84,11 @@ build() {
   local meson_options=(
     --libdir=lib32
     --libexecdir=lib32
+    # Superproject options
     -D devtools=disabled
     -D doc=disabled
     -D examples=disabled
+    -D gobject-cast-checks=disabled
     -D ges=disabled
     -D gpl=enabled
     -D gst-examples=disabled
@@ -91,23 +96,32 @@ build() {
     -D libav=disabled
     -D libnice=disabled
     -D omx=disabled
-    -D orc=disabled
+    -D orc-source=system
+    -D package-origin="https://www.archlinux.org/"
+
+    # Package names
+    -D gst-plugins-bad:package-name="Arch Linux lib32-gst-plugins-bad $pkgver-$pkgrel"
+    -D gst-plugins-ugly:package-name="Arch Linux lib32-gst-plugins-ugly $pkgver-$pkgrel"
+    -D gst-libav:package-name="Arch Linux lib32-gst-libav $pkgver-$pkgrel"
     -D python=disabled
     -D qt5=disabled
     -D rs=disabled
     -D rtsp_server=disabled
     -D sharp=disabled
+    -D vaapi=disabled
     -D base=disabled # already in repo
     -D good=disabled # already in repo
     -D gstreamer=disabled # already in repo
+
     # package scoped
     -D libav=enabled
     -D ugly=enabled
     -D bad=enabled
     # subprojects
     -D gst-plugins-bad:directfb=disabled
+    -D gst-plugins-bad:directshow=disabled
+    -D gst-plugins-bad:directsound=disabled
     -D gst-plugins-bad:flite=disabled
-    -D gst-plugins-bad:gobject-cast-checks=disabled
     -D gst-plugins-bad:gs=disabled
     -D gst-plugins-bad:iqa=disabled
     -D gst-plugins-bad:isac=disabled
@@ -116,8 +130,6 @@ build() {
     -D gst-plugins-bad:openh264=disabled
     -D gst-plugins-bad:openni2=disabled
     -D gst-plugins-bad:opensles=disabled
-    -D gst-plugins-bad:package-name="Arch Linux gst-plugins-bad $pkgver-$pkgrel"
-    -D gst-plugins-bad:package-origin="https://www.archlinux.org/"
     -D gst-plugins-bad:tinyalsa=disabled
     -D gst-plugins-bad:voaacenc=disabled
     -D gst-plugins-bad:voamrwbenc=disabled
@@ -137,23 +149,17 @@ build() {
     -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"
-    -D gst-plugins-ugly:package-origin="https://www.archlinux.org/"
-
-    -D gst-libav:package-name="Arch Linux gst-libav $pkgver-$pkgrel"
-    -D gst-libav:package-origin="https://www.archlinux.org/"
+    -D gst-plugins-ugly:sidplay=disabled
   )
 
   arch-meson gstreamer build "${meson_options[@]}"
+  meson configure build  # Print config
   meson compile -C build
 }
 
 check() (
-  mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}"
-  export XDG_RUNTIME_DIR
+  export XDG_RUNTIME_DIR="$PWD/runtime-dir"
+  mkdir -p -m 700 "$XDG_RUNTIME_DIR"
 
   # Flaky due to timeouts
   xvfb-run -s '-nolisten local' \
@@ -243,7 +249,7 @@ package_lib32-gst-plugins-ugly() {
   pkgdesc+=" - ugly plugins"
   depends=(
     "lib32-gst-plugins-base-libs>=$pkgver"
-    lib32-libdvdread lib32-libmpeg2 lib32-a52dec lib32-libsidplay lib32-libcdio lib32-x264 lib32-opencore-amr
+    lib32-libdvdread lib32-libmpeg2 lib32-a52dec lib32-libcdio lib32-x264 lib32-opencore-amr
   )
   replaces=('lib32-gst-plugins-ugly-latest')