lib32-gst-bad-ugly: Fix build errors and missing deps

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

3 files changed, 71 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2abb3a4ece7..3a4d2955398d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-gst-plugins-good
 	makedepends = wayland-protocols
 	makedepends = lib32-gtk3
+	makedepends = python-packaging
 	makedepends = lib32-gst-plugins-base-libs>=1.24.0
 	makedepends = lib32-a52dec
 	makedepends = lib32-libcdio
@@ -23,10 +24,9 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-libdrm
 	makedepends = lib32-libgudev
 	makedepends = lib32-libusb
-	makedepends = lib32-libva
+	makedepends = lib32-orc
 	makedepends = lib32-libx11
 	makedepends = lib32-libxkbcommon-x11
-	makedepends = lib32-orc
 	makedepends = lib32-aom
 	makedepends = lib32-bzip2
 	makedepends = lib32-curl
@@ -43,8 +43,6 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-libdvdnav
 	makedepends = lib32-libdvdread
 	makedepends = lib32-libfdk-aac
-	makedepends = lib32-libgme
-	makedepends = lib32-libkate
 	makedepends = lib32-liblrdf
 	makedepends = lib32-libmodplug
 	makedepends = lib32-libmpcdec
@@ -71,6 +69,7 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-x265
 	makedepends = lib32-zvbi
 	makedepends = libltc
+	makedepends = lib32-libgme
 	makedepends = vulkan-headers
 	makedepends = lib32-vulkan-validation-layers
 	makedepends = lib32-shaderc
@@ -80,13 +79,12 @@ pkgbase = lib32-gst-bad-ugly
 	makedepends = lib32-json-glib
 	makedepends = lib32-ffmpeg
 	options = !debug
-	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.0
+	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git#tag=1.24.0
 	source = 0001-Allow-disabling-gstreamer.patch
 	source = 0002-HACK-meson-Disable-broken-tests.patch
-	validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
 	sha256sums = SKIP
 	sha256sums = dd928acaa15670225059b36ca5a29d808feba3855700f9b36128a2e55a335a50
-	sha256sums = 951edc965cce062b3a08048297c9d66ff264eed5d8e884170706e4854c9f92df
+	sha256sums = 3ff4e16e0d64ca935fbcc1ee5338ac815a8682878c2da78b9d0166037949e54e
 
 pkgname = lib32-gst-plugins-ugly
 	pkgdesc = Multimedia graph framework (32-bit) - ugly plugins
@@ -112,10 +110,9 @@ pkgname = lib32-gst-plugins-bad-libs
 	depends = lib32-libdrm
 	depends = lib32-libgudev
 	depends = lib32-libusb
-	depends = lib32-libva
+	depends = lib32-orc
 	depends = lib32-libx11
 	depends = lib32-libxkbcommon-x11
-	depends = lib32-orc
 	replaces = lib32-gst-plugins-bad-libs-latest
 
 pkgname = lib32-gst-plugins-bad
@@ -137,8 +134,6 @@ pkgname = lib32-gst-plugins-bad
 	depends = lib32-libdvdnav
 	depends = lib32-libdvdread
 	depends = lib32-libfdk-aac
-	depends = lib32-libgme
-	depends = lib32-libkate
 	depends = lib32-liblrdf
 	depends = lib32-libmodplug
 	depends = lib32-libmpcdec
@@ -165,4 +160,5 @@ pkgname = lib32-gst-plugins-bad
 	depends = lib32-x265
 	depends = lib32-zvbi
 	depends = libltc
+	depends = lib32-libgme
 	replaces = lib32-gst-plugins-bad-latest
diff --git a/0002-HACK-meson-Disable-broken-tests.patch b/0002-HACK-meson-Disable-broken-tests.patch
index fecc2efdd740..a3f5741b5bc7 100644
--- a/0002-HACK-meson-Disable-broken-tests.patch
+++ b/0002-HACK-meson-Disable-broken-tests.patch
@@ -4,27 +4,53 @@ 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-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(-)
+ subprojects/gst-editing-services/meson.build                | 1 -
+ subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c | 1 -
+ subprojects/gst-plugins-bad/tests/check/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         | 2 --
+ subprojects/gstreamer-vaapi/meson.build                     | 1 -
+ 7 files changed, 8 deletions(-)
 
 diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
-index eb05471af7f2..1d97a018fc00 100644
+index 968671934c4e..9741838d67b9 100644
 --- a/subprojects/gst-editing-services/meson.build
 +++ b/subprojects/gst-editing-services/meson.build
-@@ -270,7 +270,6 @@ subdir('ges')
+@@ -295,7 +295,6 @@ subdir('ges')
  subdir('plugins')
  subdir('tools')
  
 -subdir('tests')
- if not get_option('examples').disabled()
-   subdir('examples')
- endif
+ subdir('examples')
+ subdir('docs')
+ 
+diff --git a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c
+index 1d347b0a54ea..1ee4babf36ae 100644
+--- a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c
++++ b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c
+@@ -6659,7 +6659,6 @@ dash_suite (void)
+   tcase_add_test (tc_simpleMPD, dash_mpdparser_default_presentation_delay);
+ 
+   /* tests checking xlink attributes */
+-  tcase_add_test (tc_simpleMPD, dash_mpdparser_xlink_period);
+ 
+   /* tests checking the MPD management
+    * (eg. setting active streams, obtaining attributes values)
+diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build
+index c21887d99ed1..4da79603f5bc 100644
+--- a/subprojects/gst-plugins-bad/tests/check/meson.build
++++ b/subprojects/gst-plugins-bad/tests/check/meson.build
+@@ -145,7 +145,6 @@ if host_machine.system() != 'windows'
+     [['elements/jifmux.c'],
+         not exif_dep.found() or not cdata.has('HAVE_UNISTD_H'), [exif_dep]],
+     [['elements/jpegparse.c'], not cdata.has('HAVE_UNISTD_H')],
+-    [['elements/netsim.c']],
+     [['elements/shm.c'], not shm_enabled, shm_deps],
+     [['elements/unixfd.c'], not gio_unix_dep.found()],
+     [['elements/voaacenc.c'],
 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
+index 6efa928fb09b..1f1950ef323d 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)
@@ -36,32 +62,35 @@ index 53a8e634e41a..f270c1d11bfb 100644
    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 25898b4c9607..fa6c4285af9c 100644
+index d2b994288d4a..00df444f18fa 100644
 --- a/subprojects/gst-python/meson.build
 +++ b/subprojects/gst-python/meson.build
-@@ -107,5 +107,4 @@ if not get_option('plugin').disabled()
+@@ -132,5 +132,4 @@ if not get_option('plugin').disabled()
    endif
  endif
  if not get_option('tests').disabled()
 -  subdir('testsuite')
  endif
 diff --git a/subprojects/gst-rtsp-server/tests/check/meson.build b/subprojects/gst-rtsp-server/tests/check/meson.build
-index 229af32f8117..b9372c125d77 100644
+index 2112da396235..1cbcb861dcf4 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 = [
+@@ -28,10 +28,8 @@ rtsp_server_tests = [
    'gst/mediafactory',
    'gst/media',
    'gst/permissions',
 -  'gst/rtspserver',
    'gst/sessionmedia',
    'gst/sessionpool',
-   'gst/stream',
+-  'gst/stream',
+   'gst/threadpool',
+   'gst/token',
+   'gst/onvif',
 diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
-index dd04729188b6..f5302bf20837 100644
+index e5b03a30b98e..0044bc4ad979 100644
 --- a/subprojects/gstreamer-vaapi/meson.build
 +++ b/subprojects/gstreamer-vaapi/meson.build
-@@ -219,7 +219,6 @@ plugins = []
+@@ -218,7 +218,6 @@ plugins = []
  
  subdir('gst-libs')
  subdir('gst')
diff --git a/PKGBUILD b/PKGBUILD
index 03fef8029216..2088758448c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,9 +25,8 @@ _libav_depends=(lib32-ffmpeg)
 _common_depends=("lib32-gst-plugins-base-libs>=$pkgver")
 _bad_libs_depends=(
 	lib32-libdrm		lib32-libgudev
-	lib32-libusb		lib32-libva
+	lib32-libusb		lib32-orc
 	lib32-libx11		lib32-libxkbcommon-x11
-	lib32-orc
 )
 
 _ugly_depends=(
@@ -45,7 +44,6 @@ _bad_depends=(
 	lib32-libdc1394		lib32-libdca
 	lib32-libde265		lib32-libdvdnav
 	lib32-libdvdread	lib32-libfdk-aac
-	lib32-libgme		lib32-libkate
 	lib32-liblrdf		lib32-libmodplug
 	lib32-libmpcdec		lib32-librsvg
 	lib32-libsndfile	lib32-libsrtp
@@ -59,12 +57,13 @@ _bad_depends=(
 	lib32-vulkan-icd-loader	lib32-wayland
 	lib32-wildmidi		lib32-x265
 	lib32-zvbi		libltc
+	lib32-libgme
 )
 
 makedepends=(
 	# superproject
 	git meson lib32-gstreamer lib32-gst-plugins-{base,good} wayland-protocols
-	lib32-gtk3
+	lib32-gtk3 python-packaging
 
 	# _common
 	"${_common_depends[@]}"
@@ -92,14 +91,14 @@ makedepends=(
 checkdepends=(xorg-server-xvfb)
 options=(!debug)
 source=(
-	"git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=$pkgver"
+	"git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git#tag=$pkgver"
 	0001-Allow-disabling-gstreamer.patch
 	0002-HACK-meson-Disable-broken-tests.patch
 )
 sha256sums=('SKIP'
             'dd928acaa15670225059b36ca5a29d808feba3855700f9b36128a2e55a335a50'
-            '951edc965cce062b3a08048297c9d66ff264eed5d8e884170706e4854c9f92df')
-validpgpkeys=(D637032E45B8C6585B9456565D2EEE6F6F349D7C) # Tim Müller <tim@gstreamer-foundation.org>
+            '3ff4e16e0d64ca935fbcc1ee5338ac815a8682878c2da78b9d0166037949e54e')
+#validpgpkeys=(D637032E45B8C6585B9456565D2EEE6F6F349D7C) # Tim Müller <tim@gstreamer-foundation.org>
 
 pkgver() {
 	cd gstreamer
@@ -147,8 +146,10 @@ build() {
 		-D gpl=enabled
 		-D gst-examples=disabled
 		-D introspection=disabled
+		-D qt6=disabled
+		-D webrtc=disabled
 		-D libnice=disabled
-		-D omx=disabled
+#		-D omx=disabled
 		-D orc-source=system
 		-D package-origin="https://www.archlinux.org/"
 
@@ -171,6 +172,7 @@ build() {
 		-D ugly=enabled
 		-D "bad=${meson_switches[LIB32GST_DISABLE_BAD]}"
 		# subprojects
+		-D gst-plugins-bad:mfx_api=oneVPL
 		-D gst-plugins-bad:directfb=disabled
 		-D gst-plugins-bad:directshow=disabled
 		-D gst-plugins-bad:directsound=disabled
@@ -198,6 +200,8 @@ build() {
 		-D gst-plugins-bad:mplex=disabled
 		-D gst-plugins-bad:webrtc=disabled
 		-D gst-plugins-bad:webrtcdsp=disabled
+		-D gst-plugins-bad:aja=disabled
+		-D gst-plugins-bad:qt6d3d11=disabled
 		# -- end -- -D gst-plugins-bad:=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
@@ -209,8 +213,10 @@ 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:svtav1=disabled # due to no lib32-svt-av1
 		-D gst-plugins-bad:wpe=disabled # due to no lib32-wpe support
+		-D gst-plugins-bad:lc3=disabled # no lib32 support
+		-D gst-plugins-bad:va=disabled  # linker error
 		-D gst-plugins-bad:zxing=disabled # due to no lib32-zxing support
 		-D gst-plugins-bad:amfcodec=disabled # only support windows
 		-D gst-plugins-ugly:sidplay=disabled
@@ -276,7 +282,7 @@ package_lib32-gst-plugins-bad-libs() {
 	closedcaption colormanagement
 	curl dash dc1394 de265 dtls dtsdec
 	faac faad fdkaac fluidsynthmidi
-	gme hls kate ladspa lv2 modplug
+	gme hls ladspa lv2 modplug
 	musepack neonhttpsrc
 	openal opusparse resindvd
 	rsvg rtmp sbc sctp smoothstreaming