From nobody Thu Aug 25 08:50:09 2022 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 4MCxVn3lHHz4bFck; Thu, 25 Aug 2022 08:50:09 +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 4MCxVn3KDLz3dWk; Thu, 25 Aug 2022 08:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661417409; 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=qRsVeWK7qbgAiov3ZDOMStTcYl4WAYjc24jzGWI+9rs=; b=x9yFlauqxzC/nImW2wfJyFrqtcDP64o0icmml3Qg6jeRVRxgsNDBCmqrZwG0GuTE6St/dy XljbkAx3/b990IwbiLkabBXKDeGS+mwMECOJ79cJfDNsUIB+sKnw4Y+m5aNzOi4sVFmpxj Js8HMp0fE8a5zHgB80ZU9QxBLTqOutov5ustIbbJ+ouD1c8k84qrlmz2CphtRDM2jwpWel w4nNzdU9zPQi5OY7eAdBsytjl87cdHTja4jx3xREYzhoZpXAhjcif1YWNQUuRGYfxDSf6k VGk0TnI4tlRDX0vd9RIBfzl9+CRCYdrIJxGan7NQJCNj+nhLt4wUD01UJ/DXXw== 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 4MCxVn2Qz4zj19; Thu, 25 Aug 2022 08:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27P8o9EE000413; Thu, 25 Aug 2022 08:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27P8o9Zl000410; Thu, 25 Aug 2022 08:50:09 GMT (envelope-from git) Date: Thu, 25 Aug 2022 08:50:09 GMT Message-Id: <202208250850.27P8o9Zl000410@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: 5e9ef674125a - main - games/veloren: Fix build with rust 1.63.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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 5e9ef674125a03baa9bae3f138134219d2212428 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661417409; 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=qRsVeWK7qbgAiov3ZDOMStTcYl4WAYjc24jzGWI+9rs=; b=GxCBGyBL1+rgo1Wz0eONr1m/c0G0vTloz+Pp3RHWa70wfFUYDZNTjlehENBo/YbowdpzTO UAiF2nDvNLutDYPY+SQZkTRMIu9PZTeHfNYspbt931tP4vsEdzgtwGk2d4J3eLjWgqJu0u 2k+VAwx8x3D54QtnTHJwTgWi2fzO3yKznZ1eH4/n/6txSEALWRJEWkhC4gURqLXVvHI0t5 Qp6GBuvLv8H9kwHk0hSnjx0Cwb/54kh53J2Jrxbg7w0c96ykzf4Fvq0K568faUyzL6puNE S3x6IV+pLn0J2Qbu7D6KN6kupVak/F9A23fcmk3jjbuRY7srhPtazE33htBhIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661417409; a=rsa-sha256; cv=none; b=cHx6LOXohG0UjC320BRp2t5ZgJQf5KMN16lf1RDf6Qrtd6Rm07tKZAwv9Fh/Cmz5kSzds8 jCAmTeQ1S6n/7gnxY8+M85ZaLSGporDxuUeySWLWsPqljg2m39hkrDP86cD0ZAgTPawv96 jkdJflF8nglZ43jrVLHixP002ipJzttl8y6Cagc/cPl/cN8PD7ZaTt123yWVac4mKNN3un bguA+O2+Ja4Hzb0ePUr9tGuD7YUmkOKjQPfhNr1v+1vUHzoanTpLtihydBmwfNXs6uE53W GVlQ9WPg60XWKoGFfnuD5t2Lsx3lQIOh7+vdqlbuAjTCd8ZqAKClv5hAP/lXCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e9ef674125a03baa9bae3f138134219d2212428 commit 5e9ef674125a03baa9bae3f138134219d2212428 Author: Mikael Urankar AuthorDate: 2022-08-17 17:28:25 +0000 Commit: Mikael Urankar CommitDate: 2022-08-25 08:50:04 +0000 games/veloren: Fix build with rust 1.63.0 - Update packed_simd_2 to 0.3.8 which fixed the build with rust 1.63.0 - lazy::OnceCell is moved to cell::OnceCell --- games/veloren/Makefile | 2 +- games/veloren/distinfo | 6 +++--- games/veloren/files/patch-rust-1.63 | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/games/veloren/Makefile b/games/veloren/Makefile index 4badfde39818..5a84669e10e8 100644 --- a/games/veloren/Makefile +++ b/games/veloren/Makefile @@ -409,7 +409,7 @@ CARGO_CRATES= ab_glyph-0.2.15 \ os_str_bytes-6.0.0 \ owned_ttf_parser-0.6.0 \ owned_ttf_parser-0.15.0 \ - packed_simd_2-0.3.7 \ + packed_simd_2-0.3.8 \ parking_lot-0.10.2 \ parking_lot-0.11.2 \ parking_lot-0.12.0 \ diff --git a/games/veloren/distinfo b/games/veloren/distinfo index 566198c1e6d4..52400ab98f49 100644 --- a/games/veloren/distinfo +++ b/games/veloren/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1658582101 +TIMESTAMP = 1660732539 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 @@ -751,8 +751,8 @@ SHA256 (rust/crates/owned_ttf_parser-0.6.0.crate) = 9f923fb806c46266c02ab4a5b239 SIZE (rust/crates/owned_ttf_parser-0.6.0.crate) = 20574 SHA256 (rust/crates/owned_ttf_parser-0.15.0.crate) = 4fb1e509cfe7a12db2a90bfa057dfcdbc55a347f5da677c506b53dd099cfec9d SIZE (rust/crates/owned_ttf_parser-0.15.0.crate) = 23088 -SHA256 (rust/crates/packed_simd_2-0.3.7.crate) = defdcfef86dcc44ad208f71d9ff4ce28df6537a4e0d6b0e8e845cb8ca10059a6 -SIZE (rust/crates/packed_simd_2-0.3.7.crate) = 97413 +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/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 diff --git a/games/veloren/files/patch-rust-1.63 b/games/veloren/files/patch-rust-1.63 new file mode 100644 index 000000000000..5050354349f1 --- /dev/null +++ b/games/veloren/files/patch-rust-1.63 @@ -0,0 +1,36 @@ +--- Cargo.lock.orig 2022-08-17 12:36:05 UTC ++++ Cargo.lock +@@ -4025,9 +4025,9 @@ name = "packed_simd_2" + + [[package]] + name = "packed_simd_2" +-version = "0.3.7" ++version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "defdcfef86dcc44ad208f71d9ff4ce28df6537a4e0d6b0e8e845cb8ca10059a6" ++checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" + dependencies = [ + "cfg-if 1.0.0", + "libm 0.1.4", +@@ -6241,7 +6241,7 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" + dependencies = [ +- "cfg-if 1.0.0", ++ "cfg-if 0.1.10", + "rand 0.8.5", + "static_assertions", + ] + + +--- voxygen/src/scene/terrain.rs.orig 2022-08-17 11:42:07.587067000 +0000 ++++ voxygen/src/scene/terrain.rs 2022-08-17 11:43:10.451160000 +0000 +@@ -555,7 +557,7 @@ impl SpriteRenderContext { + } + }); + +- let init = core::lazy::OnceCell::new(); ++ let init = core::cell::OnceCell::new(); + let mut join_handle = Some(join_handle); + let mut closure = move |renderer: &mut Renderer| { + // The second unwrap can only fail if the sprite meshing thread panics, which