diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 3bc6df5de..0383ffaf2 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" rust-version = "1.70" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.18", version = "0.18" } 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,14 +25,14 @@ 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 } -gio = { git = "https://github.com/gtk-rs/gtk-rs-core", optional = true } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.18", version = "0.18", 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.18", version = "0.18", features=["use_glib"], optional = true } +pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.18", version = "0.18", optional = true } +pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.18", version = "0.18", optional = true } glutin = { version = "0.29", optional = true } image = { version = "0.24", optional = true, default-features = false, features = ["png", "jpeg"] } memmap2 = { version = "0.7", optional = true } diff --git a/gstreamer-allocators/Cargo.toml b/gstreamer-allocators/Cargo.toml index 1b50967fa..57cc36499 100644 --- a/gstreamer-allocators/Cargo.toml +++ b/gstreamer-allocators/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [dependencies] libc = "0.2" 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-allocators/sys/Cargo.toml b/gstreamer-allocators/sys/Cargo.toml index 176b9b1d3..6172d1b8e 100644 --- a/gstreamer-allocators/sys/Cargo.toml +++ b/gstreamer-allocators/sys/Cargo.toml @@ -7,10 +7,14 @@ libc = "0.2" [dependencies.glib] git = "https://github.com/gtk-rs/gtk-rs-core" package = "glib-sys" +branch = "0.18" +version = "0.18" [dependencies.gobject] git = "https://github.com/gtk-rs/gtk-rs-core" package = "gobject-sys" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-app/Cargo.toml b/gstreamer-app/Cargo.toml index 07359e8e2..1f663efa7 100644 --- a/gstreamer-app/Cargo.toml +++ b/gstreamer-app/Cargo.toml @@ -18,7 +18,7 @@ futures-core = "0.3" futures-sink = "0.3" 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } diff --git a/gstreamer-app/sys/Cargo.toml b/gstreamer-app/sys/Cargo.toml index c97dfe3be..3e137443b 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.18" +version = "0.18" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index 9a53a14eb..980d354df 100644 --- a/gstreamer-audio/Cargo.toml +++ b/gstreamer-audio/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.70" libc = "0.2" cfg-if = "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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } serde = { version = "1.0", optional = true } diff --git a/gstreamer-audio/sys/Cargo.toml b/gstreamer-audio/sys/Cargo.toml index c0249f2cc..b84ed8cd4 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml index c104905cb..74949dca6 100644 --- a/gstreamer-base/Cargo.toml +++ b/gstreamer-base/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.70" cfg-if = "1.0" libc = "0.2" 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } atomic_refcell = "0.1" diff --git a/gstreamer-base/sys/Cargo.toml b/gstreamer-base/sys/Cargo.toml index 3671a5b02..2d4d8e623 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-check/Cargo.toml b/gstreamer-check/Cargo.toml index 0ef96d120..71efbbee2 100644 --- a/gstreamer-check/Cargo.toml +++ b/gstreamer-check/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.70" [dependencies] 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-check/sys/Cargo.toml b/gstreamer-check/sys/Cargo.toml index d2bd0b5f9..58119ea15 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-controller/Cargo.toml b/gstreamer-controller/Cargo.toml index 7dbb18433..d149bb0dc 100644 --- a/gstreamer-controller/Cargo.toml +++ b/gstreamer-controller/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.70" [dependencies] 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-controller/sys/Cargo.toml b/gstreamer-controller/sys/Cargo.toml index 1fd9fd70f..aed473143 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-editing-services/Cargo.toml b/gstreamer-editing-services/Cargo.toml index 508b26bf7..a348c9b40 100644 --- a/gstreamer-editing-services/Cargo.toml +++ b/gstreamer-editing-services/Cargo.toml @@ -16,8 +16,8 @@ rust-version = "1.70" [dependencies] libc = "0.2" 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.18", version = "0.18" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.18", version = "0.18" } 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 704f5a190..2c05fb682 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.18" +version = "0.18" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_pbutils] package = "gstreamer-pbutils-sys" diff --git a/gstreamer-gl/Cargo.toml b/gstreamer-gl/Cargo.toml index fac4798e1..da41fe78e 100644 --- a/gstreamer-gl/Cargo.toml +++ b/gstreamer-gl/Cargo.toml @@ -19,7 +19,7 @@ rust-version = "1.70" [dependencies] libc = "0.2" 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.18", version = "0.18" } 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 24f144399..915e419ac 100644 --- a/gstreamer-gl/egl/Cargo.toml +++ b/gstreamer-gl/egl/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.70" 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.18", version = "0.18" } 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 d2c53c97b..9faec5945 100644 --- a/gstreamer-gl/egl/sys/Cargo.toml +++ b/gstreamer-gl/egl/sys/Cargo.toml @@ -47,6 +47,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-gl/sys/Cargo.toml b/gstreamer-gl/sys/Cargo.toml index 76dbf1c0d..cc882f57a 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-gl/wayland/Cargo.toml b/gstreamer-gl/wayland/Cargo.toml index 78a4e6b1a..4fb6d668b 100644 --- a/gstreamer-gl/wayland/Cargo.toml +++ b/gstreamer-gl/wayland/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.70" 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.18", version = "0.18" } 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 f12a18001..877531b05 100644 --- a/gstreamer-gl/wayland/sys/Cargo.toml +++ b/gstreamer-gl/wayland/sys/Cargo.toml @@ -47,6 +47,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-gl/x11/Cargo.toml b/gstreamer-gl/x11/Cargo.toml index c20356142..872a009de 100644 --- a/gstreamer-gl/x11/Cargo.toml +++ b/gstreamer-gl/x11/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.70" 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.18", version = "0.18" } 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 5132cd02a..cb48f6a08 100644 --- a/gstreamer-gl/x11/sys/Cargo.toml +++ b/gstreamer-gl/x11/sys/Cargo.toml @@ -47,6 +47,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_gl] package = "gstreamer-gl-sys" diff --git a/gstreamer-mpegts/Cargo.toml b/gstreamer-mpegts/Cargo.toml index b8947d835..5a95f2b3e 100644 --- a/gstreamer-mpegts/Cargo.toml +++ b/gstreamer-mpegts/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.70" [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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-mpegts/sys/Cargo.toml b/gstreamer-mpegts/sys/Cargo.toml index 565b9e412..cdf6c2646 100644 --- a/gstreamer-mpegts/sys/Cargo.toml +++ b/gstreamer-mpegts/sys/Cargo.toml @@ -49,6 +49,8 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-net/Cargo.toml b/gstreamer-net/Cargo.toml index 33ec1dd41..cd823f52b 100644 --- a/gstreamer-net/Cargo.toml +++ b/gstreamer-net/Cargo.toml @@ -15,9 +15,9 @@ rust-version = "1.70" [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.18", version = "0.18" } 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.18", version = "0.18" } [dev-dependencies] gir-format-check = "0.1" diff --git a/gstreamer-net/sys/Cargo.toml b/gstreamer-net/sys/Cargo.toml index 1b56800d3..dc9e9d066 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.18" +version = "0.18" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml index a0d87405c..81002c7f6 100644 --- a/gstreamer-pbutils/Cargo.toml +++ b/gstreamer-pbutils/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [dependencies] 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.18", version = "0.18" } 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 2e9e3de0b..8af8f44af 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_audio] package = "gstreamer-audio-sys" diff --git a/gstreamer-play/Cargo.toml b/gstreamer-play/Cargo.toml index f516083ae..d824db0b3 100644 --- a/gstreamer-play/Cargo.toml +++ b/gstreamer-play/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [dependencies] 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer", features = ["v1_20"] } gst-video = { package = "gstreamer-video", path = "../gstreamer-video", features = ["v1_20"] } diff --git a/gstreamer-play/sys/Cargo.toml b/gstreamer-play/sys/Cargo.toml index 7832019fc..a8f87d99e 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-player/Cargo.toml b/gstreamer-player/Cargo.toml index b3520a0e2..cb5788643 100644 --- a/gstreamer-player/Cargo.toml +++ b/gstreamer-player/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [dependencies] 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } gst-video = { package = "gstreamer-video", path = "../gstreamer-video" } diff --git a/gstreamer-player/sys/Cargo.toml b/gstreamer-player/sys/Cargo.toml index 6993b96c8..f7927e504 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-rtp/Cargo.toml b/gstreamer-rtp/Cargo.toml index 1e47778f7..dc9042425 100644 --- a/gstreamer-rtp/Cargo.toml +++ b/gstreamer-rtp/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [dependencies] 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.18", version = "0.18" } 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 a8d1897ef..925e004a0 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.18" +version = "0.18" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml index dcf42125b..85e8c7143 100644 --- a/gstreamer-rtsp-server/Cargo.toml +++ b/gstreamer-rtsp-server/Cargo.toml @@ -16,8 +16,8 @@ rust-version = "1.70" [dependencies] libc = "0.2" 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.18", version = "0.18" } +gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.18", version = "0.18" } 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 9c1528b66..18c64eb95 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.18" +version = "0.18" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_net] package = "gstreamer-net-sys" diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml index 70b27e3e3..2364f31d8 100644 --- a/gstreamer-rtsp/Cargo.toml +++ b/gstreamer-rtsp/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [dependencies] 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.18", version = "0.18" } 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 368fb5866..6e6113904 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.18" +version = "0.18" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_sdp] package = "gstreamer-sdp-sys" diff --git a/gstreamer-sdp/Cargo.toml b/gstreamer-sdp/Cargo.toml index 73fdebe39..e6ff98d7e 100644 --- a/gstreamer-sdp/Cargo.toml +++ b/gstreamer-sdp/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.70" [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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } [dev-dependencies] diff --git a/gstreamer-sdp/sys/Cargo.toml b/gstreamer-sdp/sys/Cargo.toml index 6959fd0d4..991a935ea 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.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-tag/sys/Cargo.toml b/gstreamer-tag/sys/Cargo.toml index 867371602..1cdcf5a81 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-validate/Cargo.toml b/gstreamer-validate/Cargo.toml index 7fe5f863a..da47b4129 100644 --- a/gstreamer-validate/Cargo.toml +++ b/gstreamer-validate/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer", features = ["v1_22"] } [dev-dependencies] diff --git a/gstreamer-validate/sys/Cargo.toml b/gstreamer-validate/sys/Cargo.toml index a20111dfc..bd43dbcf7 100644 --- a/gstreamer-validate/sys/Cargo.toml +++ b/gstreamer-validate/sys/Cargo.toml @@ -37,14 +37,20 @@ libc = "0.2" [dependencies.glib] package = "glib-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gio] package = "gio-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index b17894789..b2de7c919 100644 --- a/gstreamer-video/Cargo.toml +++ b/gstreamer-video/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.70" 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.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } gst-base = { package = "gstreamer-base", path = "../gstreamer-base" } futures-channel = "0.3" diff --git a/gstreamer-video/sys/Cargo.toml b/gstreamer-video/sys/Cargo.toml index 395fd114d..a659ebf09 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dependencies.gst_base] package = "gstreamer-base-sys" diff --git a/gstreamer-webrtc/Cargo.toml b/gstreamer-webrtc/Cargo.toml index b175d07b4..b0e900463 100644 --- a/gstreamer-webrtc/Cargo.toml +++ b/gstreamer-webrtc/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.70" [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.18", version = "0.18" } 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 66c281841..def4cae17 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.18" +version = "0.18" [dependencies.gst] package = "gstreamer-sys" diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index 536f028ca..6b85f5fe7 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.70" 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.18", version = "0.18" } num-integer = { version = "0.1", default-features = false, features = [] } num-rational = { version = "0.4", default-features = false, features = [] } futures-core = "0.3" diff --git a/gstreamer/sys/Cargo.toml b/gstreamer/sys/Cargo.toml index 4b864ab2c..f4fb9dbf2 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.18" +version = "0.18" [dependencies.gobject] package = "gobject-sys" git = "https://github.com/gtk-rs/gtk-rs-core" +branch = "0.18" +version = "0.18" [dev-dependencies] shell-words = "1.0.0" diff --git a/tutorials/Cargo.toml b/tutorials/Cargo.toml index 4b456ed81..4244ff2eb 100644 --- a/tutorials/Cargo.toml +++ b/tutorials/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" rust-version = "1.70" [dependencies] -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } +glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.18", version = "0.18" } gst = { package = "gstreamer", path = "../gstreamer" } gst-audio = { package = "gstreamer-audio", path = "../gstreamer-audio" } gst-video = { package = "gstreamer-video", path = "../gstreamer-video", optional = true }