From 4f01421cc49971a36dcd42de094595cb4769ccbf Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Tue, 13 Aug 2024 17:16:15 +0300
Subject: [PATCH] video/gtk4: Make feature "v4_6" the default assumption

It's our minimum gtk4 version we target anyway so we
can remove some of the extra features in the toml and require
it by default.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1708>
---
 Cargo.toml            |  8 ++++----
 video/gtk4/Cargo.toml | 14 ++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6995218a..2bef9f08 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -134,10 +134,10 @@ gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
 cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master", features=["use_glib"] }
 pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
 pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
-gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
-gdk-wayland = { package = "gdk4-wayland", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
-gdk-x11 = { package = "gdk4-x11", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
-gdk-win32 = { package = "gdk4-win32", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master", features = ["v4_6"]}
+gdk-wayland = { package = "gdk4-wayland", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master", features = ["v4_4"]}
+gdk-x11 = { package = "gdk4-x11", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master", features = ["v4_4"]}
+gdk-win32 = { package = "gdk4-win32", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master", features = ["v4_4"]}
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
 gst-allocators = { package = "gstreamer-allocators", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
 gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
diff --git a/video/gtk4/Cargo.toml b/video/gtk4/Cargo.toml
index aedb0e3d..b413539f 100644
--- a/video/gtk4/Cargo.toml
+++ b/video/gtk4/Cargo.toml
@@ -10,8 +10,8 @@ description = "GStreamer GTK 4 sink element"
 
 [dependencies]
 gtk.workspace = true
-gdk-wayland = { workspace = true, features = ["v4_4"], optional = true}
-gdk-x11 = { workspace = true, features = ["v4_4"], optional = true}
+gdk-wayland = { workspace = true, optional = true}
+gdk-x11 = { workspace = true, optional = true}
 
 gst = { workspace = true, features = ["v1_16"] }
 gst-base.workspace = true
@@ -27,13 +27,11 @@ once_cell.workspace = true
 
 
 [target.'cfg(target_os = "macos")'.dependencies]
-gtk = { workspace = true, features = ["v4_6"] }
 gst-gl = { workspace = true, features = ["v1_16"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-gtk = { workspace = true, features = ["v4_6"] }
+gdk-win32.workspace = true
 gst-gl = { workspace = true, features = ["v1_20"] }
-gdk-win32 = { workspace = true, features = ["v4_4"]}
 windows-sys = { version = "0.52", features = ["Win32_Graphics_OpenGL", "Win32_Foundation", "Win32_Graphics_Gdi"] }
 
 [lib]
@@ -47,9 +45,9 @@ gst-plugin-version-helper.workspace = true
 [features]
 default = []
 static = []
-wayland = ["gtk/v4_6", "gdk-wayland", "gst-gl-wayland"]
-x11glx = ["gtk/v4_6", "gdk-x11", "gst-gl-x11"]
-x11egl = ["gtk/v4_6", "gdk-x11", "gst-gl-egl"]
+wayland = ["gdk-wayland", "gst-gl-wayland"]
+x11glx = ["gdk-x11", "gst-gl-x11"]
+x11egl = ["gdk-x11", "gst-gl-egl"]
 winegl = ["gdk-win32/egl", "gst-gl-egl"]
 dmabuf = ["gst-allocators", "wayland", "gtk_v4_14", "gst-video/v1_24"]
 capi = []