games/veloren-weekly: update to s20250611

Changes:	https://gitlab.com/veloren/veloren/-/compare/ef560ce9f1...b78d089fa7

4 files changed, 207 insertions, 25 deletions

diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 9743bb91e9ae..270f04a9d55d 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	veloren
-PORTVERSION=	s20250527
-PORTREVISION=	1
+PORTVERSION=	s20250611
 CATEGORIES=	games wayland
 PKGNAMESUFFIX=	-weekly
 
@@ -26,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-797-gef560ce9f1 # git describe --match='v[0-9]*' weekly
+GL_TAGNAME=	v0.17.0-803-gb78d089fa7 # 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 f4bb9e556f06..440347f6447b 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -526,7 +526,6 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		ppv-lite86-0.2.21 \
 		presser-0.3.1 \
 		proc-macro-crate-1.3.1 \
-		proc-macro-crate-3.3.0 \
 		proc-macro-hack-0.5.20+deprecated \
 		proc-macro-nested-0.1.7 \
 		proc-macro2-0.4.30 \
@@ -925,11 +924,11 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
 		zune-core-0.4.12 \
 		zune-jpeg-0.4.14 \
 		keyboard-keynames@git+https://gitlab.com/Imbris/keyboard-keynames.git?tag=veloren-winit-0.28\#fca4bbdfa51bf054b155a455935b3792975c989d \
-		kira@git+https://github.com/DaforLynx/kira.git?tag=v0.10.6-with-config\#f1516a8d9599834787adae8bebf78e975d1b73e5 \
 		specs,specs-derive@git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27\#4e2da1df29ee840baa9b936593c45592b7c9ae27 \
 		egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=34691d4e9149deb9cd0bb8cbb5a56bffebf47588\#34691d4e9149deb9cd0bb8cbb5a56bffebf47588 \
 		auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=ae0e16783a9f9041951296885f082308e155db79\#ae0e16783a9f9041951296885f082308e155db79 \
 		iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28\#47243c257c8b8dd6c506b060804cb00b618aa0aa \
 		naga,wgpu,wgpu-core,wgpu-hal,wgpu-types@git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v2\#b35d2bbb407eef00beb41f04688f1741f23d3f05 \
 		portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172 \
-		conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#c74446362371dc837b8b4b6d6ddcd7693b48d9b6
+		conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#c74446362371dc837b8b4b6d6ddcd7693b48d9b6 \
+		kira@git+https://github.com/DaforLynx/kira.git?tag=v0.10.7-with-config\#83dda1845bbf17cc9066fafc98ec47cd843d3ba2
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 0791f288eca3..2f265a897753 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1748364230
+TIMESTAMP = 1749681637
 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
@@ -1055,8 +1055,6 @@ SHA256 (rust/crates/presser-0.3.1.crate) = e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b
 SIZE (rust/crates/presser-0.3.1.crate) = 20946
 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
-SHA256 (rust/crates/proc-macro-crate-3.3.0.crate) = edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35
-SIZE (rust/crates/proc-macro-crate-3.3.0.crate) = 12432
 SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068
 SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045
 SHA256 (rust/crates/proc-macro-nested-0.1.7.crate) = bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086
@@ -1853,8 +1851,6 @@ SHA256 (rust/crates/zune-jpeg-0.4.14.crate) = 99a5bab8d7dedf81405c4bb1f2b83ea057
 SIZE (rust/crates/zune-jpeg-0.4.14.crate) = 63388
 SHA256 (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = cc8baf32868d7c0d52a8c9dea7beaf5f3226433147a63e3a118a3cd710109263
 SIZE (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = 4886
-SHA256 (DaforLynx-kira-v0.10.6-with-config_GH0.tar.gz) = 64abdb203bbcf1c0f572cabcf09dce8417b2ecd10c9b0d23accc46b3aab38755
-SIZE (DaforLynx-kira-v0.10.6-with-config_GH0.tar.gz) = 4378973
 SHA256 (amethyst-specs-4e2da1df29ee840baa9b936593c45592b7c9ae27_GH0.tar.gz) = 0f7a525f61a575d212ecab1860af9166b6453a5ad5f44c5c7bcdcd4a353f6ff9
 SIZE (amethyst-specs-4e2da1df29ee840baa9b936593c45592b7c9ae27_GH0.tar.gz) = 142942
 SHA256 (hasenbanck-egui_wgpu_backend-34691d4e9149deb9cd0bb8cbb5a56bffebf47588_GH0.tar.gz) = 0e60138671e406a80cb19a1995681b1defcfc233353d9833d6c4cd1234c9ffd8
@@ -1869,5 +1865,7 @@ SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.g
 SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210
 SHA256 (veloren-conrod-c74446362371dc837b8b4b6d6ddcd7693b48d9b6_GL0.tar.gz) = 43f0faa196eb33341c8e9952da17876649dd3aade44fd357a3a098eaaeb78e9d
 SIZE (veloren-conrod-c74446362371dc837b8b4b6d6ddcd7693b48d9b6_GL0.tar.gz) = 808402
-SHA256 (veloren-v0.17.0-797-gef560ce9f1.tar.bz2) = 3148d8943f521526ed042f059916247381e3bcca34fda9a984244cf3ae4b3b05
-SIZE (veloren-v0.17.0-797-gef560ce9f1.tar.bz2) = 325870379
+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-803-gb78d089fa7.tar.bz2) = 1f9c0f4d57339a5bebedccef1fcc726731efcb266ae7a8cb885708de7e32acc2
+SIZE (veloren-v0.17.0-803-gb78d089fa7.tar.bz2) = 326011873
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index afe17dcac92f..513d59cbacc7 100644
--- a/games/veloren-weekly/files/patch-gilrs
+++ b/games/veloren-weekly/files/patch-gilrs
@@ -23,8 +23,80 @@ 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-05-07 12:24:01 UTC
+--- Cargo.lock.orig	2025-06-11 22:40:37 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 = [
  
  [[package]]
@@ -63,11 +135,17 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "wasm-bindgen",
   "web-sys",
 - "windows 0.61.1",
-+ "windows 0.51.1",
++ "windows 0.48.0",
  ]
  
  [[package]]
-@@ -3539,9 +3538,9 @@ dependencies = [
+@@ -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",
+ ]
  
  [[package]]
  name = "io-kit-sys"
@@ -79,6 +157,24 @@ 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 = [
   "memoffset 0.6.5",
  ]
@@ -97,16 +193,97 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  [[package]]
  name = "nix"
  version = "0.29.0"
-@@ -7560,7 +7570,7 @@ version = "1.6.3"
+@@ -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"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+ checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
  dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if 0.1.10",
-  "rand 0.8.5",
-  "static_assertions",
+- "windows-sys 0.48.0",
++ "windows-sys 0.59.0",
  ]
-@@ -9342,28 +9352,6 @@ dependencies = [
+ 
+ [[package]]
+@@ -9336,28 +9346,6 @@ dependencies = [
   "windows-targets 0.52.6",
  ]
  
@@ -135,7 +312,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  [[package]]
  name = "windows-core"
  version = "0.51.1"
-@@ -9409,16 +9397,6 @@ dependencies = [
+@@ -9403,16 +9391,6 @@ dependencies = [
   "windows-strings 0.4.0",
  ]
  
@@ -152,7 +329,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  [[package]]
  name = "windows-implement"
  version = "0.58.0"
-@@ -9469,16 +9447,6 @@ version = "0.1.1"
+@@ -9463,16 +9441,6 @@ version = "0.1.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
  
@@ -169,6 +346,15 @@ 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;