From 287aea90b6fc847e6a318bb483a790cd82e7babe Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 28 Mar 2022 17:48:38 +0800 Subject: [PATCH] bump to latest version of minifb --- Cargo.lock | 60 +++++++++++++++++++---------- services/graphics-server/Cargo.toml | 4 +- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e75750994..04c332d22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -689,6 +689,12 @@ dependencies = [ "cipher", ] +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + [[package]] name = "curl" version = "0.4.35" @@ -1593,9 +1599,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] @@ -1624,12 +1630,14 @@ dependencies = [ [[package]] name = "minifb" -version = "0.19.3" -source = "git+https://github.com/betrusted-io/rust_minifb.git?rev=1717ec60830c1f9592b77ce875e492afef1aa533#1717ec60830c1f9592b77ce875e492afef1aa533" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e52abe7ff0cb18cd88a6e9d7a91ca1ff74876587e7b6b1f30d1aeee9aa89aed" dependencies = [ "cc", + "libc", "orbclient", - "raw-window-handle", + "raw-window-handle 0.4.2", "tempfile", "wayland-client", "wayland-cursor", @@ -1698,14 +1706,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ "bitflags", "cc", "cfg-if 1.0.0", "libc", + "memoffset", ] [[package]] @@ -1827,7 +1836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee68c3c79e81d82127e0870f94479675774d34c7ad5b55eecb9c320ef9701187" dependencies = [ "libc", - "raw-window-handle", + "raw-window-handle 0.3.3", "redox_syscall", "sdl2", "sdl2-sys", @@ -2104,6 +2113,15 @@ dependencies = [ "libc", ] +[[package]] +name = "raw-window-handle" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" +dependencies = [ + "cty", +] + [[package]] name = "rayon" version = "1.5.1" @@ -2416,7 +2434,7 @@ dependencies = [ "bitflags", "lazy_static", "libc", - "raw-window-handle", + "raw-window-handle 0.3.3", "sdl2-sys", ] @@ -3225,9 +3243,9 @@ checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" [[package]] name = "wayland-client" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355" +checksum = "91223460e73257f697d9e23d401279123d36039a3f7a449e983f123292d4458f" dependencies = [ "bitflags", "downcast-rs", @@ -3240,9 +3258,9 @@ dependencies = [ [[package]] name = "wayland-commons" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda" +checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e" dependencies = [ "nix", "once_cell", @@ -3252,9 +3270,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" +checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd" dependencies = [ "nix", "wayland-client", @@ -3263,9 +3281,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" +checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741" dependencies = [ "bitflags", "wayland-client", @@ -3275,9 +3293,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1" +checksum = "39a1ed3143f7a143187156a2ab52742e89dac33245ba505c17224df48939f9e0" dependencies = [ "proc-macro2", "quote", @@ -3286,9 +3304,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.28.6" +version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" +checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4" dependencies = [ "pkg-config", ] diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index 7f564d1d7..ea825c34b 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -25,9 +25,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics utralib = {path = "../../utralib"} [target.'cfg(any(windows,unix))'.dependencies] -# this is forked from minifb because the `set_key_state` callback was dropped in later versions of minifb (or maybe it was never there?) -# the working branch is thus `set-key-state-cb` -minifb = {version = "0.19.2", git = "https://github.com/betrusted-io/rust_minifb.git", rev = "1717ec60830c1f9592b77ce875e492afef1aa533"} +minifb = "0.22.0" [features] debugprint = []