From b13bfe36170d2635975cb8a838887cc8fb943a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 8 Feb 2024 14:36:50 +0200 Subject: [PATCH] Update dependency versions for gtk-rs-core and the local crates --- Cargo.toml | 70 +++++++++++++-------------- gstreamer-allocators/Cargo.toml | 2 +- gstreamer-analytics/Cargo.toml | 2 +- gstreamer-app/Cargo.toml | 2 +- gstreamer-audio/Cargo.toml | 2 +- gstreamer-base/Cargo.toml | 2 +- gstreamer-check/Cargo.toml | 2 +- gstreamer-controller/Cargo.toml | 2 +- gstreamer-editing-services/Cargo.toml | 2 +- gstreamer-gl/Cargo.toml | 2 +- gstreamer-gl/egl/Cargo.toml | 2 +- gstreamer-gl/wayland/Cargo.toml | 2 +- gstreamer-gl/x11/Cargo.toml | 2 +- gstreamer-mpegts/Cargo.toml | 2 +- gstreamer-net/Cargo.toml | 2 +- gstreamer-pbutils/Cargo.toml | 2 +- gstreamer-play/Cargo.toml | 2 +- gstreamer-player/Cargo.toml | 2 +- gstreamer-rtp/Cargo.toml | 2 +- gstreamer-rtsp-server/Cargo.toml | 2 +- gstreamer-rtsp/Cargo.toml | 2 +- gstreamer-sdp/Cargo.toml | 2 +- gstreamer-tag/Cargo.toml | 2 +- gstreamer-validate/Cargo.toml | 2 +- gstreamer-video/Cargo.toml | 2 +- gstreamer-webrtc/Cargo.toml | 2 +- gstreamer/Cargo.toml | 2 +- 27 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bd9f9c8ed..2ffe1ec2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,38 +115,38 @@ edition = "2021" rust-version = "1.70" [workspace.dependencies] -gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -gio-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" } -cairo-rs = { 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" } -gstreamer-audio-sys = { path = "./gstreamer-audio/sys"} -gstreamer-base-sys = { path = "./gstreamer-base/sys"} -gstreamer-gl-sys = { path = "./gstreamer-gl/sys"} -gstreamer-net-sys = { path = "./gstreamer-net/sys"} -gstreamer-pbutils-sys = { path = "./gstreamer-pbutils/sys"} -gstreamer-rtsp-sys = { path = "./gstreamer-rtsp/sys"} -gstreamer-sdp-sys = { path = "./gstreamer-sdp/sys"} -gstreamer-sys = { path = "./gstreamer/sys"} -gstreamer-video-sys = { path = "./gstreamer-video/sys"} -ges = { package = "gstreamer-editing-services", path = "./gstreamer-editing-services" } -gst = { package = "gstreamer", path = "./gstreamer" } -gst-allocators = { package = "gstreamer-allocators", path = "./gstreamer-allocators" } -gst-app = { package = "gstreamer-app", path = "./gstreamer-app" } -gst-audio = { package = "gstreamer-audio", path = "./gstreamer-audio" } -gst-base = { package = "gstreamer-base", path = "./gstreamer-base" } -gst-check = { package = "gstreamer-check", path = "./gstreamer-check" } -gst-gl = { package = "gstreamer-gl", path = "./gstreamer-gl" } -gst-gl-egl = { package = "gstreamer-gl-egl", path = "./gstreamer-gl/egl" } -gst-gl-x11 = { package = "gstreamer-gl-x11", path = "./gstreamer-gl/x11" } -gst-net = { package = "gstreamer-net", path = "./gstreamer-net" } -gst-pbutils = { package = "gstreamer-pbutils", path = "./gstreamer-pbutils" } -gst-play = { package = "gstreamer-play", path = "./gstreamer-play" } -gst-player = { package = "gstreamer-player", path = "./gstreamer-player" } -gst-rtsp = { package = "gstreamer-rtsp", path = "./gstreamer-rtsp" } -gst-rtsp-server = { package = "gstreamer-rtsp-server", path = "./gstreamer-rtsp-server" } -gst-sdp = { package = "gstreamer-sdp", path = "./gstreamer-sdp" } -gst-video = { package = "gstreamer-video", path = "./gstreamer-video" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +gio-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" } +gstreamer-audio-sys = { path = "./gstreamer-audio/sys", version = "0.22" } +gstreamer-base-sys = { path = "./gstreamer-base/sys", version = "0.22" } +gstreamer-gl-sys = { path = "./gstreamer-gl/sys", version = "0.22" } +gstreamer-net-sys = { path = "./gstreamer-net/sys", version = "0.22" } +gstreamer-pbutils-sys = { path = "./gstreamer-pbutils/sys", version = "0.22" } +gstreamer-rtsp-sys = { path = "./gstreamer-rtsp/sys", version = "0.22" } +gstreamer-sdp-sys = { path = "./gstreamer-sdp/sys", version = "0.22" } +gstreamer-sys = { path = "./gstreamer/sys", version = "0.22" } +gstreamer-video-sys = { path = "./gstreamer-video/sys", version = "0.22" } +ges = { package = "gstreamer-editing-services", path = "./gstreamer-editing-services", version = "0.22" } +gst = { package = "gstreamer", path = "./gstreamer", version = "0.22" } +gst-allocators = { package = "gstreamer-allocators", path = "./gstreamer-allocators", version = "0.22" } +gst-app = { package = "gstreamer-app", path = "./gstreamer-app", version = "0.22" } +gst-audio = { package = "gstreamer-audio", path = "./gstreamer-audio", version = "0.22" } +gst-base = { package = "gstreamer-base", path = "./gstreamer-base", version = "0.22" } +gst-check = { package = "gstreamer-check", path = "./gstreamer-check", version = "0.22" } +gst-gl = { package = "gstreamer-gl", path = "./gstreamer-gl", version = "0.22" } +gst-gl-egl = { package = "gstreamer-gl-egl", path = "./gstreamer-gl/egl", version = "0.22" } +gst-gl-x11 = { package = "gstreamer-gl-x11", path = "./gstreamer-gl/x11", version = "0.22" } +gst-net = { package = "gstreamer-net", path = "./gstreamer-net", version = "0.22" } +gst-pbutils = { package = "gstreamer-pbutils", path = "./gstreamer-pbutils", version = "0.22" } +gst-play = { package = "gstreamer-play", path = "./gstreamer-play", version = "0.22" } +gst-player = { package = "gstreamer-player", path = "./gstreamer-player", version = "0.22" } +gst-rtsp = { package = "gstreamer-rtsp", path = "./gstreamer-rtsp", version = "0.22" } +gst-rtsp-server = { package = "gstreamer-rtsp-server", path = "./gstreamer-rtsp-server", version = "0.22" } +gst-sdp = { package = "gstreamer-sdp", path = "./gstreamer-sdp", version = "0.22" } +gst-video = { package = "gstreamer-video", path = "./gstreamer-video", version = "0.22" } diff --git a/gstreamer-allocators/Cargo.toml b/gstreamer-allocators/Cargo.toml index 0741a2e75..30bd07672 100644 --- a/gstreamer-allocators/Cargo.toml +++ b/gstreamer-allocators/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-allocators-sys", path = "sys" } +ffi = { package = "gstreamer-allocators-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true once_cell = "1" diff --git a/gstreamer-analytics/Cargo.toml b/gstreamer-analytics/Cargo.toml index 88869b2f2..975a01070 100644 --- a/gstreamer-analytics/Cargo.toml +++ b/gstreamer-analytics/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-analytics-sys", path = "sys" } +ffi = { package = "gstreamer-analytics-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true diff --git a/gstreamer-app/Cargo.toml b/gstreamer-app/Cargo.toml index 825c2ef0d..756c9d5d1 100644 --- a/gstreamer-app/Cargo.toml +++ b/gstreamer-app/Cargo.toml @@ -17,7 +17,7 @@ rust-version.workspace = true futures-core = "0.3" futures-sink = "0.3" libc = "0.2" -ffi = { package = "gstreamer-app-sys", path = "sys" } +ffi = { package = "gstreamer-app-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-base.workspace = true diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index 2964b36e4..c414ed27e 100644 --- a/gstreamer-audio/Cargo.toml +++ b/gstreamer-audio/Cargo.toml @@ -16,7 +16,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" cfg-if = "1.0" -ffi = { package = "gstreamer-audio-sys", path = "sys" } +ffi = { package = "gstreamer-audio-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-base.workspace = true diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml index 1904788ac..9a35dafb4 100644 --- a/gstreamer-base/Cargo.toml +++ b/gstreamer-base/Cargo.toml @@ -16,7 +16,7 @@ rust-version.workspace = true [dependencies] cfg-if = "1.0" libc = "0.2" -ffi = { package = "gstreamer-base-sys", path = "sys" } +ffi = { package = "gstreamer-base-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true atomic_refcell = "0.1" diff --git a/gstreamer-check/Cargo.toml b/gstreamer-check/Cargo.toml index 41c05d100..86e945628 100644 --- a/gstreamer-check/Cargo.toml +++ b/gstreamer-check/Cargo.toml @@ -14,7 +14,7 @@ edition.workspace = true rust-version.workspace = true [dependencies] -ffi = { package = "gstreamer-check-sys", path = "sys" } +ffi = { package = "gstreamer-check-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true diff --git a/gstreamer-controller/Cargo.toml b/gstreamer-controller/Cargo.toml index 9e4826e56..652090e51 100644 --- a/gstreamer-controller/Cargo.toml +++ b/gstreamer-controller/Cargo.toml @@ -14,7 +14,7 @@ edition.workspace = true rust-version.workspace = true [dependencies] -ffi = { package = "gstreamer-controller-sys", path = "sys" } +ffi = { package = "gstreamer-controller-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true diff --git a/gstreamer-editing-services/Cargo.toml b/gstreamer-editing-services/Cargo.toml index c5496224b..53ed9db00 100644 --- a/gstreamer-editing-services/Cargo.toml +++ b/gstreamer-editing-services/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-editing-services-sys", path = "sys"} +ffi = { package = "gstreamer-editing-services-sys", path = "sys", version = "0.22"} glib.workspace = true gio.workspace = true gst.workspace = true diff --git a/gstreamer-gl/Cargo.toml b/gstreamer-gl/Cargo.toml index 5e3b71014..3dec53048 100644 --- a/gstreamer-gl/Cargo.toml +++ b/gstreamer-gl/Cargo.toml @@ -18,7 +18,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-gl-sys", path = "sys" } +ffi = { package = "gstreamer-gl-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-base.workspace = true diff --git a/gstreamer-gl/egl/Cargo.toml b/gstreamer-gl/egl/Cargo.toml index 4021d4604..c45c1c4fe 100644 --- a/gstreamer-gl/egl/Cargo.toml +++ b/gstreamer-gl/egl/Cargo.toml @@ -17,7 +17,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-gl-egl-sys", path = "sys" } +ffi = { package = "gstreamer-gl-egl-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-gl.workspace = true diff --git a/gstreamer-gl/wayland/Cargo.toml b/gstreamer-gl/wayland/Cargo.toml index 8b63c6182..6a6cfd3d8 100644 --- a/gstreamer-gl/wayland/Cargo.toml +++ b/gstreamer-gl/wayland/Cargo.toml @@ -18,7 +18,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-gl-wayland-sys", path = "sys" } +ffi = { package = "gstreamer-gl-wayland-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-gl.workspace = true diff --git a/gstreamer-gl/x11/Cargo.toml b/gstreamer-gl/x11/Cargo.toml index c74558aef..8895ad4bf 100644 --- a/gstreamer-gl/x11/Cargo.toml +++ b/gstreamer-gl/x11/Cargo.toml @@ -18,7 +18,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-gl-x11-sys", path = "sys" } +ffi = { package = "gstreamer-gl-x11-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-gl.workspace = true diff --git a/gstreamer-mpegts/Cargo.toml b/gstreamer-mpegts/Cargo.toml index d7d60f309..d5717c888 100644 --- a/gstreamer-mpegts/Cargo.toml +++ b/gstreamer-mpegts/Cargo.toml @@ -14,7 +14,7 @@ edition.workspace = true rust-version.workspace = true [dependencies] -ffi = { package = "gstreamer-mpegts-sys", path = "sys" } +ffi = { package = "gstreamer-mpegts-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true diff --git a/gstreamer-net/Cargo.toml b/gstreamer-net/Cargo.toml index 8f3001aaa..0acb33eec 100644 --- a/gstreamer-net/Cargo.toml +++ b/gstreamer-net/Cargo.toml @@ -14,7 +14,7 @@ edition.workspace = true rust-version.workspace = true [dependencies] -ffi = { package = "gstreamer-net-sys", path = "sys" } +ffi = { package = "gstreamer-net-sys", path = "sys", version = "0.22" } glib.workspace = true gio.workspace = true gst.workspace = true diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml index c70090b50..54de9da5e 100644 --- a/gstreamer-pbutils/Cargo.toml +++ b/gstreamer-pbutils/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-pbutils-sys", path = "sys" } +ffi = { package = "gstreamer-pbutils-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-video.workspace = true diff --git a/gstreamer-play/Cargo.toml b/gstreamer-play/Cargo.toml index a7201d41c..2665ebbeb 100644 --- a/gstreamer-play/Cargo.toml +++ b/gstreamer-play/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-play-sys", path = "sys" } +ffi = { package = "gstreamer-play-sys", path = "sys", version = "0.22" } glib.workspace = true gst = { workspace = true, features = ["v1_20"] } gst-video = { workspace = true, features = ["v1_20"] } diff --git a/gstreamer-player/Cargo.toml b/gstreamer-player/Cargo.toml index f92b162b3..30dbedbc4 100644 --- a/gstreamer-player/Cargo.toml +++ b/gstreamer-player/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-player-sys", path = "sys" } +ffi = { package = "gstreamer-player-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-video.workspace = true diff --git a/gstreamer-rtp/Cargo.toml b/gstreamer-rtp/Cargo.toml index 4270c03ba..667c26559 100644 --- a/gstreamer-rtp/Cargo.toml +++ b/gstreamer-rtp/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-rtp-sys", path = "sys" } +ffi = { package = "gstreamer-rtp-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true serde = { version = "1.0", optional = true } diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml index 922993788..6786df09f 100644 --- a/gstreamer-rtsp-server/Cargo.toml +++ b/gstreamer-rtsp-server/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-rtsp-server-sys", path = "sys" } +ffi = { package = "gstreamer-rtsp-server-sys", path = "sys", version = "0.22" } glib.workspace = true gio.workspace = true gst.workspace = true diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml index 1745364a1..f86ddca3b 100644 --- a/gstreamer-rtsp/Cargo.toml +++ b/gstreamer-rtsp/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-rtsp-sys", path = "sys" } +ffi = { package = "gstreamer-rtsp-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-sdp.workspace = true diff --git a/gstreamer-sdp/Cargo.toml b/gstreamer-sdp/Cargo.toml index 1f13eb604..39e00183d 100644 --- a/gstreamer-sdp/Cargo.toml +++ b/gstreamer-sdp/Cargo.toml @@ -14,7 +14,7 @@ edition.workspace = true rust-version.workspace = true [dependencies] -ffi = { package = "gstreamer-sdp-sys", path = "sys" } +ffi = { package = "gstreamer-sdp-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true diff --git a/gstreamer-tag/Cargo.toml b/gstreamer-tag/Cargo.toml index e424c0684..8ae4f6149 100644 --- a/gstreamer-tag/Cargo.toml +++ b/gstreamer-tag/Cargo.toml @@ -18,7 +18,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-tag-sys", path = "sys" } +ffi = { package = "gstreamer-tag-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true diff --git a/gstreamer-validate/Cargo.toml b/gstreamer-validate/Cargo.toml index a73faac96..700634163 100644 --- a/gstreamer-validate/Cargo.toml +++ b/gstreamer-validate/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-validate-sys", path = "sys" } +ffi = { package = "gstreamer-validate-sys", path = "sys", version = "0.22" } glib.workspace = true gst = { workspace = true, features = ["v1_22"] } diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index 9c8b18cbd..93cd9d4a5 100644 --- a/gstreamer-video/Cargo.toml +++ b/gstreamer-video/Cargo.toml @@ -17,7 +17,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" cfg-if = "1.0" -ffi = { package = "gstreamer-video-sys", path = "sys" } +ffi = { package = "gstreamer-video-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-base.workspace = true diff --git a/gstreamer-webrtc/Cargo.toml b/gstreamer-webrtc/Cargo.toml index ed699fd67..1dc6285b2 100644 --- a/gstreamer-webrtc/Cargo.toml +++ b/gstreamer-webrtc/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] libc = "0.2" -ffi = { package = "gstreamer-webrtc-sys", path = "sys" } +ffi = { package = "gstreamer-webrtc-sys", path = "sys", version = "0.22" } glib.workspace = true gst.workspace = true gst-sdp.workspace = true diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index d6e20807b..72625493d 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -16,7 +16,7 @@ rust-version.workspace = true [dependencies] cfg-if = "1.0" libc = "0.2" -ffi = { package = "gstreamer-sys", path = "sys" } +ffi = { package = "gstreamer-sys", path = "sys", version = "0.22" } glib.workspace = true num-integer = { version = "0.1", default-features = false, features = [] } num-rational = { version = "0.4", default-features = false, features = [] }