From nobody Tue Jul 11 05:04:16 2023 X-Original-To: dev-commits-ports-all@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 4R0TLS361Lz4gtNm; Tue, 11 Jul 2023 05:04:16 +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 4R0TLS2hmGz4588; Tue, 11 Jul 2023 05:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689051856; 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=hGRA+GxZoEX6RvCA0ZNzARM2eZj7AIoZrGvP571mGTk=; b=p2THDoYuMXJ+fTDO6id5UONE7+E8ZsNvgTQgsA+YDFgOg6dLge1zm2e8jlRFs1pC1aN9Ro HKQq3FwlZiu7SQhdxsTV2SNvcyGdHQDkYOauMPKwAsEtcGAZ4X2p2cq08f2BYToRzNMgCW u1yDKnQXOHykeucadwDfnKrMLUUnCYHwG+U3SliJ0k+UUgPCuizFqXWcYllgvz/wFMay7Q FJBvvBQcomXtfZUfy5yYamMVLao16qfnFwyO2qayBpr9fdjUCElqQnq4GaweaUCQF2hC8r pxk4+UlBFAL1mT0HoPTiQVNjnTaaJFWCIhfvn3Rj69+Pu+L1RDcXuIr219MiPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689051856; 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=hGRA+GxZoEX6RvCA0ZNzARM2eZj7AIoZrGvP571mGTk=; b=aamBwU6mfXUJGk+GsHj7EhNlMwQYnBRfk27a/ZEXD4TqJ6TYmIkKoX2CzFcYHaO350U4n2 9/ueNs5DsFGtDiM05UG1Z+uJbqzu/oyBg2ieHdnUMBzyobFXg2oIll1UMP+6iWwpDdDD2+ I3tAY4ZGkI4k8eNHbFGSRIiNR/gT6AAasxbKXq7bSS702GoJlvrN0xqUE7d7v2MOuI2+Hb ulCOCgkMgFQN7nxpZNg9wTHivGNsKItiBBfApLy1fy4ooSkify8Gx6gJ6UPnXitu8ulymk JQ2hZXsagNvTMIcHT1XcORPztt7F5WyI6UjekZbdiv6eBTWmNomwKwACwylyyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689051856; a=rsa-sha256; cv=none; b=LaLBJrv80FK3kTD5uDbIe+dB3CgJro6W3L9cuCiY8QPWRzCJUs5jr2CRQz6Tvbi9JswTFd PxAUXVXIhB4/i2yPmpJyxwoOlYMv8A9laKdzu55OJyp8/e6BiqoUrfYf+1dkyJk2O/bafD bELQIwM/Eh1skrRYfo977vZyO7e6LDlo/XDGBFTk8/E/0yK0XSY0UCLLZ3zQI6hqeOrMXK ANyXt/irHdXzYY+Ep1xF5KZC/0dNDo+nyT3lNgvrAy6PRlVmNbJWwKaYH6LO5L3v2kikxj iTXaTQSTsV0jE9uBHSjir3+ogP/uBNA/HgUxxicwA4Q3yhMNQAZnYN9+WraIZg== 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 4R0TLS1Vksz1Cm5; Tue, 11 Jul 2023 05:04:16 +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 36B54GYJ013744; Tue, 11 Jul 2023 05:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B54GMU013743; Tue, 11 Jul 2023 05:04:16 GMT (envelope-from git) Date: Tue, 11 Jul 2023 05:04:16 GMT Message-Id: <202307110504.36B54GMU013743@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: f4a7497b21ee - main - games/punchy: replace 316a89ed4e72 with upstream fix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: f4a7497b21ee9bc7c9468ec6632dedcd34875798 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4a7497b21ee9bc7c9468ec6632dedcd34875798 commit f4a7497b21ee9bc7c9468ec6632dedcd34875798 Author: Jan Beich AuthorDate: 2023-07-11 03:17:45 +0000 Commit: Jan Beich CommitDate: 2023-07-11 05:03:23 +0000 games/punchy: replace 316a89ed4e72 with upstream fix --- games/punchy/Makefile | 5 +- games/punchy/files/patch-clang16-aarch64 | 104 +++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/games/punchy/Makefile b/games/punchy/Makefile index 8e1fe489fc11..ebb10876a190 100644 --- a/games/punchy/Makefile +++ b/games/punchy/Makefile @@ -1,7 +1,7 @@ PORTNAME= punchy DISTVERSIONPREFIX= v DISTVERSION= 0.3.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games wayland MAINTAINER= jbeich@FreeBSD.org @@ -24,11 +24,10 @@ PORTDATA= * # Bundled v8 BUILD_DEPENDS+= gn:devel/gn -USES+= compiler ninja:build python:build +USES+= ninja:build python:build BINARY_ALIAS+= python=${PYTHON_CMD} CARGO_ENV+= V8_FROM_SOURCE=1 CLANG_BASE_PATH="/usr" GN_ARGS='${GN_ARGS}' GN_ARGS+= use_custom_libcxx=false -CXXFLAGS+= ${${ARCH} == aarch64 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160:?-Wno-enum-constexpr-conversion:} post-patch: # Search assets under PREFIX instead of current directory diff --git a/games/punchy/files/patch-clang16-aarch64 b/games/punchy/files/patch-clang16-aarch64 new file mode 100644 index 000000000000..2ee89b0603ee --- /dev/null +++ b/games/punchy/files/patch-clang16-aarch64 @@ -0,0 +1,104 @@ +https://chromium.googlesource.com/v8/v8/+/d15d49b09dc7%5E%21/ + +--- cargo-crates/v8-0.47.1/v8/include/v8-internal.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/include/v8-internal.h +@@ -413,7 +413,7 @@ class Internals { + + static const int kNodeClassIdOffset = 1 * kApiSystemPointerSize; + static const int kNodeFlagsOffset = 1 * kApiSystemPointerSize + 3; +- static const int kNodeStateMask = 0x7; ++ static const int kNodeStateMask = 0x3; + static const int kNodeStateIsWeakValue = 2; + + static const int kFirstNonstringType = 0x80; +--- cargo-crates/v8-0.47.1/v8/src/ast/ast.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/ast/ast.h +@@ -1006,7 +1006,7 @@ class Literal final : public Expression { + friend class AstNodeFactory; + friend Zone; + +- using TypeField = Expression::NextBitField; ++ using TypeField = Expression::NextBitField; + + Literal(int smi, int position) : Expression(position, kLiteral), smi_(smi) { + bit_field_ = TypeField::update(bit_field_, kSmi); +--- cargo-crates/v8-0.47.1/v8/src/base/bit-field.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/base/bit-field.h +@@ -40,6 +40,11 @@ class BitField final { + static constexpr U kNumValues = U{1} << kSize; + + // Value for the field with all bits set. ++ // If clang complains ++ // "constexpr variable 'kMax' must be initialized by a constant expression" ++ // on this line, then you're creating a BitField for an enum with more bits ++ // than needed for the enum values. Either reduce the BitField size, ++ // or give the enum an explicit underlying type. + static constexpr T kMax = static_cast(kNumValues - 1); + + template +--- cargo-crates/v8-0.47.1/v8/src/compiler/backend/instruction-codes.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/compiler/backend/instruction-codes.h +@@ -195,7 +195,7 @@ V8_EXPORT_PRIVATE std::ostream& operator<<(std::ostrea + V(None) \ + TARGET_ADDRESSING_MODE_LIST(V) + +-enum AddressingMode { ++enum AddressingMode : uint8_t { + #define DECLARE_ADDRESSING_MODE(Name) kMode_##Name, + ADDRESSING_MODE_LIST(DECLARE_ADDRESSING_MODE) + #undef DECLARE_ADDRESSING_MODE +@@ -306,7 +306,7 @@ using LaneSizeField = base::BitField; + // LaneSizeField and AccessModeField are helper types to encode/decode a lane + // size, an access mode, or both inside the overlapping MiscField. + using LaneSizeField = base::BitField; +-using AccessModeField = base::BitField; ++using AccessModeField = base::BitField; + // TODO(turbofan): {HasMemoryAccessMode} is currently only used to guard + // decoding (in CodeGenerator and InstructionScheduler). Encoding (in + // InstructionSelector) is not yet guarded. There are in fact instructions for +--- cargo-crates/v8-0.47.1/v8/src/compiler/backend/instruction.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/compiler/backend/instruction.h +@@ -591,8 +591,8 @@ class LocationOperand : public InstructionOperand { + } + + static_assert(KindField::kSize == 3); +- using LocationKindField = base::BitField64; +- using RepresentationField = base::BitField64; ++ using LocationKindField = base::BitField64; ++ using RepresentationField = LocationKindField::Next; + using IndexField = base::BitField64; + }; + +--- cargo-crates/v8-0.47.1/v8/src/handles/global-handles.cc.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/handles/global-handles.cc +@@ -573,7 +573,7 @@ class GlobalHandles::Node final : public NodeBase; ++ using NodeState = base::BitField8; + // Tracks whether the node is contained in the set of young nodes. This bit + // persists across allocating and freeing a node as it's only cleaned up + // when young nodes are proccessed. +--- cargo-crates/v8-0.47.1/v8/src/maglev/maglev-ir.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/maglev/maglev-ir.h +@@ -271,7 +271,7 @@ class OpProperties { + return kValueRepresentationBits::decode(bitfield_); + } + constexpr bool is_pure() const { +- return (bitfield_ | kPureMask) == kPureValue; ++ return (bitfield_ & kPureMask) == kPureValue; + } + constexpr bool is_required_when_unused() const { + return can_write() || non_memory_side_effects(); +--- cargo-crates/v8-0.47.1/v8/src/wasm/wasm-code-manager.h.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/v8-0.47.1/v8/src/wasm/wasm-code-manager.h +@@ -463,7 +463,7 @@ class V8_EXPORT_PRIVATE WasmCode final { + int trap_handler_index_ = -1; + + // Bits encoded in {flags_}: +- using KindField = base::BitField8; ++ using KindField = base::BitField8; + using ExecutionTierField = KindField::Next; + using ForDebuggingField = ExecutionTierField::Next; +