diff --git a/examples/Cargo.toml b/examples/Cargo.toml index c4b6efb40..3147060c9 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" rust-version = "1.64" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } 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 } @@ -25,16 +25,16 @@ gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp", optional = tru gst-rtsp = { package = "gstreamer-rtsp", path = "../gstreamer-rtsp", optional = true } gst-rtsp-server = { package = "gstreamer-rtsp-server", path = "../gstreamer-rtsp-server", optional = true } gst-allocators = { package = "gstreamer-allocators", path = "../gstreamer-allocators", 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.17", version = "0.17.0", optional = true } +gdk = { git = "https://github.com/gtk-rs/gtk3-rs", branch = "0.17", version = "0.17.0", optional = true } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17.0", 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.17", version = "0.17.0", features=["use_glib"], optional = true } +pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17.0", optional = true } +pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17.0", optional = true } glutin = { version = "0.29", optional = true } once_cell = "1.0" image = { version = "0.24", optional = true } diff --git a/gstreamer-allocators/Cargo.toml b/gstreamer-allocators/Cargo.toml index 5cd6f8255..6d6e5ead7 100644 --- a/gstreamer-allocators/Cargo.toml +++ b/gstreamer-allocators/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.64" libc = "0.2" bitflags = "1.0" ffi = { package = "gstreamer-allocators-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } once_cell = "1.0" diff --git a/gstreamer-allocators/sys/Cargo.toml b/gstreamer-allocators/sys/Cargo.toml index 0ef4ed115..099c598be 100644 --- a/gstreamer-allocators/sys/Cargo.toml +++ b/gstreamer-allocators/sys/Cargo.toml @@ -6,10 +6,14 @@ libc = "0.2" [dependencies.glib] git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" package = "glib-sys" [dependencies.gobject] git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" package = "gobject-sys" [dependencies.gst] diff --git a/gstreamer-app/Cargo.toml b/gstreamer-app/Cargo.toml index 34b9e5986..71c6ff9cf 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" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } 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 551213b45..9b2f5bcc4 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.17" +version = "0.17" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index a2ea1c31e..e40ff0f79 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" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } once_cell = "1.0" diff --git a/gstreamer-audio/sys/Cargo.toml b/gstreamer-audio/sys/Cargo.toml index 681be3445..86fd5cd30 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml index fe3df04c1..1bcfe462c 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" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } atomic_refcell = "0.1" diff --git a/gstreamer-base/sys/Cargo.toml b/gstreamer-base/sys/Cargo.toml index c0d7814c1..030e7c79d 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-check/Cargo.toml b/gstreamer-check/Cargo.toml index 800ae2c6d..a9648f52a 100644 --- a/gstreamer-check/Cargo.toml +++ b/gstreamer-check/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.64" [dependencies] bitflags = "1.0" ffi = { package = "gstreamer-check-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-check/sys/Cargo.toml b/gstreamer-check/sys/Cargo.toml index 8a28c0849..4672f4027 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-controller/Cargo.toml b/gstreamer-controller/Cargo.toml index 748ea90d4..7d6d71374 100644 --- a/gstreamer-controller/Cargo.toml +++ b/gstreamer-controller/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.64" bitflags = "1.0" once_cell = "1.0" ffi = { package = "gstreamer-controller-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-controller/sys/Cargo.toml b/gstreamer-controller/sys/Cargo.toml index e9a4f6afa..9dcbde9d4 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-editing-services/Cargo.toml b/gstreamer-editing-services/Cargo.toml index a7c81654c..d9d461ee7 100644 --- a/gstreamer-editing-services/Cargo.toml +++ b/gstreamer-editing-services/Cargo.toml @@ -17,8 +17,8 @@ rust-version = "1.64" libc = "0.2" bitflags = "1.0" ffi = { package = "gstreamer-editing-services-sys", path = "sys"} -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.17", version = "0.17" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } 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 6874e5259..4a5fb936c 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.17" +version = "0.17" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_pbutils] package = "gstreamer-pbutils-sys" diff --git a/gstreamer-gl/Cargo.toml b/gstreamer-gl/Cargo.toml index 442ade04a..4dd83514d 100644 --- a/gstreamer-gl/Cargo.toml +++ b/gstreamer-gl/Cargo.toml @@ -21,7 +21,7 @@ bitflags = "1.0" 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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } gst-video = { package = "gstreamer-video", path = "../gstreamer-video" } diff --git a/gstreamer-gl/egl/Cargo.toml b/gstreamer-gl/egl/Cargo.toml index 4ceec1a89..fc43f542f 100644 --- a/gstreamer-gl/egl/Cargo.toml +++ b/gstreamer-gl/egl/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.64" 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.17", version = "0.17" } gst = { package = "gstreamer", path = "../../gstreamer" } gst-gl = { package = "gstreamer-gl", path = "../" } diff --git a/gstreamer-gl/egl/sys/Cargo.toml b/gstreamer-gl/egl/sys/Cargo.toml index b167cda88..b01e7c9ed 100644 --- a/gstreamer-gl/egl/sys/Cargo.toml +++ b/gstreamer-gl/egl/sys/Cargo.toml @@ -42,6 +42,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-gl/sys/Cargo.toml b/gstreamer-gl/sys/Cargo.toml index ef3c48d54..b92f95c52 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-gl/wayland/Cargo.toml b/gstreamer-gl/wayland/Cargo.toml index 70e074687..1063eb820 100644 --- a/gstreamer-gl/wayland/Cargo.toml +++ b/gstreamer-gl/wayland/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.64" 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.17", version = "0.17" } gst = { package = "gstreamer", path = "../../gstreamer" } gst-gl = { package = "gstreamer-gl", path = "../" } diff --git a/gstreamer-gl/wayland/sys/Cargo.toml b/gstreamer-gl/wayland/sys/Cargo.toml index bf0cb1dd3..7988b4c45 100644 --- a/gstreamer-gl/wayland/sys/Cargo.toml +++ b/gstreamer-gl/wayland/sys/Cargo.toml @@ -42,6 +42,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-gl/x11/Cargo.toml b/gstreamer-gl/x11/Cargo.toml index 1526fca25..4edfffb6f 100644 --- a/gstreamer-gl/x11/Cargo.toml +++ b/gstreamer-gl/x11/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.64" 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.17", version = "0.17" } gst = { package = "gstreamer", path = "../../gstreamer" } gst-gl = { package = "gstreamer-gl", path = "../" } diff --git a/gstreamer-gl/x11/sys/Cargo.toml b/gstreamer-gl/x11/sys/Cargo.toml index 834d3b147..4b2f0ff12 100644 --- a/gstreamer-gl/x11/sys/Cargo.toml +++ b/gstreamer-gl/x11/sys/Cargo.toml @@ -42,6 +42,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-mpegts/Cargo.toml b/gstreamer-mpegts/Cargo.toml index 984567d78..f77079f22 100644 --- a/gstreamer-mpegts/Cargo.toml +++ b/gstreamer-mpegts/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.64" [dependencies] ffi = { package = "gstreamer-mpegts-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-mpegts/sys/Cargo.toml b/gstreamer-mpegts/sys/Cargo.toml index c62fa9d4b..fb1088087 100644 --- a/gstreamer-mpegts/sys/Cargo.toml +++ b/gstreamer-mpegts/sys/Cargo.toml @@ -44,6 +44,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-net/Cargo.toml b/gstreamer-net/Cargo.toml index 3ad63bdf3..431429efb 100644 --- a/gstreamer-net/Cargo.toml +++ b/gstreamer-net/Cargo.toml @@ -15,9 +15,9 @@ rust-version = "1.64" [dependencies] ffi = { package = "gstreamer-net-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.17", version = "0.17" } 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.17", version = "0.17" } [dev-dependencies] gir-format-check = "0.1" diff --git a/gstreamer-net/sys/Cargo.toml b/gstreamer-net/sys/Cargo.toml index 7e4d66f82..030d03f13 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.17" +version = "0.17" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml index de860285f..57645e240 100644 --- a/gstreamer-pbutils/Cargo.toml +++ b/gstreamer-pbutils/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.64" bitflags = "1.0" libc = "0.2" ffi = { package = "gstreamer-pbutils-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } gst-video = { package = "gstreamer-video", path = "../gstreamer-video" } gst-audio = { package = "gstreamer-audio", path = "../gstreamer-audio" } diff --git a/gstreamer-pbutils/sys/Cargo.toml b/gstreamer-pbutils/sys/Cargo.toml index 12ec0b28e..d59f685e1 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_audio] package = "gstreamer-audio-sys" diff --git a/gstreamer-play/Cargo.toml b/gstreamer-play/Cargo.toml index f028d8ef3..cb9c11b67 100644 --- a/gstreamer-play/Cargo.toml +++ b/gstreamer-play/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.64" bitflags = "1.0" libc = "0.2" ffi = { package = "gstreamer-play-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer", features = ["v1_20"] } gst-video = { package = "gstreamer-video", path = "../gstreamer-video", features = ["v1_20"] } once_cell = "1.0" diff --git a/gstreamer-play/sys/Cargo.toml b/gstreamer-play/sys/Cargo.toml index 2e444431b..cfd45b879 100644 --- a/gstreamer-play/sys/Cargo.toml +++ b/gstreamer-play/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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-player/Cargo.toml b/gstreamer-player/Cargo.toml index 3328a918a..c5e5f7052 100644 --- a/gstreamer-player/Cargo.toml +++ b/gstreamer-player/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.64" 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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } gst-video = { package = "gstreamer-video", path = "../gstreamer-video" } once_cell = "1.0" diff --git a/gstreamer-player/sys/Cargo.toml b/gstreamer-player/sys/Cargo.toml index a89db6c95..626f96798 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-rtp/Cargo.toml b/gstreamer-rtp/Cargo.toml index 475bd654e..2c72426da 100644 --- a/gstreamer-rtp/Cargo.toml +++ b/gstreamer-rtp/Cargo.toml @@ -18,7 +18,7 @@ bitflags = "1.0" once_cell = "1.0" libc = "0.2" ffi = { package = "gstreamer-rtp-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } serde = { version = "1.0", optional = true } diff --git a/gstreamer-rtp/sys/Cargo.toml b/gstreamer-rtp/sys/Cargo.toml index 547c6d4bc..50c773bb4 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.17" +version = "0.17" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml index 177a493ca..7e6503f4a 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" } -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.17", version = "0.17" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } 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 fca28c272..f079a6d9c 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.17" +version = "0.17" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_net] package = "gstreamer-net-sys" diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml index 7c31cde63..b93c74159 100644 --- a/gstreamer-rtsp/Cargo.toml +++ b/gstreamer-rtsp/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.64" bitflags = "1.0" libc = "0.2" ffi = { package = "gstreamer-rtsp-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp" } serde = { version = "1.0", optional = true } diff --git a/gstreamer-rtsp/sys/Cargo.toml b/gstreamer-rtsp/sys/Cargo.toml index 7a9c0ec85..ead6117cd 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.17" +version = "0.17" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_sdp] package = "gstreamer-sdp-sys" diff --git a/gstreamer-sdp/Cargo.toml b/gstreamer-sdp/Cargo.toml index 562960fe0..1699df2aa 100644 --- a/gstreamer-sdp/Cargo.toml +++ b/gstreamer-sdp/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.64" [dependencies] ffi = { package = "gstreamer-sdp-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-sdp/sys/Cargo.toml b/gstreamer-sdp/sys/Cargo.toml index 449491f94..cfa6616c5 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.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-tag/sys/Cargo.toml b/gstreamer-tag/sys/Cargo.toml index 0889c9c1e..8667e65a6 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-validate/Cargo.toml b/gstreamer-validate/Cargo.toml index 42d314b54..8cf214f40 100644 --- a/gstreamer-validate/Cargo.toml +++ b/gstreamer-validate/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.64" [dependencies] libc = "0.2" ffi = { package = "gstreamer-validate-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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer", features = ["v1_22"] } bitflags = "1.0" diff --git a/gstreamer-validate/sys/Cargo.toml b/gstreamer-validate/sys/Cargo.toml index 7625773a5..94be3542e 100644 --- a/gstreamer-validate/sys/Cargo.toml +++ b/gstreamer-validate/sys/Cargo.toml @@ -32,14 +32,20 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gio] package = "gio-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index 4855004ba..6b9172789 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" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } 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 03808504d..a1a29d980 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-webrtc/Cargo.toml b/gstreamer-webrtc/Cargo.toml index fa27923fd..c56121455 100644 --- a/gstreamer-webrtc/Cargo.toml +++ b/gstreamer-webrtc/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.64" [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.17", version = "0.17" } gst = { package = "gstreamer", path = "../gstreamer" } gst-sdp = { package = "gstreamer-sdp", path = "../gstreamer-sdp" } diff --git a/gstreamer-webrtc/sys/Cargo.toml b/gstreamer-webrtc/sys/Cargo.toml index 1953593cb..9d23dfed6 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.17" +version = "0.17" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index 4d033b462..25dd8383d 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" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.17", version = "0.17" } 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 d922923a4..4a743a4da 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.17" +version = "0.17" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.17" +version = "0.17" [dev-dependencies] shell-words = "1.0.0" diff --git a/tutorials/Cargo.toml b/tutorials/Cargo.toml index 534202e24..6a0ddc02e 100644 --- a/tutorials/Cargo.toml +++ b/tutorials/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" rust-version = "1.64" [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.17", version = "0.17" } +gdk = { git = "https://github.com/gtk-rs/gtk3-rs", branch = "0.17", version = "0.17.0", optional = true } +gtk = { git = "https://github.com/gtk-rs/gtk3-rs", branch = "0.17", version = "0.17.0", 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 }