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-gilrs100
-rw-r--r--games/veloren-weekly/files/patch-shaderc76
2 files changed, 23 insertions, 153 deletions
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index 5ff7ffda430e..bcba8722d178 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-08-14 15:14:34 UTC
+--- Cargo.lock.orig 2025-09-10 09:49:58 UTC
+++ Cargo.lock
-@@ -2564,9 +2564,9 @@ dependencies = [
+@@ -2709,9 +2709,9 @@ dependencies = [
[[package]]
name = "gilrs"
@@ -37,7 +37,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
dependencies = [
"fnv",
"gilrs-core",
-@@ -2578,24 +2578,23 @@ dependencies = [
+@@ -2723,24 +2723,23 @@ dependencies = [
[[package]]
name = "gilrs-core"
@@ -47,8 +47,8 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
-checksum = "a6d95ae10ce5aa99543a28cf74e41c11f3b9e3c14f0452bbde46024753cd683e"
+checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
dependencies = [
-- "core-foundation 0.10.0",
-- "inotify 0.11.0",
+- "core-foundation 0.10.1",
+- "inotify",
+ "core-foundation 0.9.4",
"io-kit-sys",
"js-sys",
@@ -62,12 +62,12 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
"vec_map",
"wasm-bindgen",
"web-sys",
-- "windows 0.61.1",
+- "windows 0.61.3",
+ "windows 0.48.0",
]
[[package]]
-@@ -3414,9 +3413,9 @@
+@@ -3525,9 +3524,9 @@ dependencies = [
[[package]]
name = "io-kit-sys"
@@ -79,87 +79,23 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
dependencies = [
"core-foundation-sys",
"mach2",
-@@ -4205,6 +4204,17 @@ dependencies = [
- "memoffset 0.6.5",
- ]
+@@ -4317,13 +4316,12 @@ dependencies = [
-+[[package]]
-+name = "nix"
+ [[package]]
+ name = "nix"
+-version = "0.29.0"
+version = "0.26.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
-+dependencies = [
+ dependencies = [
+- "bitflags 2.9.4",
+ "bitflags 1.3.2",
-+ "cfg-if 1.0.0",
-+ "libc",
-+]
-+
- [[package]]
- name = "nix"
- version = "0.29.0"
-@@ -9218,28 +9228,6 @@ dependencies = [
- "windows-targets 0.52.6",
- ]
-
--[[package]]
--name = "windows"
--version = "0.61.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
--dependencies = [
-- "windows-collections",
-- "windows-core 0.61.0",
-- "windows-future",
-- "windows-link",
-- "windows-numerics",
--]
--
--[[package]]
--name = "windows-collections"
--version = "0.2.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
--dependencies = [
-- "windows-core 0.61.0",
--]
--
- [[package]]
- name = "windows-core"
- version = "0.54.0"
-@@ -9276,16 +9264,6 @@ dependencies = [
- "windows-strings 0.4.0",
+ "cfg-if 1.0.3",
+- "cfg_aliases",
+ "libc",
]
--[[package]]
--name = "windows-future"
--version = "0.2.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
--dependencies = [
-- "windows-core 0.61.0",
-- "windows-link",
--]
--
- [[package]]
- name = "windows-implement"
- version = "0.58.0"
-@@ -9336,16 +9314,6 @@ version = "0.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
-
--[[package]]
--name = "windows-numerics"
--version = "0.2.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
--dependencies = [
-- "windows-core 0.61.0",
-- "windows-link",
--]
--
- [[package]]
- name = "windows-result"
- version = "0.1.2"
--- 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-shaderc b/games/veloren-weekly/files/patch-shaderc
index 94b0989d62a5..865309451ab7 100644
--- a/games/veloren-weekly/files/patch-shaderc
+++ b/games/veloren-weekly/files/patch-shaderc
@@ -1,45 +1,8 @@
-This file is in the public domain.
-https://github.com/google/shaderc-rs/issues/62
-
- Restore system shaderc support
- Detect system shaderc on BSDs
---- Cargo.lock.orig 2024-02-07 19:13:27 UTC
-+++ Cargo.lock
-@@ -5792,8 +5792,9 @@ dependencies = [
-
- [[package]]
- name = "shaderc"
--version = "0.8.0"
--source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-+version = "0.8.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "27e07913ada18607bb60d12431cbe3358d3bbebbe95948e1618851dc01e63b7b"
- dependencies = [
- "libc",
- "shaderc-sys",
-@@ -5801,8 +5802,9 @@ dependencies = [
-
- [[package]]
- name = "shaderc-sys"
--version = "0.8.0"
--source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-+version = "0.8.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "73120d240fe22196300f39ca8547ca2d014960f27b19b47b21288b396272f7f7"
- dependencies = [
- "cmake",
- "libc",
--- voxygen/Cargo.toml.orig 2025-08-14 15:14:34 UTC
+++ voxygen/Cargo.toml
-@@ -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_cmd_doc_gen = []
-
@@ -48,7 +47,7 @@ default-publish = [
"discord",
"simd",
@@ -49,43 +12,14 @@ https://github.com/google/shaderc-rs/issues/62
[dependencies]
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
--shaderc = { git = "https://github.com/pythonesque/shaderc-rs", rev = "f2605a02062834019bedff911aee2fd2998c49f9" }
-+shaderc = "0.8.0"
-
- # Ui
- conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "copypasta_0.7" }
---- cargo-crates/shaderc-sys-0.8.3/build/build.rs.orig 1970-01-01 00:00:00 UTC
-+++ cargo-crates/shaderc-sys-0.8.3/build/build.rs
-@@ -309,10 +309,13 @@ fn main() {
+--- cargo-crates/shaderc-sys-0.10.1/build/build.rs.orig 1970-01-01 00:00:00 UTC
++++ cargo-crates/shaderc-sys-0.10.1/build/build.rs
+@@ -357,7 +357,7 @@ fn main() {
}
} {
match (target_os.as_str(), target_env.as_str()) {
-- ("linux", _) => {
-+ ("linux", _) | ("dragonfly", _) | ("freebsd", _) | ("netbsd", _) | ("openbsd", _) => {
+- ("linux" | "android", _) => {
++ ("linux" | "android" | "dragonfly" | "freebsd" | "netbsd" | "openbsd", _) => {
println!("cargo:rustc-link-search=native={search_dir_str}");
println!("cargo:rustc-link-lib={lib_kind}={lib_name}");
-- println!("cargo:rustc-link-lib=dylib=stdc++");
-+ println!("cargo:rustc-link-lib=dylib={}", match target_os.as_str() {
-+ "freebsd" | "openbsd" => "c++",
-+ _ => "stdc++",
-+ });
return;
- }
- ("windows", "msvc") => {
-@@ -395,8 +398,8 @@ fn emit_std_cpp_link() {
- let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap();
-
- match (target_os.as_str(), target_env.as_str()) {
-- ("linux", _) | ("windows", "gnu") => println!("cargo:rustc-link-lib=dylib=stdc++"),
-- ("macos", _) => println!("cargo:rustc-link-lib=dylib=c++"),
-+ ("linux", _) | ("dragonfly", _) | ("netbsd", _) | ("windows", "gnu") => println!("cargo:rustc-link-lib=dylib=stdc++"),
-+ ("macos", _) | ("freebsd", _) | ("openbsd", _) => println!("cargo:rustc-link-lib=dylib=c++"),
- _ => {}
- }
- }
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-02 16:54:09 +0000