From 5fa5f04e043d817e61ebbab42a62fca269f8112d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 15 Jan 2022 17:15:34 +0200 Subject: [PATCH] Switch to 0.15 branches of gtk-rs and provide a version --- examples/Cargo.toml | 14 +++++++------- gstreamer-app/Cargo.toml | 2 +- gstreamer-app/sys/Cargo.toml | 2 ++ gstreamer-audio/Cargo.toml | 2 +- gstreamer-audio/sys/Cargo.toml | 4 ++++ gstreamer-base/Cargo.toml | 2 +- gstreamer-base/sys/Cargo.toml | 4 ++++ gstreamer-check/Cargo.toml | 2 +- gstreamer-check/sys/Cargo.toml | 4 ++++ gstreamer-controller/Cargo.toml | 2 +- gstreamer-controller/sys/Cargo.toml | 4 ++++ gstreamer-editing-services/Cargo.toml | 4 ++-- gstreamer-editing-services/sys/Cargo.toml | 6 ++++++ gstreamer-gl/Cargo.toml | 2 +- gstreamer-gl/egl/Cargo.toml | 2 +- gstreamer-gl/egl/sys/Cargo.toml | 2 ++ gstreamer-gl/sys/Cargo.toml | 4 ++++ gstreamer-gl/wayland/Cargo.toml | 2 +- gstreamer-gl/wayland/sys/Cargo.toml | 2 ++ gstreamer-gl/x11/Cargo.toml | 2 +- gstreamer-gl/x11/sys/Cargo.toml | 2 ++ gstreamer-mpegts/sys/Cargo.toml | 2 ++ gstreamer-net/Cargo.toml | 4 ++-- gstreamer-net/sys/Cargo.toml | 4 ++++ gstreamer-pbutils/Cargo.toml | 2 +- gstreamer-pbutils/sys/Cargo.toml | 4 ++++ gstreamer-player/Cargo.toml | 2 +- gstreamer-player/sys/Cargo.toml | 4 ++++ gstreamer-rtp/Cargo.toml | 2 +- gstreamer-rtp/sys/Cargo.toml | 2 ++ gstreamer-rtsp-server/Cargo.toml | 4 ++-- gstreamer-rtsp-server/sys/Cargo.toml | 6 ++++++ gstreamer-rtsp/Cargo.toml | 2 +- gstreamer-rtsp/sys/Cargo.toml | 6 ++++++ gstreamer-sdp/Cargo.toml | 2 +- gstreamer-sdp/sys/Cargo.toml | 2 ++ gstreamer-tag/sys/Cargo.toml | 4 ++++ gstreamer-video/Cargo.toml | 2 +- gstreamer-video/sys/Cargo.toml | 4 ++++ gstreamer-webrtc/Cargo.toml | 2 +- gstreamer-webrtc/sys/Cargo.toml | 2 ++ gstreamer/Cargo.toml | 2 +- gstreamer/sys/Cargo.toml | 4 ++++ tutorials/Cargo.toml | 6 +++--- 44 files changed, 111 insertions(+), 33 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index dfffb0a3e..329104f12 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" rust-version = "1.56" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } gst-gl = { package = "gstreamer-gl", path = "../gstreamer-gl", optional = true } gst-gl-egl = { package = "gstreamer-gl-egl", path = "../gstreamer-gl/egl", optional = true } @@ -23,16 +23,16 @@ ges = { package = "gstreamer-editing-services", path = "../gstreamer-editing-ser gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp", optional = true } gst-rtsp = { package = "gstreamer-rtsp", path = "../gstreamer-rtsp", optional = true } gst-rtsp-server = { package = "gstreamer-rtsp-server", path = "../gstreamer-rtsp-server", optional = true } -gtk = { git = "https://github.com/gtk-rs/gtk3-rs", optional = true } -gdk = { git = "https://github.com/gtk-rs/gtk3-rs", optional = true } -gio = { git = "https://github.com/gtk-rs/gtk-rs-core" , optional = true } +gtk = { git = "https://github.com/gtk-rs/gtk3-rs", branch = "0.15", version = "0.15", optional = true } +gdk = { git = "https://github.com/gtk-rs/gtk3-rs", branch = "0.15", version = "0.15", optional = true } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" , optional = true } anyhow = "1.0" derive_more = "0.99.5" futures = "0.3" byte-slice-cast = "1" -cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core" , features=["use_glib"], optional = true } -pango = { git = "https://github.com/gtk-rs/gtk-rs-core" , optional = true } -pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core" , optional = true } +cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" , features=["use_glib"], optional = true } +pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" , optional = true } +pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" , optional = true } glutin = { version = "0.28", optional = true } once_cell = "1.0" image = { version="0.23", optional = true } diff --git a/gstreamer-app/Cargo.toml b/gstreamer-app/Cargo.toml index 0dcb30033..0b23296a1 100644 --- a/gstreamer-app/Cargo.toml +++ b/gstreamer-app/Cargo.toml @@ -19,7 +19,7 @@ futures-sink = "0.3" bitflags = "1.0" libc = "0.2" ffi = { package = "gstreamer-app-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } once_cell = "1.0" diff --git a/gstreamer-app/sys/Cargo.toml b/gstreamer-app/sys/Cargo.toml index 822515492..5dede57bc 100644 --- a/gstreamer-app/sys/Cargo.toml +++ b/gstreamer-app/sys/Cargo.toml @@ -7,6 +7,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index f61dc3cb9..e004d557f 100644 --- a/gstreamer-audio/Cargo.toml +++ b/gstreamer-audio/Cargo.toml @@ -18,7 +18,7 @@ libc = "0.2" cfg-if = "1.0" bitflags = "1.0" ffi = { package = "gstreamer-audio-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } array-init = "2.0" diff --git a/gstreamer-audio/sys/Cargo.toml b/gstreamer-audio/sys/Cargo.toml index 1794a0baa..838a69b87 100644 --- a/gstreamer-audio/sys/Cargo.toml +++ b/gstreamer-audio/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml index c4d78d818..d2fb53516 100644 --- a/gstreamer-base/Cargo.toml +++ b/gstreamer-base/Cargo.toml @@ -18,7 +18,7 @@ cfg-if = "1.0" libc = "0.2" bitflags = "1.0" ffi = { package = "gstreamer-base-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-base/sys/Cargo.toml b/gstreamer-base/sys/Cargo.toml index a736084ea..b048311f4 100644 --- a/gstreamer-base/sys/Cargo.toml +++ b/gstreamer-base/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-check/Cargo.toml b/gstreamer-check/Cargo.toml index c948fd0cc..864a98b04 100644 --- a/gstreamer-check/Cargo.toml +++ b/gstreamer-check/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.56" [dependencies] bitflags = "1.0" ffi = { package = "gstreamer-check-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-check/sys/Cargo.toml b/gstreamer-check/sys/Cargo.toml index 83568f7df..8e448aa09 100644 --- a/gstreamer-check/sys/Cargo.toml +++ b/gstreamer-check/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-controller/Cargo.toml b/gstreamer-controller/Cargo.toml index 14b71078d..5ce464b65 100644 --- a/gstreamer-controller/Cargo.toml +++ b/gstreamer-controller/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.56" bitflags = "1.0" once_cell = "1.0" ffi = { package = "gstreamer-controller-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-controller/sys/Cargo.toml b/gstreamer-controller/sys/Cargo.toml index 4183ab4aa..d2639bdfa 100644 --- a/gstreamer-controller/sys/Cargo.toml +++ b/gstreamer-controller/sys/Cargo.toml @@ -8,10 +8,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-editing-services/Cargo.toml b/gstreamer-editing-services/Cargo.toml index db49d1666..ff9040d99 100644 --- a/gstreamer-editing-services/Cargo.toml +++ b/gstreamer-editing-services/Cargo.toml @@ -17,8 +17,8 @@ rust-version = "1.56" libc = "0.2" bitflags = "1.0" ffi = { package = "gstreamer-editing-services-sys", path = "sys", features = ["v1_8"]} -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } -gio = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } gst-pbutils = { package = "gstreamer-pbutils", path = "../gstreamer-pbutils" } diff --git a/gstreamer-editing-services/sys/Cargo.toml b/gstreamer-editing-services/sys/Cargo.toml index 5f5df9001..f1f3115cc 100644 --- a/gstreamer-editing-services/sys/Cargo.toml +++ b/gstreamer-editing-services/sys/Cargo.toml @@ -7,14 +7,20 @@ libc = "0.2" [dependencies.gio] package = "gio-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_pbutils] package = "gstreamer-pbutils-sys" diff --git a/gstreamer-gl/Cargo.toml b/gstreamer-gl/Cargo.toml index f4865f503..9fe373290 100644 --- a/gstreamer-gl/Cargo.toml +++ b/gstreamer-gl/Cargo.toml @@ -23,7 +23,7 @@ cfg-if = "1" libc = "0.2" once_cell = "1.0" ffi = { package = "gstreamer-gl-sys", path = "sys" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer", features = ["v1_14"] } gst-base = { package = "gstreamer-base", path = "../gstreamer-base", features = ["v1_14"] } gst-video = { package = "gstreamer-video", path = "../gstreamer-video", features = ["v1_14"] } diff --git a/gstreamer-gl/egl/Cargo.toml b/gstreamer-gl/egl/Cargo.toml index dbdfdc21c..a7d62c006 100644 --- a/gstreamer-gl/egl/Cargo.toml +++ b/gstreamer-gl/egl/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.56" libc = "0.2" ffi = { package = "gstreamer-gl-egl-sys", path = "sys" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../../gstreamer", features = ["v1_14"] } gst-gl = { package = "gstreamer-gl", path = "../" } diff --git a/gstreamer-gl/egl/sys/Cargo.toml b/gstreamer-gl/egl/sys/Cargo.toml index 4fbf28bc0..41d7bced7 100644 --- a/gstreamer-gl/egl/sys/Cargo.toml +++ b/gstreamer-gl/egl/sys/Cargo.toml @@ -37,6 +37,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-gl/sys/Cargo.toml b/gstreamer-gl/sys/Cargo.toml index 25082ca53..643b1a7d5 100644 --- a/gstreamer-gl/sys/Cargo.toml +++ b/gstreamer-gl/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-gl/wayland/Cargo.toml b/gstreamer-gl/wayland/Cargo.toml index 4bfecc335..4f5438e7d 100644 --- a/gstreamer-gl/wayland/Cargo.toml +++ b/gstreamer-gl/wayland/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.56" libc = "0.2" ffi = { package = "gstreamer-gl-wayland-sys", path = "sys" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../../gstreamer", features = ["v1_14"] } gst-gl = { package = "gstreamer-gl", path = "../" } diff --git a/gstreamer-gl/wayland/sys/Cargo.toml b/gstreamer-gl/wayland/sys/Cargo.toml index 4487c6e28..3afd41a3c 100644 --- a/gstreamer-gl/wayland/sys/Cargo.toml +++ b/gstreamer-gl/wayland/sys/Cargo.toml @@ -37,6 +37,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-gl/x11/Cargo.toml b/gstreamer-gl/x11/Cargo.toml index 211ba8a3f..c0ee0cc69 100644 --- a/gstreamer-gl/x11/Cargo.toml +++ b/gstreamer-gl/x11/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.56" libc = "0.2" ffi = { package = "gstreamer-gl-x11-sys", path = "sys" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../../gstreamer", features = ["v1_14"] } gst-gl = { package = "gstreamer-gl", path = "../" } diff --git a/gstreamer-gl/x11/sys/Cargo.toml b/gstreamer-gl/x11/sys/Cargo.toml index f50d34e5d..be222d65d 100644 --- a/gstreamer-gl/x11/sys/Cargo.toml +++ b/gstreamer-gl/x11/sys/Cargo.toml @@ -37,6 +37,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-mpegts/sys/Cargo.toml b/gstreamer-mpegts/sys/Cargo.toml index 293a4f66c..363b745b1 100644 --- a/gstreamer-mpegts/sys/Cargo.toml +++ b/gstreamer-mpegts/sys/Cargo.toml @@ -7,6 +7,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-net/Cargo.toml b/gstreamer-net/Cargo.toml index 9d84cb056..56323ef44 100644 --- a/gstreamer-net/Cargo.toml +++ b/gstreamer-net/Cargo.toml @@ -15,9 +15,9 @@ rust-version = "1.56" [dependencies] ffi = { package = "gstreamer-net-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } -gio = { git = "https://github.com/gtk-rs/gtk-rs-core" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } [dev-dependencies] gir-format-check = "0.1" diff --git a/gstreamer-net/sys/Cargo.toml b/gstreamer-net/sys/Cargo.toml index ec0a517ac..e0b22e980 100644 --- a/gstreamer-net/sys/Cargo.toml +++ b/gstreamer-net/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.gio] package = "gio-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml index a1e6c43cf..469dd3e3b 100644 --- a/gstreamer-pbutils/Cargo.toml +++ b/gstreamer-pbutils/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.56" bitflags = "1.0" libc = "0.2" ffi = { package = "gstreamer-pbutils-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } thiserror = "1.0" diff --git a/gstreamer-pbutils/sys/Cargo.toml b/gstreamer-pbutils/sys/Cargo.toml index 873613cbd..b931335ac 100644 --- a/gstreamer-pbutils/sys/Cargo.toml +++ b/gstreamer-pbutils/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_audio] package = "gstreamer-audio-sys" diff --git a/gstreamer-player/Cargo.toml b/gstreamer-player/Cargo.toml index 3c4d2ec20..2b9b5898a 100644 --- a/gstreamer-player/Cargo.toml +++ b/gstreamer-player/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.56" bitflags = "1.0" libc = "0.2" ffi = { package = "gstreamer-player-sys", path = "sys" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer", features = ["v1_12"] } gst-video = { package = "gstreamer-video", path = "../gstreamer-video", features = ["v1_12"] } once_cell = "1.0" diff --git a/gstreamer-player/sys/Cargo.toml b/gstreamer-player/sys/Cargo.toml index dbcee51f5..cf80a8530 100644 --- a/gstreamer-player/sys/Cargo.toml +++ b/gstreamer-player/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-rtp/Cargo.toml b/gstreamer-rtp/Cargo.toml index fca8eab22..d9d16190a 100644 --- a/gstreamer-rtp/Cargo.toml +++ b/gstreamer-rtp/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.56" bitflags = "1.0" once_cell = "1.0" ffi = { package = "gstreamer-rtp-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-rtp/sys/Cargo.toml b/gstreamer-rtp/sys/Cargo.toml index 92e4bd12f..aa71b5289 100644 --- a/gstreamer-rtp/sys/Cargo.toml +++ b/gstreamer-rtp/sys/Cargo.toml @@ -7,6 +7,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml index aa39e8a3f..7388d675d 100644 --- a/gstreamer-rtsp-server/Cargo.toml +++ b/gstreamer-rtsp-server/Cargo.toml @@ -18,8 +18,8 @@ bitflags = "1.0" libc = "0.2" once_cell = "1.0" ffi = { package = "gstreamer-rtsp-server-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } -gio = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp" } gst-rtsp = { package = "gstreamer-rtsp", path = "../gstreamer-rtsp" } diff --git a/gstreamer-rtsp-server/sys/Cargo.toml b/gstreamer-rtsp-server/sys/Cargo.toml index 29768428b..645203561 100644 --- a/gstreamer-rtsp-server/sys/Cargo.toml +++ b/gstreamer-rtsp-server/sys/Cargo.toml @@ -7,14 +7,20 @@ libc = "0.2" [dependencies.gio] package = "gio-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_net] package = "gstreamer-net-sys" diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml index 05e5ac202..4548960f2 100644 --- a/gstreamer-rtsp/Cargo.toml +++ b/gstreamer-rtsp/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.56" bitflags = "1.0" libc = "0.2" ffi = { package = "gstreamer-rtsp-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp" } diff --git a/gstreamer-rtsp/sys/Cargo.toml b/gstreamer-rtsp/sys/Cargo.toml index 30c07cdef..2a5ebffbd 100644 --- a/gstreamer-rtsp/sys/Cargo.toml +++ b/gstreamer-rtsp/sys/Cargo.toml @@ -7,14 +7,20 @@ libc = "0.2" [dependencies.gio] package = "gio-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_sdp] package = "gstreamer-sdp-sys" diff --git a/gstreamer-sdp/Cargo.toml b/gstreamer-sdp/Cargo.toml index b50b674f4..6d15efbe0 100644 --- a/gstreamer-sdp/Cargo.toml +++ b/gstreamer-sdp/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.56" [dependencies] ffi = { package = "gstreamer-sdp-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-sdp/sys/Cargo.toml b/gstreamer-sdp/sys/Cargo.toml index f15e6b33b..e8861f7b2 100644 --- a/gstreamer-sdp/sys/Cargo.toml +++ b/gstreamer-sdp/sys/Cargo.toml @@ -7,6 +7,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-tag/sys/Cargo.toml b/gstreamer-tag/sys/Cargo.toml index 4a86a5c6a..994fa5bd3 100644 --- a/gstreamer-tag/sys/Cargo.toml +++ b/gstreamer-tag/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index fe21cbcde..f36a9b635 100644 --- a/gstreamer-video/Cargo.toml +++ b/gstreamer-video/Cargo.toml @@ -18,7 +18,7 @@ bitflags = "1.0" libc = "0.2" cfg-if = "1.0" ffi = { package = "gstreamer-video-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } once_cell = "1.0" diff --git a/gstreamer-video/sys/Cargo.toml b/gstreamer-video/sys/Cargo.toml index f8749b84d..a353cbdb5 100644 --- a/gstreamer-video/sys/Cargo.toml +++ b/gstreamer-video/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-webrtc/Cargo.toml b/gstreamer-webrtc/Cargo.toml index 2172ad781..d300fa2e5 100644 --- a/gstreamer-webrtc/Cargo.toml +++ b/gstreamer-webrtc/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.56" [dependencies] libc = "0.2" ffi = { package = "gstreamer-webrtc-sys", path = "sys" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } gst = { package = "gstreamer", path = "../gstreamer", features = ["v1_14"] } gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp", features = ["v1_14"] } diff --git a/gstreamer-webrtc/sys/Cargo.toml b/gstreamer-webrtc/sys/Cargo.toml index 572c13cd8..4a79bc9eb 100644 --- a/gstreamer-webrtc/sys/Cargo.toml +++ b/gstreamer-webrtc/sys/Cargo.toml @@ -7,6 +7,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gst_sdp] package = "gstreamer-sdp-sys" diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index ee1503f3e..67044a40e 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -18,7 +18,7 @@ bitflags = "1.0" cfg-if = "1.0" libc = "0.2" ffi = { package = "gstreamer-sys", path = "sys", features = ["v1_8"] } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } num-integer = { version = "0.1", default-features = false, features = [] } num-rational = { version = "0.4", default-features = false, features = [] } once_cell = "1.0" diff --git a/gstreamer/sys/Cargo.toml b/gstreamer/sys/Cargo.toml index 4b4b71aab..62c182777 100644 --- a/gstreamer/sys/Cargo.toml +++ b/gstreamer/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.15" +version = "0.15" [dev-dependencies] shell-words = "1.0.0" diff --git a/tutorials/Cargo.toml b/tutorials/Cargo.toml index 1f1a37219..d84d90558 100644 --- a/tutorials/Cargo.toml +++ b/tutorials/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" rust-version = "1.56" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } -gdk = { git = "https://github.com/gtk-rs/gtk3-rs", optional = true } -gtk = { git = "https://github.com/gtk-rs/gtk3-rs", optional = true } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.15", version = "0.15" } +gdk = { git = "https://github.com/gtk-rs/gtk3-rs", branch = "0.15", version = "0.15", optional = true } +gtk = { git = "https://github.com/gtk-rs/gtk3-rs", branch = "0.15", version = "0.15", optional = true } gst = { package = "gstreamer", path = "../gstreamer" } gst-audio = { package = "gstreamer-audio", path = "../gstreamer-audio" } gst-video = { package = "gstreamer-video", path = "../gstreamer-video", optional = true }