From fcee935e0d95d9c891d385e4196673903ee8f121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 9 Feb 2018 11:23:49 +0200 Subject: [PATCH] Minor cleanup of sdp/rtsp/rtsp-server crates - Add myself to authors so I can upload the crate whenever doing releases - Add missing features/versions to build.rs - Simplify glib/gobject/gio-sys dependencies in Cargo.toml --- gstreamer-rtsp-server-sys/Cargo.toml | 14 ++++---------- gstreamer-rtsp-server-sys/build.rs | 6 ++++++ gstreamer-rtsp-sys/Cargo.toml | 14 ++++---------- gstreamer-rtsp-sys/build.rs | 6 ++++++ gstreamer-sdp-sys/Cargo.toml | 10 +++------- gstreamer-sdp-sys/build.rs | 8 +++++++- 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/gstreamer-rtsp-server-sys/Cargo.toml b/gstreamer-rtsp-server-sys/Cargo.toml index d727136b1..358440893 100644 --- a/gstreamer-rtsp-server-sys/Cargo.toml +++ b/gstreamer-rtsp-server-sys/Cargo.toml @@ -8,15 +8,9 @@ pkg-config = "0.3.7" [dependencies] bitflags = "1.0" libc = "0.2" - -[dependencies.gio-sys] -git = "https://github.com/gtk-rs/sys" - -[dependencies.glib-sys] -git = "https://github.com/gtk-rs/sys" - -[dependencies.gobject-sys] -git = "https://github.com/gtk-rs/sys" +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" } [dependencies.gstreamer-net-sys] path = "../gstreamer-net-sys" @@ -42,7 +36,7 @@ v1_12 = ["v1_10"] name = "gstreamer_rtsp_server_sys" [package] -authors = ["Mathieu Duponchelle "] +authors = ["Mathieu Duponchelle ", "Sebastian Dröge "] build = "build.rs" description = "FFI bindings to libgstrtspserver-1.0" homepage = "https://gstreamer.freedesktop.org" diff --git a/gstreamer-rtsp-server-sys/build.rs b/gstreamer-rtsp-server-sys/build.rs index a28eace6b..41c0ff379 100644 --- a/gstreamer-rtsp-server-sys/build.rs +++ b/gstreamer-rtsp-server-sys/build.rs @@ -18,10 +18,16 @@ fn find() -> Result<(), Error> { let shared_libs = ["gstrtspserver-1.0"]; let version = if cfg!(feature = "v1_12") { "1.12" + } else if cfg!(feature = "v1_10") { + "1.10" } else if cfg!(feature = "v1_8") { "1.8" } else if cfg!(feature = "v1_6") { "1.6" + } else if cfg!(feature = "v1_4") { + "1.4" + } else if cfg!(feature = "v1_2") { + "1.2" } else { "1.0" }; diff --git a/gstreamer-rtsp-sys/Cargo.toml b/gstreamer-rtsp-sys/Cargo.toml index 11bd930c2..e425a7336 100644 --- a/gstreamer-rtsp-sys/Cargo.toml +++ b/gstreamer-rtsp-sys/Cargo.toml @@ -4,15 +4,9 @@ pkg-config = "0.3.7" [dependencies] bitflags = "1.0" libc = "0.2" - -[dependencies.gio-sys] -git = "https://github.com/gtk-rs/sys" - -[dependencies.glib-sys] -git = "https://github.com/gtk-rs/sys" - -[dependencies.gobject-sys] -git = "https://github.com/gtk-rs/sys" +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" } [dependencies.gstreamer-sdp-sys] path = "../gstreamer-sdp-sys" @@ -38,7 +32,7 @@ build = "build.rs" links = "gstrtsp-1.0" name = "gstreamer-rtsp-sys" version = "0.5.0" -authors = ["Mathieu Duponchelle "] +authors = ["Mathieu Duponchelle ", "Sebastian Dröge "] description = "FFI bindings to libgstrtsp-1.0" homepage = "https://gstreamer.freedesktop.org" keywords = ["ffi", "gstreamer", "gnome", "multimedia"] diff --git a/gstreamer-rtsp-sys/build.rs b/gstreamer-rtsp-sys/build.rs index 6369e72aa..a529e3551 100644 --- a/gstreamer-rtsp-sys/build.rs +++ b/gstreamer-rtsp-sys/build.rs @@ -18,12 +18,18 @@ fn find() -> Result<(), Error> { let shared_libs = ["gstrtsp-1.0"]; let version = if cfg!(feature = "v1_12") { "1.12" + } else if cfg!(feature = "v1_10") { + "1.10" + } else if cfg!(feature = "v1_8") { + "1.8" } else if cfg!(feature = "v1_6") { "1.6" } else if cfg!(feature = "v1_4") { "1.4" } else if cfg!(feature = "v1_2_1") { "1.2.1" + } else if cfg!(feature = "v1_2") { + "1.2" } else { "1.0" }; diff --git a/gstreamer-sdp-sys/Cargo.toml b/gstreamer-sdp-sys/Cargo.toml index 36c0ec3f1..00281226b 100644 --- a/gstreamer-sdp-sys/Cargo.toml +++ b/gstreamer-sdp-sys/Cargo.toml @@ -4,12 +4,8 @@ pkg-config = "0.3.7" [dependencies] bitflags = "1.0" libc = "0.2" - -[dependencies.glib-sys] -git = "https://github.com/gtk-rs/sys" - -[dependencies.gobject-sys] -git = "https://github.com/gtk-rs/sys" +glib-sys = { git = "https://github.com/gtk-rs/sys" } +gobject-sys = { git = "https://github.com/gtk-rs/sys" } [dependencies.gstreamer-sys] path = "../gstreamer-sys" @@ -32,7 +28,7 @@ build = "build.rs" links = "gstsdp-1.0" name = "gstreamer-sdp-sys" version = "0.5.0" -authors = ["Mathieu Duponchelle "] +authors = ["Mathieu Duponchelle ", "Sebastian Dröge "] description = "FFI bindings to libgstsdp-1.0" homepage = "https://gstreamer.freedesktop.org" keywords = ["ffi", "gstreamer", "gnome", "multimedia"] diff --git a/gstreamer-sdp-sys/build.rs b/gstreamer-sdp-sys/build.rs index 4b467c4ac..73652f273 100644 --- a/gstreamer-sdp-sys/build.rs +++ b/gstreamer-sdp-sys/build.rs @@ -16,12 +16,18 @@ fn main() { fn find() -> Result<(), Error> { let package_name = "gstreamer-sdp-1.0"; let shared_libs = ["gstsdp-1.0"]; - let version = if cfg!(feature = "v1_8_1") { + let version = if cfg!(feature = "v1_12") { + "1.12" + } else if cfg!(feature = "v1_10") { + "1.10" + } else if cfg!(feature = "v1_8_1") { "1.8.1" } else if cfg!(feature = "v1_8") { "1.8" } else if cfg!(feature = "v1_4") { "1.4" + } else if cfg!(feature = "v1_2") { + "1.2" } else { "1.0" };