git: 6b3e4babafb2 - 2023Q3 - games/veloren-weekly: update to s20230901

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 07 Sep 2023 00:31:46 UTC
The branch 2023Q3 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6b3e4babafb2019ea054d187704f9a859bcc358c

commit 6b3e4babafb2019ea054d187704f9a859bcc358c
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-09-01 18:14:24 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-07 00:31:34 +0000

    games/veloren-weekly: update to s20230901
    
    Changes:        https://gitlab.com/veloren/veloren/-/compare/78b2443ed...19742bb93
    (cherry picked from commit c57cfd0f4229d649ae9447fbcfcfaef518da638d)
---
 games/veloren-weekly/Makefile          | 4 ++--
 games/veloren-weekly/distinfo          | 6 +++---
 games/veloren-weekly/files/patch-gilrs | 2 +-
 games/veloren-weekly/files/patch-i386  | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index c09f33367b29..dd71b4a5be04 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	veloren
-PORTVERSION=	s20230830
+PORTVERSION=	s20230901
 CATEGORIES=	games wayland
 PKGNAMESUFFIX=	-weekly
 
@@ -24,7 +24,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_COMMIT=	78b2443edc4bf09ff3dc6e8cad7b7a3887ef584e
+GL_COMMIT=	19742bb9300fb0be9fdc92f30766c95230a8a371
 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 ab8583701cfd..f3deec929a71 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1693397332
+TIMESTAMP = 1693592064
 SHA256 (rust/crates/ab_glyph-0.2.21.crate) = 5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39
 SIZE (rust/crates/ab_glyph-0.2.21.crate) = 17764
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -1535,5 +1535,5 @@ SHA256 (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = f6fc0
 SIZE (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = 90485
 SHA256 (Imberflur-winit-raw-window-handle-0.4-retro-support-v1_GH0.tar.gz) = 55b7e0bfdf87aca662e4ae0a8abd4cbe0cf5d2d2e9f9a61f8b40f02ab769d04f
 SIZE (Imberflur-winit-raw-window-handle-0.4-retro-support-v1_GH0.tar.gz) = 402612
-SHA256 (veloren-veloren-78b2443edc4bf09ff3dc6e8cad7b7a3887ef584e_GL0.tar.gz) = 6de40aec5643bff09407d75cc8e2aedb3ea284598eed20737f64bf7d9e313a79
-SIZE (veloren-veloren-78b2443edc4bf09ff3dc6e8cad7b7a3887ef584e_GL0.tar.gz) = 269734589
+SHA256 (veloren-veloren-19742bb9300fb0be9fdc92f30766c95230a8a371_GL0.tar.gz) = 9d5e9b1e7ad85467fc672483b05e0e787bc2e217aca42b19cad1d7ae7f33c420
+SIZE (veloren-veloren-19742bb9300fb0be9fdc92f30766c95230a8a371_GL0.tar.gz) = 269737005
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index a488f3438d1f..c92fe9ad3aa5 100644
--- a/games/veloren-weekly/files/patch-gilrs
+++ b/games/veloren-weekly/files/patch-gilrs
@@ -1,5 +1,5 @@
 Temporarily revert https://gitlab.com/gilrs-project/gilrs/-/commit/7cd001dacfb1
-until https://github.com/nix-rust/nix/issues/2037
+until https://gitlab.com/gilrs-project/gilrs/-/issues/145
 
 error[E0432]: unresolved import `nix::sys::epoll`
   --> cargo-crates/gilrs-core-0.5.5/src/platform/linux/gamepad.rs:21:15
diff --git a/games/veloren-weekly/files/patch-i386 b/games/veloren-weekly/files/patch-i386
index f9ccdf51a9c1..2dd39fcca4b6 100644
--- a/games/veloren-weekly/files/patch-i386
+++ b/games/veloren-weekly/files/patch-i386
@@ -1,3 +1,5 @@
+https://gitlab.com/veloren/veloren/-/merge_requests/4103
+
 error[E0308]: mismatched types
    --> rtsim/src/gen/mod.rs:30:43
     |