git: dadc2c5e43db - main - games/veloren: Fix build with rust 1.64.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 30 Oct 2022 12:07:51 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dadc2c5e43db1543deff59669d79139ed69bec4a
commit dadc2c5e43db1543deff59669d79139ed69bec4a
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-10-18 12:28:45 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-10-30 12:07:08 +0000
games/veloren: Fix build with rust 1.64.0
Update wgpu to 179ea209374a92837cde252f1d9ee01f628cae08
error[E0597]: `desc_set` does not live long enough
PR: 267173
Reviewed by: jbeich
---
games/veloren/Makefile | 2 +-
games/veloren/distinfo | 6 ++---
games/veloren/files/patch-rust-1.64 | 48 +++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/games/veloren/Makefile b/games/veloren/Makefile
index 4d18b09d4126..79f35e2e4fe2 100644
--- a/games/veloren/Makefile
+++ b/games/veloren/Makefile
@@ -739,7 +739,7 @@ CARGO_CRATES= ab_glyph-0.2.15 \
specs-idvs@git+https://gitlab.com/veloren/specs-idvs.git?rev=c17abc638f23ef221ce7384c7dd77eef757b82f4\#c17abc638f23ef221ce7384c7dd77eef757b82f4 \
naga@git+https://github.com/gfx-rs/naga?tag=gfx-25\#057d03ad86f18e3bb3866b20901d8d4e892dd3d6 \
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/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46\#a92b8549a8e2cb9dac781bafc5ed32828f3caf46 \
+ wgpu,wgpu-core,wgpu-types@git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08\#179ea209374a92837cde252f1d9ee01f628cae08 \
refinery,refinery-core,refinery-macros@git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e\#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e \
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 \
diff --git a/games/veloren/distinfo b/games/veloren/distinfo
index 52400ab98f49..7ff2cc7b0536 100644
--- a/games/veloren/distinfo
+++ b/games/veloren/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1660732539
+TIMESTAMP = 1666093812
SHA256 (rust/crates/ab_glyph-0.2.15.crate) = 24606928a235e73cdef55a0c909719cadd72fce573e5713d58cb2952d8f5794c
SIZE (rust/crates/ab_glyph-0.2.15.crate) = 15906
SHA256 (rust/crates/ab_glyph_rasterizer-0.1.5.crate) = a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e
@@ -1407,8 +1407,8 @@ SHA256 (gfx-rs-naga-gfx-25_GH0.tar.gz) = cfbb7b2b3d2b06770278e599b1af9bbf82d6193
SIZE (gfx-rs-naga-gfx-25_GH0.tar.gz) = 263802
SHA256 (gfx-rs-gfx-27a1dae3796d33d23812f2bb8c7e3b5aea18b521_GH0.tar.gz) = 0e3578dae85a52adba9cb75e583d4a73c1f50491d3021c80610e2cebca223191
SIZE (gfx-rs-gfx-27a1dae3796d33d23812f2bb8c7e3b5aea18b521_GH0.tar.gz) = 751311
-SHA256 (gfx-rs-wgpu-a92b8549a8e2cb9dac781bafc5ed32828f3caf46_GH0.tar.gz) = c33f2d7640bdb420b3cf104f873649e83888e2a3c7d7f2dd1a4be29510861b8c
-SIZE (gfx-rs-wgpu-a92b8549a8e2cb9dac781bafc5ed32828f3caf46_GH0.tar.gz) = 4008917
+SHA256 (gfx-rs-wgpu-179ea209374a92837cde252f1d9ee01f628cae08_GH0.tar.gz) = 1c8347a91ee9767812db6d5a36800afe45dc2ee6b125afca39b0139ad90ef9d7
+SIZE (gfx-rs-wgpu-179ea209374a92837cde252f1d9ee01f628cae08_GH0.tar.gz) = 4008990
SHA256 (veloren-refinery-8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e_GL0.tar.gz) = 5b66f3a324504b64edf02806953fa5228578b5ab70837fba10736dab2ac60df0
SIZE (veloren-refinery-8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e_GL0.tar.gz) = 38520
SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f
diff --git a/games/veloren/files/patch-rust-1.64 b/games/veloren/files/patch-rust-1.64
new file mode 100644
index 000000000000..356aecf737ad
--- /dev/null
+++ b/games/veloren/files/patch-rust-1.64
@@ -0,0 +1,48 @@
+https://gitlab.com/veloren/veloren/-/commit/c2b453f6f19e
+
+
+error[E0597]: `desc_set` does not live long enough
+ --> wgpu-core-a92b854/src/device/mod.rs:1792:26
+ |
+1792 | set: desc_set.raw_mut(),
+ | ^^^^^^^^^^^^^^^^^^ borrowed value does not live long enough
+...
+1813 | }
+ | -
+ | |
+ | `desc_set` dropped here while still borrowed
+ | borrow might be used here, when `write_map` is dropped and runs the `Drop` code for type `BTreeMap`
+ |
+ = note: values in a scope are dropped in the opposite order they are defined
+
+
+
+--- Cargo.lock.orig 2022-10-14 14:51:24UTC
++++ Cargo.lock
+@@ -7464,7 +7464,7 @@ version = "0.8.0"
+ [[package]]
+ name = "wgpu"
+ version = "0.8.0"
+-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
++source = "git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
+ dependencies = [
+ "arrayvec 0.5.2",
+ "js-sys",
+@@ -7484,7 +7484,7 @@ version = "0.8.0"
+ [[package]]
+ name = "wgpu-core"
+ version = "0.8.0"
+-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
++source = "git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
+ dependencies = [
+ "arrayvec 0.5.2",
+ "bitflags",
+@@ -7524,7 +7524,7 @@ version = "0.8.0"
+ [[package]]
+ name = "wgpu-types"
+ version = "0.8.0"
+-source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
++source = "git+https://github.com/gfx-rs/wgpu.git?rev=179ea209374a92837cde252f1d9ee01f628cae08#179ea209374a92837cde252f1d9ee01f628cae08"
+ dependencies = [
+ "bitflags",
+ "serde",