From 7f479b0e14705119b4d15af4e7a1d7c8d9011484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 15 Mar 2018 10:42:34 +0200 Subject: [PATCH] Use correct gstreamer-sys branch --- examples/Cargo.toml | 2 +- gstreamer-app/Cargo.toml | 6 +++--- gstreamer-audio/Cargo.toml | 4 ++-- gstreamer-base/Cargo.toml | 4 ++-- gstreamer-net/Cargo.toml | 4 ++-- gstreamer-pbutils/Cargo.toml | 4 ++-- gstreamer-player/Cargo.toml | 4 ++-- gstreamer-rtsp-server/Cargo.toml | 8 ++++---- gstreamer-rtsp/Cargo.toml | 6 +++--- gstreamer-sdp/Cargo.toml | 4 ++-- gstreamer-video/Cargo.toml | 6 +++--- gstreamer/Cargo.toml | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index b738064cd..f6caf6ccd 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -13,7 +13,7 @@ gstreamer-pbutils = { path = "../gstreamer-pbutils" } gstreamer-player = { path = "../gstreamer-player", optional = true } gstreamer-rtsp = { path = "../gstreamer-rtsp", optional = true } gstreamer-rtsp-server = { path = "../gstreamer-rtsp-server", optional = true } -gstreamer-rtsp-server-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-rtsp-server-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } gtk = { git = "https://github.com/gtk-rs/gtk", features = ["v3_6"], optional = true } gdk = { git = "https://github.com/gtk-rs/gdk", optional = true } gio = { git = "https://github.com/gtk-rs/gio", optional = true } diff --git a/gstreamer-app/Cargo.toml b/gstreamer-app/Cargo.toml index 3df967895..9a74f3706 100644 --- a/gstreamer-app/Cargo.toml +++ b/gstreamer-app/Cargo.toml @@ -17,9 +17,9 @@ bitflags = "1.0" libc = "0.2" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-base-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-app-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-base-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-app-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } gstreamer-base = { path = "../gstreamer-base" } diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index 21bb22bd1..0c22dd570 100644 --- a/gstreamer-audio/Cargo.toml +++ b/gstreamer-audio/Cargo.toml @@ -16,8 +16,8 @@ build = "build.rs" bitflags = "1.0" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-audio-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-audio-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } array-init = "0.0" diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml index 66ec772fb..bffdced63 100644 --- a/gstreamer-base/Cargo.toml +++ b/gstreamer-base/Cargo.toml @@ -16,8 +16,8 @@ build = "build.rs" bitflags = "1.0" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-base-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-base-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } diff --git a/gstreamer-net/Cargo.toml b/gstreamer-net/Cargo.toml index 8048efb39..22186ab24 100644 --- a/gstreamer-net/Cargo.toml +++ b/gstreamer-net/Cargo.toml @@ -15,8 +15,8 @@ build = "build.rs" [dependencies] glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-net-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-net-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml index e5ce2f66d..39956b7bc 100644 --- a/gstreamer-pbutils/Cargo.toml +++ b/gstreamer-pbutils/Cargo.toml @@ -17,8 +17,8 @@ bitflags = "1.0" libc = "0.2" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-pbutils-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-pbutils-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } diff --git a/gstreamer-player/Cargo.toml b/gstreamer-player/Cargo.toml index 5e9ad035b..a0ae3af4e 100644 --- a/gstreamer-player/Cargo.toml +++ b/gstreamer-player/Cargo.toml @@ -17,8 +17,8 @@ bitflags = "1.0" libc = "0.2" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_12"] } -gstreamer-player-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_12"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_12"], branch = "1.14" } +gstreamer-player-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_12"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer", features = ["v1_12"] } gstreamer-video = { path = "../gstreamer-video", features = ["v1_12"] } diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml index 4e86f828a..5c0309bc4 100644 --- a/gstreamer-rtsp-server/Cargo.toml +++ b/gstreamer-rtsp-server/Cargo.toml @@ -19,10 +19,10 @@ lazy_static = "1.0" glib-sys = { git = "https://github.com/gtk-rs/sys" } gio-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-rtsp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-rtsp-server-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-net-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-rtsp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-rtsp-server-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-net-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gio = { git = "https://github.com/gtk-rs/gio" } gstreamer = { path = "../gstreamer" } diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml index e69225f54..a127195bb 100644 --- a/gstreamer-rtsp/Cargo.toml +++ b/gstreamer-rtsp/Cargo.toml @@ -18,9 +18,9 @@ libc = "0.2" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } gio-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-rtsp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-sdp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-rtsp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-sdp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gio = { git = "https://github.com/gtk-rs/gio" } gstreamer = { path = "../gstreamer" } diff --git a/gstreamer-sdp/Cargo.toml b/gstreamer-sdp/Cargo.toml index 0469937ea..dc2071704 100644 --- a/gstreamer-sdp/Cargo.toml +++ b/gstreamer-sdp/Cargo.toml @@ -17,8 +17,8 @@ bitflags = "1.0" libc = "0.2" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-sdp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-sdp-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index fe190b0c5..f5104345a 100644 --- a/gstreamer-video/Cargo.toml +++ b/gstreamer-video/Cargo.toml @@ -17,9 +17,9 @@ bitflags = "1.0" libc = "0.2" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-base-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } -gstreamer-video-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-base-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } +gstreamer-video-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } gstreamer-base = { path = "../gstreamer-base" } diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index 0b8075f4f..989f9d623 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -17,7 +17,7 @@ bitflags = "1.0" libc = "0.2" glib-sys = { git = "https://github.com/gtk-rs/sys" } gobject-sys = { git = "https://github.com/gtk-rs/sys" } -gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"] } +gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = ["v1_8"], branch = "1.14" } glib = { git = "https://github.com/gtk-rs/glib" } num-rational = { version = "0.1.38", default-features = false, features = [] } lazy_static = "1.0"