summaryrefslogtreecommitdiff
path: root/games/veloren-weekly/files
diff options
context:
space:
mode:
Diffstat (limited to 'games/veloren-weekly/files')
-rw-r--r--games/veloren-weekly/files/patch-gilrs27
-rw-r--r--games/veloren-weekly/files/patch-i38628
-rw-r--r--games/veloren-weekly/files/patch-keyboard-keynames41
-rw-r--r--games/veloren-weekly/files/patch-shaderc26
-rw-r--r--games/veloren-weekly/files/patch-unix72
-rw-r--r--games/veloren-weekly/files/patch-wgpu-nvidia13
6 files changed, 101 insertions, 106 deletions
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index d18771ab9298..5ff7ffda430e 100644
--- a/games/veloren-weekly/files/patch-gilrs
+++ b/games/veloren-weekly/files/patch-gilrs
@@ -23,9 +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-07-02 22:31:56 UTC
+--- Cargo.lock.orig 2025-08-14 15:14:34 UTC
+++ Cargo.lock
-@@ -2628,9 +2628,9 @@ dependencies = [
+@@ -2564,9 +2564,9 @@ dependencies = [
[[package]]
name = "gilrs"
@@ -37,7 +37,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
dependencies = [
"fnv",
"gilrs-core",
-@@ -2642,24 +2642,23 @@ dependencies = [
+@@ -2578,24 +2578,23 @@ dependencies = [
[[package]]
name = "gilrs-core"
@@ -67,7 +67,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
]
[[package]]
-@@ -3546,9 +3545,9 @@ dependencies = [
+@@ -3414,9 +3413,9 @@
[[package]]
name = "io-kit-sys"
@@ -79,7 +79,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
dependencies = [
"core-foundation-sys",
"mach2",
-@@ -4381,6 +4380,17 @@ dependencies = [
+@@ -4205,6 +4204,17 @@ dependencies = [
"memoffset 0.6.5",
]
@@ -97,16 +97,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
[[package]]
name = "nix"
version = "0.29.0"
-@@ -7578,7 +7588,7 @@ version = "1.6.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if 0.1.10",
- "rand 0.8.5",
- "static_assertions",
- ]
-@@ -9363,28 +9373,6 @@ dependencies = [
+@@ -9218,28 +9228,6 @@ dependencies = [
"windows-targets 0.52.6",
]
@@ -134,8 +125,8 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
-
[[package]]
name = "windows-core"
- version = "0.51.1"
-@@ -9430,16 +9418,6 @@ dependencies = [
+ version = "0.54.0"
+@@ -9276,16 +9264,6 @@ dependencies = [
"windows-strings 0.4.0",
]
@@ -152,7 +143,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
[[package]]
name = "windows-implement"
version = "0.58.0"
-@@ -9490,16 +9468,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"
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-unix b/games/veloren-weekly/files/patch-unix
index 58054ecb2112..2369920616b9 100644
--- a/games/veloren-weekly/files/patch-unix
+++ b/games/veloren-weekly/files/patch-unix
@@ -1,5 +1,77 @@
Relax Linux checks for the code works on any non-Windows platform.
+--- cargo-crates/wgpu-26.0.1/build.rs.orig 2006-07-24 01:21:28 UTC
++++ cargo-crates/wgpu-26.0.1/build.rs
+@@ -16,7 +16,7 @@ fn main() {
+ metal: { all(target_vendor = "apple", feature = "metal") },
+ vulkan: { any(
+ // The `vulkan` feature enables the Vulkan backend only on "native Vulkan" platforms, i.e. Windows/Linux/Android
+- all(any(windows, target_os = "linux", target_os = "android"), feature = "vulkan"),
++ all(any(windows, unix), not(target_vendor = "apple"), feature = "vulkan"),
+ // On Apple platforms, however, we require the `vulkan-portability` feature
+ // to explicitly opt-in to Vulkan since it's meant to be used with MoltenVK.
+ all(target_vendor = "apple", feature = "vulkan-portability")
+@@ -24,7 +24,7 @@ fn main() {
+ gles: { any(
+ // The `gles` feature enables the OpenGL/GLES backend only on "native OpenGL" platforms, i.e. Windows, Linux, Android, and Emscripten.
+ // (Note that WebGL is also not included here!)
+- all(any(windows, target_os = "linux", target_os = "android", Emscripten), feature = "gles"),
++ all(any(windows, unix, Emscripten), not(target_vendor = "apple"), feature = "gles"),
+ // On Apple platforms, however, we require the `angle` feature to explicitly opt-in to OpenGL
+ // since its meant to be used with ANGLE.
+ all(target_vendor = "apple", feature = "angle")
+--- cargo-crates/wgpu-core-26.0.1/Cargo.toml.orig 1970-01-01 00:00:01 UTC
++++ cargo-crates/wgpu-core-26.0.1/Cargo.toml
+@@ -206,7 +206,7 @@ optional = true
+ version = "26.0.0"
+ optional = true
+
+-[target.'cfg(any(windows, target_os = "linux", target_os = "android"))'.dependencies.wgpu-core-deps-windows-linux-android]
++[target.'cfg(all(any(windows, unix), not(target_vendor = "apple")))'.dependencies.wgpu-core-deps-windows-linux-android]
+ version = "26.0.0"
+ optional = true
+
+--- cargo-crates/wgpu-core-26.0.1/build.rs.orig 2006-07-24 01:21:28 UTC
++++ cargo-crates/wgpu-core-26.0.1/build.rs
+@@ -1,6 +1,6 @@ fn main() {
+ fn main() {
+ cfg_aliases::cfg_aliases! {
+- windows_linux_android: { any(windows, target_os = "linux", target_os = "android") },
++ windows_linux_android: { all(any(windows, unix), not(target_vendor = "apple")) },
+ send_sync: { all(
+ feature = "std",
+ any(
+--- cargo-crates/wgpu-core-deps-windows-linux-android-26.0.0/Cargo.toml.orig 1970-01-01 00:00:01 UTC
++++ cargo-crates/wgpu-core-deps-windows-linux-android-26.0.0/Cargo.toml
+@@ -38,5 +38,5 @@ vulkan = ["wgpu-hal/vulkan"]
+ renderdoc = ["wgpu-hal/renderdoc"]
+ vulkan = ["wgpu-hal/vulkan"]
+
+-[target.'cfg(any(windows, target_os = "linux", target_os = "android"))'.dependencies.wgpu-hal]
++[target.'cfg(all(any(windows, unix), not(target_vendor = "apple")))'.dependencies.wgpu-hal]
+ version = "26.0.0"
+--- cargo-crates/wgpu-hal-26.0.4/src/vulkan/adapter.rs.orig 2006-07-24 01:21:28 UTC
++++ cargo-crates/wgpu-hal-26.0.4/src/vulkan/adapter.rs
+@@ -1170,7 +1170,7 @@ impl PhysicalDeviceProperties {
+ // Prevent very large buffers on mesa and most android devices.
+ let is_nvidia = self.properties.vendor_id == crate::auxil::db::nvidia::VENDOR;
+ let max_buffer_size =
+- if (cfg!(target_os = "linux") || cfg!(target_os = "android")) && !is_nvidia {
++ if (cfg!(all(unix, not(target_vendor = "apple")))) && !is_nvidia {
+ i32::MAX as u64
+ } else {
+ u64::MAX
+--- cargo-crates/wgpu-hal-26.0.4/src/vulkan/instance.rs.orig 2006-07-24 01:21:28 UTC
++++ cargo-crates/wgpu-hal-26.0.4/src/vulkan/instance.rs
+@@ -986,7 +986,7 @@ impl crate::Instance for super::Instance {
+ exposed.info.device_type == wgt::DeviceType::DiscreteGpu
+ && exposed.info.vendor == db::nvidia::VENDOR
+ });
+- if cfg!(target_os = "linux") && has_nvidia_dgpu && self.shared.has_nv_optimus {
++ if cfg!(unix) && has_nvidia_dgpu && self.shared.has_nv_optimus {
+ for exposed in exposed_adapters.iter_mut() {
+ if exposed.info.device_type == wgt::DeviceType::IntegratedGpu
+ && exposed.info.vendor == db::intel::VENDOR
--- server-cli/src/main.rs.orig 2024-02-14 21:58:23 UTC
+++ server-cli/src/main.rs
@@ -66,14 +66,14 @@ fn main() -> io::Result<()> {
diff --git a/games/veloren-weekly/files/patch-wgpu-nvidia b/games/veloren-weekly/files/patch-wgpu-nvidia
index 72f9f69c49e4..13e6891aa7da 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-26.0.1/src/backend/wgpu_core.rs.orig 2006-07-24 01:21:28 UTC
++++ cargo-crates/wgpu-26.0.1/src/backend/wgpu_core.rs
+@@ -1802,10 +1802,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) => ()
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 18:22:36 +0000