diff options
| author | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2019-11-17 16:10:54 +0000 |
|---|---|---|
| committer | Tuncer Ayaz <tuncer.ayaz@gmail.com> | 2019-11-21 20:08:03 +0000 |
| commit | 01a99b5cbe75146c5ec38a2947fb36ab7429237c (patch) | |
| tree | 0dd50c8fff0e21c7de480b87b4aff8d947bfe356 /components | |
| parent | c7ac4bbb19ca01436c960dfc76d06c4278043003 (diff) | |
| download | servo-01a99b5cbe75146c5ec38a2947fb36ab7429237c.tar.gz servo-01a99b5cbe75146c5ec38a2947fb36ab7429237c.zip | |
Make gstreamer(-sys) optional
Diffstat (limited to 'components')
| -rw-r--r-- | components/servo/Cargo.toml | 6 | ||||
| -rw-r--r-- | components/servo/lib.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index f0eb9c892e8..458ffb114a0 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -36,6 +36,8 @@ webgl_backtrace = [ "canvas_traits/webgl_backtrace", ] vslatestinstalled = ["script/vslatestinstalled"] +media-dummy = ["servo-media-dummy"] +media-gstreamer = ["servo-media-gstreamer", "gstreamer"] [dependencies] background_hang_monitor = {path = "../background_hang_monitor"} @@ -86,12 +88,10 @@ webvr_traits = {path = "../webvr_traits"} webxr-api = {git = "https://github.com/servo/webxr"} webxr = {git = "https://github.com/servo/webxr"} surfman = { version = "0.1", features = ["sm-osmesa"] } +gstreamer = { version = "0.14.5", optional = true } [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies] gaol = "0.2.1" -[target.'cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows"))'.dependencies] -gstreamer = "0.14.5" - [target.'cfg(target_os = "windows")'.dependencies] mozangle = {version = "0.2"} diff --git a/components/servo/lib.rs b/components/servo/lib.rs index e6a152dc15f..d201bc2d757 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -135,7 +135,7 @@ pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId; pub use servo_config as config; pub use servo_url as url; -#[cfg(feature = "servo-media-gstreamer")] +#[cfg(feature = "media-gstreamer")] mod media_platform { use super::ServoMedia; use servo_media_gstreamer::GStreamerBackend; @@ -245,7 +245,7 @@ mod media_platform { } } -#[cfg(feature = "servo-media-dummy")] +#[cfg(feature = "media-dummy")] mod media_platform { use super::ServoMedia; pub fn init() { |