mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-25 04:51:26 +00:00
Code Issues Projects Releases Wiki Activity

video/gtk4: Make feature "v4_6" the default assumption

Browse source 
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>
This commit is contained in:
Jordan Petridis 2024-08-13 17:16:15 +03:00 committed by GStreamer Marge Bot
parent ff5032934d
commit 4f01421cc4
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.toml
View file

@ -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"] } 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" } pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
pangocairo = { 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"} 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"} 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"} 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"} 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 = { 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-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" } gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }

14
video/gtk4/Cargo.toml
View file

@ -10,8 +10,8 @@ description = "GStreamer GTK 4 sink element"
[dependencies] [dependencies]
gtk.workspace = true gtk.workspace = true
gdk-wayland = { workspace = true, features = ["v4_4"], optional = true} gdk-wayland = { workspace = true, optional = true}
gdk-x11 = { workspace = true, features = ["v4_4"], optional = true} gdk-x11 = { workspace = true, optional = true}
gst = { workspace = true, features = ["v1_16"] } gst = { workspace = true, features = ["v1_16"] }
gst-base.workspace = true gst-base.workspace = true
@ -27,13 +27,11 @@ once_cell.workspace = true
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]
gtk = { workspace = true, features = ["v4_6"] }
gst-gl = { workspace = true, features = ["v1_16"] } gst-gl = { workspace = true, features = ["v1_16"] }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
gtk = { workspace = true, features = ["v4_6"] } gdk-win32.workspace = true
gst-gl = { workspace = true, features = ["v1_20"] } 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"] } windows-sys = { version = "0.52", features = ["Win32_Graphics_OpenGL", "Win32_Foundation", "Win32_Graphics_Gdi"] }
[lib] [lib]
@ -47,9 +45,9 @@ gst-plugin-version-helper.workspace = true
[features] [features]
default = [] default = []
static = [] static = []
wayland = ["gtk/v4_6", "gdk-wayland", "gst-gl-wayland"] wayland = ["gdk-wayland", "gst-gl-wayland"]
x11glx = ["gtk/v4_6", "gdk-x11", "gst-gl-x11"] x11glx = ["gdk-x11", "gst-gl-x11"]
x11egl = ["gtk/v4_6", "gdk-x11", "gst-gl-egl"] x11egl = ["gdk-x11", "gst-gl-egl"]
winegl = ["gdk-win32/egl", "gst-gl-egl"] winegl = ["gdk-win32/egl", "gst-gl-egl"]
dmabuf = ["gst-allocators", "wayland", "gtk_v4_14", "gst-video/v1_24"] dmabuf = ["gst-allocators", "wayland", "gtk_v4_14", "gst-video/v1_24"]
capi = [] capi = []