From nobody Thu Jul 11 00:52:59 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 4WKGRb6y6Fz5PmMX; Thu, 11 Jul 2024 00:52:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WKGRb3tNkz4ZX6; Thu, 11 Jul 2024 00:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720659179; 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=JgmM/yDVV//rbl+eTfzFtaHFJkD6jAMvd65i3p35Lf4=; b=VRGIkZHgefB0sba9xtPhvpqCMs6zfi/XVqHd/81k0E1y4mAEr4oSfqgX12WemV/TpLhVHo QUIGri6lO3tbL5nLfRD+G40iq6zlWqrKgIKxDS09ALIsVEYb0O2I+VJZ61Z9W7u4ltIt+I FwBe3c8f4eFr8Re1RQvGHvTNJsVTrmLl5YZye4UNQExmgM+FQgZGv43aH/9eA9VXvfcNum +lX3r9wIZ4cRxRnso2rDN8whANcX7ZWL0yo8Rn8Nv3hdRfTPJxN93IoFGZ8XhJT3s33bgS XNOES8/f/TiBGr8jGELjdTU+YwpGu+TI6fwJ98llvH5/q42v5EaptjAoDTWSLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720659179; a=rsa-sha256; cv=none; b=DRNKTG589uE8nN4BKaXobZRmO4HAFc1yomWvgxmckWTwOZeQZZTEjhTMdKleqsxgjJ+CiL DWjER5y+vdPEVvnDjXgN8e9H3A8EYbB7JjAp5utj5iTj8TwghQC50wdsN39siQVT7imfgU Z43WrfNNiZB+y5wRNTR3FgB6DoA9Y6DT7fFqM6cdreOyRdF76Al0hmTPUjOnPveriVsaED rsv3KjD3fbhFr0cOfc0n0g89IlUBaIyj4VnVHWCSZelDqdiDVzygGBv8x/AooXSCuH/lb2 Tb42U+i2kkfhDHTf5sK8Lz4fuqCOTkm3UvU6LmeXc8fn6YPfrQdWmHYifxY+wg== 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=1720659179; 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=JgmM/yDVV//rbl+eTfzFtaHFJkD6jAMvd65i3p35Lf4=; b=O96qYxv9Wa3QT8uJnAeXN6urXNxb321Fn69Tp3xPGIshySkR7drtIC/39XINhHvg/CQ04E KK/CzKDlgr8hwlRrMdJGKXpQnfoe8m5gl0ke3Fj5v93PupjGBlCXL/SLFKRxQN+jGj2sPm 07YzPr04nPmUJepKFeKLxiYS2kL96ZaGkq7OwZbvPZZosVphDvjReIw/ONEimj/1IdcGqm CHWM49wUqr5CutQaEW+JoEdS2m3B7LaJ2wHNoCjQsa0bKefBVfc6JWwYlwW/W/8Pms60wm jUzIl2xbNbIZT9qOBYAbquo/mK/mj5m2KP4IelKbKTLhVOucm/ofdsAv4kNtPw== 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 4WKGRb3VqhzfpG; Thu, 11 Jul 2024 00:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46B0qxE2066149; Thu, 11 Jul 2024 00:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46B0qxYV066146; Thu, 11 Jul 2024 00:52:59 GMT (envelope-from git) Date: Thu, 11 Jul 2024 00:52:59 GMT Message-Id: <202407110052.46B0qxYV066146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: a104e2d0db3b - main - games/veloren-weekly: update to s20240710 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a104e2d0db3ba461ea2010b40178a8224e2c1622 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a104e2d0db3ba461ea2010b40178a8224e2c1622 commit a104e2d0db3ba461ea2010b40178a8224e2c1622 Author: Jan Beich AuthorDate: 2024-07-10 22:07:53 +0000 Commit: Jan Beich CommitDate: 2024-07-11 00:50:40 +0000 games/veloren-weekly: update to s20240710 Changes: https://gitlab.com/veloren/veloren/-/compare/a3ef7ddf9...9452500f1 --- games/veloren-weekly/Makefile | 4 ++-- games/veloren-weekly/Makefile.crates | 4 ++-- games/veloren-weekly/distinfo | 14 +++++++------- games/veloren-weekly/files/patch-rust-1.79 | 23 +++++++++++++++++++++++ 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index c994d5b44d50..766512017763 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,5 +1,5 @@ PORTNAME= veloren -PORTVERSION= s20240630 +PORTVERSION= s20240710 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly @@ -26,7 +26,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.16.0-306-ga3ef7ddf9 # git describe --match='v[0-9]*' weekly +GL_TAGNAME= v0.16.0-361-g9452500f1 # 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 bf9cd859b183..3fd3f1bd1567 100644 --- a/games/veloren-weekly/Makefile.crates +++ b/games/veloren-weekly/Makefile.crates @@ -343,7 +343,7 @@ CARGO_CRATES= ab_glyph-0.2.27 \ libloading-0.7.4 \ libloading-0.8.4 \ libm-0.2.8 \ - libmimalloc-sys-0.1.39 \ + libmimalloc-sys-0.1.38 \ libredox-0.0.2 \ libredox-0.1.3 \ libsqlite3-sys-0.28.0 \ @@ -374,7 +374,7 @@ CARGO_CRATES= ab_glyph-0.2.27 \ memoffset-0.6.5 \ memoffset-0.9.1 \ metal-0.27.0 \ - mimalloc-0.1.43 \ + mimalloc-0.1.42 \ mime-0.3.17 \ minifb-0.27.0 \ minimal-lexical-0.2.1 \ diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo index 6b224e154b2e..ccb5515d1352 100644 --- a/games/veloren-weekly/distinfo +++ b/games/veloren-weekly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1719790053 +TIMESTAMP = 1720649273 SHA256 (rust/crates/ab_glyph-0.2.27.crate) = 1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697 SIZE (rust/crates/ab_glyph-0.2.27.crate) = 19562 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046 @@ -689,8 +689,8 @@ SHA256 (rust/crates/libloading-0.8.4.crate) = e310b3a6b5907f99202fcdb4960ff45b93 SIZE (rust/crates/libloading-0.8.4.crate) = 28636 SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058 SIZE (rust/crates/libm-0.2.8.crate) = 113450 -SHA256 (rust/crates/libmimalloc-sys-0.1.39.crate) = 23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44 -SIZE (rust/crates/libmimalloc-sys-0.1.39.crate) = 198523 +SHA256 (rust/crates/libmimalloc-sys-0.1.38.crate) = 0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6 +SIZE (rust/crates/libmimalloc-sys-0.1.38.crate) = 196009 SHA256 (rust/crates/libredox-0.0.2.crate) = 3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607 SIZE (rust/crates/libredox-0.0.2.crate) = 4538 SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d @@ -751,8 +751,8 @@ SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb4486776 SIZE (rust/crates/memoffset-0.9.1.crate) = 9032 SHA256 (rust/crates/metal-0.27.0.crate) = c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25 SIZE (rust/crates/metal-0.27.0.crate) = 3028990 -SHA256 (rust/crates/mimalloc-0.1.43.crate) = 68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633 -SIZE (rust/crates/mimalloc-0.1.43.crate) = 4075 +SHA256 (rust/crates/mimalloc-0.1.42.crate) = e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176 +SIZE (rust/crates/mimalloc-0.1.42.crate) = 4079 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a SIZE (rust/crates/mime-0.3.17.crate) = 15712 SHA256 (rust/crates/minifb-0.27.0.crate) = b0c470a74618b43cd182c21b3dc1e6123501249f3bad9a0085e95d1304ca2478 @@ -1669,5 +1669,5 @@ SHA256 (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = ff1056ad3df5df0604440a4a SIZE (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = 1130634 SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210 -SHA256 (veloren-v0.16.0-306-ga3ef7ddf9.tar.bz2) = b8d4871934030840ac74a827f04a723c8bf5165d72ac6fde038852007051aaa6 -SIZE (veloren-v0.16.0-306-ga3ef7ddf9.tar.bz2) = 299991582 +SHA256 (veloren-v0.16.0-361-g9452500f1.tar.bz2) = c8f3ccdd2eebfd579d93d725b60967dd3ea2d576479b5ee5693df0be8ee57d74 +SIZE (veloren-v0.16.0-361-g9452500f1.tar.bz2) = 299985255 diff --git a/games/veloren-weekly/files/patch-rust-1.79 b/games/veloren-weekly/files/patch-rust-1.79 new file mode 100644 index 000000000000..52d0eb68ce87 --- /dev/null +++ b/games/veloren-weekly/files/patch-rust-1.79 @@ -0,0 +1,23 @@ +Partially revert https://gitlab.com/veloren/veloren/-/commit/a698a7d46ed7 +until lang/rust >= 1.80 update + +error[E0658]: use of unstable library feature 'option_take_if' + --> common/src/comp/inventory/item/mod.rs:1622:22 + | +1622 | .take_if(|contained_item| matches!(contained_item.quality(), Quality::Debug)); + | ^^^^^^^ + | + = note: see issue #98934 for more information + = help: add `#![feature(option_take_if)]` to the crate attributes to enable + = note: this compiler was built on 2024-06-10; consider upgrading it if it is out of date + +--- common/src/lib.rs.orig 2024-07-10 22:07:53 UTC ++++ common/src/lib.rs +@@ -7,6 +7,7 @@ + associated_type_defaults, + fundamental, + let_chains, ++ option_take_if, + option_zip, + trait_alias, + type_alias_impl_trait,