Commit fcee935e authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

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
parent 2f22e8c3
...@@ -8,15 +8,9 @@ pkg-config = "0.3.7" ...@@ -8,15 +8,9 @@ pkg-config = "0.3.7"
[dependencies] [dependencies]
bitflags = "1.0" bitflags = "1.0"
libc = "0.2" libc = "0.2"
glib-sys = { git = "https://github.com/gtk-rs/sys" }
[dependencies.gio-sys] gobject-sys = { git = "https://github.com/gtk-rs/sys" }
git = "https://github.com/gtk-rs/sys" 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"
[dependencies.gstreamer-net-sys] [dependencies.gstreamer-net-sys]
path = "../gstreamer-net-sys" path = "../gstreamer-net-sys"
...@@ -42,7 +36,7 @@ v1_12 = ["v1_10"] ...@@ -42,7 +36,7 @@ v1_12 = ["v1_10"]
name = "gstreamer_rtsp_server_sys" name = "gstreamer_rtsp_server_sys"
[package] [package]
authors = ["Mathieu Duponchelle <mathieu@centricular.com>"] authors = ["Mathieu Duponchelle <mathieu@centricular.com>", "Sebastian Dröge <sebastian@centricular.com>"]
build = "build.rs" build = "build.rs"
description = "FFI bindings to libgstrtspserver-1.0" description = "FFI bindings to libgstrtspserver-1.0"
homepage = "https://gstreamer.freedesktop.org" homepage = "https://gstreamer.freedesktop.org"
......
...@@ -18,10 +18,16 @@ fn find() -> Result<(), Error> { ...@@ -18,10 +18,16 @@ fn find() -> Result<(), Error> {
let shared_libs = ["gstrtspserver-1.0"]; let shared_libs = ["gstrtspserver-1.0"];
let version = if cfg!(feature = "v1_12") { let version = if cfg!(feature = "v1_12") {
"1.12" "1.12"
} else if cfg!(feature = "v1_10") {
"1.10"
} else if cfg!(feature = "v1_8") { } else if cfg!(feature = "v1_8") {
"1.8" "1.8"
} else if cfg!(feature = "v1_6") { } else if cfg!(feature = "v1_6") {
"1.6" "1.6"
} else if cfg!(feature = "v1_4") {
"1.4"
} else if cfg!(feature = "v1_2") {
"1.2"
} else { } else {
"1.0" "1.0"
}; };
......
...@@ -4,15 +4,9 @@ pkg-config = "0.3.7" ...@@ -4,15 +4,9 @@ pkg-config = "0.3.7"
[dependencies] [dependencies]
bitflags = "1.0" bitflags = "1.0"
libc = "0.2" libc = "0.2"
glib-sys = { git = "https://github.com/gtk-rs/sys" }
[dependencies.gio-sys] gobject-sys = { git = "https://github.com/gtk-rs/sys" }
git = "https://github.com/gtk-rs/sys" 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"
[dependencies.gstreamer-sdp-sys] [dependencies.gstreamer-sdp-sys]
path = "../gstreamer-sdp-sys" path = "../gstreamer-sdp-sys"
...@@ -38,7 +32,7 @@ build = "build.rs" ...@@ -38,7 +32,7 @@ build = "build.rs"
links = "gstrtsp-1.0" links = "gstrtsp-1.0"
name = "gstreamer-rtsp-sys" name = "gstreamer-rtsp-sys"
version = "0.5.0" version = "0.5.0"
authors = ["Mathieu Duponchelle <mathieu@centricular.com>"] authors = ["Mathieu Duponchelle <mathieu@centricular.com>", "Sebastian Dröge <sebastian@centricular.com>"]
description = "FFI bindings to libgstrtsp-1.0" description = "FFI bindings to libgstrtsp-1.0"
homepage = "https://gstreamer.freedesktop.org" homepage = "https://gstreamer.freedesktop.org"
keywords = ["ffi", "gstreamer", "gnome", "multimedia"] keywords = ["ffi", "gstreamer", "gnome", "multimedia"]
......
...@@ -18,12 +18,18 @@ fn find() -> Result<(), Error> { ...@@ -18,12 +18,18 @@ fn find() -> Result<(), Error> {
let shared_libs = ["gstrtsp-1.0"]; let shared_libs = ["gstrtsp-1.0"];
let version = if cfg!(feature = "v1_12") { let version = if cfg!(feature = "v1_12") {
"1.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") { } else if cfg!(feature = "v1_6") {
"1.6" "1.6"
} else if cfg!(feature = "v1_4") { } else if cfg!(feature = "v1_4") {
"1.4" "1.4"
} else if cfg!(feature = "v1_2_1") { } else if cfg!(feature = "v1_2_1") {
"1.2.1" "1.2.1"
} else if cfg!(feature = "v1_2") {
"1.2"
} else { } else {
"1.0" "1.0"
}; };
......
...@@ -4,12 +4,8 @@ pkg-config = "0.3.7" ...@@ -4,12 +4,8 @@ pkg-config = "0.3.7"
[dependencies] [dependencies]
bitflags = "1.0" bitflags = "1.0"
libc = "0.2" libc = "0.2"
glib-sys = { git = "https://github.com/gtk-rs/sys" }
[dependencies.glib-sys] gobject-sys = { git = "https://github.com/gtk-rs/sys" }
git = "https://github.com/gtk-rs/sys"
[dependencies.gobject-sys]
git = "https://github.com/gtk-rs/sys"
[dependencies.gstreamer-sys] [dependencies.gstreamer-sys]
path = "../gstreamer-sys" path = "../gstreamer-sys"
...@@ -32,7 +28,7 @@ build = "build.rs" ...@@ -32,7 +28,7 @@ build = "build.rs"
links = "gstsdp-1.0" links = "gstsdp-1.0"
name = "gstreamer-sdp-sys" name = "gstreamer-sdp-sys"
version = "0.5.0" version = "0.5.0"
authors = ["Mathieu Duponchelle <mathieu@centricular.com>"] authors = ["Mathieu Duponchelle <mathieu@centricular.com>", "Sebastian Dröge <sebastian@centricular.com>"]
description = "FFI bindings to libgstsdp-1.0" description = "FFI bindings to libgstsdp-1.0"
homepage = "https://gstreamer.freedesktop.org" homepage = "https://gstreamer.freedesktop.org"
keywords = ["ffi", "gstreamer", "gnome", "multimedia"] keywords = ["ffi", "gstreamer", "gnome", "multimedia"]
......
...@@ -16,12 +16,18 @@ fn main() { ...@@ -16,12 +16,18 @@ fn main() {
fn find() -> Result<(), Error> { fn find() -> Result<(), Error> {
let package_name = "gstreamer-sdp-1.0"; let package_name = "gstreamer-sdp-1.0";
let shared_libs = ["gstsdp-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" "1.8.1"
} else if cfg!(feature = "v1_8") { } else if cfg!(feature = "v1_8") {
"1.8" "1.8"
} else if cfg!(feature = "v1_4") { } else if cfg!(feature = "v1_4") {
"1.4" "1.4"
} else if cfg!(feature = "v1_2") {
"1.2"
} else { } else {
"1.0" "1.0"
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment