From nobody Mon May 13 11:04:03 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdGnv6DrYz5K120; Mon, 13 May 2024 11:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdGnv3Zt6z4nlJ; Mon, 13 May 2024 11:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715598243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4unt3gQtoBgqSafbPQnGRwA3JtkZyMu/s+mv+lH9Qc=; b=BxmCw7zH2E1dNzX9YVIK4osBXAbQ7HwLG42qgvD4BSBTWu/YFwTuRiMRdYMdMUA1ZMviIr n8SgThsmrwn4YSIHQbPJSak7c21dVk51g9XGcV9/q/txbMCfKqZ3Ejh1n092XF22XdDjeE iOqy6hXFw7EY3s5U8/uYvzJURzwqWeikPVBMaVIotXpCUFEzvH/ZDwIBc3q2OXStQ/aPyv N8YBNR6vFH/vevx9sKdkwz5mmikib2Bo0Vlzb84nEmCGqcBNGODRqTb4TPN6vVuHFg3kr6 tuC0UQ0Ch7yyZ0TbDJFzwjFWGWrXs61LWCNkVkY1ZKH3TxamLPwrkE1r3/1p8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715598243; a=rsa-sha256; cv=none; b=IEoyB9yOzItHlG/MTEk8i2Lg3V+0t2+xm7tZ2MONlEvxliiUYzkFo64fvmuA62lWKLVeCG 06YVV9duqQmcTLkN0o2bA4a3pMC1WZCkzksCCy9PA2i7+MpqYo5UniuQQ5y6yrwakuiR0T 9oDkxbtWrowyYhriSXUl37nnmF6SzV21jM6eyyje3nYyJmx+YBqsN55w0DmOJ0P+2ld9J1 X426Q7SVkOWvodN49m/KeZS180BhmF86Qaee7/QSbWOmbpQVT3MlJwTgWkqXUiXzKrs00g HTdgml+hvZzAVUGm2FVqoDcyjxZ4Bp1TESpjdotkV8GSYG3sVsnducqEC+1M/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715598243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4unt3gQtoBgqSafbPQnGRwA3JtkZyMu/s+mv+lH9Qc=; b=Iy1Hr3b11lU7R1cPd7jeB1bo6zFhqvWjPOERcHOX9nmt9etBZmE+aPHZJICghsTzwYj3II YpYKb7Zy/62TFlGVy8LSKMyzBnpvieZe9LzJwLCN5UQ4UVz+eMtYkXQppVwzNDz8oCDjor eRikSzd8PUyQSGvXxQOJnvZ3uZ3hi+spOoTlcdhF73tlT7nMwifR75wualDSNcTRspltDQ 8P5nLnpnC0gVpngTJS4zTMVXqUCXCNF8Me5OEHnHPc6vPMxjasrj16Ub2EgfQj2Jant3aB KN0z5IAB4v7TPIbPJEGpF+EsUf2l78jpAxtXjU0p+3tcptJ09i7G4fddnozlag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VdGnv37c9zm0S; Mon, 13 May 2024 11:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DB43Pf061164; Mon, 13 May 2024 11:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DB43g6061161; Mon, 13 May 2024 11:04:03 GMT (envelope-from git) Date: Mon, 13 May 2024 11:04:03 GMT Message-Id: <202405131104.44DB43g6061161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: b352c01459d9 - main - games/veloren-weekly: Fix build with rust 1.78.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b352c01459d9b6243eeeb7443bb632ce7fca943e Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=b352c01459d9b6243eeeb7443bb632ce7fca943e commit b352c01459d9b6243eeeb7443bb632ce7fca943e Author: Mikael Urankar AuthorDate: 2024-05-12 17:05:27 +0000 Commit: Mikael Urankar CommitDate: 2024-05-13 11:03:24 +0000 games/veloren-weekly: Fix build with rust 1.78.0 PR: 278834, 278938 Approved by: portmgr (build fix blanket) --- games/veloren-weekly/files/patch-rust-1.78.0 | 20 ++++++++++++++++++++ .../files/patch-rust-1.78.0-disable-simd | 16 ++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/games/veloren-weekly/files/patch-rust-1.78.0 b/games/veloren-weekly/files/patch-rust-1.78.0 new file mode 100644 index 000000000000..a5a2315fc547 --- /dev/null +++ b/games/veloren-weekly/files/patch-rust-1.78.0 @@ -0,0 +1,20 @@ +invalid_mut was renamed to without_provenance_mut +in https://github.com/rust-lang/rust/commit/b58f647d5488dce73bba517907c44af2c2a618c4 + +error[E0425]: cannot find function `invalid_mut` in module `core::ptr` + --> /wrkdirs/usr/ports/games/veloren-weekly/work/shred-5d52c6fc390dd04c12158633e77591f6523d1f85/src/meta.rs:402:38 + | +402 | let invalid_ptr = core::ptr::invalid_mut::((self as *mut Self).addr()); + | ^^^^^^^^^^^ not found in `core::ptr` + +--- ../shred-5d52c6fc390dd04c12158633e77591f6523d1f85/src/meta.rs.orig 2024-05-07 13:31:09.835758000 +0200 ++++ ../shred-5d52c6fc390dd04c12158633e77591f6523d1f85/src/meta.rs 2024-05-07 13:31:24.927663000 +0200 +@@ -399,7 +399,7 @@ impl MetaTable { + { + let ty_id = TypeId::of::(); + // use self.addr() for unpredictable address to use for checking consistency below +- let invalid_ptr = core::ptr::invalid_mut::((self as *mut Self).addr()); ++ let invalid_ptr = core::ptr::without_provenance_mut::((self as *mut Self).addr()); + let trait_ptr = >::cast(invalid_ptr); + // assert that address not changed (to catch some mistakes in CastFrom impl) + assert_eq!( diff --git a/games/veloren-weekly/files/patch-rust-1.78.0-disable-simd b/games/veloren-weekly/files/patch-rust-1.78.0-disable-simd new file mode 100644 index 000000000000..54a9ea7488fa --- /dev/null +++ b/games/veloren-weekly/files/patch-rust-1.78.0-disable-simd @@ -0,0 +1,16 @@ +packed_simd doesn't compile with rust 1.78.0 +Part of the issue is fixed with https://github.com/yoanlcq/vek/pull/95/files +but it's not enough, packed_simd2 is used here: +https://gitlab.com/veloren/veloren/-/blob/master/world/src/sim/erosion.rs?ref_type=heads#L16 + +--- world/Cargo.toml.orig 2024-05-10 18:54:20.494825000 +0200 ++++ world/Cargo.toml 2024-05-10 18:54:43.257129000 +0200 +@@ -11,7 +11,7 @@ cli = ["clap", "signal-hook", "indicatif"] + bin_compression = ["lz-fear", "deflate", "flate2", "image/jpeg", "num-traits", "fallible-iterator", "rstar", "cli"] + cli = ["clap", "signal-hook", "indicatif"] + +-default = ["simd"] ++#default = ["simd"] + + [dependencies] + common = { package = "veloren-common", path = "../common" }