Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make gstreamer(-sys) optional

Browse source
This commit is contained in:
Tuncer Ayaz 2019-11-17 16:10:54 +00:00
parent c7ac4bbb19
commit 01a99b5cbe
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/servo/Cargo.toml
View file

@ -36,6 +36,8 @@ webgl_backtrace = [
"canvas_traits/webgl_backtrace", "canvas_traits/webgl_backtrace",
] ]
vslatestinstalled = ["script/vslatestinstalled"] vslatestinstalled = ["script/vslatestinstalled"]
media-dummy = ["servo-media-dummy"]
media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
[dependencies] [dependencies]
background_hang_monitor = {path = "../background_hang_monitor"} 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-api = {git = "https://github.com/servo/webxr"}
webxr = {git = "https://github.com/servo/webxr"} webxr = {git = "https://github.com/servo/webxr"}
surfman = { version = "0.1", features = ["sm-osmesa"] } 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] [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" 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] [target.'cfg(target_os = "windows")'.dependencies]
mozangle = {version = "0.2"} mozangle = {version = "0.2"}

4
components/servo/lib.rs
View file

@ -135,7 +135,7 @@ pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId;
pub use servo_config as config; pub use servo_config as config;
pub use servo_url as url; pub use servo_url as url;
#[cfg(feature = "servo-media-gstreamer")] #[cfg(feature = "media-gstreamer")]
mod media_platform { mod media_platform {
use super::ServoMedia; use super::ServoMedia;
use servo_media_gstreamer::GStreamerBackend; use servo_media_gstreamer::GStreamerBackend;
@ -245,7 +245,7 @@ mod media_platform {
} }
} }
#[cfg(feature = "servo-media-dummy")] #[cfg(feature = "media-dummy")]
mod media_platform { mod media_platform {
use super::ServoMedia; use super::ServoMedia;
pub fn init() { pub fn init() {

4
ports/glutin/Cargo.toml
View file

@ -33,8 +33,8 @@ default = ["webdriver", "max_log_level"]
egl = ["libservo/egl"] egl = ["libservo/egl"]
energy-profiling = ["libservo/energy-profiling"] energy-profiling = ["libservo/energy-profiling"]
debugmozjs = ["libservo/debugmozjs"] debugmozjs = ["libservo/debugmozjs"]
media-dummy = ["libservo/servo-media-dummy"] media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/servo-media-gstreamer"] media-gstreamer = ["libservo/media-gstreamer"]
js_backtrace = ["libservo/js_backtrace"] js_backtrace = ["libservo/js_backtrace"]
layout-2013 = ["libservo/layout-2013"] layout-2013 = ["libservo/layout-2013"]
layout-2020 = ["libservo/layout-2020"] layout-2020 = ["libservo/layout-2020"]

4
ports/libsimpleservo/api/Cargo.toml
View file

@ -35,8 +35,8 @@ canvas2d-azure = ["libservo/canvas2d-azure"]
canvas2d-raqote = ["libservo/canvas2d-raqote"] canvas2d-raqote = ["libservo/canvas2d-raqote"]
default = ["webdriver", "max_log_level"] default = ["webdriver", "max_log_level"]
debugmozjs = ["libservo/debugmozjs"] debugmozjs = ["libservo/debugmozjs"]
media-dummy = ["libservo/servo-media-dummy"] media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/servo-media-gstreamer"] media-gstreamer = ["libservo/media-gstreamer"]
egl = ["libservo/egl"] egl = ["libservo/egl"]
energy-profiling = ["libservo/energy-profiling"] energy-profiling = ["libservo/energy-profiling"]
googlevr = ["libservo/googlevr"] googlevr = ["libservo/googlevr"]