fix(git): build lib32-gstreamer @tag:main

3 files changed, 38 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3402fce56096..976a18a4926a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-gstreamer-git
 	pkgdesc = Multimedia graph framework (32-bit)
-	pkgver = 1.20.2
+	pkgver = 1.20.0+r1244+g3385ea3481
 	pkgrel = 1
 	url = https://gstreamer.freedesktop.org/
 	arch = x86_64
@@ -109,7 +109,7 @@ pkgbase = lib32-gstreamer-git
 	source = 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch
 	sha256sums = SKIP
 	sha256sums = 292edebc224557db08404b0d53e2824413f0aad2a99c991de2cb8ccc6e9a7683
-	sha256sums = 11971a978e37fda3822f95fb61b59ba3ded6487066dc59fcbde7b72a3a9cfe70
+	sha256sums = cdb0b056d8a1d31394fb3cf23dcfa8e7345cac6671dacdee8029b380ef30640d
 	sha256sums = 79d3038a0ba0c3958ffa8b5aec8431336b372906c07c0c878c3767bec0acb46f
 
 pkgname = lib32-gstreamer-git
@@ -120,35 +120,35 @@ pkgname = lib32-gstreamer-git
 	depends = lib32-libunwind
 	depends = lib32-libelf
 	depends = gstreamer
-	provides = lib32-gstreamer=1.20.2
+	provides = lib32-gstreamer=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
 	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.2
+	provides = lib32-gst-plugins-bad-libs=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gstreamer-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-orc
 	depends = lib32-libxv
 	depends = lib32-libgudev
 	depends = lib32-libgl
 	depends = lib32-mesa
-	provides = lib32-gst-plugins-base-libs=1.20.2
+	provides = lib32-gst-plugins-base-libs=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-alsa-lib
 	depends = lib32-cdparanoia
 	depends = lib32-libvisual
@@ -158,12 +158,12 @@ pkgname = lib32-gst-plugins-base-git
 	depends = lib32-opus
 	depends = lib32-libpng
 	depends = lib32-libjpeg
-	provides = lib32-gst-plugins-base=1.20.2
+	provides = lib32-gst-plugins-base=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-libpulse
 	depends = lib32-libsoup3
 	depends = lib32-gst-plugins-base-libs
@@ -188,12 +188,12 @@ pkgname = lib32-gst-plugins-good-git
 	depends = lib32-mpg123
 	depends = lib32-twolame
 	depends = libjack.so
-	provides = lib32-gst-plugins-good=1.20.2
+	provides = lib32-gst-plugins-good=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-bad-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-aom
 	depends = lib32-libass
 	depends = lib32-libbs2b
@@ -248,26 +248,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.2
+	provides = lib32-gst-plugins-bad=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-gtk3
-	provides = lib32-gst-plugin-gtk=1.20.2
+	provides = lib32-gst-plugin-gtk=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-bad-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-libva
-	provides = lib32-gst-plugin-va=1.20.2
+	provides = lib32-gst-plugin-va=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-libdvdread
 	depends = lib32-libmpeg2
 	depends = lib32-a52dec
@@ -275,27 +275,27 @@ pkgname = lib32-gst-plugins-ugly-git
 	depends = lib32-libcdio
 	depends = lib32-x264
 	depends = lib32-opencore-amr
-	provides = lib32-gst-plugins-ugly=1.20.2
+	provides = lib32-gst-plugins-ugly=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-bzip2
 	depends = lib32-ffmpeg
-	provides = lib32-gst-ffmpeg=1.20.2
+	provides = lib32-gst-ffmpeg=1.20.0+r1244+g3385ea3481
 	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.2
-	provides = lib32-gst-rtsp-server=1.20.2
+	depends = lib32-gst-plugins-base-libs-git=1.20.0+r1244+g3385ea3481
+	provides = lib32-gst-rtsp-server=1.20.0+r1244+g3385ea3481
 	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.2
+	depends = lib32-gst-plugins-bad-libs-git=1.20.0+r1244+g3385ea3481
 	depends = lib32-libva
 	depends = lib32-libxrandr
-	provides = lib32-gstreamer-vaapi=1.20.2
+	provides = lib32-gstreamer-vaapi=1.20.0+r1244+g3385ea3481
 	conflicts = lib32-gstreamer-vaapi
diff --git a/0002-HACK-meson-Disable-broken-tests.patch b/0002-HACK-meson-Disable-broken-tests.patch
index 0aa801eacebd..a64bef60055e 100644
--- a/0002-HACK-meson-Disable-broken-tests.patch
+++ b/0002-HACK-meson-Disable-broken-tests.patch
@@ -1,39 +1,5 @@
-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: 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(-)
-
-diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
-index 1a4a29b3657f..857290baf35f 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
--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
---- a/subprojects/gst-python/meson.build
-+++ b/subprojects/gst-python/meson.build
-@@ -104,5 +104,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 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 = [
@@ -45,14 +11,15 @@ 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 4440d7a03c..60822c7b32 100644
 --- a/subprojects/gstreamer-vaapi/meson.build
 +++ b/subprojects/gstreamer-vaapi/meson.build
-@@ -202,7 +202,6 @@ plugins = []
+@@ -218,7 +218,7 @@ plugins = []
  
  subdir('gst-libs')
  subdir('gst')
 -subdir('tests')
++# subdir('tests')
  subdir('docs')
  
  # Set release date
diff --git a/PKGBUILD b/PKGBUILD
index 2d93304937d1..971c2f4f687f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ pkgname=(
 
   lib32-gstreamer-vaapi-git
 )
-pkgver=1.20.2
+pkgver=1.20.0+r1244+g3385ea3481
 pkgrel=1
 pkgdesc="Multimedia graph framework (32-bit)"
 url="https://gstreamer.freedesktop.org/"
@@ -69,7 +69,7 @@ source=(
 )
 sha256sums=('SKIP'
             '292edebc224557db08404b0d53e2824413f0aad2a99c991de2cb8ccc6e9a7683'
-            '11971a978e37fda3822f95fb61b59ba3ded6487066dc59fcbde7b72a3a9cfe70'
+            'cdb0b056d8a1d31394fb3cf23dcfa8e7345cac6671dacdee8029b380ef30640d'
             '79d3038a0ba0c3958ffa8b5aec8431336b372906c07c0c878c3767bec0acb46f')
 
 pkgver() {
@@ -96,6 +96,7 @@ build() {
     -D devtools=disabled
     -D doc=disabled
     -D examples=disabled
+    -D ges=disabled
     -D gpl=enabled
     -D gst-examples=disabled
     -D libnice=disabled
@@ -142,6 +143,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
@@ -151,6 +153,8 @@ build() {
     -D gst-plugins-bad:svthevcenc=disabled # due to no lib32-svthevcenc support
     -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/"
@@ -159,7 +163,6 @@ build() {
     -D gst-rtsp-server:gobject-cast-checks=disabled
     -D gst-rtsp-server:package-name="Arch Linux gst-rtsp-server $pkgver-$pkgrel"
     -D gst-rtsp-server:package-origin="https://www.archlinux.org/"
-    -D gst-editing-services:validate=disabled
     -D gstreamer-vaapi:package-origin="https://www.archlinux.org/"
   )
 
@@ -219,7 +222,6 @@ package_lib32-gstreamer-git() {
   cd root
   local files=(
     usr/include/gstreamer-1.0/gst/{base,check,controller,net,*.h}
-    usr/lib*/python*/site-packages/gi/overrides/GES.py
 
     usr/share/locale/*/LC_MESSAGES/gstreamer-1.0.mo
     usr/share/man/man1/gst-{inspect,launch,stats,typefind}-1.0.1
@@ -251,7 +253,7 @@ 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,insertbin,isoff,mpegts,photography,play,player,sctp,transcoder,uridownloader,vulkan,wayland,webrtc}-1.0.so*
+    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/pkgconfig/gstreamer-plugins-bad-1.0.pc
@@ -367,9 +369,8 @@ package_lib32-gst-plugins-base-libs-git() {
     usr/lib32/gstreamer-1.0/libgstsubparse.so
     usr/lib32/gstreamer-1.0/libgsttcp.so
     usr/lib32/gstreamer-1.0/libgsttypefindfunctions.so
-    usr/lib32/gstreamer-1.0/libgstvideoconvert.so
+    usr/lib32/gstreamer-1.0/libgstvideoconvertscale.so
     usr/lib32/gstreamer-1.0/libgstvideorate.so
-    usr/lib32/gstreamer-1.0/libgstvideoscale.so
     usr/lib32/gstreamer-1.0/libgstvideotestsrc.so
     usr/lib32/gstreamer-1.0/libgstvolume.so
     usr/lib32/gstreamer-1.0/libgstximagesink.so
@@ -502,6 +503,7 @@ package_lib32-gst-plugins-bad-git() {
   conflicts=("lib32-gst-plugins-bad")
 
   cd root; local files=(
+    usr/lib32/gstreamer-1.0/libgstadaptivedemux2.so # new
     usr/lib32/gstreamer-1.0/libgstaes.so
     usr/lib32/gstreamer-1.0/libgstaom.so
     usr/lib32/gstreamer-1.0/libgstassrender.so