From 3b4c9069789e9e88ada6d1c1dc4230d56eab24fa Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 21 Feb 2024 23:59:21 +0100 Subject: [PATCH] games/veloren-weekly: update to s20240221 Changes: https://gitlab.com/veloren/veloren/-/compare/99c997fab...7a77fa6bf --- games/veloren-weekly/Makefile | 5 ++--- games/veloren-weekly/Makefile.crates | 2 +- games/veloren-weekly/distinfo | 10 +++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index c997c4c4f25bc..8ccc1d6d73290 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,6 +1,5 @@ PORTNAME= veloren -PORTVERSION= s20240215 -PORTREVISION= 1 +PORTVERSION= s20240221 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly @@ -26,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.15.0-1162-g99c997fab # git describe --match='v[0-9]*' weekly +GL_TAGNAME= v0.15.0-1199-g7a77fa6bf # 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 477814f0b9b10..009e118e1f7e7 100644 --- a/games/veloren-weekly/Makefile.crates +++ b/games/veloren-weekly/Makefile.crates @@ -799,11 +799,11 @@ CARGO_CRATES= ab_glyph-0.2.23 \ zstd-safe-5.0.2+zstd.1.5.2 \ zstd-sys-2.0.9+zstd.1.5.5 \ keyboard-keynames@git+https://gitlab.com/Imbris/keyboard-keynames.git?tag=veloren-winit-0.28\#fca4bbdfa51bf054b155a455935b3792975c989d \ + naga,wgpu,wgpu-core,wgpu-hal,wgpu-types@git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1\#df527ef82e2eba827eda9278caa583506a06aa87 \ shred,shred-derive@git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85\#5d52c6fc390dd04c12158633e77591f6523d1f85 \ egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=34691d4e9149deb9cd0bb8cbb5a56bffebf47588\#34691d4e9149deb9cd0bb8cbb5a56bffebf47588 \ auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533\#abb1a705827984e11706d7bb97fb7a459e1e6533 \ fluent,fluent-bundle,fluent-syntax,intl-memoizer@git+https://github.com/juliancoffee/fluent-rs.git?branch=patched\#929cf9512de121cce9b4cbf1cb860cd3294a1cd9 \ conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#59fddc617696e68d28a75c2137a08c2572efb986 \ iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28\#47243c257c8b8dd6c506b060804cb00b618aa0aa \ - naga,wgpu,wgpu-core,wgpu-hal,wgpu-types@git+https://github.com/IsseW/wgpu?rev=5ea160164\#5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0 \ portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172 diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo index 4a7298e07e39d..3d1ccda467605 100644 --- a/games/veloren-weekly/distinfo +++ b/games/veloren-weekly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1707953009 +TIMESTAMP = 1708556361 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 @@ -1601,6 +1601,8 @@ SHA256 (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 9e16efa8a874a0481a574084d SIZE (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 728791 SHA256 (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = cc8baf32868d7c0d52a8c9dea7beaf5f3226433147a63e3a118a3cd710109263 SIZE (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = 4886 +SHA256 (Imberflur-wgpu-0.18-with-fixes-for-veloren-v1_GH0.tar.gz) = 49f1c4f4ea15c542b335c350319ce474660d6385d57cbcc8691bc1f53d564fd1 +SIZE (Imberflur-wgpu-0.18-with-fixes-for-veloren-v1_GH0.tar.gz) = 9994365 SHA256 (amethyst-shred-5d52c6fc390dd04c12158633e77591f6523d1f85_GH0.tar.gz) = 099a29969d304d885e65316c34099b24100b8ec47dab5526af7326e550e79457 SIZE (amethyst-shred-5d52c6fc390dd04c12158633e77591f6523d1f85_GH0.tar.gz) = 56424 SHA256 (hasenbanck-egui_wgpu_backend-34691d4e9149deb9cd0bb8cbb5a56bffebf47588_GH0.tar.gz) = 0e60138671e406a80cb19a1995681b1defcfc233353d9833d6c4cd1234c9ffd8 @@ -1613,9 +1615,7 @@ SHA256 (veloren-conrod-59fddc617696e68d28a75c2137a08c2572efb986_GL0.tar.gz) = a7 SIZE (veloren-conrod-59fddc617696e68d28a75c2137a08c2572efb986_GL0.tar.gz) = 808456 SHA256 (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = ff1056ad3df5df0604440a4ad9e752a27e019276f9275abdabdea1b7fba51036 SIZE (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = 1130634 -SHA256 (IsseW-wgpu-5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0_GH0.tar.gz) = 65b2e75c2b996a098f85107e6af728c3fa7b9430822d28d6aa173c977d1916bb -SIZE (IsseW-wgpu-5ea16016402bb83b4ccd7ac8e6d4b0a2f85da6a0_GH0.tar.gz) = 9995366 SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210 -SHA256 (veloren-v0.15.0-1162-g99c997fab.tar.bz2) = a71254abcaf022f04b5c428122d42e386c4fb6454ebebee95dc5953afcce01db -SIZE (veloren-v0.15.0-1162-g99c997fab.tar.bz2) = 291081775 +SHA256 (veloren-v0.15.0-1199-g7a77fa6bf.tar.bz2) = de2d0fcb0fb490bff2ea164415fccc9adef4548eba1ae79035d7fb3143021494 +SIZE (veloren-v0.15.0-1199-g7a77fa6bf.tar.bz2) = 291120256