diff options
Diffstat (limited to 'games/veloren-weekly/files')
| -rw-r--r-- | games/veloren-weekly/files/patch-gilrs | 213 | ||||
| -rw-r--r-- | games/veloren-weekly/files/patch-i386 | 28 | ||||
| -rw-r--r-- | games/veloren-weekly/files/patch-keyboard-keynames | 41 | ||||
| -rw-r--r-- | games/veloren-weekly/files/patch-shaderc | 26 | ||||
| -rw-r--r-- | games/veloren-weekly/files/patch-wgpu-nvidia | 13 |
5 files changed, 29 insertions, 292 deletions
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs index 513d59cbacc7..5ff7ffda430e 100644 --- a/games/veloren-weekly/files/patch-gilrs +++ b/games/veloren-weekly/files/patch-gilrs @@ -23,81 +23,9 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` | | help: a similar name exists in the module: `event` | no `epoll` in `sys` ---- Cargo.lock.orig 2025-06-11 22:40:37 UTC +--- Cargo.lock.orig 2025-08-14 15:14:34 UTC +++ Cargo.lock -@@ -518,7 +518,7 @@ dependencies = [ - "bitflags 2.9.0", - "cexpr", - "clang-sys", -- "itertools 0.10.5", -+ "itertools 0.13.0", - "proc-macro2 1.0.95", - "quote 1.0.40", - "regex", -@@ -734,7 +734,7 @@ dependencies = [ - "cap-primitives", - "cap-std", - "io-lifetimes", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -763,7 +763,7 @@ dependencies = [ - "maybe-owned", - "rustix 1.0.7", - "rustix-linux-procfs", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - "winx", - ] - -@@ -1650,7 +1650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" - dependencies = [ - "bitflags 2.9.0", -- "libloading 0.7.4", -+ "libloading 0.8.6", - "winapi", - ] - -@@ -1876,7 +1876,7 @@ version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" - dependencies = [ -- "libloading 0.7.4", -+ "libloading 0.8.6", - ] - - [[package]] -@@ -2100,7 +2100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" - dependencies = [ - "libc", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -2194,7 +2194,7 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" - dependencies = [ - "cfg-if 1.0.0", - "rustix 1.0.7", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -2407,7 +2407,7 @@ checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a" - dependencies = [ - "io-lifetimes", - "rustix 1.0.7", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -2622,9 +2622,9 @@ dependencies = [ +@@ -2564,9 +2564,9 @@ dependencies = [ [[package]] name = "gilrs" @@ -109,7 +37,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` dependencies = [ "fnv", "gilrs-core", -@@ -2636,24 +2636,23 @@ dependencies = [ +@@ -2578,24 +2578,23 @@ dependencies = [ [[package]] name = "gilrs-core" @@ -139,13 +67,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` ] [[package]] -@@ -3534,14 +3533,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65" - dependencies = [ - "io-lifetimes", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] +@@ -3414,9 +3413,9 @@ [[package]] name = "io-kit-sys" @@ -157,25 +79,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` dependencies = [ "core-foundation-sys", "mach2", -@@ -3588,7 +3587,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" - dependencies = [ - "hermit-abi 0.5.0", - "libc", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -3852,7 +3851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" - dependencies = [ - "cfg-if 1.0.0", -- "windows-targets 0.48.5", -+ "windows-targets 0.52.6", - ] - - [[package]] -@@ -4364,6 +4363,17 @@ dependencies = [ +@@ -4205,6 +4204,17 @@ dependencies = [ "memoffset 0.6.5", ] @@ -193,97 +97,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` [[package]] name = "nix" version = "0.29.0" -@@ -5594,7 +5604,7 @@ dependencies = [ - "once_cell", - "socket2", - "tracing", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -6082,7 +6092,7 @@ dependencies = [ - "errno", - "libc", - "linux-raw-sys 0.4.15", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -6095,7 +6105,7 @@ dependencies = [ - "errno", - "libc", - "linux-raw-sys 0.9.4", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -6170,7 +6180,7 @@ dependencies = [ - "security-framework", - "security-framework-sys", - "webpki-root-certs", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -6829,7 +6839,7 @@ dependencies = [ - "cfg-if 1.0.0", - "libc", - "psm", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -7047,7 +7057,7 @@ dependencies = [ - "fd-lock", - "io-lifetimes", - "rustix 0.38.44", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - "winx", - ] - -@@ -7090,7 +7100,7 @@ dependencies = [ - "getrandom 0.3.2", - "once_cell", - "rustix 1.0.7", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -7494,7 +7504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "69fff37da548239c3bf9e64a12193d261e8b22b660991c6fd2df057c168f435f" - dependencies = [ - "cc", -- "windows-targets 0.48.5", -+ "windows-targets 0.52.6", - ] - - [[package]] -@@ -9124,7 +9134,7 @@ dependencies = [ - "js-sys", - "khronos-egl", - "libc", -- "libloading 0.7.4", -+ "libloading 0.8.6", - "log", - "metal", - "naga", -@@ -9247,7 +9257,7 @@ version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" - dependencies = [ -- "windows-sys 0.48.0", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -9336,28 +9346,6 @@ dependencies = [ +@@ -9218,28 +9228,6 @@ dependencies = [ "windows-targets 0.52.6", ] @@ -311,8 +125,8 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` - [[package]] name = "windows-core" - version = "0.51.1" -@@ -9403,16 +9391,6 @@ dependencies = [ + version = "0.54.0" +@@ -9276,16 +9264,6 @@ dependencies = [ "windows-strings 0.4.0", ] @@ -329,7 +143,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` [[package]] name = "windows-implement" version = "0.58.0" -@@ -9463,16 +9441,6 @@ version = "0.1.1" +@@ -9336,16 +9314,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" @@ -346,15 +160,6 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` [[package]] name = "windows-result" version = "0.1.2" -@@ -9829,7 +9797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d" - dependencies = [ - "bitflags 2.9.0", -- "windows-sys 0.52.0", -+ "windows-sys 0.59.0", - ] - - [[package]] --- cargo-crates/gilrs-0.10.2/examples/ev.rs.orig 1970-01-01 00:00:00 UTC +++ cargo-crates/gilrs-0.10.2/examples/ev.rs @@ -9,6 +9,8 @@ use std::process; diff --git a/games/veloren-weekly/files/patch-i386 b/games/veloren-weekly/files/patch-i386 deleted file mode 100644 index 2dd39fcca4b6..000000000000 --- a/games/veloren-weekly/files/patch-i386 +++ /dev/null @@ -1,28 +0,0 @@ -https://gitlab.com/veloren/veloren/-/merge_requests/4103 - -error[E0308]: mismatched types - --> rtsim/src/gen/mod.rs:30:43 - | -30 | let mut rng = SmallRng::from_seed(seed); - | ------------------- ^^^^ expected an array with a fixed size of 16 elements, found one with 32 elements - | | - | arguments to this function are incorrect - | -note: associated function defined here - --> cargo-crates/rand_core-0.6.4/src/lib.rs:319:8 - | -319 | fn from_seed(seed: Self::Seed) -> Self; - | ^^^^^^^^^ - ---- rtsim/src/gen/mod.rs.orig 2023-07-03 10:21:20 UTC -+++ rtsim/src/gen/mod.rs -@@ -23,6 +23,9 @@ impl Data { - - impl Data { - pub fn generate(settings: &WorldSettings, world: &World, index: IndexRef) -> Self { -+#[cfg(target_pointer_width = "32")] -+ let mut seed = [0; 16]; -+#[cfg(not(target_pointer_width = "32"))] - let mut seed = [0; 32]; - seed.iter_mut() - .zip(&mut index.seed.to_le_bytes()) diff --git a/games/veloren-weekly/files/patch-keyboard-keynames b/games/veloren-weekly/files/patch-keyboard-keynames deleted file mode 100644 index 10f126ce6f72..000000000000 --- a/games/veloren-weekly/files/patch-keyboard-keynames +++ /dev/null @@ -1,41 +0,0 @@ -Assume X11/Wayland key names on every Unix-like system - ---- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/Cargo.toml.orig 2023-08-23 04:01:46 UTC -+++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/Cargo.toml -@@ -18,7 +18,7 @@ winapi = { version = "0.3.9", features = ["winuser"] } - [target.'cfg(windows)'.dependencies] - winapi = { version = "0.3.9", features = ["winuser"] } - --[target.'cfg(target_os = "linux")'.dependencies] -+[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies] - xkbcommon = { version = "0.5", features = ["x11", "wayland"] } - xcb = { version = "1", features = ["as-raw-xcb-connection"] } - wayland-client = "0.29" ---- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/mod.rs.orig 2023-08-23 04:01:46 UTC -+++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/mod.rs -@@ -1,5 +1,5 @@ - //! The KeyLayout struct and supporting elements --#[cfg(target_os = "linux")] -+#[cfg(all(unix, not(target_os = "macos")))] - #[path = "unix/mod.rs"] - mod platform; - -@@ -7,7 +7,7 @@ mod platform; - #[path = "windows/mod.rs"] - mod platform; - --#[cfg(not(any(target_os = "windows", target_os = "linux")))] -+#[cfg(target_os = "macos")] - #[path = "other/mod.rs"] - mod platform; - ---- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/unix/key_layout.rs.orig 2023-08-23 04:01:46 UTC -+++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/unix/key_layout.rs -@@ -220,7 +220,6 @@ impl KeyLayout { - } - - /// Methods for KeyLayout specific to Unix-based systems --#[cfg(target_os = "linux")] - pub trait KeyLayoutExtUnix { - /// Construct a KeyLayout explicitly using the Wayland protocol - fn new_wayland() -> Result<KeyLayout, KeyLayoutError>; diff --git a/games/veloren-weekly/files/patch-shaderc b/games/veloren-weekly/files/patch-shaderc index 3d44fe45b6f4..94b0989d62a5 100644 --- a/games/veloren-weekly/files/patch-shaderc +++ b/games/veloren-weekly/files/patch-shaderc @@ -30,28 +30,28 @@ https://github.com/google/shaderc-rs/issues/62 dependencies = [ "cmake", "libc", ---- voxygen/Cargo.toml.orig 2024-05-20 18:26:00 UTC +--- voxygen/Cargo.toml.orig 2025-08-14 15:14:34 UTC +++ voxygen/Cargo.toml -@@ -32,7 +32,6 @@ egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend" - tracy-memory = ["tracy"] # enables heap profiling with tracy - plugins = ["client/plugins", "common-assets/plugins", "server/plugins"] +@@ -36,7 +36,6 @@ egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend" + # enables heap profiling with tracy + plugins = ["client/plugins", "server/plugins", "anim/plugins", "common/plugins"] egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"] -shaderc-from-source = ["shaderc/build-from-source"] discord = ["discord-sdk"] - bin_img-export = ["common-assets"] + bin_cmd_doc_gen = [] -@@ -45,7 +44,7 @@ default-publish = [ +@@ -48,7 +47,7 @@ default-publish = [ + "discord", "simd", ] - # Temp for bug on current wgpu version that has access violation in vulkan when constructing egui pipeline --default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"] -+default-no-egui = ["default-publish", "hot-reloading"] - default = ["default-no-egui", "egui-ui"] +-default = ["default-publish", "hot-reloading", "shaderc-from-source", "egui-ui"] ++default = ["default-publish", "hot-reloading", "egui-ui"] [dependencies] -@@ -73,9 +72,7 @@ bytemuck = { version = "1.7", features = ["derive"] } - ] } - wgpu-profiler = "0.15.0" + client = { package = "veloren-client", path = "../client" } +@@ -71,9 +70,7 @@ bytemuck = { version = "1.7", features = ["derive"] } + wgpu = { version = "24", default-features = false, features = ["spirv", "glsl"] } + wgpu-profiler = "0.22.0" bytemuck = { version = "1.7", features = ["derive"] } -# shaderc = "0.8.0" -# Working around a current bug in shaderc that causes it to use the system installation even if we specify compile from source diff --git a/games/veloren-weekly/files/patch-wgpu-nvidia b/games/veloren-weekly/files/patch-wgpu-nvidia index 72f9f69c49e4..a145e3df69b2 100644 --- a/games/veloren-weekly/files/patch-wgpu-nvidia +++ b/games/veloren-weekly/files/patch-wgpu-nvidia @@ -1,13 +1,14 @@ https://gitlab.com/veloren/veloren/-/issues/1975 ---- ../wgpu-0.18-with-fixes-for-veloren-v2/wgpu/src/backend/direct.rs.orig 2024-09-27 04:53:27 UTC -+++ ../wgpu-0.18-with-fixes-for-veloren-v2/wgpu/src/backend/direct.rs -@@ -2279,9 +2279,7 @@ impl crate::Context for Context { - &size - )) { +--- cargo-crates/wgpu-24.0.5/src/backend/wgpu_core.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/wgpu-24.0.5/src/backend/wgpu_core.rs +@@ -1761,10 +1761,7 @@ impl dispatch::QueueInterface for CoreQueue { + &size, + ) { Ok(()) => (), - Err(err) => { -- self.handle_error_nolabel(&queue_data.error_sink, err, "Queue::write_texture") +- self.context +- .handle_error_nolabel(&self.error_sink, err, "Queue::write_texture") - } + Err(_err) => () } |