mirror of
https://github.com/servo/servo.git
synced 2025-10-02 01:29:15 +01:00
Auto merge of #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 #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. -->
This commit is contained in:
commit
62899c0f52
7 changed files with 316 additions and 133 deletions
56
Cargo.lock
generated
56
Cargo.lock
generated
|
@ -478,8 +478,8 @@ dependencies = [
|
|||
"raqote",
|
||||
"servo_config",
|
||||
"sparkle",
|
||||
"surfman",
|
||||
"surfman-chains",
|
||||
"surfman 0.1.3",
|
||||
"surfman-chains 0.2.1",
|
||||
"surfman-chains-api",
|
||||
"webrender",
|
||||
"webrender_api",
|
||||
|
@ -3000,7 +3000,7 @@ dependencies = [
|
|||
"sparkle",
|
||||
"style",
|
||||
"style_traits",
|
||||
"surfman",
|
||||
"surfman 0.1.3",
|
||||
"webdriver_server",
|
||||
"webgpu",
|
||||
"webrender",
|
||||
|
@ -4816,8 +4816,8 @@ dependencies = [
|
|||
"log",
|
||||
"servo-media",
|
||||
"sparkle",
|
||||
"surfman",
|
||||
"surfman-chains",
|
||||
"surfman 0.2.0",
|
||||
"surfman-chains 0.3.0",
|
||||
"surfman-chains-api",
|
||||
]
|
||||
|
||||
|
@ -5500,6 +5500,33 @@ dependencies = [
|
|||
"x11",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "surfman"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/pcwalton/surfman?branch=multi#808e5c5906dbcc6707536c8bac8bcc9389b4e1eb"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cgl 0.3.2",
|
||||
"cocoa 0.19.1",
|
||||
"core-foundation",
|
||||
"core-graphics",
|
||||
"display-link",
|
||||
"euclid",
|
||||
"gl_generator 0.11.0",
|
||||
"io-surface",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"log",
|
||||
"mach",
|
||||
"objc",
|
||||
"parking_lot",
|
||||
"wayland-sys 0.24.0",
|
||||
"winapi",
|
||||
"winit",
|
||||
"wio",
|
||||
"x11",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "surfman-chains"
|
||||
version = "0.2.1"
|
||||
|
@ -5510,7 +5537,20 @@ dependencies = [
|
|||
"fnv",
|
||||
"log",
|
||||
"sparkle",
|
||||
"surfman",
|
||||
"surfman 0.1.3",
|
||||
"surfman-chains-api",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "surfman-chains"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/asajeffrey/surfman-chains?branch=multi#80a71b1a2df71ae70c3c194d0af40b8ebf72968a"
|
||||
dependencies = [
|
||||
"euclid",
|
||||
"fnv",
|
||||
"log",
|
||||
"sparkle",
|
||||
"surfman 0.2.0",
|
||||
"surfman-chains-api",
|
||||
]
|
||||
|
||||
|
@ -6420,8 +6460,8 @@ dependencies = [
|
|||
"log",
|
||||
"openxr",
|
||||
"serde",
|
||||
"surfman",
|
||||
"surfman-chains",
|
||||
"surfman 0.1.3",
|
||||
"surfman-chains 0.2.1",
|
||||
"time",
|
||||
"webxr-api",
|
||||
"winapi",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue