summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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-gilrs214
4 files changed, 34 insertions, 214 deletions
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 574af22627f5..6cd41e169c8c 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= veloren
-PORTVERSION= s20250625
+PORTVERSION= s20250702
CATEGORIES= games wayland
PKGNAMESUFFIX= -weekly
@@ -25,7 +25,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-813-ga5038be023 # git describe --match='v[0-9]*' weekly
+GL_TAGNAME= v0.17.0-831-ga40c4d41e3 # 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 440347f6447b..018b32e61e7a 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -141,6 +141,7 @@ CARGO_CRATES= ab_glyph-0.2.29 \
crc32fast-1.4.2 \
criterion-0.5.1 \
criterion-plot-0.5.0 \
+ critical-section-1.2.0 \
crossbeam-channel-0.5.15 \
crossbeam-deque-0.7.4 \
crossbeam-deque-0.8.6 \
@@ -296,8 +297,8 @@ CARGO_CRATES= ab_glyph-0.2.29 \
hex-0.4.3 \
hexf-parse-0.2.1 \
hibitset-0.6.4 \
- hickory-proto-0.24.4 \
- hickory-resolver-0.24.4 \
+ hickory-proto-0.25.2 \
+ hickory-resolver-0.25.2 \
home-0.5.11 \
http-1.3.1 \
http-body-1.0.1 \
@@ -385,7 +386,6 @@ CARGO_CRATES= ab_glyph-0.2.29 \
log-0.4.27 \
loom-0.7.2 \
lru-0.12.5 \
- lru-cache-0.1.2 \
lz-fear-0.2.0 \
mach2-0.4.2 \
macro_rules_attribute-0.1.3 \
@@ -411,6 +411,7 @@ CARGO_CRATES= ab_glyph-0.2.29 \
mint-0.5.9 \
mio-0.8.11 \
mio-1.0.3 \
+ moka-0.12.10 \
mumble-link-0.2.0 \
nanorand-0.7.0 \
native-dialog-0.9.0 \
@@ -686,6 +687,7 @@ CARGO_CRATES= ab_glyph-0.2.29 \
sync_wrapper-1.0.2 \
synstructure-0.13.2 \
system-interface-0.27.3 \
+ tagptr-0.2.0 \
take-once-0.1.2 \
tap-1.0.1 \
tar-0.4.44 \
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index a8c133930029..9f3c06475ef0 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1750868585
+TIMESTAMP = 1751495516
SHA256 (rust/crates/ab_glyph-0.2.29.crate) = ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0
SIZE (rust/crates/ab_glyph-0.2.29.crate) = 20011
SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -285,6 +285,8 @@ SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f
SIZE (rust/crates/criterion-0.5.1.crate) = 110088
SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1
SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
+SHA256 (rust/crates/critical-section-1.2.0.crate) = 790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b
+SIZE (rust/crates/critical-section-1.2.0.crate) = 19133
SHA256 (rust/crates/crossbeam-channel-0.5.15.crate) = 82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2
SIZE (rust/crates/crossbeam-channel-0.5.15.crate) = 92716
SHA256 (rust/crates/crossbeam-deque-0.7.4.crate) = c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed
@@ -595,10 +597,10 @@ SHA256 (rust/crates/hexf-parse-0.2.1.crate) = dfa686283ad6dd069f105e5ab091b04c62
SIZE (rust/crates/hexf-parse-0.2.1.crate) = 4662
SHA256 (rust/crates/hibitset-0.6.4.crate) = f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121
SIZE (rust/crates/hibitset-0.6.4.crate) = 23698
-SHA256 (rust/crates/hickory-proto-0.24.4.crate) = 92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248
-SIZE (rust/crates/hickory-proto-0.24.4.crate) = 383461
-SHA256 (rust/crates/hickory-resolver-0.24.4.crate) = cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e
-SIZE (rust/crates/hickory-resolver-0.24.4.crate) = 89596
+SHA256 (rust/crates/hickory-proto-0.25.2.crate) = f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502
+SIZE (rust/crates/hickory-proto-0.25.2.crate) = 417616
+SHA256 (rust/crates/hickory-resolver-0.25.2.crate) = dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a
+SIZE (rust/crates/hickory-resolver-0.25.2.crate) = 91883
SHA256 (rust/crates/home-0.5.11.crate) = 589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf
SIZE (rust/crates/home-0.5.11.crate) = 9926
SHA256 (rust/crates/http-1.3.1.crate) = f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565
@@ -773,8 +775,6 @@ SHA256 (rust/crates/loom-0.7.2.crate) = 419e0dc8046cb947daa77eb95ae174acfbddb767
SIZE (rust/crates/loom-0.7.2.crate) = 73989
SHA256 (rust/crates/lru-0.12.5.crate) = 234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38
SIZE (rust/crates/lru-0.12.5.crate) = 16047
-SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
-SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
SHA256 (rust/crates/lz-fear-0.2.0.crate) = 26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d
SIZE (rust/crates/lz-fear-0.2.0.crate) = 142438
SHA256 (rust/crates/mach2-0.4.2.crate) = 19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709
@@ -825,6 +825,8 @@ SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae
SIZE (rust/crates/mio-0.8.11.crate) = 102983
SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
SIZE (rust/crates/mio-1.0.3.crate) = 103703
+SHA256 (rust/crates/moka-0.12.10.crate) = a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926
+SIZE (rust/crates/moka-0.12.10.crate) = 253622
SHA256 (rust/crates/mumble-link-0.2.0.crate) = c7f4c53745d4e7afd0faaf6ee46c0c3114d4b7d0db63bef96917751906453285
SIZE (rust/crates/mumble-link-0.2.0.crate) = 11204
SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
@@ -1375,6 +1377,8 @@ SHA256 (rust/crates/synstructure-0.13.2.crate) = 728a70f3dbaf5bab7f0c4b1ac8d7ae5
SIZE (rust/crates/synstructure-0.13.2.crate) = 18950
SHA256 (rust/crates/system-interface-0.27.3.crate) = cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745
SIZE (rust/crates/system-interface-0.27.3.crate) = 32567
+SHA256 (rust/crates/tagptr-0.2.0.crate) = 7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417
+SIZE (rust/crates/tagptr-0.2.0.crate) = 13320
SHA256 (rust/crates/take-once-0.1.2.crate) = ae3e30fcd6e30346aff75e3bd38834ebc8ca2ed8925884bc867f77213bf3f714
SIZE (rust/crates/take-once-0.1.2.crate) = 4285
SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
@@ -1867,5 +1871,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-813-ga5038be023.tar.bz2) = eb4ae68c815e4d0d1a1618f51bf7a04a7e36292d0bbcf82c0ad4e4ce2f3da47b
-SIZE (veloren-v0.17.0-813-ga5038be023.tar.bz2) = 326011038
+SHA256 (veloren-v0.17.0-831-ga40c4d41e3.tar.bz2) = b1475fdd7186f7e83eccfd756c66f2e90d190ed2d73a91284da9442dcfe5b0ef
+SIZE (veloren-v0.17.0-831-ga40c4d41e3.tar.bz2) = 326078183
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index 513d59cbacc7..d18771ab9298 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-07-02 22:31:56 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 = [
+@@ -2628,9 +2628,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 = [
+@@ -2642,24 +2642,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",
- ]
+@@ -3546,9 +3545,9 @@ dependencies = [
[[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 = [
+@@ -4381,6 +4380,17 @@ dependencies = [
"memoffset 0.6.5",
]
@@ -193,97 +97,16 @@ 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"
+@@ -7578,7 +7588,7 @@ version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
-- "windows-sys 0.48.0",
-+ "windows-sys 0.59.0",
+- "cfg-if 1.0.0",
++ "cfg-if 0.1.10",
+ "rand 0.8.5",
+ "static_assertions",
]
-
- [[package]]
-@@ -9336,28 +9346,6 @@ dependencies = [
+@@ -9363,28 +9373,6 @@ dependencies = [
"windows-targets 0.52.6",
]
@@ -312,7 +135,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
[[package]]
name = "windows-core"
version = "0.51.1"
-@@ -9403,16 +9391,6 @@ dependencies = [
+@@ -9430,16 +9418,6 @@ dependencies = [
"windows-strings 0.4.0",
]
@@ -329,7 +152,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"
+@@ -9490,16 +9468,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
@@ -346,15 +169,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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 03:22:39 +0000