Bump surfman to 0.6

Update to the new release of surfman, and consume it without using the
`patches` section in Cargo.toml.
This commit is contained in:
Thomas Gardner 2023-02-24 16:02:20 +11:00
parent f64814f249
commit 140dda9968
10 changed files with 472 additions and 51 deletions

489
Cargo.lock generated
View file

@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser",
"owned_ttf_parser 0.18.1",
]
[[package]]
@ -72,6 +72,19 @@ dependencies = [
"alloc-no-stdlib",
]
[[package]]
name = "andrew"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf"
dependencies = [
"bitflags",
"rusttype",
"walkdir",
"xdg",
"xml-rs",
]
[[package]]
name = "android-activity"
version = "0.4.1"
@ -84,10 +97,10 @@ dependencies = [
"jni-sys",
"libc",
"log",
"ndk",
"ndk 0.7.0",
"ndk-context",
"ndk-sys",
"num_enum",
"ndk-sys 0.4.1+23.1.7779620",
"num_enum 0.5.1",
]
[[package]]
@ -610,6 +623,16 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "calloop"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c"
dependencies = [
"log",
"nix 0.18.0",
]
[[package]]
name = "calloop"
version = "0.10.5"
@ -650,7 +673,7 @@ dependencies = [
"sparkle",
"style",
"style_traits",
"surfman",
"surfman 0.6.0",
"surfman-chains",
"surfman-chains-api",
"time",
@ -785,7 +808,7 @@ dependencies = [
"ansi_term",
"atty",
"bitflags",
"strsim",
"strsim 0.8.0",
"textwrap",
"unicode-width",
"vec_map",
@ -870,6 +893,22 @@ dependencies = [
"objc",
]
[[package]]
name = "cocoa"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
dependencies = [
"bitflags",
"block",
"cocoa-foundation",
"core-foundation 0.9.3",
"core-graphics 0.22.3",
"foreign-types",
"libc",
"objc",
]
[[package]]
name = "cocoa-foundation"
version = "0.1.0"
@ -1121,6 +1160,19 @@ dependencies = [
"libc",
]
[[package]]
name = "core-video-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828"
dependencies = [
"cfg-if 0.1.10",
"core-foundation-sys 0.7.0",
"core-graphics 0.19.0",
"libc",
"objc",
]
[[package]]
name = "cpufeatures"
version = "0.2.5"
@ -1306,6 +1358,7 @@ dependencies = [
"ident_case",
"proc-macro2",
"quote",
"strsim 0.9.3",
"syn",
]
@ -1474,6 +1527,15 @@ dependencies = [
"crypto-common",
]
[[package]]
name = "dirs"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-next"
version = "2.0.0"
@ -1484,6 +1546,17 @@ dependencies = [
"dirs-sys-next",
]
[[package]]
name = "dirs-sys"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [
"libc",
"redox_users",
"winapi",
]
[[package]]
name = "dirs-sys-next"
version = "0.1.2"
@ -3028,6 +3101,18 @@ dependencies = [
"libc",
]
[[package]]
name = "io-surface"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef"
dependencies = [
"cgl",
"core-foundation 0.9.3",
"leaky-cow",
"libc",
]
[[package]]
name = "iovec"
version = "0.1.4"
@ -3501,7 +3586,7 @@ dependencies = [
"sparkle",
"style",
"style_traits",
"surfman",
"surfman 0.6.0",
"webdriver_server",
"webgpu",
"webrender",
@ -3711,6 +3796,15 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
[[package]]
name = "memmap2"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a"
dependencies = [
"libc",
]
[[package]]
name = "memmap2"
version = "0.5.9"
@ -3758,6 +3852,20 @@ dependencies = [
"objc",
]
[[package]]
name = "metal"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
dependencies = [
"bitflags",
"block",
"core-graphics-types",
"foreign-types",
"log",
"objc",
]
[[package]]
name = "metrics"
version = "0.0.1"
@ -4032,6 +4140,18 @@ dependencies = [
"tempfile",
]
[[package]]
name = "ndk"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
dependencies = [
"jni-sys",
"ndk-sys 0.2.2",
"num_enum 0.4.3",
"thiserror",
]
[[package]]
name = "ndk"
version = "0.7.0"
@ -4040,8 +4160,8 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
"bitflags",
"jni-sys",
"ndk-sys",
"num_enum",
"ndk-sys 0.4.1+23.1.7779620",
"num_enum 0.5.1",
"raw-window-handle 0.5.0",
"thiserror",
]
@ -4052,6 +4172,39 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-glue"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241"
dependencies = [
"lazy_static",
"libc",
"log",
"ndk 0.2.1",
"ndk-macro",
"ndk-sys 0.2.2",
]
[[package]]
name = "ndk-macro"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
dependencies = [
"darling",
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "ndk-sys"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
[[package]]
name = "ndk-sys"
version = "0.4.1+23.1.7779620"
@ -4183,6 +4336,30 @@ dependencies = [
"void",
]
[[package]]
name = "nix"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
dependencies = [
"bitflags",
"cc",
"cfg-if 0.1.10",
"libc",
]
[[package]]
name = "nix"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
"bitflags",
"cc",
"cfg-if 1.0.0",
"libc",
]
[[package]]
name = "nix"
version = "0.24.3"
@ -4328,6 +4505,16 @@ dependencies = [
"libc",
]
[[package]]
name = "num_enum"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
dependencies = [
"derivative",
"num_enum_derive 0.4.3",
]
[[package]]
name = "num_enum"
version = "0.5.1"
@ -4335,7 +4522,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
dependencies = [
"derivative",
"num_enum_derive",
"num_enum_derive 0.5.1",
]
[[package]]
name = "num_enum_derive"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -4531,13 +4730,22 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
[[package]]
name = "owned_ttf_parser"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb"
dependencies = [
"ttf-parser 0.15.2",
]
[[package]]
name = "owned_ttf_parser"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228"
dependencies = [
"ttf-parser",
"ttf-parser 0.18.1",
]
[[package]]
@ -5326,6 +5534,16 @@ dependencies = [
"semver",
]
[[package]]
name = "rusttype"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser 0.15.2",
]
[[package]]
name = "ryu"
version = "1.0.9"
@ -5566,8 +5784,8 @@ checksum = "cc56402866c717f54e48b122eb93c69f709bc5a6359c403598992fd92f017931"
dependencies = [
"ab_glyph",
"log",
"memmap2",
"smithay-client-toolkit",
"memmap2 0.5.9",
"smithay-client-toolkit 0.16.0",
"tiny-skia",
]
@ -5700,11 +5918,11 @@ dependencies = [
"servo-media",
"shellwords",
"sig",
"surfman",
"surfman 0.6.0",
"tinyfiledialogs",
"webxr",
"winapi",
"winit",
"winit 0.28.1",
"winres",
]
@ -5749,7 +5967,7 @@ dependencies = [
"log",
"servo-media",
"sparkle",
"surfman",
"surfman 0.6.0",
"surfman-chains",
"surfman-chains-api",
"webxr",
@ -6115,7 +6333,7 @@ dependencies = [
"log",
"serde_json",
"servo-media",
"surfman",
"surfman 0.6.0",
"webxr",
"webxr-api",
"winapi",
@ -6133,7 +6351,7 @@ dependencies = [
"libc",
"log",
"simpleservo",
"surfman",
"surfman 0.6.0",
"winapi",
]
@ -6192,6 +6410,25 @@ dependencies = [
"serde",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80"
dependencies = [
"andrew",
"bitflags",
"calloop 0.6.5",
"dlib 0.4.2",
"lazy_static",
"log",
"memmap2 0.1.0",
"nix 0.18.0",
"wayland-client 0.28.6",
"wayland-cursor 0.28.6",
"wayland-protocols 0.28.6",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.16.0"
@ -6199,16 +6436,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
dependencies = [
"bitflags",
"calloop",
"calloop 0.10.5",
"dlib 0.5.0",
"lazy_static",
"log",
"memmap2",
"memmap2 0.5.9",
"nix 0.24.3",
"pkg-config",
"wayland-client",
"wayland-cursor",
"wayland-protocols",
"wayland-client 0.29.5",
"wayland-cursor 0.29.5",
"wayland-protocols 0.29.5",
]
[[package]]
@ -6337,6 +6574,12 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "strsim"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]]
name = "style"
version = "0.0.1"
@ -6452,7 +6695,8 @@ dependencies = [
[[package]]
name = "surfman"
version = "0.5.0"
source = "git+https://github.com/servo/surfman.git#64df6b2dadb2d77500c5dcfb253786cde64e0860"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab6e313fe157a4f6ecdaff1aa5f866a3191509bf4e1f49ededefce62ccc4a4bb"
dependencies = [
"bitflags",
"cfg_aliases",
@ -6462,7 +6706,7 @@ dependencies = [
"core-graphics 0.17.3",
"euclid",
"gl_generator 0.14.0",
"io-surface",
"io-surface 0.12.1",
"lazy_static",
"libc",
"log",
@ -6470,11 +6714,41 @@ dependencies = [
"metal 0.18.0",
"objc",
"parking_lot 0.10.2",
"raw-window-handle 0.5.0",
"raw-window-handle 0.3.3",
"servo-display-link",
"wayland-sys 0.24.1",
"winapi",
"winit",
"winit 0.24.0",
"wio",
"x11",
]
[[package]]
name = "surfman"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4ebdfa54ba49e91f713e232973ca44ac493aa98e6fbf1366772ffdf9b9ddb3f"
dependencies = [
"bitflags",
"cfg_aliases",
"cgl",
"cocoa 0.24.1",
"core-foundation 0.9.3",
"core-graphics 0.22.3",
"euclid",
"gl_generator 0.14.0",
"io-surface 0.15.1",
"lazy_static",
"libc",
"log",
"mach",
"metal 0.24.0",
"objc",
"raw-window-handle 0.5.0",
"servo-display-link",
"wayland-sys 0.30.1",
"winapi",
"winit 0.28.1",
"wio",
"x11",
]
@ -6488,7 +6762,7 @@ dependencies = [
"fnv",
"log",
"sparkle",
"surfman",
"surfman 0.5.0",
"surfman-chains-api",
]
@ -6955,6 +7229,12 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "ttf-parser"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
[[package]]
name = "ttf-parser"
version = "0.18.1"
@ -7265,6 +7545,22 @@ version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "wayland-client"
version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355"
dependencies = [
"bitflags",
"downcast-rs",
"libc",
"nix 0.20.0",
"scoped-tls",
"wayland-commons 0.28.6",
"wayland-scanner 0.28.6",
"wayland-sys 0.28.6",
]
[[package]]
name = "wayland-client"
version = "0.29.5"
@ -7276,11 +7572,23 @@ dependencies = [
"libc",
"nix 0.24.3",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
"wayland-commons 0.29.5",
"wayland-scanner 0.29.5",
"wayland-sys 0.29.5",
]
[[package]]
name = "wayland-commons"
version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda"
dependencies = [
"nix 0.20.0",
"once_cell",
"smallvec",
"wayland-sys 0.28.6",
]
[[package]]
name = "wayland-commons"
version = "0.29.5"
@ -7293,6 +7601,17 @@ dependencies = [
"wayland-sys 0.29.5",
]
[[package]]
name = "wayland-cursor"
version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a"
dependencies = [
"nix 0.20.0",
"wayland-client 0.28.6",
"xcursor",
]
[[package]]
name = "wayland-cursor"
version = "0.29.5"
@ -7300,10 +7619,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
dependencies = [
"nix 0.24.3",
"wayland-client",
"wayland-client 0.29.5",
"xcursor",
]
[[package]]
name = "wayland-protocols"
version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f"
dependencies = [
"bitflags",
"wayland-client 0.28.6",
"wayland-commons 0.28.6",
"wayland-scanner 0.28.6",
]
[[package]]
name = "wayland-protocols"
version = "0.29.5"
@ -7311,9 +7642,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
dependencies = [
"bitflags",
"wayland-client",
"wayland-commons",
"wayland-scanner",
"wayland-client 0.29.5",
"wayland-commons 0.29.5",
"wayland-scanner 0.29.5",
]
[[package]]
name = "wayland-scanner"
version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1"
dependencies = [
"proc-macro2",
"quote",
"xml-rs",
]
[[package]]
@ -7337,6 +7679,17 @@ dependencies = [
"lazy_static",
]
[[package]]
name = "wayland-sys"
version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8"
dependencies = [
"dlib 0.5.0",
"lazy_static",
"pkg-config",
]
[[package]]
name = "wayland-sys"
version = "0.29.5"
@ -7348,6 +7701,18 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "wayland-sys"
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06"
dependencies = [
"dlib 0.5.0",
"lazy_static",
"log",
"pkg-config",
]
[[package]]
name = "web-sys"
version = "0.3.61"
@ -7507,7 +7872,7 @@ name = "webrender_surfman"
version = "0.0.1"
dependencies = [
"euclid",
"surfman",
"surfman 0.6.0",
"surfman-chains",
]
@ -7534,7 +7899,7 @@ dependencies = [
"openxr",
"serde",
"sparkle",
"surfman",
"surfman 0.5.0",
"surfman-chains",
"time",
"webxr-api",
@ -7720,6 +8085,37 @@ version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
[[package]]
name = "winit"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597"
dependencies = [
"bitflags",
"cocoa 0.24.1",
"core-foundation 0.9.3",
"core-graphics 0.22.3",
"core-video-sys",
"dispatch",
"instant",
"lazy_static",
"libc",
"log",
"mio 0.6.22",
"mio-extras",
"ndk 0.2.1",
"ndk-glue",
"ndk-sys 0.2.2",
"objc",
"parking_lot 0.11.0",
"percent-encoding",
"raw-window-handle 0.3.3",
"smithay-client-toolkit 0.12.3",
"wayland-client 0.28.6",
"winapi",
"x11-dl",
]
[[package]]
name = "winit"
version = "0.28.1"
@ -7736,7 +8132,7 @@ dependencies = [
"libc",
"log",
"mio 0.8.6",
"ndk",
"ndk 0.7.0",
"objc2",
"once_cell",
"orbclient",
@ -7744,12 +8140,12 @@ dependencies = [
"raw-window-handle 0.5.0",
"redox_syscall 0.3.4",
"sctk-adwaita",
"smithay-client-toolkit",
"smithay-client-toolkit 0.16.0",
"wasm-bindgen",
"wayland-client",
"wayland-commons",
"wayland-protocols",
"wayland-scanner",
"wayland-client 0.29.5",
"wayland-commons 0.29.5",
"wayland-protocols 0.29.5",
"wayland-scanner 0.29.5",
"web-sys",
"windows-sys 0.45.0",
"x11-dl",
@ -7849,6 +8245,15 @@ dependencies = [
"nom",
]
[[package]]
name = "xdg"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6"
dependencies = [
"dirs",
]
[[package]]
name = "xi-unicode"
version = "0.1.0"

View file

@ -28,8 +28,6 @@ opt-level = 3
# This is here to dedupe winapi since mio 0.6 is still using winapi 0.2.
mio = { git = "https://github.com/servo/mio.git", branch = "servo-mio-0.6.22" }
# This is here so surfman targets winit 0.28.1.
surfman = { git = "https://github.com/servo/surfman.git" }
# surfman-chains has not yet released version 0.7 to crates.io yet.
surfman-chains = { git = "https://github.com/servo/surfman-chains.git" }

View file

@ -40,7 +40,7 @@ sparkle = "0.1.25"
style = { path = "../style" }
style_traits = { path = "../style_traits" }
# NOTE: the sm-angle feature only enables angle on windows, not other platforms!
surfman = { version = "0.5", features = ["sm-angle","sm-angle-default"] }
surfman = { version = "0.6", features = ["sm-angle","sm-angle-default"] }
surfman-chains = "0.7"
surfman-chains-api = "0.2"
time = { version = "0.1.41", optional = true }

View file

@ -78,7 +78,7 @@ servo_url = { path = "../url" }
sparkle = "0.1"
style = { path = "../style", features = ["servo"] }
style_traits = { path = "../style_traits", features = ["servo"] }
surfman = "0.5"
surfman = "0.6"
webdriver_server = { path = "../webdriver_server", optional = true }
webgpu = { path = "../webgpu" }
webrender = { git = "https://github.com/servo/webrender" }

View file

@ -12,6 +12,6 @@ path = "lib.rs"
[dependencies]
euclid = "0.22"
surfman = "0.5"
surfman = "0.6"
surfman-chains = "0.7"

View file

@ -29,7 +29,7 @@ libservo = { path = "../../components/servo" }
log = "0.4"
servo-media = { git = "https://github.com/servo/media" }
sparkle = "0.1"
surfman = "0.5"
surfman = "0.6"
surfman-chains = "0.7"
surfman-chains-api = "0.2"
webxr = { git = "https://github.com/servo/webxr", features = ["glwindow"] }

View file

@ -12,7 +12,7 @@ ipc-channel = "0.14"
libservo = { path = "../../../components/servo" }
log = "0.4"
servo-media = { git = "https://github.com/servo/media" }
surfman = { version = "0.5", features = ["sm-angle-default"] }
surfman = { version = "0.6", features = ["sm-angle-default"] }
webxr = { git = "https://github.com/servo/webxr"}
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }

View file

@ -18,7 +18,7 @@ env_logger = "0.8"
lazy_static = "1"
log = "0.4"
simpleservo = { path = "../api" }
surfman = "0.5"
surfman = "0.6"
keyboard-types = "0.6"
[target.'cfg(target_os = "windows")'.dependencies]

View file

@ -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.5", features = ["sm-winit", "sm-x11"] }
surfman = { version = "0.6", features = ["sm-winit", "sm-x11"] }
tinyfiledialogs = "3.0"
webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] }
winit = "0.28.1"

View file

@ -100,6 +100,24 @@ packages = [
# Duplicated by winit/surfman update.
"raw-window-handle",
"windows-sys",
"calloop",
"io-surface",
"memmap2",
"ndk",
"ndk-sys",
"num_enum",
"num_enum_derive",
"owned_ttf_parser",
"smithay-client-toolkit",
"strsim",
"surfman",
"ttf-parser",
"wayland-client",
"wayland-commons",
"wayland-cursor",
"wayland-protocols",
"wayland-scanner",
"winit",
]
# Files that are ignored for all tidy and lint checks.
files = [