git: 09bc34bc055b - 2024Q2 - games/veloren-weekly: update to s20240503
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 09 May 2024 00:56:23 UTC
The branch 2024Q2 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=09bc34bc055b5284865d9e52f7c3a7dc89e9bf04
commit 09bc34bc055b5284865d9e52f7c3a7dc89e9bf04
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-05-03 21:08:24 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-05-09 00:56:06 +0000
games/veloren-weekly: update to s20240503
Changes: https://gitlab.com/veloren/veloren/-/compare/0b9c2621f...9e98d473e
(cherry picked from commit a1c5a15258726c8787cd1f145de8837579cf1ed5)
---
games/veloren-weekly/Makefile | 4 ++--
games/veloren-weekly/Makefile.crates | 7 ++++--
games/veloren-weekly/distinfo | 20 +++++++++++------
games/veloren-weekly/files/patch-gilrs | 41 +++++++++++++---------------------
4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 865b7dab1c9c..a065821d8597 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= veloren
-PORTVERSION= s20240502
+PORTVERSION= s20240503
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.16.0-130-g0b9c2621f # git describe --match='v[0-9]*' weekly
+GL_TAGNAME= v0.16.0-145-g9e98d473e # 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 4c0a53c3096a..baed4ad9dad9 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -196,6 +196,7 @@ CARGO_CRATES= ab_glyph-0.2.23 \
epaint-0.23.0 \
equivalent-1.0.1 \
errno-0.3.8 \
+ error-chain-0.12.4 \
error-code-2.3.1 \
error-code-3.2.0 \
euc-0.5.3 \
@@ -259,7 +260,7 @@ CARGO_CRATES= ab_glyph-0.2.23 \
gpu-descriptor-0.2.4 \
gpu-descriptor-types-0.1.2 \
guillotiere-0.6.2 \
- h2-0.3.25 \
+ h2-0.3.26 \
half-2.4.0 \
hash32-0.2.1 \
hashbrown-0.9.1 \
@@ -467,6 +468,8 @@ CARGO_CRATES= ab_glyph-0.2.23 \
profiling-procmacros-1.0.15 \
prometheus-0.13.3 \
prometheus-hyper-0.1.5 \
+ protocol-3.4.0 \
+ protocol-derive-3.4.0 \
psm-0.1.21 \
quick-error-1.2.3 \
quick-xml-0.30.0 \
@@ -522,7 +525,7 @@ CARGO_CRATES= ab_glyph-0.2.23 \
rustc_version-0.2.3 \
rustc_version-0.4.0 \
rustix-0.38.32 \
- rustls-0.21.10 \
+ rustls-0.21.12 \
rustls-native-certs-0.6.3 \
rustls-pemfile-1.0.4 \
rustls-webpki-0.101.7 \
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 1617007b2ef2..68def68e3dff 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1714633013
+TIMESTAMP = 1714770504
SHA256 (rust/crates/ab_glyph-0.2.23.crate) = 80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225
SIZE (rust/crates/ab_glyph-0.2.23.crate) = 18537
SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -395,6 +395,8 @@ SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8d
SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/error-chain-0.12.4.crate) = 2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc
+SIZE (rust/crates/error-chain-0.12.4.crate) = 29274
SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21
SIZE (rust/crates/error-code-2.3.1.crate) = 5324
SHA256 (rust/crates/error-code-3.2.0.crate) = a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b
@@ -521,8 +523,8 @@ SHA256 (rust/crates/gpu-descriptor-types-0.1.2.crate) = 6bf0b36e6f090b7e1d8a4b49
SIZE (rust/crates/gpu-descriptor-types-0.1.2.crate) = 1928
SHA256 (rust/crates/guillotiere-0.6.2.crate) = b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782
SIZE (rust/crates/guillotiere-0.6.2.crate) = 18116
-SHA256 (rust/crates/h2-0.3.25.crate) = 4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb
-SIZE (rust/crates/h2-0.3.25.crate) = 167894
+SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
+SIZE (rust/crates/h2-0.3.26.crate) = 168315
SHA256 (rust/crates/half-2.4.0.crate) = b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e
SIZE (rust/crates/half-2.4.0.crate) = 50666
SHA256 (rust/crates/hash32-0.2.1.crate) = b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67
@@ -937,6 +939,10 @@ SHA256 (rust/crates/prometheus-0.13.3.crate) = 449811d15fbdf5ceb5c1144416066429c
SIZE (rust/crates/prometheus-0.13.3.crate) = 82457
SHA256 (rust/crates/prometheus-hyper-0.1.5.crate) = 18fc98d5705a20b11f8b240c0857167b79852ba469f9faec6df0027e576e676e
SIZE (rust/crates/prometheus-hyper-0.1.5.crate) = 14841
+SHA256 (rust/crates/protocol-3.4.0.crate) = 13cfa9ba37e0183f87fb14b82f23fc76494c458c72469d95b8a8eec75ad5f191
+SIZE (rust/crates/protocol-3.4.0.crate) = 24174
+SHA256 (rust/crates/protocol-derive-3.4.0.crate) = 28647f30298898ead966b51e9aee5c74e4ac709ce5ca554378fde187fd3f7e47
+SIZE (rust/crates/protocol-derive-3.4.0.crate) = 8347
SHA256 (rust/crates/psm-0.1.21.crate) = 5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874
SIZE (rust/crates/psm-0.1.21.crate) = 23126
SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
@@ -1047,8 +1053,8 @@ SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15
SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
SHA256 (rust/crates/rustix-0.38.32.crate) = 65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89
SIZE (rust/crates/rustix-0.38.32.crate) = 376999
-SHA256 (rust/crates/rustls-0.21.10.crate) = f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba
-SIZE (rust/crates/rustls-0.21.10.crate) = 284920
+SHA256 (rust/crates/rustls-0.21.12.crate) = 3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e
+SIZE (rust/crates/rustls-0.21.12.crate) = 285674
SHA256 (rust/crates/rustls-native-certs-0.6.3.crate) = a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00
SIZE (rust/crates/rustls-native-certs-0.6.3.crate) = 24438
SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
@@ -1615,5 +1621,5 @@ SHA256 (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = ff1056ad3df5df0604440a4a
SIZE (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = 1130634
SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f
SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210
-SHA256 (veloren-v0.16.0-130-g0b9c2621f.tar.bz2) = 63741cf10c10a0428eb5f3f15b5bfda840338ed26ea2cdb21d4bbd09bb4913e7
-SIZE (veloren-v0.16.0-130-g0b9c2621f.tar.bz2) = 299936779
+SHA256 (veloren-v0.16.0-145-g9e98d473e.tar.bz2) = f637f877d8c4ed459240419f545d06cf20fbe0bffb49ce8294b57440591ad5a6
+SIZE (veloren-v0.16.0-145-g9e98d473e.tar.bz2) = 299934899
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index 1a01e3399772..452347e08a18 100644
--- a/games/veloren-weekly/files/patch-gilrs
+++ b/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-04-03 20:23:33 UTC
+--- Cargo.lock.orig 2024-05-03 21:08:24 UTC
+++ Cargo.lock
-@@ -2484,9 +2484,9 @@ name = "gilrs"
+@@ -2494,9 +2494,9 @@ dependencies = [
[[package]]
name = "gilrs"
@@ -37,7 +37,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
dependencies = [
"fnv",
"gilrs-core",
-@@ -2498,24 +2498,23 @@ name = "gilrs-core"
+@@ -2508,24 +2508,23 @@ dependencies = [
[[package]]
name = "gilrs-core"
@@ -66,10 +66,11 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
]
[[package]]
-@@ -3151,17 +3150,6 @@ dependencies = [
+@@ -3160,17 +3159,6 @@ dependencies = [
+ "libc",
]
- [[package]]
+-[[package]]
-name = "inotify"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -80,11 +81,10 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
- "libc",
-]
-
--[[package]]
+ [[package]]
name = "inotify-sys"
version = "0.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -3212,9 +3200,9 @@ name = "io-kit-sys"
+@@ -3222,9 +3210,9 @@ dependencies = [
[[package]]
name = "io-kit-sys"
@@ -96,10 +96,12 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
dependencies = [
"core-foundation-sys",
"mach2",
-@@ -3971,6 +3959,17 @@ name = "nix"
+@@ -3979,6 +3967,17 @@ dependencies = [
+ "memoffset 0.6.5",
+ ]
- [[package]]
- name = "nix"
++[[package]]
++name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
@@ -109,12 +111,10 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
+ "libc",
+]
+
-+[[package]]
-+name = "nix"
+ [[package]]
+ name = "nix"
version = "0.28.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-@@ -4017,7 +4016,7 @@ dependencies = [
+@@ -4027,7 +4026,7 @@ dependencies = [
"crossbeam-channel",
"filetime",
"fsevent-sys",
@@ -123,15 +123,6 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
"kqueue",
"libc",
"log",
-@@ -6618,7 +6617,7 @@ dependencies = [
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if 0.1.10",
- "rand 0.8.5",
- "static_assertions",
- ]
--- 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;