mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-11-25 11:01:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix build with --all-features and run it on travis

Browse source
This commit is contained in:
Sebastian Dröge 2017-08-15 13:46:16 +03:00
parent 8a40fed0a4
commit b0307f9108
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -22,7 +22,8 @@ script:
- rustc --version - rustc --version
- cargo build --all - cargo build --all
- cargo test --all - cargo test --all
- cd examples && cargo build --features=gst-player - cargo build --all --all-features
- cargo test --all --all-features
before_install: before_install:
- curl -L https://people.freedesktop.org/~slomo/gstreamer.tar.gz | tar xz - curl -L https://people.freedesktop.org/~slomo/gstreamer.tar.gz | tar xz

4
gstreamer-audio/Cargo.toml
View file

@ -26,8 +26,8 @@ version = "0.1"
optional = true optional = true
[features] [features]
v1_10 = ["gstreamer-sys/v1_10"] v1_10 = ["gstreamer-sys/v1_10", "gstreamer-audio-sys/v1_10"]
v1_12 = ["gstreamer-sys/v1_12", "v1_10"] v1_12 = ["gstreamer-sys/v1_12", "gstreamer-audio-sys/v1_12", "v1_10"]
embed-lgpl-docs = ["rustdoc-stripper"] embed-lgpl-docs = ["rustdoc-stripper"]
purge-lgpl-docs = ["rustdoc-stripper"] purge-lgpl-docs = ["rustdoc-stripper"]
default-features = [] default-features = []

4
gstreamer-video/Cargo.toml
View file

@ -25,8 +25,8 @@ version = "0.1"
optional = true optional = true
[features] [features]
v1_10 = ["gstreamer-sys/v1_10"] v1_10 = ["gstreamer-sys/v1_10", "gstreamer-video-sys/v1_10"]
v1_12 = ["gstreamer-sys/v1_12", "v1_10"] v1_12 = ["gstreamer-sys/v1_12", "gstreamer-video-sys/v1_12", "v1_10"]
embed-lgpl-docs = ["rustdoc-stripper"] embed-lgpl-docs = ["rustdoc-stripper"]
purge-lgpl-docs = ["rustdoc-stripper"] purge-lgpl-docs = ["rustdoc-stripper"]
default-features = [] default-features = []

4
gstreamer-video/src/video_info.rs
View file

@ -664,7 +664,7 @@ impl ::VideoFieldOrder {
unsafe { from_glib_full(ffi::gst_video_field_order_to_string(self.to_glib())) } unsafe { from_glib_full(ffi::gst_video_field_order_to_string(self.to_glib())) }
} }
pub fn from_string(s: &str) -> Option<Self> { pub fn from_string(s: &str) -> Self {
unsafe { from_glib(ffi::gst_video_field_order_from_string(s.to_glib_none().0)) } unsafe { from_glib(ffi::gst_video_field_order_from_string(s.to_glib_none().0)) }
} }
} }
@ -674,7 +674,7 @@ impl str::FromStr for ::VideoFieldOrder {
type Err = (); type Err = ();
fn from_str(s: &str) -> Result<Self, ()> { fn from_str(s: &str) -> Result<Self, ()> {
Self::from_string(s).ok_or(()) Ok(Self::from_string(s))
} }
} }