summaryrefslogtreecommitdiff
path: root/games/veloren-weekly
diff options
context:
space:
mode:
Diffstat (limited to 'games/veloren-weekly')
-rw-r--r--games/veloren-weekly/Makefile4
-rw-r--r--games/veloren-weekly/Makefile.crates8
-rw-r--r--games/veloren-weekly/distinfo22
-rw-r--r--games/veloren-weekly/files/patch-shaderc76
4 files changed, 22 insertions, 88 deletions
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 5610e1d83c2f..33118a3a1e0f 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= veloren
-PORTVERSION= s20250924
+PORTVERSION= s20251008
CATEGORIES= games wayland
PKGNAMESUFFIX= -weekly
@@ -24,7 +24,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
USES= cargo xorg
USE_XORG= xcb
USE_GITLAB= yes
-GL_TAGNAME= v0.17.0-1227-gbb56ecab89 # git describe --match='v[0-9]*' weekly
+GL_TAGNAME= v0.17.0-1253-g8176fe3613 # git describe --match='v[0-9]*' weekly
CARGO_ENV= VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib"
PLIST_FILES= bin/${PORTNAME}-server-cli \
bin/${PORTNAME}-voxygen \
diff --git a/games/veloren-weekly/Makefile.crates b/games/veloren-weekly/Makefile.crates
index f757af1a098e..52bd448805f2 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -377,6 +377,7 @@ CARGO_CRATES= ab_glyph-0.2.31 \
libredox-0.1.9 \
libsqlite3-sys-0.28.0 \
libudev-sys-0.1.4 \
+ link-cplusplus-1.0.12 \
linked-hash-map-0.5.6 \
linux-raw-sys-0.4.15 \
linux-raw-sys-0.11.0 \
@@ -585,7 +586,7 @@ CARGO_CRATES= ab_glyph-0.2.31 \
robust-0.2.3 \
ron-0.11.0 \
roots-0.0.8 \
- roxmltree-0.14.1 \
+ roxmltree-0.20.0 \
rstar-0.12.2 \
rtrb-0.3.2 \
rusqlite-0.31.0 \
@@ -638,8 +639,8 @@ CARGO_CRATES= ab_glyph-0.2.31 \
serde_with-3.14.0 \
serde_with_macros-3.14.0 \
sha2-0.10.9 \
- shaderc-0.8.3 \
- shaderc-sys-0.8.3 \
+ shaderc-0.10.1 \
+ shaderc-sys-0.10.1 \
sharded-slab-0.1.7 \
shell-words-1.1.0 \
shellexpand-3.1.1 \
@@ -938,7 +939,6 @@ CARGO_CRATES= ab_glyph-0.2.31 \
xkbcommon-dl-0.4.2 \
xkeysym-0.2.1 \
xml-rs-0.8.27 \
- xmlparser-0.13.6 \
yasna-0.5.2 \
yoke-0.8.0 \
yoke-derive-0.8.0 \
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 387200a0d686..d8789159a2f9 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1758751388
+TIMESTAMP = 1759952259
SHA256 (rust/crates/ab_glyph-0.2.31.crate) = e074464580a518d16a7126262fffaaa47af89d4099d4cb403f8ed938ba12ee7d
SIZE (rust/crates/ab_glyph-0.2.31.crate) = 20909
SHA256 (rust/crates/ab_glyph_rasterizer-0.1.10.crate) = 366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618
@@ -757,6 +757,8 @@ SHA256 (rust/crates/libsqlite3-sys-0.28.0.crate) = 0c10584274047cb335c23d3e61bce
SIZE (rust/crates/libsqlite3-sys-0.28.0.crate) = 4975624
SHA256 (rust/crates/libudev-sys-0.1.4.crate) = 3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324
SIZE (rust/crates/libudev-sys-0.1.4.crate) = 6177
+SHA256 (rust/crates/link-cplusplus-1.0.12.crate) = 7f78c730aaa7d0b9336a299029ea49f9ee53b0ed06e9202e8cb7db9bae7b8c82
+SIZE (rust/crates/link-cplusplus-1.0.12.crate) = 8178
SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
SHA256 (rust/crates/linux-raw-sys-0.4.15.crate) = d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab
@@ -1173,8 +1175,8 @@ SHA256 (rust/crates/ron-0.11.0.crate) = db09040cc89e461f1a265139777a2bde7f8d8c67
SIZE (rust/crates/ron-0.11.0.crate) = 121686
SHA256 (rust/crates/roots-0.0.8.crate) = 082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058
SIZE (rust/crates/roots-0.0.8.crate) = 29257
-SHA256 (rust/crates/roxmltree-0.14.1.crate) = 921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b
-SIZE (rust/crates/roxmltree-0.14.1.crate) = 39163
+SHA256 (rust/crates/roxmltree-0.20.0.crate) = 6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97
+SIZE (rust/crates/roxmltree-0.20.0.crate) = 54594
SHA256 (rust/crates/rstar-0.12.2.crate) = 421400d13ccfd26dfa5858199c30a5d76f9c54e0dba7575273025b43c5175dbb
SIZE (rust/crates/rstar-0.12.2.crate) = 43756
SHA256 (rust/crates/rtrb-0.3.2.crate) = ad8388ea1a9e0ea807e442e8263a699e7edcb320ecbcd21b4fa8ff859acce3ba
@@ -1279,10 +1281,10 @@ SHA256 (rust/crates/serde_with_macros-3.14.0.crate) = de90945e6565ce0d9a25098082
SIZE (rust/crates/serde_with_macros-3.14.0.crate) = 39066
SHA256 (rust/crates/sha2-0.10.9.crate) = a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283
SIZE (rust/crates/sha2-0.10.9.crate) = 29271
-SHA256 (rust/crates/shaderc-0.8.3.crate) = 27e07913ada18607bb60d12431cbe3358d3bbebbe95948e1618851dc01e63b7b
-SIZE (rust/crates/shaderc-0.8.3.crate) = 16536
-SHA256 (rust/crates/shaderc-sys-0.8.3.crate) = 73120d240fe22196300f39ca8547ca2d014960f27b19b47b21288b396272f7f7
-SIZE (rust/crates/shaderc-sys-0.8.3.crate) = 7210982
+SHA256 (rust/crates/shaderc-0.10.1.crate) = 8ab2a6e36d1c1e2320c87e2b806a3e7b0dffaa67b82c14a39dad6cf7637208ae
+SIZE (rust/crates/shaderc-0.10.1.crate) = 17761
+SHA256 (rust/crates/shaderc-sys-0.10.1.crate) = bdceb85b2c6d2c27b95ffe2d341063dfded0aca8046f7f60c544bbeaeaf8bcae
+SIZE (rust/crates/shaderc-sys-0.10.1.crate) = 8055273
SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
SHA256 (rust/crates/shell-words-1.1.0.crate) = 24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde
@@ -1879,8 +1881,6 @@ SHA256 (rust/crates/xkeysym-0.2.1.crate) = b9cc00251562a284751c9973bace760d86c02
SIZE (rust/crates/xkeysym-0.2.1.crate) = 103129
SHA256 (rust/crates/xml-rs-0.8.27.crate) = 6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7
SIZE (rust/crates/xml-rs-0.8.27.crate) = 55258
-SHA256 (rust/crates/xmlparser-0.13.6.crate) = 66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4
-SIZE (rust/crates/xmlparser-0.13.6.crate) = 26718
SHA256 (rust/crates/yasna-0.5.2.crate) = e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd
SIZE (rust/crates/yasna-0.5.2.crate) = 34859
SHA256 (rust/crates/yoke-0.8.0.crate) = 5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc
@@ -1925,5 +1925,5 @@ SHA256 (veloren-conrod-c74446362371dc837b8b4b6d6ddcd7693b48d9b6_GL0.tar.gz) = 43
SIZE (veloren-conrod-c74446362371dc837b8b4b6d6ddcd7693b48d9b6_GL0.tar.gz) = 808402
SHA256 (DaforLynx-kira-v0.10.7-with-config_GH0.tar.gz) = ffc38b7c73cb6419d02a21a3905cd0b00b3a544711230c5b11ef77301b7b9bb2
SIZE (DaforLynx-kira-v0.10.7-with-config_GH0.tar.gz) = 4379268
-SHA256 (veloren-v0.17.0-1227-gbb56ecab89.tar.bz2) = c452b45967cbbe19e593131cb80efe70346113c0174623f37338712d09f9f35e
-SIZE (veloren-v0.17.0-1227-gbb56ecab89.tar.bz2) = 345073046
+SHA256 (veloren-v0.17.0-1253-g8176fe3613.tar.bz2) = db8ad800fb1fb91adc3ff4ee1f0fd642e670718a962eba8fe4f09df59f0ed22d
+SIZE (veloren-v0.17.0-1253-g8176fe3613.tar.bz2) = 345070395
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-11 13:15:33 +0000