From 01a99b5cbe75146c5ec38a2947fb36ab7429237c Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Sun, 17 Nov 2019 16:10:54 +0000
Subject: [PATCH] Make gstreamer(-sys) optional

---
 components/servo/Cargo.toml         | 6 +++---
 components/servo/lib.rs             | 4 ++--
 ports/glutin/Cargo.toml             | 4 ++--
 ports/libsimpleservo/api/Cargo.toml | 4 ++--
 4 files changed, 9 insertions(+), 9 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() {
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index 886f140b9b2..69c71acb509 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -33,8 +33,8 @@ default = ["webdriver", "max_log_level"]
 egl = ["libservo/egl"]
 energy-profiling = ["libservo/energy-profiling"]
 debugmozjs = ["libservo/debugmozjs"]
-media-dummy = ["libservo/servo-media-dummy"]
-media-gstreamer = ["libservo/servo-media-gstreamer"]
+media-dummy = ["libservo/media-dummy"]
+media-gstreamer = ["libservo/media-gstreamer"]
 js_backtrace = ["libservo/js_backtrace"]
 layout-2013 = ["libservo/layout-2013"]
 layout-2020 = ["libservo/layout-2020"]
diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml
index 1a50e28ad03..d681fb59b07 100644
--- a/ports/libsimpleservo/api/Cargo.toml
+++ b/ports/libsimpleservo/api/Cargo.toml
@@ -35,8 +35,8 @@ canvas2d-azure = ["libservo/canvas2d-azure"]
 canvas2d-raqote = ["libservo/canvas2d-raqote"]
 default = ["webdriver", "max_log_level"]
 debugmozjs = ["libservo/debugmozjs"]
-media-dummy = ["libservo/servo-media-dummy"]
-media-gstreamer = ["libservo/servo-media-gstreamer"]
+media-dummy = ["libservo/media-dummy"]
+media-gstreamer = ["libservo/media-gstreamer"]
 egl = ["libservo/egl"]
 energy-profiling = ["libservo/energy-profiling"]
 googlevr = ["libservo/googlevr"]