Switch git dependencies to explicitly name branch

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1384>
This commit is contained in:
Sebastian Dröge 2024-02-05 12:29:46 +02:00
parent a51b5bdfd3
commit fde0c061c2
3 changed files with 21 additions and 21 deletions

24
Cargo.lock generated
View file

@ -170,7 +170,7 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
[[package]] [[package]]
name = "cairo-rs" name = "cairo-rs"
version = "0.20.0" 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 = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"cairo-sys-rs", "cairo-sys-rs",
@ -182,7 +182,7 @@ dependencies = [
[[package]] [[package]]
name = "cairo-sys-rs" name = "cairo-sys-rs"
version = "0.20.0" 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 = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
@ -678,7 +678,7 @@ dependencies = [
[[package]] [[package]]
name = "gio" name = "gio"
version = "0.20.0" 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 = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
@ -695,7 +695,7 @@ dependencies = [
[[package]] [[package]]
name = "gio-sys" name = "gio-sys"
version = "0.20.0" 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 = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
@ -724,7 +724,7 @@ dependencies = [
[[package]] [[package]]
name = "glib" name = "glib"
version = "0.20.0" 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 = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"futures-channel", "futures-channel",
@ -745,7 +745,7 @@ dependencies = [
[[package]] [[package]]
name = "glib-macros" name = "glib-macros"
version = "0.20.0" 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 = [ dependencies = [
"heck", "heck",
"proc-macro-crate", "proc-macro-crate",
@ -757,7 +757,7 @@ dependencies = [
[[package]] [[package]]
name = "glib-sys" name = "glib-sys"
version = "0.20.0" 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 = [ dependencies = [
"libc", "libc",
"system-deps", "system-deps",
@ -820,7 +820,7 @@ dependencies = [
[[package]] [[package]]
name = "gobject-sys" name = "gobject-sys"
version = "0.20.0" 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 = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
@ -1870,7 +1870,7 @@ dependencies = [
[[package]] [[package]]
name = "pango" name = "pango"
version = "0.20.0" 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 = [ dependencies = [
"gio", "gio",
"glib", "glib",
@ -1881,7 +1881,7 @@ dependencies = [
[[package]] [[package]]
name = "pango-sys" name = "pango-sys"
version = "0.20.0" 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 = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
@ -1892,7 +1892,7 @@ dependencies = [
[[package]] [[package]]
name = "pangocairo" name = "pangocairo"
version = "0.20.0" 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 = [ dependencies = [
"cairo-rs", "cairo-rs",
"glib", "glib",
@ -1904,7 +1904,7 @@ dependencies = [
[[package]] [[package]]
name = "pangocairo-sys" name = "pangocairo-sys"
version = "0.20.0" 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 = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"glib-sys", "glib-sys",

View file

@ -111,11 +111,11 @@ edition = "2021"
rust-version = "1.70" rust-version = "1.70"
[workspace.dependencies] [workspace.dependencies]
gio = { 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" } gio-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
glib = { git = "https://github.com/gtk-rs/gtk-rs-core" } glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" } glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" } gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
gstreamer-audio-sys = { path = "./gstreamer-audio/sys"} gstreamer-audio-sys = { path = "./gstreamer-audio/sys"}
gstreamer-base-sys = { path = "./gstreamer-base/sys"} gstreamer-base-sys = { path = "./gstreamer-base/sys"}
gstreamer-gl-sys = { path = "./gstreamer-gl/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 = { package = "gstreamer-rtsp", path = "./gstreamer-rtsp" }
gst-rtsp-server = { package = "gstreamer-rtsp-server", path = "./gstreamer-rtsp-server" } gst-rtsp-server = { package = "gstreamer-rtsp-server", path = "./gstreamer-rtsp-server" }
gst-sdp = { package = "gstreamer-sdp", path = "./gstreamer-sdp" } gst-sdp = { package = "gstreamer-sdp", path = "./gstreamer-sdp" }
gst-video = { package = "gstreamer-video", path = "./gstreamer-video" } gst-video = { package = "gstreamer-video", path = "./gstreamer-video" }

View file

@ -27,7 +27,7 @@ gst-allocators = { workspace = true, optional = true }
gio = { workspace = true, optional = true } gio = { workspace = true, optional = true }
anyhow = "1.0" anyhow = "1.0"
byte-slice-cast = "1" 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" derive_more = "0.99.5"
futures = "0.3" futures = "0.3"
glutin = { version = "0.31", optional = true, default-features = false } 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"] } image = { version = "0.24", optional = true, default-features = false, features = ["png", "jpeg"] }
memfd = { version = "0.6", optional = true } memfd = { version = "0.6", optional = true }
memmap2 = { version = "0.9", optional = true } memmap2 = { version = "0.9", optional = true }
pango = { 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", optional = true } pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master", optional = true }
raw-window-handle = { version = "0.5", optional = true } raw-window-handle = { version = "0.5", optional = true }
uds = { version = "0.4", optional = true } uds = { version = "0.4", optional = true }
winit = { version = "0.29", optional = true, default-features = false, features = ["rwh_05"] } winit = { version = "0.29", optional = true, default-features = false, features = ["rwh_05"] }