From 034620591b794594e7e641e1692dcf4dd7f4adc1 Mon Sep 17 00:00:00 2001 From: Mwa Date: Fri, 6 Mar 2026 22:14:44 +0100 Subject: [PATCH] re-added default winit features --- Cargo.lock | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 +- sim_rs.tar.xz | Bin 3872 -> 3840 bytes src/main.rs | 1 - 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a53f851..266ce2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,22 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "ab_glyph" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" + [[package]] name = "ahash" version = "0.8.12" @@ -1091,6 +1107,15 @@ dependencies = [ "libredox", ] +[[package]] +name = "owned_ttf_parser" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b" +dependencies = [ + "ttf-parser", +] + [[package]] name = "parking_lot" version = "0.12.5" @@ -1353,6 +1378,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -1365,7 +1396,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ + "ab_glyph", "log", + "memmap2", "smithay-client-toolkit", "tiny-skia", ] @@ -1612,6 +1645,12 @@ version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +[[package]] +name = "ttf-parser" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" + [[package]] name = "ultraviolet" version = "0.9.2" @@ -1738,6 +1777,7 @@ dependencies = [ "cc", "downcast-rs", "rustix 1.1.4", + "scoped-tls", "smallvec", "wayland-sys", ] @@ -1788,6 +1828,19 @@ dependencies = [ "wayland-scanner", ] +[[package]] +name = "wayland-protocols-plasma" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d392fc283a87774afc9beefcd6f931582bb97fe0e6ced0b306a62cb1d026527c" +dependencies = [ + "bitflags 2.11.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + [[package]] name = "wayland-protocols-wlr" version = "0.3.11" @@ -1818,6 +1871,9 @@ version = "0.31.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "374f6b70e8e0d6bf9461a32988fd553b59ff630964924dad6e4a4eb6bd538d17" dependencies = [ + "dlib", + "log", + "once_cell", "pkg-config", ] @@ -2217,6 +2273,10 @@ dependencies = [ "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", "web-sys", "web-time", "windows-sys 0.52.0", diff --git a/Cargo.toml b/Cargo.toml index 71cd995..61d0aaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,5 +5,5 @@ edition = "2024" [dependencies] pixels = "0.15.0" -winit = { version = "0.30.13", default-features = false, features = ["x11", "x11-dl", "x11rb", "ahash", "bytemuck", "memmap2", "rwh_06", "sctk", "sctk-adwaita"] } +winit = { version = "0.30.13", features = ["x11", "x11-dl", "x11rb", "ahash", "bytemuck", "memmap2", "rwh_06", "sctk", "sctk-adwaita"] } winit_input_helper = "0.17.0" diff --git a/sim_rs.tar.xz b/sim_rs.tar.xz index 1a541dd863c874d68b3cb6c4b2d98c78b3768a72..98b566ea216fe742bfdec1d67f113a93eb699411 100644 GIT binary patch literal 3840 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 CU|~i8 literal 3872 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