git: b51d169384d5 - main - games/veloren-weekly: update to s20231013
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 14 Oct 2023 00:57:32 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b51d169384d5de015b3bef5e75351d845c4f99d1
commit b51d169384d5de015b3bef5e75351d845c4f99d1
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-10-08 11:35:01 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-10-14 00:50:19 +0000
games/veloren-weekly: update to s20231013
- Update shaderc crate to 0.8.2
Changes: https://gitlab.com/veloren/veloren/-/compare/63b001959...72691a76e
---
games/veloren-weekly/Makefile | 4 +-
games/veloren-weekly/Makefile.crates | 9 +-
games/veloren-weekly/distinfo | 24 ++--
games/veloren-weekly/files/patch-rust-1.72 | 179 -----------------------------
games/veloren-weekly/files/patch-shaderc | 18 +--
games/veloren-weekly/files/patch-wgpu | 46 ++++++++
6 files changed, 72 insertions(+), 208 deletions(-)
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 2292c5447713..6df87b287932 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= veloren
-PORTVERSION= s20231003
+PORTVERSION= s20231013
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-389-g63b001959 # git describe --match='v[0-9]*' weekly
+GL_TAGNAME= v0.15.0-444-g72691a76e # 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 730238f469b7..6f714a8df292 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -301,7 +301,6 @@ CARGO_CRATES= ab_glyph-0.2.21 \
libc-0.2.147 \
libloading-0.7.4 \
libloading-0.8.0 \
- libm-0.1.4 \
libm-0.2.7 \
libmimalloc-sys-0.1.34 \
libsqlite3-sys-0.25.2 \
@@ -398,7 +397,7 @@ CARGO_CRATES= ab_glyph-0.2.21 \
overload-0.1.1 \
owned_ttf_parser-0.15.2 \
owned_ttf_parser-0.19.0 \
- packed_simd_2-0.3.8 \
+ packed_simd-0.3.9 \
parking_lot-0.10.2 \
parking_lot-0.11.2 \
parking_lot-0.12.1 \
@@ -533,8 +532,8 @@ CARGO_CRATES= ab_glyph-0.2.21 \
sha1-0.6.1 \
sha1_smol-1.0.0 \
sha2-0.10.7 \
- shaderc-0.8.1 \
- shaderc-sys-0.8.1 \
+ shaderc-0.8.2 \
+ shaderc-sys-0.8.2 \
sharded-slab-0.1.4 \
shell-words-1.1.0 \
shellexpand-3.1.0 \
@@ -757,8 +756,8 @@ CARGO_CRATES= ab_glyph-0.2.21 \
conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#59fddc617696e68d28a75c2137a08c2572efb986 \
naga@git+https://github.com/gfx-rs/naga?tag=gfx-25\#057d03ad86f18e3bb3866b20901d8d4e892dd3d6 \
iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28\#47243c257c8b8dd6c506b060804cb00b618aa0aa \
- gfx-auxil,gfx-backend-dx11,gfx-backend-dx12,gfx-backend-empty,gfx-backend-gl,gfx-backend-metal,gfx-backend-vulkan,gfx-hal,range-alloc@git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521\#27a1dae3796d33d23812f2bb8c7e3b5aea18b521 \
wgpu,wgpu-core,wgpu-types@git+https://github.com/pythonesque/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08\#179ea209374a92837cde252f1d9ee01f628cae08 \
+ gfx-auxil,gfx-backend-dx11,gfx-backend-dx12,gfx-backend-empty,gfx-backend-gl,gfx-backend-metal,gfx-backend-vulkan,gfx-hal,range-alloc@git+https://github.com/Imberflur/gfx.git?tag=veloren-fixes-v1\#a8ba0a4859abb5f980b02480cb219030fb64530c \
portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172 \
egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=63a002c6a9b6c016e45806dd065864431caab621\#63a002c6a9b6c016e45806dd065864431caab621 \
vek@git+https://github.com/yoanlcq/vek.git?rev=84d5cb65841d46599a986c5477341bea4456be26\#84d5cb65841d46599a986c5477341bea4456be26 \
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 4f73b2d6dacc..ee5c943d4514 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1696343753
+TIMESTAMP = 1697203078
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
@@ -605,8 +605,6 @@ SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f
SIZE (rust/crates/libloading-0.7.4.crate) = 27580
SHA256 (rust/crates/libloading-0.8.0.crate) = d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb
SIZE (rust/crates/libloading-0.8.0.crate) = 27845
-SHA256 (rust/crates/libm-0.1.4.crate) = 7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a
-SIZE (rust/crates/libm-0.1.4.crate) = 110593
SHA256 (rust/crates/libm-0.2.7.crate) = f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4
SIZE (rust/crates/libm-0.2.7.crate) = 115688
SHA256 (rust/crates/libmimalloc-sys-0.1.34.crate) = 25d058a81af0d1c22d7a1c948576bee6d673f7af3c0f35564abd6c81122f513d
@@ -799,8 +797,8 @@ SHA256 (rust/crates/owned_ttf_parser-0.15.2.crate) = 05e6affeb1632d6ff6a23d2cd40
SIZE (rust/crates/owned_ttf_parser-0.15.2.crate) = 137485
SHA256 (rust/crates/owned_ttf_parser-0.19.0.crate) = 706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4
SIZE (rust/crates/owned_ttf_parser-0.19.0.crate) = 150704
-SHA256 (rust/crates/packed_simd_2-0.3.8.crate) = a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282
-SIZE (rust/crates/packed_simd_2-0.3.8.crate) = 97388
+SHA256 (rust/crates/packed_simd-0.3.9.crate) = 1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d
+SIZE (rust/crates/packed_simd-0.3.9.crate) = 98340
SHA256 (rust/crates/parking_lot-0.10.2.crate) = d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e
SIZE (rust/crates/parking_lot-0.10.2.crate) = 39536
SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
@@ -1069,10 +1067,10 @@ SHA256 (rust/crates/sha1_smol-1.0.0.crate) = ae1a47186c03a32177042e55dbc5fd5aee9
SIZE (rust/crates/sha1_smol-1.0.0.crate) = 9782
SHA256 (rust/crates/sha2-0.10.7.crate) = 479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8
SIZE (rust/crates/sha2-0.10.7.crate) = 22541
-SHA256 (rust/crates/shaderc-0.8.1.crate) = 77a410ea26a220ceaef964dd71054ccd63cc97fd54393014c09046e795127824
-SIZE (rust/crates/shaderc-0.8.1.crate) = 16478
-SHA256 (rust/crates/shaderc-sys-0.8.1.crate) = a281c39df7d8a0a97e9430409abb466ff4bd046875c4d97591935042bbffc898
-SIZE (rust/crates/shaderc-sys-0.8.1.crate) = 7172792
+SHA256 (rust/crates/shaderc-0.8.2.crate) = 31cef52787a0db5108788ea20bed13d6bf4b96287c5c5201e55725f7070f3443
+SIZE (rust/crates/shaderc-0.8.2.crate) = 16474
+SHA256 (rust/crates/shaderc-sys-0.8.2.crate) = 1e8f8439fffcffd6efcd74197204addf935dbab5752696bd990a6cd36d54cf64
+SIZE (rust/crates/shaderc-sys-0.8.2.crate) = 7207637
SHA256 (rust/crates/sharded-slab-0.1.4.crate) = 900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31
SIZE (rust/crates/sharded-slab-0.1.4.crate) = 52479
SHA256 (rust/crates/shell-words-1.1.0.crate) = 24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde
@@ -1517,10 +1515,10 @@ SHA256 (gfx-rs-naga-gfx-25_GH0.tar.gz) = cfbb7b2b3d2b06770278e599b1af9bbf82d6193
SIZE (gfx-rs-naga-gfx-25_GH0.tar.gz) = 263802
SHA256 (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = ff1056ad3df5df0604440a4ad9e752a27e019276f9275abdabdea1b7fba51036
SIZE (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = 1130634
-SHA256 (gfx-rs-gfx-27a1dae3796d33d23812f2bb8c7e3b5aea18b521_GH0.tar.gz) = 0e3578dae85a52adba9cb75e583d4a73c1f50491d3021c80610e2cebca223191
-SIZE (gfx-rs-gfx-27a1dae3796d33d23812f2bb8c7e3b5aea18b521_GH0.tar.gz) = 751311
SHA256 (pythonesque-wgpu-179ea209374a92837cde252f1d9ee01f628cae08_GH0.tar.gz) = 1c8347a91ee9767812db6d5a36800afe45dc2ee6b125afca39b0139ad90ef9d7
SIZE (pythonesque-wgpu-179ea209374a92837cde252f1d9ee01f628cae08_GH0.tar.gz) = 4008990
+SHA256 (Imberflur-gfx-veloren-fixes-v1_GH0.tar.gz) = 2eed99174d29729f3d874485bcc41edf43c52d385cb37cd49c53d544e7f09eb0
+SIZE (Imberflur-gfx-veloren-fixes-v1_GH0.tar.gz) = 751126
SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f
SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210
SHA256 (hasenbanck-egui_wgpu_backend-63a002c6a9b6c016e45806dd065864431caab621_GH0.tar.gz) = 0adea0f9f167886d2bc7535c09d8f543a7c1c9a6524ca6981f9d39525c6830a6
@@ -1529,5 +1527,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-389-g63b001959.tar.bz2) = 0479a4752cbeb8ac0c2a761849e81c4613e202e89ed3fef228cb3ca594163f5a
-SIZE (veloren-v0.15.0-389-g63b001959.tar.bz2) = 270088619
+SHA256 (veloren-v0.15.0-444-g72691a76e.tar.bz2) = fbd249377c4e672a8532c89974e6420e0c089904d91b46a27804ad08850a03f9
+SIZE (veloren-v0.15.0-444-g72691a76e.tar.bz2) = 270015208
diff --git a/games/veloren-weekly/files/patch-rust-1.72 b/games/veloren-weekly/files/patch-rust-1.72
deleted file mode 100644
index 83d5c836df36..000000000000
--- a/games/veloren-weekly/files/patch-rust-1.72
+++ /dev/null
@@ -1,179 +0,0 @@
-https://gitlab.com/veloren/veloren/-/issues/1875
-
---- common/src/lib.rs.orig 2023-09-13 10:25:00 UTC
-+++ common/src/lib.rs
-@@ -14,7 +14,7 @@
- arbitrary_self_types,
- int_roundings
- )]
--#![feature(hash_drain_filter)]
-+#![feature(hash_extract_if)]
-
- pub use common_assets as assets;
- pub use uuid;
---- common/systems/src/lib.rs.orig 2023-09-13 10:25:00 UTC
-+++ common/systems/src/lib.rs
-@@ -1,4 +1,4 @@
--#![feature(drain_filter, let_chains)]
-+#![feature(extract_if, let_chains)]
- #![allow(clippy::option_map_unit_fn)]
-
- mod aura;
---- common/systems/src/mount.rs.orig 2023-09-13 10:25:00 UTC
-+++ common/systems/src/mount.rs
-@@ -61,7 +61,7 @@ impl<'a> System<'a> for Sys {
- .map(|c| (
- // Only take inputs and actions from the rider if the mount is not intelligent (TODO: expand the definition of 'intelligent').
- if !matches!(body, Some(Body::Humanoid(_))) {
-- let actions = c.actions.drain_filter(|action| match action {
-+ let actions = c.actions.extract_if(|action| match action {
- ControlAction::StartInput { input: i, .. }
- | ControlAction::CancelInput(i) => matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll),
- _ => false
-@@ -151,7 +151,7 @@ impl<'a> System<'a> for Sys {
- let inputs = controllers.get_mut(entity).map(|c| {
- let actions: Vec<_> = c
- .actions
-- .drain_filter(|action| match action {
-+ .extract_if(|action| match action {
- ControlAction::StartInput { input: i, .. }
- | ControlAction::CancelInput(i) => {
- matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll)
---- network/protocol/src/lib.rs.orig 2023-09-13 10:25:00 UTC
-+++ network/protocol/src/lib.rs
-@@ -1,4 +1,4 @@
--#![feature(drain_filter)]
-+#![feature(extract_if)]
- //! Network Protocol
- //!
- //! a I/O-Free protocol for the veloren network crate.
---- network/protocol/src/quic.rs.orig 2023-09-13 10:25:00 UTC
-+++ network/protocol/src/quic.rs
-@@ -388,7 +388,7 @@ where
- // try to order pending
- let mut pending_violated = false;
- let mut reliable = vec![];
-- self.pending_reliable_buffers.drain_filter(|(_, buffer)| {
-+ self.pending_reliable_buffers.extract_if(|(_, buffer)| {
- // try to get Sid without touching buffer
- let mut testbuffer = buffer.clone();
- match ITFrame::read_frame(&mut testbuffer) {
---- server/src/lib.rs.orig 2023-09-13 10:25:00 UTC
-+++ server/src/lib.rs
-@@ -3,13 +3,13 @@
- #![deny(clippy::clone_on_ref_ptr)]
- #![feature(
- box_patterns,
-- drain_filter,
-+ extract_if,
- let_chains,
- never_type,
- option_zip,
- unwrap_infallible
- )]
--#![feature(hash_drain_filter)]
-+#![feature(hash_extract_if)]
-
- pub mod automod;
- mod character_creator;
---- server/src/persistence/character_updater.rs.orig 2023-09-13 10:25:00 UTC
-+++ server/src/persistence/character_updater.rs
-@@ -267,7 +267,7 @@ impl CharacterUpdater {
- }
-
- pub fn process_batch_completion(&mut self, completed_batch_id: u64) {
-- self.pending_database_actions.drain_filter(|_, event| {
-+ self.pending_database_actions.extract_if(|_, event| {
- matches!(event, DatabaseAction::Submitted {
- batch_id,
- } if completed_batch_id == *batch_id)
---- voxygen/src/lib.rs.orig 2023-09-13 10:25:00 UTC
-+++ voxygen/src/lib.rs
-@@ -4,8 +4,7 @@
- #![deny(clippy::clone_on_ref_ptr)]
- #![feature(
- array_methods,
-- array_zip,
-- drain_filter,
-+ extract_if,
- trait_alias,
- option_get_or_insert_default,
- map_try_insert,
---- voxygen/src/render/pipelines/bloom.rs.orig 2023-09-13 10:25:00 UTC
-+++ voxygen/src/render/pipelines/bloom.rs
-@@ -112,7 +112,7 @@ impl BloomLayout {
- device: &wgpu::Device,
- src_color: &wgpu::TextureView,
- sampler: &wgpu::Sampler,
-- half_pixel: Consts<Locals>,
-+ half_pixel: &Consts<Locals>,
- ) -> BindGroup {
- let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
- label: None,
---- voxygen/src/render/pipelines/trail.rs.orig 2023-09-13 10:25:00 UTC
-+++ voxygen/src/render/pipelines/trail.rs
-@@ -39,7 +39,7 @@ impl Add<Vertex> for Vertex {
-
- fn add(self, other: Self) -> Self::Output {
- Self {
-- pos: self.pos.zip(other.pos).map(|(a, b)| a + b),
-+ pos: core::array::from_fn(|i| self.pos[i] + other.pos[i]),
- }
- }
- }
---- voxygen/src/render/renderer/locals.rs.orig 2023-09-13 10:25:00 UTC
-+++ voxygen/src/render/renderer/locals.rs
-@@ -58,10 +58,11 @@ impl Locals {
- );
-
- let bloom_binds = bloom.map(|bloom| {
-- bloom
-- .src_views
-- .zip(bloom.locals) // zip arrays
-- .map(|(view, locals)| layouts.bloom.bind(device, view, sampler, locals))
-+ core::array::from_fn(|i| {
-+ layouts
-+ .bloom
-+ .bind(device, bloom.src_views[i], sampler, &bloom.locals[i])
-+ })
- });
-
- Self {
-@@ -107,10 +108,11 @@ impl Locals {
- &self.postprocess,
- );
- self.bloom_binds = bloom.map(|bloom| {
-- bloom
-- .src_views
-- .zip(bloom.locals) // zip arrays
-- .map(|(view, locals)| layouts.bloom.bind(device, view, sampler, locals))
-+ core::array::from_fn(|i| {
-+ layouts
-+ .bloom
-+ .bind(device, bloom.src_views[i], sampler, &bloom.locals[i])
-+ })
- });
- }
- }
---- voxygen/src/scene/math.rs.orig 2023-09-13 10:25:00 UTC
-+++ voxygen/src/scene/math.rs
-@@ -250,7 +250,7 @@ pub fn clip_object_by_plane<T: Float + MulAdd<T, T, Ou
- tolerance: T,
- ) {
- let mut intersection_points = Vec::new();
-- polys.drain_filter(|points| {
-+ polys.extract_if(|points| {
- let len = intersection_points.len();
- let outside_first = clip_points_by_plane(points, plane, &mut intersection_points);
- // Only remember intersections that are not coplanar with this side; i.e. those
---- voxygen/src/scene/mod.rs.orig 2023-09-13 10:25:00 UTC
-+++ voxygen/src/scene/mod.rs
-@@ -763,7 +763,7 @@ impl Scene {
- renderer.update_consts(&mut self.data.lights, lights);
-
- // Update event lights
-- self.event_lights.drain_filter(|el| {
-+ self.event_lights.extract_if(|el| {
- el.timeout -= dt;
- el.timeout <= 0.0
- });
diff --git a/games/veloren-weekly/files/patch-shaderc b/games/veloren-weekly/files/patch-shaderc
index e75ea787e79e..877d69c02d72 100644
--- a/games/veloren-weekly/files/patch-shaderc
+++ b/games/veloren-weekly/files/patch-shaderc
@@ -1,29 +1,29 @@
- Restore system shaderc support
- Detect system shaderc on BSDs
---- Cargo.lock.orig 2023-01-06 18:27:46 UTC
+--- Cargo.lock.orig 2023-10-08 11:35:01 UTC
+++ Cargo.lock
-@@ -5630,8 +5630,9 @@ name = "shaderc"
+@@ -5614,8 +5614,9 @@ name = "shaderc"
[[package]]
name = "shaderc"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-+version = "0.8.1"
++version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "77a410ea26a220ceaef964dd71054ccd63cc97fd54393014c09046e795127824"
++checksum = "31cef52787a0db5108788ea20bed13d6bf4b96287c5c5201e55725f7070f3443"
dependencies = [
"libc",
"shaderc-sys",
-@@ -5639,8 +5640,9 @@ name = "shaderc-sys"
+@@ -5623,8 +5624,9 @@ name = "shaderc-sys"
[[package]]
name = "shaderc-sys"
-version = "0.8.0"
-source = "git+https://github.com/pythonesque/shaderc-rs?rev=f2605a02062834019bedff911aee2fd2998c49f9#f2605a02062834019bedff911aee2fd2998c49f9"
-+version = "0.8.1"
++version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a281c39df7d8a0a97e9430409abb466ff4bd046875c4d97591935042bbffc898"
++checksum = "1e8f8439fffcffd6efcd74197204addf935dbab5752696bd990a6cd36d54cf64"
dependencies = [
"cmake",
"libc",
@@ -56,8 +56,8 @@
# cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version
# see https://github.com/alexcrichton/cmake-rs/issues/131
cmake = "=0.1.45"
---- cargo-crates/shaderc-sys-0.8.1/build/build.rs.orig 1970-01-01 00:00:00 UTC
-+++ cargo-crates/shaderc-sys-0.8.1/build/build.rs
+--- cargo-crates/shaderc-sys-0.8.2/build/build.rs.orig 1970-01-01 00:00:00 UTC
++++ cargo-crates/shaderc-sys-0.8.2/build/build.rs
@@ -287,10 +287,13 @@ fn main() {
}
} {
diff --git a/games/veloren-weekly/files/patch-wgpu b/games/veloren-weekly/files/patch-wgpu
new file mode 100644
index 000000000000..8587d3518935
--- /dev/null
+++ b/games/veloren-weekly/files/patch-wgpu
@@ -0,0 +1,46 @@
+Chase https://gitlab.com/veloren/veloren/-/commit/3f7f7195cd92
+
+error: no matching package named `gfx-backend-empty` found
+location searched: https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521
+required by package `wgpu-core v0.8.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu-core)`
+ ... which satisfies path dependency `wgc` of package `wgpu v0.8.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu)`
+ ... which satisfies dependency `wgpu = "^0.8"` of package `egui_wgpu_backend v0.8.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/egui_wgpu_backend-63a002c6a9b6c016e45806dd065864431caab621)`
+ ... which satisfies git dependency `egui_wgpu_backend` of package `veloren-voxygen v0.15.0 (/wrkdirs/usr/ports/games/veloren-weekly/work/veloren-v0.15.0-403-g204834c98/voxygen)`
+*** Error code 101
+
+--- ../wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu-core/Cargo.toml.orig 2022-08-19 01:35:57 UTC
++++ ../wgpu-179ea209374a92837cde252f1d9ee01f628cae08/wgpu-core/Cargo.toml
+@@ -39,24 +39,24 @@ gpu-descriptor = "0.1"
+ gpu-alloc = "0.4"
+ gpu-descriptor = "0.1"
+
+-hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
+-gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
++hal = { package = "gfx-hal", git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
++gfx-backend-empty = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
+
+ [target.'cfg(all(not(target_arch = "wasm32"), all(unix, not(target_os = "ios"), not(target_os = "macos"))))'.dependencies]
+-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521", features = ["naga"] }
+-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
++gfx-backend-vulkan = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1", features = ["naga"] }
++gfx-backend-gl = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
+
+ [target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
+-gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
++gfx-backend-metal = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
+ #TODO: could also depend on gfx-backend-vulkan for Vulkan Portability
+
+ [target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
+-gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
+-gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
+-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521", features = ["naga"] }
++gfx-backend-dx12 = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
++gfx-backend-dx11 = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
++gfx-backend-vulkan = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1", features = ["naga"] }
+
+ [target.'cfg(target_arch = "wasm32")'.dependencies]
+-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
++gfx-backend-gl = { git = "https://github.com/Imberflur/gfx", tag = "veloren-fixes-v1" }
+
+ [dependencies.naga]
+ git = "https://github.com/gfx-rs/naga"