games/veloren-weekly: update to s20241002

Changes:	veloren/veloren@25b46dfe...167e02eb

games/veloren-weekly/Makefile

 PORTNAME=	veloren
-PORTVERSION=	s20240926
+PORTVERSION=	s20241002
 CATEGORIES=	games wayland
 PKGNAMESUFFIX=	-weekly
 
@@ -26,7 +26,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-480-g25b46dfe7 # git describe --match='v[0-9]*' weekly
+GL_TAGNAME=	v0.16.0-511-g167e02ebb # 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 \

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-09-25 14:13:48 UTC
+--- Cargo.lock.orig	2024-10-02 08:29:50 UTC
 +++ Cargo.lock
-@@ -844,12 +844,6 @@ version = "0.1.1"
+@@ -867,12 +867,6 @@ version = "0.1.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
  
@@ -38,26 +38,26 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  [[package]]
  name = "chrono"
  version = "0.4.38"
-@@ -2585,9 +2579,9 @@ dependencies = [
+@@ -2613,9 +2607,9 @@ dependencies = [
  
  [[package]]
  name = "gilrs"
--version = "0.10.7"
+-version = "0.10.10"
 +version = "0.10.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b54e5e39844ab5cddaf3bbbdfdc2923a6cb34e36818b95618da4e3f26302c24c"
+-checksum = "a556964c6d62458084356ce9770676f5104bd667e12e9a795691076e8a17c5cf"
 +checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a"
  dependencies = [
   "fnv",
   "gilrs-core",
-@@ -2599,24 +2593,23 @@ dependencies = [
+@@ -2627,24 +2621,23 @@ dependencies = [
  
  [[package]]
  name = "gilrs-core"
--version = "0.5.12"
+-version = "0.5.15"
 +version = "0.5.7"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b922f294d9f062af517ea0bd0a036ddcf11c2842211c2f9c71a3ceee859e10b6"
+-checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4"
 +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
  dependencies = [
   "core-foundation",
@@ -74,12 +74,12 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "vec_map",
   "wasm-bindgen",
   "web-sys",
-- "windows 0.57.0",
+- "windows 0.58.0",
 + "windows 0.51.1",
  ]
  
  [[package]]
-@@ -3293,17 +3286,6 @@ dependencies = [
+@@ -3326,17 +3319,6 @@ dependencies = [
   "libc",
  ]
  
@@ -97,7 +97,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  [[package]]
  name = "inotify-sys"
  version = "0.1.5"
-@@ -3355,9 +3337,9 @@ dependencies = [
+@@ -3388,9 +3370,9 @@ dependencies = [
  
  [[package]]
  name = "io-kit-sys"
@@ -109,7 +109,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "core-foundation-sys",
   "mach2",
-@@ -4152,25 +4134,24 @@ dependencies = [
+@@ -4192,25 +4174,24 @@ dependencies = [
  
  [[package]]
  name = "nix"
@@ -141,7 +141,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "libc",
  ]
  
-@@ -4211,7 +4192,7 @@ dependencies = [
+@@ -4251,7 +4232,7 @@ dependencies = [
   "crossbeam-channel",
   "filetime",
   "fsevent-sys",
@@ -150,7 +150,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "kqueue",
   "libc",
   "log",
-@@ -6911,7 +6892,7 @@ version = "1.6.3"
+@@ -7041,7 +7022,7 @@ version = "1.6.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
  dependencies = [
@@ -159,65 +159,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "rand",
   "static_assertions",
  ]
-@@ -8620,16 +8601,6 @@ dependencies = [
-  "windows-targets 0.52.5",
- ]
- 
--[[package]]
--name = "windows"
--version = "0.57.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
--dependencies = [
-- "windows-core 0.57.0",
-- "windows-targets 0.52.5",
--]
--
- [[package]]
- name = "windows-core"
- version = "0.51.1"
-@@ -8649,40 +8620,6 @@ dependencies = [
-  "windows-targets 0.52.5",
- ]
- 
--[[package]]
--name = "windows-core"
--version = "0.57.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
--dependencies = [
-- "windows-implement",
-- "windows-interface",
-- "windows-result",
-- "windows-targets 0.52.5",
--]
--
--[[package]]
--name = "windows-implement"
--version = "0.57.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
--dependencies = [
-- "proc-macro2 1.0.86",
-- "quote 1.0.36",
-- "syn 2.0.71",
--]
--
--[[package]]
--name = "windows-interface"
--version = "0.57.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
--dependencies = [
-- "proc-macro2 1.0.86",
-- "quote 1.0.36",
-- "syn 2.0.71",
--]
--
- [[package]]
- name = "windows-result"
- version = "0.1.2"
-@@ -8905,7 +8842,7 @@ checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
+@@ -9076,7 +9057,7 @@ checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
  dependencies = [
   "android-activity",
   "bitflags 1.3.2",

games/veloren-weekly/files/patch-rustls-native-certs

-https://github.com/rustls/rustls-native-certs/issues/28
-https://github.com/rustls/rustls-native-certs/commit/8162b232045e
-
---- cargo-crates/rustls-native-certs-0.7.0/src/unix.rs.orig	1970-01-01 00:00:00 UTC
-+++ cargo-crates/rustls-native-certs-0.7.0/src/unix.rs
-@@ -2,13 +2,27 @@ use pki_types::CertificateDer;
- 
- use pki_types::CertificateDer;
- 
-+use std::fs;
- use std::io::Error;
- 
- pub fn load_native_certs() -> Result<Vec<CertificateDer<'static>>, Error> {
-     let likely_locations = openssl_probe::probe();
- 
--    match likely_locations.cert_file {
--        Some(cert_file) => load_pem_certs(&cert_file),
--        None => Ok(Vec::new()),
-+    let mut certs = match likely_locations.cert_file {
-+        Some(cert_file) => load_pem_certs(&cert_file)?,
-+        None => Vec::new(),
-+    };
-+
-+    if let Some(cert_dir) = likely_locations.cert_dir {
-+        let dir_reader = fs::read_dir(cert_dir)?;
-+        for entry in dir_reader {
-+            let entry = entry?;
-+            let path = entry.path();
-+            if fs::metadata(&path)?.is_file() {
-+                certs.append(&mut load_pem_certs(&path)?);
-+            }
-+        }
-     }
-+
-+    Ok(certs)
- }

games/veloren-weekly/files/patch-vek

@@ -10,8 +10,8 @@ error[E0658]: use of unstable library feature 'portable_simd'
    = help: add `#![feature(portable_simd)]` to the crate attributes to enable
    = note: this compiler was built on 2024-04-29; consider upgrading it if it is out of date
 
---- cargo-crates/vek-0.17.0/build.rs.orig	1970-01-01 00:00:00 UTC
-+++ cargo-crates/vek-0.17.0/build.rs
+--- cargo-crates/vek-0.17.1/build.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/vek-0.17.1/build.rs
 @@ -4,23 +4,6 @@ fn main() {
  fn main() {
      assert!(version().unwrap().major >= 1);

games/veloren-weekly/files/patch-wgpu-nvidia

 https://gitlab.com/veloren/veloren/-/issues/1975
 
---- ../wgpu-0.18-with-fixes-for-veloren-v1/wgpu/src/backend/direct.rs.orig	2024-02-09 04:29:29 UTC
-+++ ../wgpu-0.18-with-fixes-for-veloren-v1/wgpu/src/backend/direct.rs
+--- ../wgpu-0.18-with-fixes-for-veloren-v2/wgpu/src/backend/direct.rs.orig	2024-09-27 04:53:27 UTC
++++ ../wgpu-0.18-with-fixes-for-veloren-v2/wgpu/src/backend/direct.rs
 @@ -2279,9 +2279,7 @@ impl crate::Context for Context {
              &size
          )) {