Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gstreamer plugin running in wayland with surfman 0.2 #25334

Merged
merged 6 commits into from Dec 20, 2019
Next

Miscellaneous gstreamer plugin fixes

  • Loading branch information
asajeffrey committed Dec 18, 2019
commit aca438aebc9291db9f1226d2575230a5189eddea

Some generated files are not rendered by default. Learn more.

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

This comment has been minimized.

Copy link
@jdm

jdm Dec 20, 2019

Member

Remove this note now that it no longer applies?

This comment has been minimized.

Copy link
@asajeffrey

asajeffrey Dec 20, 2019

Author Member

Done.

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"
@@ -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;
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.