git: d4bc82225c24 - main - games/veloren-weekly: update to s20250219
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Feb 2025 00:56:40 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d4bc82225c2428f1eea46d1a876a6bca5b7a55fd
commit d4bc82225c2428f1eea46d1a876a6bca5b7a55fd
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-02-19 10:27:05 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-02-20 00:55:02 +0000
games/veloren-weekly: update to s20250219
Changes: https://gitlab.com/veloren/veloren/-/compare/ffb66948c...4be8a78ed
---
games/veloren-weekly/Makefile | 4 ++--
games/veloren-weekly/distinfo | 6 +++---
games/veloren-weekly/files/patch-rust-1.84 | 29 +++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index e476d02db590..729ce618ec9b 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= veloren
-PORTVERSION= s20250213
+PORTVERSION= s20250219
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-157-gffb66948c # git describe --match='v[0-9]*' weekly
+GL_TAGNAME= v0.17.0-219-g4be8a78ed # 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/distinfo b/games/veloren-weekly/distinfo
index 40ad0468b2dc..12c1b04f4af7 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1739429008
+TIMESTAMP = 1740008051
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
@@ -1801,5 +1801,5 @@ SHA256 (Imberflur-wgpu-0.18-with-fixes-for-veloren-v2_GH0.tar.gz) = eaf65f3809d3
SIZE (Imberflur-wgpu-0.18-with-fixes-for-veloren-v2_GH0.tar.gz) = 10001880
SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f
SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210
-SHA256 (veloren-v0.17.0-157-gffb66948c.tar.bz2) = bab4737e25f395fe9cac8c45bc0efb220857cad33db168d9f50878373f8e4ab3
-SIZE (veloren-v0.17.0-157-gffb66948c.tar.bz2) = 317776569
+SHA256 (veloren-v0.17.0-219-g4be8a78ed.tar.bz2) = b98c94f894b18870ff2d45192c29c33f2efa0ce9d5c5ba46e803fa49752450ed
+SIZE (veloren-v0.17.0-219-g4be8a78ed.tar.bz2) = 317973450
diff --git a/games/veloren-weekly/files/patch-rust-1.84 b/games/veloren-weekly/files/patch-rust-1.84
index b996c2140343..6f104fa3bee8 100644
--- a/games/veloren-weekly/files/patch-rust-1.84
+++ b/games/veloren-weekly/files/patch-rust-1.84
@@ -19,6 +19,25 @@ note: required by a bound in `Vec::<T, A>::extract_if`
3236 | F: FnMut(&mut T) -> bool,
| ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Vec::<T, A>::extract_if`
+Drop after lang/rust >= 1.86 update per https://github.com/rust-lang/rust/commit/cbd44d799800
+
+error[E0658]: cannot cast `dyn ai::Action<S, R>` to `dyn std::any::Any`, trait upcasting coercion is experimental
+ --> rtsim/src/ai/mod.rs:126:16
+ |
+126 | match (other as &dyn Any).downcast_ref::<Self>() {
+ | ^^^^^
+ |
+error[E0658]: cannot cast `dyn ai::Action<S, R>` to `dyn std::any::Any`, trait upcasting coercion is experimental
+ --> rtsim/src/ai/mod.rs:375:16
+ |
+375 | match (other as &dyn Any).downcast_ref::<Self>() {
+ | ^^^^^
+ |
+ = note: see issue #65991 <https://github.com/rust-lang/rust/issues/65991> for more information
+ = help: add `#![feature(trait_upcasting)]` to the crate attributes to enable
+ = note: this compiler was built on 2025-01-07; consider upgrading it if it is out of date
+ = note: required when coercing `&(dyn ai::Action<S, R> + 'static)` into `&(dyn std::any::Any + 'static)`
+
--- common/systems/src/mount.rs.orig 2025-01-29 18:05:18 UTC
+++ common/systems/src/mount.rs
@@ -71,7 +71,7 @@ impl<'a> System<'a> for Sys {
@@ -39,3 +58,13 @@ note: required by a bound in `Vec::<T, A>::extract_if`
ControlAction::StartInput { input: i, .. }
| ControlAction::CancelInput(i) => {
matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll)
+--- rtsim/src/lib.rs.orig 2025-02-19 10:27:05 UTC
++++ rtsim/src/lib.rs
+@@ -137,6 +137,7 @@
+ //! See [`rule::npc_ai`].
+
+ #![feature(never_type, let_chains, binary_heap_drain_sorted)]
++#![feature(trait_upcasting)]
+
+ pub mod ai;
+ pub mod data;