From fde0c061c20043923ead356d7ef175ac8e90e2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 5 Feb 2024 12:29:46 +0200 Subject: [PATCH] Switch git dependencies to explicitly name branch Part-of: --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 12 ++++++------ examples/Cargo.toml | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb988342a..f86df9e50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,7 +170,7 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "bitflags 2.4.2", "cairo-sys-rs", @@ -182,7 +182,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "glib-sys", "libc", @@ -678,7 +678,7 @@ dependencies = [ [[package]] name = "gio" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "futures-channel", "futures-core", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "glib-sys", "gobject-sys", @@ -724,7 +724,7 @@ dependencies = [ [[package]] name = "glib" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "bitflags 2.4.2", "futures-channel", @@ -745,7 +745,7 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "heck", "proc-macro-crate", @@ -757,7 +757,7 @@ dependencies = [ [[package]] name = "glib-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "libc", "system-deps", @@ -820,7 +820,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "glib-sys", "libc", @@ -1870,7 +1870,7 @@ dependencies = [ [[package]] name = "pango" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "gio", "glib", @@ -1881,7 +1881,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "glib-sys", "gobject-sys", @@ -1892,7 +1892,7 @@ dependencies = [ [[package]] name = "pangocairo" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "cairo-rs", "glib", @@ -1904,7 +1904,7 @@ dependencies = [ [[package]] name = "pangocairo-sys" version = "0.20.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#f7e88e6fb0b9aad21dc977393e1f0ad7af740dbd" dependencies = [ "cairo-sys-rs", "glib-sys", diff --git a/Cargo.toml b/Cargo.toml index ddef10768..17164c80b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -111,11 +111,11 @@ edition = "2021" rust-version = "1.70" [workspace.dependencies] -gio = { git = "https://github.com/gtk-rs/gtk-rs-core" } -gio-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" } -glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } -glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" } -gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" } +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" } gstreamer-audio-sys = { path = "./gstreamer-audio/sys"} gstreamer-base-sys = { path = "./gstreamer-base/sys"} gstreamer-gl-sys = { path = "./gstreamer-gl/sys"} @@ -142,4 +142,4 @@ 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" } \ No newline at end of file +gst-video = { package = "gstreamer-video", path = "./gstreamer-video" } diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 7c683471d..2bcfe20a8 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -27,7 +27,7 @@ gst-allocators = { workspace = true, optional = true } gio = { workspace = true, optional = true } anyhow = "1.0" byte-slice-cast = "1" -cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", features=["use_glib"], optional = true } +cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master", features=["use_glib"], optional = true } derive_more = "0.99.5" futures = "0.3" glutin = { version = "0.31", optional = true, default-features = false } @@ -35,8 +35,8 @@ glutin-winit = { version = "0.4", optional = true, default-features = false } image = { version = "0.24", optional = true, default-features = false, features = ["png", "jpeg"] } memfd = { version = "0.6", optional = true } memmap2 = { version = "0.9", 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 } +pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master", optional = true } +pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master", optional = true } raw-window-handle = { version = "0.5", optional = true } uds = { version = "0.4", optional = true } winit = { version = "0.29", optional = true, default-features = false, features = ["rwh_05"] }