From 0f56c5967b00dc8fced88f4ff6230e681abc05b7 Mon Sep 17 00:00:00 2001
From: Rafostar <40623528+Rafostar@users.noreply.github.com>
Date: Sat, 17 Oct 2020 17:35:34 +0200
Subject: [PATCH] Update packages

Changes:
* Require the same GStreamer 1.18+ for all plugins
* Remove gst-plugins-gtk4 dependency where build is unavailable
---
 pkgs/arch/.SRCINFO      |  2 +-
 pkgs/arch/PKGBUILD      |  5 ++---
 pkgs/arch/obs/PKGBUILD  |  8 ++++----
 pkgs/deb/debian/control | 13 ++++++-------
 pkgs/rpm/clapper.spec   | 19 +++++++++----------
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/pkgs/arch/.SRCINFO b/pkgs/arch/.SRCINFO
index 713a5336..7679796d 100644
--- a/pkgs/arch/.SRCINFO
+++ b/pkgs/arch/.SRCINFO
@@ -9,7 +9,7 @@ pkgbase = clapper-git
 	makedepends = gjs
 	depends = gjs
 	depends = gst-plugins-base-libs
-	depends = gst-plugin-gtk
+	depends = gst-plugins-good
 	depends = gst-plugins-bad-libs
 	optdepends = gst-libav: Additional Codecs,
 	optdepends = gstreamer-vaapi: Hardware acceleration
diff --git a/pkgs/arch/PKGBUILD b/pkgs/arch/PKGBUILD
index c70ad9f2..47351dd6 100644
--- a/pkgs/arch/PKGBUILD
+++ b/pkgs/arch/PKGBUILD
@@ -30,10 +30,9 @@ depends=(
 	"gtk4>=3.99.2"
 	"hicolor-icon-theme"
 	"gjs"
-	"gst-plugins-base-libs"
-	"gst-plugins-good"
+	"gst-plugins-base-libs>=1.18.0"
+	"gst-plugins-good>=1.18.0"
 	"gst-plugins-bad-libs>=1.18.0"
-	"gst-plugin-gtk4"
 )
 makedepends=(
 	"meson>=0.50"
diff --git a/pkgs/arch/obs/PKGBUILD b/pkgs/arch/obs/PKGBUILD
index e54eb418..481f5fe7 100644
--- a/pkgs/arch/obs/PKGBUILD
+++ b/pkgs/arch/obs/PKGBUILD
@@ -27,12 +27,12 @@ arch=(any)
 url="https://github.com/Rafostar/clapper"
 license=("GPL-3.0")
 depends=(
-	"gtk3>=3.19.4"
+	"gtk4>=3.99.2"
 	"hicolor-icon-theme"
 	"gjs"
-	"gst-plugins-base-libs"
-	"gst-plugin-gtk"
-	"gst-plugins-bad-libs>=1.16.0"
+	"gst-plugins-base-libs>=1.18.0"
+	"gst-plugins-good>=1.18.0"
+	"gst-plugins-bad-libs>=1.18.0"
 )
 makedepends=(
 	"meson>=0.50"
diff --git a/pkgs/deb/debian/control b/pkgs/deb/debian/control
index a8e5ceeb..95590ace 100644
--- a/pkgs/deb/debian/control
+++ b/pkgs/deb/debian/control
@@ -16,14 +16,13 @@ Architecture: all
 Depends: gjs (>= 1.50),
          gir1.2-gtk-4.0 (>= 3.99.2),
          hicolor-icon-theme,
-         libgstreamer1.0-0,
-         gstreamer1.0-plugins-base,
-         gstreamer1.0-plugins-good,
+         libgstreamer1.0-0 (>= 1.18),
+         gstreamer1.0-plugins-base (>= 1.18),
+         gstreamer1.0-plugins-good (>= 1.18),
          gstreamer1.0-plugins-bad (>= 1.18),
-         gstreamer1.0-gl,
-         gstreamer1.0-gtk4
-Recommends: gstreamer1.0-libav,
-            gstreamer1.0-pulseaudio
+         gstreamer1.0-gl (>= 1.18)
+Recommends: gstreamer1.0-libav (>= 1.18),
+            gstreamer1.0-pulseaudio (>= 1.18)
 Suggests: gstreamer-plugins-ugly,
           gstreamer-vaapi
 Description: Simple and modern GNOME media player
diff --git a/pkgs/rpm/clapper.spec b/pkgs/rpm/clapper.spec
index 4ce0e835..f064a428 100644
--- a/pkgs/rpm/clapper.spec
+++ b/pkgs/rpm/clapper.spec
@@ -48,15 +48,14 @@ Group:          Productivity/Multimedia/Video/Players
 
 BuildRequires:  update-desktop-files
 
-Requires:       gstreamer
-Requires:       gstreamer-plugins-base
-Requires:       gstreamer-plugins-good
-Requires:       gstreamer-plugins-good-gtk4
-Requires:       gstreamer-plugins-bad
+Requires:       gstreamer >= %{gst_version}
+Requires:       gstreamer-plugins-base >= %{gst_version}
+Requires:       gstreamer-plugins-good >= %{gst_version}
+Requires:       gstreamer-plugins-bad >= %{gst_version}
 Requires:       libgstplayer-1_0-0 >= %{gst_version}
 
 # Popular video decoders
-Recommends:     gstreamer-plugins-libav
+Recommends:     gstreamer-plugins-libav >= %{gst_version}
 
 # CD Playback
 Suggests:       gstreamer-plugins-ugly
@@ -64,15 +63,15 @@ Suggests:       gstreamer-plugins-ugly
 Suggests:       gstreamer-plugins-vaapi
 %else
 BuildRequires:  glibc-all-langpacks
-Requires:       gstreamer1
-Requires:       gstreamer1-plugins-base
-Requires:       gstreamer1-plugins-good
+Requires:       gstreamer1 >= %{gst_version}
+Requires:       gstreamer1-plugins-base >= %{gst_version}
+Requires:       gstreamer1-plugins-good >= %{gst_version}
 Requires:       gstreamer1-plugins-good-gtk4
 # Contains GstPlayer lib
 Requires:       gstreamer1-plugins-bad-free >= %{gst_version}
 
 # ASS subtitles (assrender)
-Recommends:     gstreamer1-plugins-bad-free-extras
+Recommends:     gstreamer1-plugins-bad-free-extras >= %{gst_version}
 
 # CD Playback
 Suggests:       gstreamer1-plugins-ugly-free