Miscellaneous gstreamer plugin fixes

servo · Dec 18, 2019 · aca438a · aca438a
1 parent dcdf910
commit aca438a
Show file tree

Hide file tree

Showing 5 changed files with 263 additions and 124 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ports/gstplugin/Cargo.toml b/ports/gstplugin/Cargo.toml
@@ -22,7 +22,7 @@ glib = { version = "0.8", features = ["subclassing"] }
 gstreamer = { version = "0.14", features = ["subclassing"] }
 gstreamer-base = { version = "0.14", features = ["subclassing"] }
 gstreamer-gl = { version = "0.14" }
-gstreamer-gl-sys = { version = "0.8" }
+gstreamer-gl-sys = { version = "0.8", features = ["wayland"] }
 gstreamer-sys = { version = "0.8" }
 gstreamer-video = { version = "0.14", features = ["subclassing"] }
 log = "0.4"
@@ -31,9 +31,9 @@ libservo = {path = "../../components/servo"}
 servo-media = {git = "https://github.com/servo/media"}
 sparkle = "0.1"
 # NOTE: the sm-angle-default feature only enables angle on windows, not other platforms!
-surfman = { version = "0.1", features = ["sm-angle-default", "sm-osmesa"] }
+surfman = { git = "https://github.com/pcwalton/surfman", branch = "multi" }
 surfman-chains-api = "0.2"
-surfman-chains = "0.2.1"
+surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains", branch = "multi" }
 
 [build-dependencies]
 gst-plugin-version-helper = "0.1"

diff --git a/ports/gstplugin/logging.rs b/ports/gstplugin/logging.rs
@@ -9,7 +9,7 @@ use lazy_static::lazy_static;
 
 lazy_static! {
     pub static ref CATEGORY: DebugCategory =
-        DebugCategory::new("servosrc", DebugColorFlags::empty(), Some("Servo"));
+        DebugCategory::new("servowebsrc", DebugColorFlags::empty(), Some("Servo"));
 }
 
 pub static LOGGER: ServoSrcLogger = ServoSrcLogger;