Skip to content

Commit aca438a

Browse files
author
Alan Jeffrey
committed
Miscellaneous gstreamer plugin fixes
1 parent dcdf910 commit aca438a

File tree

5 files changed

+263
-124
lines changed

5 files changed

+263
-124
lines changed

Cargo.lock

+48-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ports/gstplugin/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ glib = { version = "0.8", features = ["subclassing"] }
2222
gstreamer = { version = "0.14", features = ["subclassing"] }
2323
gstreamer-base = { version = "0.14", features = ["subclassing"] }
2424
gstreamer-gl = { version = "0.14" }
25-
gstreamer-gl-sys = { version = "0.8" }
25+
gstreamer-gl-sys = { version = "0.8", features = ["wayland"] }
2626
gstreamer-sys = { version = "0.8" }
2727
gstreamer-video = { version = "0.14", features = ["subclassing"] }
2828
log = "0.4"
@@ -31,9 +31,9 @@ libservo = {path = "../../components/servo"}
3131
servo-media = {git = "https://github.com/servo/media"}
3232
sparkle = "0.1"
3333
# NOTE: the sm-angle-default feature only enables angle on windows, not other platforms!
34-
surfman = { version = "0.1", features = ["sm-angle-default", "sm-osmesa"] }
34+
surfman = { git = "https://github.com/pcwalton/surfman", branch = "multi" }
3535
surfman-chains-api = "0.2"
36-
surfman-chains = "0.2.1"
36+
surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains", branch = "multi" }
3737

3838
[build-dependencies]
3939
gst-plugin-version-helper = "0.1"

ports/gstplugin/logging.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use lazy_static::lazy_static;
99

1010
lazy_static! {
1111
pub static ref CATEGORY: DebugCategory =
12-
DebugCategory::new("servosrc", DebugColorFlags::empty(), Some("Servo"));
12+
DebugCategory::new("servowebsrc", DebugColorFlags::empty(), Some("Servo"));
1313
}
1414

1515
pub static LOGGER: ServoSrcLogger = ServoSrcLogger;

0 commit comments

Comments
 (0)