games/veloren-weekly: update to s20240403

Changes:	https://gitlab.com/veloren/veloren/-/compare/80fe5ca64...2f0c83992
(cherry picked from commit 1f0f2ea4a560eaabc830abff6269511a502a5e07)

4 files changed, 64 insertions, 128 deletions

diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index d88ec195ac89..90c04f65f2ac 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	veloren
-PORTVERSION=	s20240330
+PORTVERSION=	s20240403
 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.16.0 # git describe --match='v[0-9]*' weekly
+GL_TAGNAME=	v0.16.0-22-g2f0c83992 # 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 13e3bc852e60..4c0a53c3096a 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -8,7 +8,7 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		ahash-0.8.11 \
 		aho-corasick-1.1.3 \
 		allocator-api2-0.2.16 \
-		alsa-0.6.0 \
+		alsa-0.9.0 \
 		alsa-sys-0.3.1 \
 		ambient-authority-0.0.2 \
 		android-activity-0.4.3 \
@@ -116,9 +116,9 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		core-foundation-sys-0.8.6 \
 		core-graphics-0.22.3 \
 		core-graphics-types-0.1.3 \
-		coreaudio-rs-0.10.0 \
+		coreaudio-rs-0.11.3 \
 		coreaudio-sys-0.2.15 \
-		cpal-0.13.5 \
+		cpal-0.15.3 \
 		cpp_demangle-0.3.5 \
 		cpufeatures-0.2.12 \
 		cranelift-bforest-0.104.2 \
@@ -154,12 +154,10 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		culpa-macros-1.0.2 \
 		d3d12-0.7.0 \
 		daggy-0.5.0 \
-		darling-0.13.4 \
 		darling-0.20.8 \
-		darling_core-0.13.4 \
 		darling_core-0.20.8 \
-		darling_macro-0.13.4 \
 		darling_macro-0.20.8 \
+		dasp_sample-0.11.0 \
 		data-encoding-2.5.0 \
 		debugid-0.8.0 \
 		deflate-1.0.0 \
@@ -313,7 +311,6 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		itoa-1.0.10 \
 		ittapi-0.4.0 \
 		ittapi-sys-0.4.0 \
-		jni-0.19.0 \
 		jni-0.21.1 \
 		jni-sys-0.3.0 \
 		jobserver-0.1.28 \
@@ -374,15 +371,12 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		mumble-link-0.2.0 \
 		nanorand-0.7.0 \
 		native-dialog-0.6.4 \
-		ndk-0.6.0 \
 		ndk-0.7.0 \
+		ndk-0.8.0 \
 		ndk-context-0.1.1 \
-		ndk-glue-0.6.2 \
-		ndk-macro-0.3.0 \
-		ndk-sys-0.3.0 \
 		ndk-sys-0.4.1+23.1.7779620 \
+		ndk-sys-0.5.0+25.2.9519653 \
 		nibble_vec-0.1.0 \
-		nix-0.23.2 \
 		nix-0.24.3 \
 		nix-0.25.1 \
 		nix-0.26.4 \
@@ -401,7 +395,6 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		num-complex-0.2.4 \
 		num-complex-0.4.5 \
 		num-conv-0.1.0 \
-		num-derive-0.3.3 \
 		num-derive-0.4.2 \
 		num-integer-0.1.46 \
 		num-iter-0.1.44 \
@@ -411,8 +404,10 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		num_cpus-1.16.0 \
 		num_enum-0.5.11 \
 		num_enum-0.6.1 \
+		num_enum-0.7.2 \
 		num_enum_derive-0.5.11 \
 		num_enum_derive-0.6.1 \
+		num_enum_derive-0.7.2 \
 		number_prefix-0.4.0 \
 		objc-0.2.7 \
 		objc-foundation-0.1.1 \
@@ -422,8 +417,8 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		objc_exception-0.1.2 \
 		objc_id-0.1.1 \
 		object-0.32.2 \
-		oboe-0.4.6 \
-		oboe-sys-0.4.5 \
+		oboe-0.6.1 \
+		oboe-sys-0.6.1 \
 		ogg-0.8.0 \
 		once_cell-1.19.0 \
 		oorandom-11.1.3 \
@@ -437,9 +432,7 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		owned_ttf_parser-0.20.0 \
 		packed_simd-0.3.9 \
 		parking-2.2.0 \
-		parking_lot-0.11.2 \
 		parking_lot-0.12.1 \
-		parking_lot_core-0.8.6 \
 		parking_lot_core-0.9.9 \
 		parse-zoneinfo-0.3.0 \
 		paste-1.0.14 \
@@ -499,7 +492,6 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		rayon-1.9.0 \
 		rayon-core-1.12.1 \
 		rcgen-0.12.1 \
-		redox_syscall-0.2.16 \
 		redox_syscall-0.3.5 \
 		redox_syscall-0.4.1 \
 		redox_users-0.4.4 \
@@ -518,7 +510,7 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		ring-0.17.8 \
 		rmp-0.8.12 \
 		rmp-serde-1.1.2 \
-		rodio-0.15.0 \
+		rodio-0.17.3 \
 		ron-0.8.1 \
 		roots-0.0.8 \
 		roxmltree-0.14.1 \
@@ -596,10 +588,8 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		stacker-0.1.15 \
 		static_assertions-1.1.0 \
 		stb_truetype-0.3.1 \
-		stdweb-0.1.3 \
 		str-buf-1.0.6 \
 		strict-num-0.1.1 \
-		strsim-0.10.0 \
 		strsim-0.11.0 \
 		strum-0.24.1 \
 		strum-0.26.2 \
@@ -745,8 +735,11 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		window_clipboard-0.3.0 \
 		windows-0.48.0 \
 		windows-0.51.1 \
+		windows-0.54.0 \
 		windows-core-0.51.1 \
 		windows-core-0.52.0 \
+		windows-core-0.54.0 \
+		windows-result-0.1.0 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 054783027741..e11970826a7c 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1711757008
+TIMESTAMP = 1712175813
 SHA256 (rust/crates/ab_glyph-0.2.23.crate) = 80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225
 SIZE (rust/crates/ab_glyph-0.2.23.crate) = 18537
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -19,8 +19,8 @@ SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2d
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
 SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
 SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
-SHA256 (rust/crates/alsa-0.6.0.crate) = 5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b
-SIZE (rust/crates/alsa-0.6.0.crate) = 68171
+SHA256 (rust/crates/alsa-0.9.0.crate) = 37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce
+SIZE (rust/crates/alsa-0.9.0.crate) = 72602
 SHA256 (rust/crates/alsa-sys-0.3.1.crate) = db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527
 SIZE (rust/crates/alsa-sys-0.3.1.crate) = 32748
 SHA256 (rust/crates/ambient-authority-0.0.2.crate) = e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b
@@ -235,12 +235,12 @@ SHA256 (rust/crates/core-graphics-0.22.3.crate) = 2581bbab3b8ffc6fcbd550bf46c355
 SIZE (rust/crates/core-graphics-0.22.3.crate) = 29514
 SHA256 (rust/crates/core-graphics-types-0.1.3.crate) = 45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf
 SIZE (rust/crates/core-graphics-types-0.1.3.crate) = 7063
-SHA256 (rust/crates/coreaudio-rs-0.10.0.crate) = 11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88
-SIZE (rust/crates/coreaudio-rs-0.10.0.crate) = 34487
+SHA256 (rust/crates/coreaudio-rs-0.11.3.crate) = 321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace
+SIZE (rust/crates/coreaudio-rs-0.11.3.crate) = 42844
 SHA256 (rust/crates/coreaudio-sys-0.2.15.crate) = 7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9
 SIZE (rust/crates/coreaudio-sys-0.2.15.crate) = 5532
-SHA256 (rust/crates/cpal-0.13.5.crate) = 74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116
-SIZE (rust/crates/cpal-0.13.5.crate) = 93790
+SHA256 (rust/crates/cpal-0.15.3.crate) = 873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779
+SIZE (rust/crates/cpal-0.15.3.crate) = 100083
 SHA256 (rust/crates/cpp_demangle-0.3.5.crate) = eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f
 SIZE (rust/crates/cpp_demangle-0.3.5.crate) = 75313
 SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
@@ -311,18 +311,14 @@ SHA256 (rust/crates/d3d12-0.7.0.crate) = e16e44ab292b1dddfdaf7be62cfd8877df52f2f
 SIZE (rust/crates/d3d12-0.7.0.crate) = 17319
 SHA256 (rust/crates/daggy-0.5.0.crate) = 9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2
 SIZE (rust/crates/daggy-0.5.0.crate) = 17832
-SHA256 (rust/crates/darling-0.13.4.crate) = a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c
-SIZE (rust/crates/darling-0.13.4.crate) = 20895
 SHA256 (rust/crates/darling-0.20.8.crate) = 54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391
 SIZE (rust/crates/darling-0.20.8.crate) = 31234
-SHA256 (rust/crates/darling_core-0.13.4.crate) = 859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610
-SIZE (rust/crates/darling_core-0.13.4.crate) = 52937
 SHA256 (rust/crates/darling_core-0.20.8.crate) = 9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f
 SIZE (rust/crates/darling_core-0.20.8.crate) = 64442
-SHA256 (rust/crates/darling_macro-0.13.4.crate) = 9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835
-SIZE (rust/crates/darling_macro-0.13.4.crate) = 1910
 SHA256 (rust/crates/darling_macro-0.20.8.crate) = a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f
 SIZE (rust/crates/darling_macro-0.20.8.crate) = 1856
+SHA256 (rust/crates/dasp_sample-0.11.0.crate) = 0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f
+SIZE (rust/crates/dasp_sample-0.11.0.crate) = 11617
 SHA256 (rust/crates/data-encoding-2.5.0.crate) = 7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5
 SIZE (rust/crates/data-encoding-2.5.0.crate) = 20632
 SHA256 (rust/crates/debugid-0.8.0.crate) = bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d
@@ -629,8 +625,6 @@ SHA256 (rust/crates/ittapi-0.4.0.crate) = 6b996fe614c41395cdaedf3cf408a953485109
 SIZE (rust/crates/ittapi-0.4.0.crate) = 7446
 SHA256 (rust/crates/ittapi-sys-0.4.0.crate) = 52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc
 SIZE (rust/crates/ittapi-sys-0.4.0.crate) = 144943
-SHA256 (rust/crates/jni-0.19.0.crate) = c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec
-SIZE (rust/crates/jni-0.19.0.crate) = 65890
 SHA256 (rust/crates/jni-0.21.1.crate) = 1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97
 SIZE (rust/crates/jni-0.21.1.crate) = 105028
 SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
@@ -751,24 +745,18 @@ SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf479
 SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
 SHA256 (rust/crates/native-dialog-0.6.4.crate) = 1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b
 SIZE (rust/crates/native-dialog-0.6.4.crate) = 19342
-SHA256 (rust/crates/ndk-0.6.0.crate) = 2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4
-SIZE (rust/crates/ndk-0.6.0.crate) = 39828
 SHA256 (rust/crates/ndk-0.7.0.crate) = 451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0
 SIZE (rust/crates/ndk-0.7.0.crate) = 54683
+SHA256 (rust/crates/ndk-0.8.0.crate) = 2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7
+SIZE (rust/crates/ndk-0.8.0.crate) = 79770
 SHA256 (rust/crates/ndk-context-0.1.1.crate) = 27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b
 SIZE (rust/crates/ndk-context-0.1.1.crate) = 2205
-SHA256 (rust/crates/ndk-glue-0.6.2.crate) = 0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f
-SIZE (rust/crates/ndk-glue-0.6.2.crate) = 5227
-SHA256 (rust/crates/ndk-macro-0.3.0.crate) = 0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c
-SIZE (rust/crates/ndk-macro-0.3.0.crate) = 4884
-SHA256 (rust/crates/ndk-sys-0.3.0.crate) = 6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97
-SIZE (rust/crates/ndk-sys-0.3.0.crate) = 282815
 SHA256 (rust/crates/ndk-sys-0.4.1+23.1.7779620.crate) = 3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3
 SIZE (rust/crates/ndk-sys-0.4.1+23.1.7779620.crate) = 291699
+SHA256 (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691
+SIZE (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 307233
 SHA256 (rust/crates/nibble_vec-0.1.0.crate) = 77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43
 SIZE (rust/crates/nibble_vec-0.1.0.crate) = 11796
-SHA256 (rust/crates/nix-0.23.2.crate) = 8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c
-SIZE (rust/crates/nix-0.23.2.crate) = 242042
 SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069
 SIZE (rust/crates/nix-0.24.3.crate) = 266843
 SHA256 (rust/crates/nix-0.25.1.crate) = f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4
@@ -805,8 +793,6 @@ SHA256 (rust/crates/num-complex-0.4.5.crate) = 23c6602fda94a57c990fe0df199a035d8
 SIZE (rust/crates/num-complex-0.4.5.crate) = 29614
 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
 SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
-SHA256 (rust/crates/num-derive-0.3.3.crate) = 876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d
-SIZE (rust/crates/num-derive-0.3.3.crate) = 14545
 SHA256 (rust/crates/num-derive-0.4.2.crate) = ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202
 SIZE (rust/crates/num-derive-0.4.2.crate) = 14709
 SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
@@ -825,10 +811,14 @@ SHA256 (rust/crates/num_enum-0.5.11.crate) = 1f646caf906c20226733ed5b1374287eb97
 SIZE (rust/crates/num_enum-0.5.11.crate) = 16772
 SHA256 (rust/crates/num_enum-0.6.1.crate) = 7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1
 SIZE (rust/crates/num_enum-0.6.1.crate) = 17911
+SHA256 (rust/crates/num_enum-0.7.2.crate) = 02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845
+SIZE (rust/crates/num_enum-0.7.2.crate) = 18571
 SHA256 (rust/crates/num_enum_derive-0.5.11.crate) = dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799
 SIZE (rust/crates/num_enum_derive-0.5.11.crate) = 15552
 SHA256 (rust/crates/num_enum_derive-0.6.1.crate) = 96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6
 SIZE (rust/crates/num_enum_derive-0.6.1.crate) = 15403
+SHA256 (rust/crates/num_enum_derive-0.7.2.crate) = 681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b
+SIZE (rust/crates/num_enum_derive-0.7.2.crate) = 17090
 SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
 SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
 SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1
@@ -847,10 +837,10 @@ SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b
 SIZE (rust/crates/objc_id-0.1.1.crate) = 3258
 SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
 SIZE (rust/crates/object-0.32.2.crate) = 286994
-SHA256 (rust/crates/oboe-0.4.6.crate) = 27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1
-SIZE (rust/crates/oboe-0.4.6.crate) = 24067
-SHA256 (rust/crates/oboe-sys-0.4.5.crate) = 3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd
-SIZE (rust/crates/oboe-sys-0.4.5.crate) = 140656
+SHA256 (rust/crates/oboe-0.6.1.crate) = e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb
+SIZE (rust/crates/oboe-0.6.1.crate) = 24588
+SHA256 (rust/crates/oboe-sys-0.6.1.crate) = 6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d
+SIZE (rust/crates/oboe-sys-0.6.1.crate) = 169091
 SHA256 (rust/crates/ogg-0.8.0.crate) = 6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e
 SIZE (rust/crates/ogg-0.8.0.crate) = 27128
 SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
@@ -877,12 +867,8 @@ SHA256 (rust/crates/packed_simd-0.3.9.crate) = 1f9f08af0c877571712e2e3e686ad79ef
 SIZE (rust/crates/packed_simd-0.3.9.crate) = 98340
 SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae
 SIZE (rust/crates/parking-2.2.0.crate) = 9730
-SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
-SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869
 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
 SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
-SHA256 (rust/crates/parking_lot_core-0.8.6.crate) = 60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc
-SIZE (rust/crates/parking_lot_core-0.8.6.crate) = 32567
 SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
 SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
 SHA256 (rust/crates/parse-zoneinfo-0.3.0.crate) = c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41
@@ -1001,8 +987,6 @@ SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caa
 SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
 SHA256 (rust/crates/rcgen-0.12.1.crate) = 48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1
 SIZE (rust/crates/rcgen-0.12.1.crate) = 63815
-SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
-SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
 SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29
 SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404
 SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
@@ -1039,8 +1023,8 @@ SHA256 (rust/crates/rmp-0.8.12.crate) = 7f9860a6cc38ed1da53456442089b4dfa35e7ced
 SIZE (rust/crates/rmp-0.8.12.crate) = 28844
 SHA256 (rust/crates/rmp-serde-1.1.2.crate) = bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a
 SIZE (rust/crates/rmp-serde-1.1.2.crate) = 30388
-SHA256 (rust/crates/rodio-0.15.0.crate) = ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e
-SIZE (rust/crates/rodio-0.15.0.crate) = 7414161
+SHA256 (rust/crates/rodio-0.17.3.crate) = 3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611
+SIZE (rust/crates/rodio-0.17.3.crate) = 59247
 SHA256 (rust/crates/ron-0.8.1.crate) = b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94
 SIZE (rust/crates/ron-0.8.1.crate) = 63251
 SHA256 (rust/crates/roots-0.0.8.crate) = 082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058
@@ -1195,14 +1179,10 @@ SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1
 SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
 SHA256 (rust/crates/stb_truetype-0.3.1.crate) = f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51
 SIZE (rust/crates/stb_truetype-0.3.1.crate) = 22111
-SHA256 (rust/crates/stdweb-0.1.3.crate) = ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e
-SIZE (rust/crates/stdweb-0.1.3.crate) = 90221
 SHA256 (rust/crates/str-buf-1.0.6.crate) = 9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0
 SIZE (rust/crates/str-buf-1.0.6.crate) = 3828
 SHA256 (rust/crates/strict-num-0.1.1.crate) = 6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731
 SIZE (rust/crates/strict-num-0.1.1.crate) = 5104
-SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
-SIZE (rust/crates/strsim-0.10.0.crate) = 11355
 SHA256 (rust/crates/strsim-0.11.0.crate) = 5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01
 SIZE (rust/crates/strsim-0.11.0.crate) = 13710
 SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f
@@ -1493,10 +1473,16 @@ SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb8150
 SIZE (rust/crates/windows-0.48.0.crate) = 11864177
 SHA256 (rust/crates/windows-0.51.1.crate) = ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9
 SIZE (rust/crates/windows-0.51.1.crate) = 12250614
+SHA256 (rust/crates/windows-0.54.0.crate) = 9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49
+SIZE (rust/crates/windows-0.54.0.crate) = 11096265
 SHA256 (rust/crates/windows-core-0.51.1.crate) = f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64
 SIZE (rust/crates/windows-core-0.51.1.crate) = 42364
 SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
 SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-core-0.54.0.crate) = 12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65
+SIZE (rust/crates/windows-core-0.54.0.crate) = 44015
+SHA256 (rust/crates/windows-result-0.1.0.crate) = cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64
+SIZE (rust/crates/windows-result-0.1.0.crate) = 10486
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
@@ -1629,5 +1615,5 @@ SHA256 (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = ff1056ad3df5df0604440a4a
 SIZE (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = 1130634
 SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f
 SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210
-SHA256 (veloren-v0.16.0.tar.bz2) = 82b59ef378deff21d229e914b2ed9c45fbb911fc77386519b97d3bf2c08c1587
-SIZE (veloren-v0.16.0.tar.bz2) = 298930444
+SHA256 (veloren-v0.16.0-22-g2f0c83992.tar.bz2) = 971be85e33c3af605198c563dd5f24cf7d0fd0d07327614408db5345a9b559fb
+SIZE (veloren-v0.16.0-22-g2f0c83992.tar.bz2) = 299309537
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index 92332d3aadce..1a01e3399772 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	2024-03-20 22:12:47 UTC
+--- Cargo.lock.orig	2024-04-03 20:23:33 UTC
 +++ Cargo.lock
-@@ -2515,9 +2515,9 @@ dependencies = [
+@@ -2484,9 +2484,9 @@ name = "gilrs"
  
  [[package]]
  name = "gilrs"
@@ -37,7 +37,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "fnv",
   "gilrs-core",
-@@ -2529,24 +2529,23 @@ dependencies = [
+@@ -2498,24 +2498,23 @@ name = "gilrs-core"
  
  [[package]]
  name = "gilrs-core"
@@ -66,11 +66,10 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  ]
  
  [[package]]
-@@ -3181,17 +3180,6 @@ dependencies = [
-  "libc",
+@@ -3151,17 +3150,6 @@ dependencies = [
  ]
  
--[[package]]
+ [[package]]
 -name = "inotify"
 -version = "0.10.2"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -81,10 +80,11 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
 - "libc",
 -]
 -
- [[package]]
+-[[package]]
  name = "inotify-sys"
  version = "0.1.5"
-@@ -3243,9 +3231,9 @@ dependencies = [
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -3212,9 +3200,9 @@ name = "io-kit-sys"
  
  [[package]]
  name = "io-kit-sys"
@@ -96,12 +96,10 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "core-foundation-sys",
   "mach2",
-@@ -4054,6 +4042,17 @@ dependencies = [
-  "memoffset 0.6.5",
- ]
+@@ -3971,6 +3959,17 @@ name = "nix"
  
-+[[package]]
-+name = "nix"
+ [[package]]
+ name = "nix"
 +version = "0.26.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
@@ -111,10 +109,12 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
 + "libc",
 +]
 +
- [[package]]
- name = "nix"
++[[package]]
++name = "nix"
  version = "0.28.0"
-@@ -4102,7 +4101,7 @@ dependencies = [
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+@@ -4017,7 +4016,7 @@ dependencies = [
   "crossbeam-channel",
   "filetime",
   "fsevent-sys",
@@ -123,7 +123,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "kqueue",
   "libc",
   "log",
-@@ -6739,7 +6738,7 @@ version = "1.6.3"
+@@ -6618,7 +6617,7 @@ dependencies = [
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
  dependencies = [
@@ -132,49 +132,6 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "rand 0.8.5",
   "static_assertions",
  ]
-@@ -8409,16 +8408,6 @@ dependencies = [
-  "windows-targets 0.48.5",
- ]
- 
--[[package]]
--name = "windows"
--version = "0.54.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
--dependencies = [
-- "windows-core 0.54.0",
-- "windows-targets 0.52.4",
--]
--
- [[package]]
- name = "windows-core"
- version = "0.51.1"
-@@ -8437,25 +8426,6 @@ dependencies = [
-  "windows-targets 0.52.4",
- ]
- 
--[[package]]
--name = "windows-core"
--version = "0.54.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
--dependencies = [
-- "windows-result",
-- "windows-targets 0.52.4",
--]
--
--[[package]]
--name = "windows-result"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64"
--dependencies = [
-- "windows-targets 0.52.4",
--]
--
- [[package]]
- name = "windows-sys"
- version = "0.45.0"
 --- 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;