From 5ccf5c389b788b82e400b23cd4cf460cdbceb8ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 09:42:57 +0000 Subject: [PATCH] Bump surfman from 0.4.1 to 0.5.0 Bumps [surfman](https://github.com/servo/surfman) from 0.4.1 to 0.5.0. - [Release notes](https://github.com/servo/surfman/releases) - [Commits](https://github.com/servo/surfman/commits/v0.5.0) --- updated-dependencies: - dependency-name: surfman dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 171 +++++++++++++++++---------- ports/gstplugin/Cargo.toml | 2 +- ports/libsimpleservo/capi/Cargo.toml | 2 +- ports/winit/Cargo.toml | 2 +- 4 files changed, 109 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a62456019a652..e7d16ee185ed9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -589,7 +589,7 @@ dependencies = [ "canvas_traits", "crossbeam-channel 0.4.4", "cssparser", - "euclid", + "euclid 0.20.14", "fnv", "font-kit", "gfx", @@ -607,7 +607,7 @@ dependencies = [ "sparkle", "style", "style_traits", - "surfman", + "surfman 0.4.4", "surfman-chains", "surfman-chains-api", "time", @@ -625,7 +625,7 @@ version = "0.0.1" dependencies = [ "crossbeam-channel 0.4.4", "cssparser", - "euclid", + "euclid 0.20.14", "ipc-channel", "lazy_static", "malloc_size_of", @@ -881,7 +881,7 @@ dependencies = [ "canvas", "crossbeam-channel 0.4.4", "embedder_traits", - "euclid", + "euclid 0.20.14", "gfx_traits", "gleam 0.12.1", "image 0.24.1", @@ -925,7 +925,7 @@ dependencies = [ "crossbeam-channel 0.4.4", "devtools_traits", "embedder_traits", - "euclid", + "euclid 0.20.14", "gaol", "gfx", "gfx_traits", @@ -1511,18 +1511,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "display-link" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303de632386f9c82eb7823456f5932bd40b4de9521078901767bf16a9f331491" -dependencies = [ - "foreign-types", - "objc", - "objc-foundation", - "time-point", -] - [[package]] name = "dlib" version = "0.4.2" @@ -1687,6 +1675,15 @@ dependencies = [ "serde", ] +[[package]] +name = "euclid" +version = "0.22.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" +dependencies = [ + "num-traits", +] + [[package]] name = "exr" version = "1.4.1" @@ -2063,7 +2060,7 @@ dependencies = [ "core-graphics 0.22.0", "core-text", "dwrote", - "euclid", + "euclid 0.20.14", "fnv", "fontsan", "freetype", @@ -3209,7 +3206,7 @@ dependencies = [ "bitflags", "canvas_traits", "embedder_traits", - "euclid", + "euclid 0.20.14", "fnv", "gfx", "gfx_traits", @@ -3254,7 +3251,7 @@ dependencies = [ "canvas_traits", "cssparser", "embedder_traits", - "euclid", + "euclid 0.20.14", "fnv", "fxhash", "gfx", @@ -3292,7 +3289,7 @@ dependencies = [ "atomic_refcell", "crossbeam-channel 0.4.4", "embedder_traits", - "euclid", + "euclid 0.20.14", "fnv", "fxhash", "gfx", @@ -3337,7 +3334,7 @@ dependencies = [ "atomic_refcell", "crossbeam-channel 0.4.4", "embedder_traits", - "euclid", + "euclid 0.20.14", "fnv", "fxhash", "gfx", @@ -3505,7 +3502,7 @@ dependencies = [ "devtools_traits", "embedder_traits", "env_logger", - "euclid", + "euclid 0.20.14", "gaol", "gfx", "gfx_traits", @@ -3535,7 +3532,7 @@ dependencies = [ "sparkle", "style", "style_traits", - "surfman", + "surfman 0.4.4", "webdriver_server", "webgpu", "webrender", @@ -3608,7 +3605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca04310c9807612a311506106000b6eccb2e27bca9bfb594ce80fb8a31231f9d" dependencies = [ "arrayvec 0.4.12", - "euclid", + "euclid 0.20.14", "num-traits", ] @@ -3619,7 +3616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e2a8bde54788e0eb4f1b9f072910bfa1cba95688698f7bb206d13a2f8fd06b3" dependencies = [ "arrayvec 0.5.1", - "euclid", + "euclid 0.20.14", "num-traits", ] @@ -3656,7 +3653,7 @@ dependencies = [ "content-security-policy", "crossbeam-channel 0.4.4", "cssparser", - "euclid", + "euclid 0.20.14", "hashglobe", "http", "hyper_serde", @@ -3727,7 +3724,7 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" name = "media" version = "0.0.1" dependencies = [ - "euclid", + "euclid 0.20.14", "fnv", "ipc-channel", "lazy_static", @@ -4658,7 +4655,7 @@ name = "peek-poke" version = "0.2.0" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a" dependencies = [ - "euclid", + "euclid 0.20.14", "peek-poke-derive", ] @@ -4869,7 +4866,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" name = "pixels" version = "0.0.1" dependencies = [ - "euclid", + "euclid 0.20.14", "malloc_size_of", "malloc_size_of_derive", "serde", @@ -4888,7 +4885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffe16a646a08f4b4dd74035b9ff8e378eb1a4012a74f14f5889e7001cdbece33" dependencies = [ "binary-space-partition", - "euclid", + "euclid 0.20.14", "log", "num-traits", ] @@ -5134,7 +5131,7 @@ name = "raqote" version = "0.8.1-alpha.0" source = "git+https://github.com/jdm/raqote?branch=fkup#5a650714ea20f44ebe14de9fce60eeef100144c1" dependencies = [ - "euclid", + "euclid 0.20.14", "font-kit", "lyon_geom 0.15.0", "pathfinder_geometry", @@ -5380,7 +5377,7 @@ dependencies = [ "embedder_traits", "encoding_rs", "enum-iterator", - "euclid", + "euclid 0.20.14", "fnv", "fxhash", "headers", @@ -5460,7 +5457,7 @@ dependencies = [ "atomic_refcell", "canvas_traits", "crossbeam-channel 0.4.4", - "euclid", + "euclid 0.20.14", "fxhash", "gfx_traits", "html5ever", @@ -5499,7 +5496,7 @@ dependencies = [ name = "script_tests" version = "0.0.1" dependencies = [ - "euclid", + "euclid 0.20.14", "keyboard-types", "script", "servo_url", @@ -5516,7 +5513,7 @@ dependencies = [ "crossbeam-channel 0.4.4", "devtools_traits", "embedder_traits", - "euclid", + "euclid 0.20.14", "gfx_traits", "headers", "http", @@ -5663,7 +5660,7 @@ dependencies = [ "backtrace", "cc", "clipboard", - "euclid", + "euclid 0.20.14", "getopts", "image 0.24.1", "keyboard-types", @@ -5674,7 +5671,7 @@ dependencies = [ "servo-media", "shellwords", "sig", - "surfman", + "surfman 0.5.0", "tinyfiledialogs", "webxr", "winapi", @@ -5682,6 +5679,19 @@ dependencies = [ "winres", ] +[[package]] +name = "servo-display-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1060be2a0bbc35e712ec35ae98119b8def1071a5f2edbe392fd4c899bc2a5f4" +dependencies = [ + "foreign-types", + "objc", + "objc-foundation", + "thiserror", + "time-point", +] + [[package]] name = "servo-egl" version = "0.2.1" @@ -5696,7 +5706,7 @@ name = "servo-gst-plugin" version = "0.0.1" dependencies = [ "crossbeam-channel 0.4.4", - "euclid", + "euclid 0.20.14", "glib", "gst-plugin-version-helper", "gstreamer", @@ -5710,7 +5720,7 @@ dependencies = [ "log", "servo-media", "sparkle", - "surfman", + "surfman 0.5.0", "surfman-chains", "surfman-chains-api", "webxr", @@ -5735,7 +5745,7 @@ source = "git+https://github.com/servo/media#b23e72285ecbe352737eafa4100e65763cc dependencies = [ "boxfnonce", "byte-slice-cast", - "euclid", + "euclid 0.20.14", "log", "num-complex", "num-traits", @@ -5906,7 +5916,7 @@ version = "0.0.1" dependencies = [ "dirs-next", "embedder_traits", - "euclid", + "euclid 0.20.14", "getopts", "lazy_static", "log", @@ -5935,7 +5945,7 @@ name = "servo_geometry" version = "0.0.1" dependencies = [ "app_units", - "euclid", + "euclid 0.20.14", "malloc_size_of", "malloc_size_of_derive", "webrender_api", @@ -6076,7 +6086,7 @@ dependencies = [ "log", "serde_json", "servo-media", - "surfman", + "surfman 0.4.4", "webxr", "webxr-api", "winapi", @@ -6094,7 +6104,7 @@ dependencies = [ "libc", "log", "simpleservo", - "surfman", + "surfman 0.5.0", "winapi", ] @@ -6312,7 +6322,7 @@ dependencies = [ "cssparser", "derive_more", "encoding_rs", - "euclid", + "euclid 0.20.14", "fallible", "fxhash", "hashglobe", @@ -6375,7 +6385,7 @@ version = "0.0.1" dependencies = [ "app_units", "cssparser", - "euclid", + "euclid 0.20.14", "html5ever", "rayon", "selectors", @@ -6397,7 +6407,7 @@ dependencies = [ "app_units", "bitflags", "cssparser", - "euclid", + "euclid 0.20.14", "lazy_static", "malloc_size_of", "malloc_size_of_derive", @@ -6413,9 +6423,40 @@ dependencies = [ [[package]] name = "surfman" -version = "0.4.1" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70e69faf378eeb7b44044ab434a06672e0bd495d32a47d84a097e69dd994985" +dependencies = [ + "bitflags", + "cfg_aliases", + "cgl", + "cocoa 0.19.1", + "core-foundation 0.6.4", + "core-graphics 0.17.3", + "euclid 0.20.14", + "gl_generator 0.14.0", + "io-surface", + "lazy_static", + "libc", + "log", + "mach", + "metal 0.18.0", + "objc", + "parking_lot 0.10.2", + "raw-window-handle", + "servo-display-link", + "wayland-sys 0.24.1", + "winapi", + "winit", + "wio", + "x11", +] + +[[package]] +name = "surfman" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbf3b7f873f25cb7791b06a00f0626a141c05f1b95e5b34bc498358876e1a58" +checksum = "ab6e313fe157a4f6ecdaff1aa5f866a3191509bf4e1f49ededefce62ccc4a4bb" dependencies = [ "bitflags", "cfg_aliases", @@ -6423,8 +6464,7 @@ dependencies = [ "cocoa 0.19.1", "core-foundation 0.6.4", "core-graphics 0.17.3", - "display-link", - "euclid", + "euclid 0.22.7", "gl_generator 0.14.0", "io-surface", "lazy_static", @@ -6435,6 +6475,7 @@ dependencies = [ "objc", "parking_lot 0.10.2", "raw-window-handle", + "servo-display-link", "wayland-sys 0.24.1", "winapi", "winit", @@ -6448,11 +6489,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99e707090691623a80d36f4faaba50105cc7a611eda51b0312b53eeec36a0a25" dependencies = [ - "euclid", + "euclid 0.20.14", "fnv", "log", "sparkle", - "surfman", + "surfman 0.4.4", "surfman-chains-api", ] @@ -7298,7 +7339,7 @@ dependencies = [ "compositing", "cookie", "crossbeam-channel 0.4.4", - "euclid", + "euclid 0.20.14", "headers", "http", "image 0.24.1", @@ -7323,7 +7364,7 @@ name = "webgpu" version = "0.0.1" dependencies = [ "arrayvec 0.7.1", - "euclid", + "euclid 0.20.14", "ipc-channel", "log", "malloc_size_of", @@ -7354,7 +7395,7 @@ dependencies = [ "core-text", "cstr", "dwrote", - "euclid", + "euclid 0.20.14", "freetype", "fxhash", "gleam 0.12.1", @@ -7392,7 +7433,7 @@ dependencies = [ "core-foundation 0.9.0", "core-graphics 0.22.0", "derive_more", - "euclid", + "euclid 0.20.14", "malloc_size_of_derive", "peek-poke", "serde", @@ -7415,8 +7456,8 @@ dependencies = [ name = "webrender_surfman" version = "0.0.1" dependencies = [ - "euclid", - "surfman", + "euclid 0.20.14", + "surfman 0.4.4", "surfman-chains", ] @@ -7424,7 +7465,7 @@ dependencies = [ name = "webrender_traits" version = "0.0.1" dependencies = [ - "euclid", + "euclid 0.20.14", "webrender_api", ] @@ -7436,14 +7477,14 @@ dependencies = [ "android_injected_glue", "bindgen", "crossbeam-channel 0.4.4", - "euclid", + "euclid 0.20.14", "gl_generator 0.13.1", "gvr-sys", "log", "openxr", "serde", "sparkle", - "surfman", + "surfman 0.4.4", "surfman-chains", "time", "webxr-api", @@ -7456,7 +7497,7 @@ name = "webxr-api" version = "0.0.1" source = "git+https://github.com/servo/webxr#af2e84a28d52521212816584e0553aaf364a9162" dependencies = [ - "euclid", + "euclid 0.20.14", "ipc-channel", "log", "serde", @@ -7643,7 +7684,7 @@ version = "0.0.1" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a" dependencies = [ "app_units", - "euclid", + "euclid 0.20.14", ] [[package]] diff --git a/ports/gstplugin/Cargo.toml b/ports/gstplugin/Cargo.toml index 6bc536351d4bb..e75b082ed8cee 100644 --- a/ports/gstplugin/Cargo.toml +++ b/ports/gstplugin/Cargo.toml @@ -29,7 +29,7 @@ libservo = { path = "../../components/servo" } log = "0.4" servo-media = { git = "https://github.com/servo/media" } sparkle = "0.1" -surfman = "0.4" +surfman = "0.5" surfman-chains = "0.6" surfman-chains-api = "0.2" webxr = { git = "https://github.com/servo/webxr", features = ["glwindow"] } diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml index 1fa160a548f5c..e7f0df8c5e64c 100644 --- a/ports/libsimpleservo/capi/Cargo.toml +++ b/ports/libsimpleservo/capi/Cargo.toml @@ -18,7 +18,7 @@ env_logger = "0.8" lazy_static = "1" log = "0.4" simpleservo = { path = "../api" } -surfman = "0.4" +surfman = "0.5" keyboard-types = "0.6" [target.'cfg(target_os = "windows")'.dependencies] diff --git a/ports/winit/Cargo.toml b/ports/winit/Cargo.toml index 226f1327dc447..c011b687823b6 100644 --- a/ports/winit/Cargo.toml +++ b/ports/winit/Cargo.toml @@ -57,7 +57,7 @@ libservo = { path = "../../components/servo" } log = "0.4" servo-media = { git = "https://github.com/servo/media" } shellwords = "1.0.0" -surfman = { version = "0.4", features = ["sm-winit", "sm-x11"] } +surfman = { version = "0.5", features = ["sm-winit", "sm-x11"] } tinyfiledialogs = "3.0" webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] } winit = "0.24"