commit the suggestions from @kode54

2 files changed, 80 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c611aa0e5f0a..384f98def614 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gstreamer-git
 	pkgdesc = GStreamer Multimedia Framework (Git version)
-	pkgver = 1.21.3.r66.g3fa6651d91
+	pkgver = 1.22.0.r153.g9a300fc501
 	pkgrel = 1
 	url = http://gstreamer.freedesktop.org/
 	arch = i686
@@ -212,9 +212,9 @@ pkgbase = gstreamer-git
 	makedepends = libxrandr
 	makedepends = python-gobject
 	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer
-	source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.21.1.tar.xz
+	source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.22.0.tar.xz
 	md5sums = SKIP
-	md5sums = 6d123b1279d3f53bf677043b0d7a6686
+	md5sums = 75946c02fe05b952464b86c4a1d35f60
 
 pkgname = gstreamer-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - core
@@ -225,11 +225,12 @@ pkgname = gstreamer-git
 	depends = libcap
 	depends = libelf
 	optdepends = python: gst-plugins-doc-cache-generator
+	provides = gstreamer=$pkgver
 	conflicts = gstreamer
 
 pkgname = gst-plugins-bad-libs-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - bad
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = orc
 	depends = libdrm
 	depends = libx11
@@ -237,10 +238,11 @@ pkgname = gst-plugins-bad-libs-git
 	depends = libusb
 	depends = libxkbcommon-x11
 	depends = libnice
+	provides = gst-plugins-bad-libs=1.22.0.r153.g9a300fc501
 
 pkgname = gst-plugins-base-libs-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - base
-	depends = gstreamer-git=1.21.3.r66.g3fa6651d91
+	depends = gstreamer-git=1.22.0.r153.g9a300fc501
 	depends = orc
 	depends = libxv
 	depends = iso-codes
@@ -248,10 +250,11 @@ pkgname = gst-plugins-base-libs-git
 	depends = libgl
 	depends = mesa
 	depends = libxi
+	provides = gst-plugins-base-libs=1.22.0.r153.g9a300fc501
 
 pkgname = gst-plugins-base-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - base plugins
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = alsa-lib
 	depends = cdparanoia
 	depends = libvisual
@@ -263,11 +266,12 @@ pkgname = gst-plugins-base-git
 	depends = libpng
 	depends = libjpeg
 	depends = libtremor-git
-	conflicts = gst-plugin-base
+	provides = gst-plugins-base=1.22.0.r153.g9a300fc501
+	conflicts = gst-plugins-base
 
 pkgname = gst-plugins-good-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - good plugins
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = libpulse
 	depends = libsoup3
 	depends = gst-plugins-base-libs
@@ -293,11 +297,12 @@ pkgname = gst-plugins-good-git
 	depends = twolame
 	depends = qt6-wayland
 	depends = libjack.so
-	conflicts = gst-plugin-good
+	provides = gst-plugins-good=1.22.0.r153.g9a300fc501
+	conflicts = gst-plugins-good
 
 pkgname = gst-plugins-bad-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - bad plugins
-	depends = gst-plugins-bad-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-bad-libs-git=1.22.0.r153.g9a300fc501
 	depends = aom
 	depends = libass
 	depends = libbs2b
@@ -365,54 +370,62 @@ pkgname = gst-plugins-bad-git
 	depends = vo-amrwbenc
 	depends = openh264
 	depends = flite1
+	provides = gst-plugins-bad=1.22.0.r153.g9a300fc501
 
 pkgname = gst-plugin-gtk-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - gtk plugin
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = gtk3
+	provides = gst-plugin-gtk=1.22.0.r153.g9a300fc501
 	conflicts = gst-plugin-gtk
 
 pkgname = gst-plugin-msdk-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - msdk plugin
-	depends = gst-plugins-bad-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-bad-libs-git=1.22.0.r153.g9a300fc501
 	depends = libmfx
 	depends = libva
+	provides = gst-plugin-msdk=1.22.0.r153.g9a300fc501
 	conflicts = gst-plugin-msdk
 
 pkgname = gst-plugin-opencv-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - opencv plugin
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = opencv
+	provides = gst-plugin-opencv=1.22.0.r153.g9a300fc501
 	conflicts = gst-plugin-opencv
 
 pkgname = gst-plugin-qmlgl-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - qmlgl plugin
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = qt5-declarative
 	depends = qt5-x11extras
 	depends = qt5-wayland
+	provides = gst-plugin-qmlgl=1.22.0.r153.g9a300fc501
 	conflicts = gst-plugin-qmlgl
 
 pkgname = gst-plugin-va-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - va plugin
-	depends = gst-plugins-bad-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-bad-libs-git=1.22.0.r153.g9a300fc501
 	depends = libva
+	provides = gst-plugin-va=1.22.0.r153.g9a300fc501
 	conflicts = gst-plugin-va
 
 pkgname = gst-plugin-wpe-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - wpe plugin
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = wpewebkit
+	provides = gst-plugin-wpe=1.22.0.r153.g9a300fc501
 
 pkgname = gst-plugin-cuda-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - cuda plugin
-	depends = gst-plugins-bad-libs=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-bad-libs=1.22.0.r153.g9a300fc501
 	depends = cuda
+	provides = gst-plugin-cuda=1.22.0.r153.g9a300fc501
 	conflicts = gst-plugin-cuda
 
 pkgname = gst-plugins-ugly-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - ugly plugins
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = libdvdread
 	depends = libmpeg2
 	depends = a52dec
@@ -420,43 +433,50 @@ pkgname = gst-plugins-ugly-git
 	depends = libcdio
 	depends = x264
 	depends = opencore-amr
+	provides = gst-plugins-ugly=1.22.0.r153.g9a300fc501
 	conflicts = gst-plugins-ugly
 
 pkgname = gst-libav-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - libav plugin
-	depends = gst-plugins-base-libs=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs=1.22.0.r153.g9a300fc501
 	depends = bzip2
 	depends = ffmpeg
-	provides = gst-ffmpeg=1.21.3.r66.g3fa6651d91
+	provides = gst-libav=1.22.0.r153.g9a300fc501
 	conflicts = gst-libav
 
 pkgname = gst-rtsp-server-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - rtsp server
-	depends = gst-plugins-base-libs=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs=1.22.0.r153.g9a300fc501
+	provides = gst-rtsp-server=1.22.0.r153.g9a300fc501
 	conflicts = gst-rtsp-server
 
 pkgname = gstreamer-vaapi-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - vaapi plugin
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = libva
 	depends = libxrandr
+	provides = gstreamer-vaapi=1.22.0.r153.g9a300fc501
 	conflicts = gst-vaapi
+	conflicts = gstreamer-vaapi
 
 pkgname = gst-editing-services-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - editing services
-	depends = gst-plugins-base-libs=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs=1.22.0.r153.g9a300fc501
 	depends = python-gobject
+	provides = gst-editing-services=1.22.0.r153.g9a300fc501
 	conflicts = gst-editing-services
 
 pkgname = gst-python-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - python plugin
-	depends = gst-plugins-base-libs-git=1.21.3.r66.g3fa6651d91
+	depends = gst-plugins-base-libs-git=1.22.0.r153.g9a300fc501
 	depends = python-gobject
+	provides = gst-python=1.22.0.r153.g9a300fc501
 	conflicts = gst-python
 
 pkgname = gst-devtools-git
 	pkgdesc = GStreamer Multimedia Framework (Git version) - subset of devtools
 	depends = python
+	provides = gst-devtools=1.22.0.r153.g9a300fc501
 	conflicts = gst-devtools
 
 pkgname = gstreamer-docs-git
@@ -467,4 +487,5 @@ pkgname = gstreamer-docs-git
 	license = custom:CC-BY-SA-4.0
 	license = custom:MIT
 	license = custom:OPL
-	conflicts = gstream-docs
+	provides = gstreamer-docs=1.22.0.r153.g9a300fc501
+	conflicts = gstreamer-docs
diff --git a/PKGBUILD b/PKGBUILD
index f7b2f03185e6..e473f1e6faf9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,9 +26,9 @@ pkgname=(
   gst-devtools-git
   gstreamer-docs-git
 )
-pkgver=1.21.3.r66.g3fa6651d91
+pkgver=1.22.0.r153.g9a300fc501
 pkgrel=1
-_pkgver=1.21.1
+_pkgver=1.22.0
 pkgdesc='GStreamer Multimedia Framework (Git version)'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -90,7 +90,7 @@ _gitname='gstreamer'
 source=('git+https://gitlab.freedesktop.org/gstreamer/gstreamer'
         "https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-${_pkgver%%+*}.tar.xz")
 md5sums=('SKIP'
-         '6d123b1279d3f53bf677043b0d7a6686')
+         '75946c02fe05b952464b86c4a1d35f60')
 
 pkgver() {
   cd $_gitname
@@ -170,6 +170,7 @@ package_gstreamer-git() {
   depends=(libxml2 glib2 libunwind libcap libelf)
   optdepends=('python: gst-plugins-doc-cache-generator')
   conflicts=('gstreamer')
+  provides=('gstreamer=$pkgver')
   install=gstreamer.install
 
   DESTDIR="$srcdir/root" meson install -C build
@@ -209,7 +210,8 @@ package_gst-plugins-bad-libs-git() {
     "gst-plugins-base-libs-git=$pkgver"
     orc libdrm libx11 libgudev libusb libxkbcommon-x11 libnice
   )
-  conficts=('gst-plugin-bad-libs')
+  conficts=('gst-plugins-bad-libs')
+  provides=("gst-plugins-bad-libs=$pkgver")
 
   cd root; local files=(
     usr/include/gstreamer-1.0/gst/audio/{audio-bad-prelude,gstnonstreamaudiodecoder,gstplanaraudioadapter}.h
@@ -313,7 +315,8 @@ package_gst-plugins-base-libs-git() {
     "gstreamer-git=$pkgver"
     orc libxv iso-codes libgudev libgl mesa libxi
   )
-  conficts=('gst-plguin-base-lib')
+  conficts=('gst-plugins-base-libs')
+  provides=("gst-plugins-base-libs=$pkgver")
 
   cd root; local files=(
     usr/include/gstreamer-1.0/gst/{allocators,app,audio,fft,gl,pbutils,riff,rtp,rtsp,sdp,tag,video}
@@ -364,7 +367,8 @@ package_gst-plugins-base-git() {
     alsa-lib cdparanoia libvisual libvorbis libtheora pango opus graphene libpng
     libjpeg libtremor-git
   )
-  conflicts=('gst-plugin-base')
+  conflicts=('gst-plugins-base')
+  provides=("gst-plugins-base=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstalsa.so
@@ -389,7 +393,8 @@ package_gst-plugins-good-git() {
     libgudev speex flac libraw1394 lame mpg123 twolame qt6-wayland
     libjack.so
   )
-  conflicts=('gst-plugin-good')
+  conflicts=('gst-plugins-good')
+  provides=("gst-plugins-good=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgst1394.so
@@ -486,6 +491,7 @@ package_gst-plugins-bad-git() {
     openni2 gtk3 vo-amrwbenc openh264 flite1
   )
   conficts=('gst-plugins-bad')
+  provides=("gst-plugins-bad=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstaes.so
@@ -568,6 +574,7 @@ package_gst-plugin-gtk-git() {
   pkgdesc+=" - gtk plugin"
   depends=("gst-plugins-base-libs-git=$pkgver" gtk3)
   conflicts=('gst-plugin-gtk')
+  provides=("gst-plugin-gtk=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstgtk.so
@@ -578,6 +585,7 @@ package_gst-plugin-msdk-git() {
   pkgdesc+=" - msdk plugin"
   depends=("gst-plugins-bad-libs-git=$pkgver" libmfx libva)
   conflicts=('gst-plugin-msdk')
+  provides=("gst-plugin-msdk=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstmsdk.so
@@ -588,6 +596,7 @@ package_gst-plugin-opencv-git() {
   pkgdesc+=" - opencv plugin"
   depends=("gst-plugins-base-libs-git=$pkgver" opencv)
   conflicts=('gst-plugin-opencv')
+  provides=("gst-plugin-opencv=$pkgver")
 
   cd root; local files=(
     usr/include/gstreamer-1.0/gst/opencv
@@ -603,7 +612,8 @@ package_gst-plugin-qmlgl-git() {
     "gst-plugins-base-libs-git=$pkgver"
     qt5-declarative qt5-x11extras qt5-wayland
   )
-  conflicts=("gst-plugin-qmlgl")
+  conflicts=('gst-plugin-qmlgl')
+  provides=("gst-plugin-qmlgl=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstqmlgl.so
@@ -613,7 +623,8 @@ package_gst-plugin-qmlgl-git() {
 package_gst-plugin-va-git() {
   pkgdesc+=" - va plugin"
   depends=("gst-plugins-bad-libs-git=$pkgver" libva)
-  conflicts=("gst-plugin-va")
+  conflicts=('gst-plugin-va')
+  provides=("gst-plugin-va=$pkgver")
 
   cd root; local files=(
     usr/lib/libgstva-1.0.so*
@@ -625,7 +636,8 @@ package_gst-plugin-va-git() {
 package_gst-plugin-cuda-git() {
   pkgdesc+=" - cuda plugin"
   depends=("gst-plugins-bad-libs=$pkgver" cuda)
-  conflicts=("gst-plugin-cuda")
+  conflicts=('gst-plugin-cuda')
+  provides=("gst-plugin-cuda=$pkgver")
 
   cd root; local files=(
     usr/include/gstreamer-1.0/gst/cuda/cuda-prelude.h
@@ -649,6 +661,7 @@ package_gst-plugin-wpe-git() {
   pkgdesc+=" - wpe plugin"
   depends=("gst-plugins-base-libs-git=$pkgver" wpewebkit)
   conficts=('gst-plugin-wpe')
+  provides=("gst-plugin-wpe=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstwpe.so
@@ -663,6 +676,7 @@ package_gst-plugins-ugly-git() {
     libdvdread libmpeg2 a52dec libsidplay libcdio x264 opencore-amr
   )
   conflicts=('gst-plugins-ugly')
+  provides=("gst-plugins-ugly=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgsta52dec.so
@@ -690,6 +704,7 @@ package_gst-libav-git() {
   depends=("gst-plugins-base-libs=$pkgver" bzip2 ffmpeg)
   provides=("gst-ffmpeg=$pkgver")
   conflicts=('gst-libav')
+  provides=("gst-libav=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstlibav.so
@@ -700,6 +715,7 @@ package_gst-rtsp-server-git() {
   pkgdesc+=" - rtsp server"
   depends=("gst-plugins-base-libs=$pkgver")
   conflicts=('gst-rtsp-server')
+  provides=("gst-rtsp-server=$pkgver")
 
   cd root; local files=(
     usr/include/gstreamer-1.0/gst/rtsp-server
@@ -716,6 +732,7 @@ package_gst-editing-services-git() {
   pkgdesc+=" - editing services"
   depends=("gst-plugins-base-libs=$pkgver" python-gobject)
   conflicts=('gst-editing-services')
+  provides=("gst-editing-services=$pkgver")
 
   cd root; local files=(
     usr/include/gstreamer-1.0/ges
@@ -742,7 +759,8 @@ package_gst-editing-services-git() {
 package_gstreamer-vaapi-git() {
   pkgdesc+=" - vaapi plugin"
   depends=("gst-plugins-base-libs-git=$pkgver" libva libxrandr)
-  conflicts=('gst-vaapi')
+  conflicts=('gst-vaapi' 'gstreamer-vaapi')
+  provides=("gstreamer-vaapi=$pkgver")
   cd root; local files=(
   usr/include/gstreamer-1.0/gst/va/va-enumtypes.h
   usr/include/gstreamer-1.0/gst/va/gstva.h
@@ -758,7 +776,6 @@ package_gstreamer-vaapi-git() {
   usr/lib/gstreamer-1.0/libgstvaapi.so
   usr/lib/girepository-1.0/GstVa-1.0.typelib
 
-  usr/lib/gstreamer-1.0/pkgconfig/gstvaapi.pc
   usr/lib/pkgconfig/gstreamer-va-1.0.pc
   usr/share/gir-1.0/GstVa-1.0.gir
 
@@ -769,6 +786,7 @@ package_gst-python-git() {
   pkgdesc+=" - python plugin"
   depends=("gst-plugins-base-libs-git=$pkgver" python-gobject)
   conflicts=('gst-python')
+  provides=("gst-python=$pkgver")
 
   cd root; local files=(
     usr/lib/gstreamer-1.0/libgstpython.so
@@ -782,7 +800,8 @@ package_gst-python-git() {
 package_gst-devtools-git() {
   pkgdesc+=" - subset of devtools"
   depends=(python)
-  conflicts=("gst-devtools")
+  conflicts=('gst-devtools')
+  provides=("gst-devtools=$pkgver")
   cd root; local files=(
   usr/lib/gst-validate-launcher/python/launcher/apps/geslaunch.py
   usr/share/gstreamer-1.0/validate/scenarios/ges-edit-clip-while-paused.scenario
@@ -791,7 +810,8 @@ package_gst-devtools-git() {
 }
 package_gstreamer-docs-git() {
   pkgdesc+=" - documentation"
-  conflicts=('gstream-docs')
+  conflicts=('gstreamer-docs')
+  provides=("gstreamer-docs=$pkgver")
   license=(GPL3 LGPL custom:BSD custom:CC-BY-SA-4.0 custom:MIT custom:OPL)
 
   # make sure there are no files left to install