git: 5dc5a7ec9018 - main - games/veloren-weekly: update to s20231018
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 19 Oct 2023 00:36:42 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5dc5a7ec901805d8f25b64f4656a4b1452b521c3
commit 5dc5a7ec901805d8f25b64f4656a4b1452b521c3
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-10-18 12:03:13 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-10-19 00:32:42 +0000
games/veloren-weekly: update to s20231018
Changes: https://gitlab.com/veloren/veloren/-/compare/0d5017932...8babe6535
---
games/veloren-weekly/Makefile | 4 ++--
games/veloren-weekly/Makefile.crates | 11 +++++++++++
games/veloren-weekly/distinfo | 28 +++++++++++++++++++++++++---
games/veloren-weekly/files/patch-rust-1.72 | 19 +++++++++++++++++++
4 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 4a178f746ac3..73965dba4c2d 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= veloren
-PORTVERSION= s20231016
+PORTVERSION= s20231018
CATEGORIES= games wayland
PKGNAMESUFFIX= -weekly
@@ -23,7 +23,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.15.0-494-g0d5017932 # git describe --match='v[0-9]*' weekly
+GL_TAGNAME= v0.15.0-527-g8babe6535 # 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 6f714a8df292..689a4767eebc 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -41,6 +41,8 @@ CARGO_CRATES= ab_glyph-0.2.21 \
atomic_refcell-0.1.11 \
atomicwrites-0.4.1 \
autocfg-1.1.0 \
+ axum-0.6.20 \
+ axum-core-0.3.4 \
backtrace-0.3.69 \
base-x-0.2.11 \
base64-0.13.1 \
@@ -319,6 +321,7 @@ CARGO_CRATES= ab_glyph-0.2.21 \
macro_rules_attribute-proc_macro-0.1.3 \
malloc_buf-0.0.6 \
matchers-0.1.0 \
+ matchit-0.7.3 \
maybe-uninit-2.0.0 \
memchr-2.5.0 \
memmap2-0.5.10 \
@@ -329,6 +332,7 @@ CARGO_CRATES= ab_glyph-0.2.21 \
memoffset-0.9.0 \
metal-0.22.0 \
mimalloc-0.1.38 \
+ mime-0.3.17 \
minifb-0.24.0 \
minimal-lexical-0.2.1 \
miniz_oxide-0.7.1 \
@@ -416,6 +420,8 @@ CARGO_CRATES= ab_glyph-0.2.21 \
phf_codegen-0.11.2 \
phf_generator-0.11.2 \
phf_shared-0.11.2 \
+ pin-project-1.1.3 \
+ pin-project-internal-1.1.3 \
pin-project-lite-0.2.13 \
pin-utils-0.1.0 \
piston-float-0.3.0 \
@@ -527,8 +533,10 @@ CARGO_CRATES= ab_glyph-0.2.21 \
serde-wasm-bindgen-0.4.5 \
serde_derive-1.0.188 \
serde_json-1.0.105 \
+ serde_path_to_error-0.1.14 \
serde_repr-0.1.16 \
serde_spanned-0.6.3 \
+ serde_urlencoded-0.7.1 \
sha1-0.6.1 \
sha1_smol-1.0.0 \
sha2-0.10.7 \
@@ -585,6 +593,7 @@ CARGO_CRATES= ab_glyph-0.2.21 \
syn-0.15.44 \
syn-1.0.109 \
syn-2.0.29 \
+ sync_wrapper-0.1.2 \
tap-1.0.1 \
tar-0.4.40 \
target-lexicon-0.12.11 \
@@ -616,6 +625,8 @@ CARGO_CRATES= ab_glyph-0.2.21 \
toml-0.7.6 \
toml_datetime-0.6.3 \
toml_edit-0.19.14 \
+ tower-0.4.13 \
+ tower-layer-0.3.2 \
tower-service-0.3.2 \
tracing-0.1.37 \
tracing-appender-0.2.2 \
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 65ffe035e030..d9d6c895fa9b 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1697486406
+TIMESTAMP = 1697669084
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
@@ -85,6 +85,10 @@ SHA256 (rust/crates/atomicwrites-0.4.1.crate) = c1163d9d7c51de51a2b79d6df5e8888d
SIZE (rust/crates/atomicwrites-0.4.1.crate) = 6341
SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/axum-0.6.20.crate) = 3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf
+SIZE (rust/crates/axum-0.6.20.crate) = 146227
+SHA256 (rust/crates/axum-core-0.3.4.crate) = 759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c
+SIZE (rust/crates/axum-core-0.3.4.crate) = 21088
SHA256 (rust/crates/backtrace-0.3.69.crate) = 2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837
SIZE (rust/crates/backtrace-0.3.69.crate) = 77299
SHA256 (rust/crates/base-x-0.2.11.crate) = 4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270
@@ -641,6 +645,8 @@ SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218e
SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
SIZE (rust/crates/matchers-0.1.0.crate) = 6948
+SHA256 (rust/crates/matchit-0.7.3.crate) = 0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94
+SIZE (rust/crates/matchit-0.7.3.crate) = 30372
SHA256 (rust/crates/maybe-uninit-2.0.0.crate) = 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00
SIZE (rust/crates/maybe-uninit-2.0.0.crate) = 11809
SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
@@ -661,6 +667,8 @@ SHA256 (rust/crates/metal-0.22.0.crate) = 1c12e48c737ee9a55e8bb2352bcde588f79ae3
SIZE (rust/crates/metal-0.22.0.crate) = 679289
SHA256 (rust/crates/mimalloc-0.1.38.crate) = 972e5f23f6716f62665760b0f4cbf592576a80c7b879ba9beaafc0e558894127
SIZE (rust/crates/mimalloc-0.1.38.crate) = 4423
+SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
+SIZE (rust/crates/mime-0.3.17.crate) = 15712
SHA256 (rust/crates/minifb-0.24.0.crate) = c66a1fdd7e946fe33fe9725012e25836bba3655769bee9ee347cce7de3f396df
SIZE (rust/crates/minifb-0.24.0.crate) = 95691
SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
@@ -835,6 +843,10 @@ SHA256 (rust/crates/phf_generator-0.11.2.crate) = 48e4cc64c2ad9ebe670cb8fd69dd50
SIZE (rust/crates/phf_generator-0.11.2.crate) = 14190
SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
+SHA256 (rust/crates/pin-project-1.1.3.crate) = fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422
+SIZE (rust/crates/pin-project-1.1.3.crate) = 57740
+SHA256 (rust/crates/pin-project-internal-1.1.3.crate) = 4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405
+SIZE (rust/crates/pin-project-internal-1.1.3.crate) = 27824
SHA256 (rust/crates/pin-project-lite-0.2.13.crate) = 8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58
SIZE (rust/crates/pin-project-lite-0.2.13.crate) = 29141
SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
@@ -1057,10 +1069,14 @@ SHA256 (rust/crates/serde_derive-1.0.188.crate) = 4eca7ac642d82aa35b60049a6eccb4
SIZE (rust/crates/serde_derive-1.0.188.crate) = 55563
SHA256 (rust/crates/serde_json-1.0.105.crate) = 693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360
SIZE (rust/crates/serde_json-1.0.105.crate) = 146316
+SHA256 (rust/crates/serde_path_to_error-0.1.14.crate) = 4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335
+SIZE (rust/crates/serde_path_to_error-0.1.14.crate) = 16553
SHA256 (rust/crates/serde_repr-0.1.16.crate) = 8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00
SIZE (rust/crates/serde_repr-0.1.16.crate) = 9629
SHA256 (rust/crates/serde_spanned-0.6.3.crate) = 96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186
SIZE (rust/crates/serde_spanned-0.6.3.crate) = 7737
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
SHA256 (rust/crates/sha1-0.6.1.crate) = c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770
SIZE (rust/crates/sha1-0.6.1.crate) = 2931
SHA256 (rust/crates/sha1_smol-1.0.0.crate) = ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012
@@ -1173,6 +1189,8 @@ SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67
SIZE (rust/crates/syn-1.0.109.crate) = 237611
SHA256 (rust/crates/syn-2.0.29.crate) = c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a
SIZE (rust/crates/syn-2.0.29.crate) = 241664
+SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
+SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
SIZE (rust/crates/tap-1.0.1.crate) = 11316
SHA256 (rust/crates/tar-0.4.40.crate) = b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb
@@ -1235,6 +1253,10 @@ SHA256 (rust/crates/toml_datetime-0.6.3.crate) = 7cda73e2f1397b1262d6dfdcef8aafa
SIZE (rust/crates/toml_datetime-0.6.3.crate) = 10770
SHA256 (rust/crates/toml_edit-0.19.14.crate) = f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a
SIZE (rust/crates/toml_edit-0.19.14.crate) = 94875
+SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
+SIZE (rust/crates/tower-0.4.13.crate) = 106906
+SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0
+SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023
SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
SHA256 (rust/crates/tracing-0.1.37.crate) = 8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8
@@ -1527,5 +1549,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-v0.15.0-494-g0d5017932.tar.bz2) = 4676efe3e529de48880c31d33c4792a2af8333a0859bccd440d7925525ae41c9
-SIZE (veloren-v0.15.0-494-g0d5017932.tar.bz2) = 270014420
+SHA256 (veloren-v0.15.0-527-g8babe6535.tar.bz2) = 41c24cf2e644e3b8bdac72e3fa9a71ce75664b917fa0db66c44f63c52436c1e9
+SIZE (veloren-v0.15.0-527-g8babe6535.tar.bz2) = 270014145
diff --git a/games/veloren-weekly/files/patch-rust-1.72 b/games/veloren-weekly/files/patch-rust-1.72
new file mode 100644
index 000000000000..c8fc812a243d
--- /dev/null
+++ b/games/veloren-weekly/files/patch-rust-1.72
@@ -0,0 +1,19 @@
+Drop after lang/rust >= 1.74 update
+
+error[E0658]: use of unstable library feature 'io_error_other'
+ --> common/assets/src/tar_source.rs:147:42
+ |
+147 | entry.path().map_err(io::Error::other)?.as_ref(),
+ | ^^^^^^^^^^^^^^^^
+ |
+ = note: see issue #91946 <https://github.com/rust-lang/rust/issues/91946> for more information
+ = help: add `#![feature(io_error_other)]` to the crate attributes to enable
+
+--- common/assets/src/lib.rs.orig 2023-10-18 12:03:13 UTC
++++ common/assets/src/lib.rs
+@@ -1,4 +1,5 @@
+ //#![warn(clippy::pedantic)]
++#![feature(io_error_other)]
+ //! Load assets (images or voxel data) from files
+
+ use dot_vox::DotVoxData;