Auto merge of servo#25334 - asajeffrey:gstplugins-misc-tidying-up, r=jdm

Gstreamer plugin running in wayland with surfman 0.2

<!-- Please describe your changes on the following line: -->

Tidying up the gstreamer plugin. The plugin now:

* uses surfman 0.2
* runs in wayland (but can't render WebGL content yet)
* gets its GL configuration from gstreamer
* uses GLsync if needed

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix servo#24843
- [X] These changes do not require tests because

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Author: bors-servo

Cargo.lock

@@ -491,9 +491,9 @@ def windows_unit(cached=True):
             "mach smoketest --angle",
             "mach package --dev",
             "mach build --dev --libsimpleservo",
-            # We're getting link errors on windows, due to the x11 feature being
-            # enabled on gstreamer-gl. https://github.com/servo/media/pull/304/
-            "mach build --dev --media-stack=dummy -p servo-gst-plugin",
+            # The GStreamer plugin currently doesn't support Windows
+            # https://github.com/servo/servo/issues/25353
+            # "mach build --dev -p servo-gst-plugin",
 
         )
         .with_artifacts("repo/target/debug/msi/Servo.exe",

etc/taskcluster/decision_task.py

@@ -22,18 +22,17 @@ 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"
 lazy_static = "1.4"
 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"

ports/gstplugin/Cargo.toml

@@ -1,5 +1,10 @@
 # A GStreamer plugin which runs servo
 
+## Supported platforms
+
+* MacOS + CGL
+* Linux + Wayland (currently no WebGL content)
+
 ## Build
 
 ```
@@ -68,8 +73,6 @@ LD_LIBRARY_PATH=$PWD/support/linux/gstreamer/gst/lib \
 
 ## Troubleshooting running the plugin
 
-*Currently x11 support is broken!*
-
 First try:
 ```
 GST_PLUGIN_PATH=target/gstplugins \

ports/gstplugin/README.md

@@ -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;