From nobody Thu Feb 09 04:35:30 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 4PC3vR1Y8Gz3pJ1Z; Thu, 9 Feb 2023 04:35:31 +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 4PC3vR0wvDz3jC3; Thu, 9 Feb 2023 04:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675917331; 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=NFjpm6j17mJI84RPUpP5Nic0n20ovZKM2Z4iYcoPXKA=; b=gQ+Qr3ydHNvuBJZpkPDjz4TwnCDtSxwVr0XEQniNC/M6Y/sQPGt3P3TrJb0P+FteFIFRXv jzQ9mUb3gCYA9H7wWar8r7mKwTTBqFfomnM7ivCuoHPqJZ/MLC0nAUTUiUCF0kV3n/aVhX fajQWWl1LmNuSpeWOvynOv/LCu2++s1JbwP2fGtfZP0emLDYYuY6KG6Cbj49DqqFFLPjDX PcNSM3AAMA2MRpqGc2B1piJXZx+A3QCQN4aTkUYuUIzRrIbn8sysRh+qpJJSIoP2wnP0ma ENjHkpmE4OQ6sM+5CQOIUFFunUkp8+AkEDkX/ZsJYU/pVDVK+uCnDYZBQrzszw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675917331; 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=NFjpm6j17mJI84RPUpP5Nic0n20ovZKM2Z4iYcoPXKA=; b=l3/hbv3jBoXFu6Q6tzVyUrSynu1y8TIL/XjsvqR9endvBltoyvJyzpMwaJrjaSHd3hklCu 287ite19uPLw6ykrsWCySgZZVxw2ZVg+8qB1NBeiyBMSc6oM3miaR4d1dOhaUVVsn5zPYn n02xsIoWqDucmJGfYDmz061tqUsXitJILgWdIrzh+Yb54VkWN5Mp8KAOHZKnMUTWk9MWCV 0gtC+a52m4n3q/SgxGi70yt3hY0qiE2lE0WMx+3hsUXOG+wmdJNY3GlpPTgCqlfPyCAit8 NIcutBiPH1WfSmB+51sEwQKl/g3oHT2b7CZK81gpEX7RcW9PnHfDoJx/GUhA5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675917331; a=rsa-sha256; cv=none; b=pbRNgSrBxgNWs54TqFTgloHTxjgK3LH0Ol958qp5tzZ1v88rp9dB9lIlGSauj4hGU/V7Ay E6E2jgvbvseBPA4EI6BDPYd7wAPwbaHMGqeXW/801FI5iAYQxfbfW+kH0s7i9pYLFLw/Jp V0+NnkJxTTKzcNlDZvK4043srTLHj3onAoDi5JCP+AoHAFhmnWmEefdIcLtGTyyBSF0Jen 0Tdk+oG0Er/kvj0Ympglb+rVdPJC66AmfAIDsQ9SP0A39c2f4ashdtdSnh8PpFbmLcmPgq 2hNNKGf5SWZ2VliWb82f81FrC82PCAWuLJJbRA0jYzjaW2Ci8P9UeVw43akDkg== 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 4PC3vQ6pFMzPRh; Thu, 9 Feb 2023 04:35:30 +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 3194ZUlD008701; Thu, 9 Feb 2023 04:35:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3194ZUYl008700; Thu, 9 Feb 2023 04:35:30 GMT (envelope-from git) Date: Thu, 9 Feb 2023 04:35:30 GMT Message-Id: <202302090435.3194ZUYl008700@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 7ad0eea3f54d - main - www/qt6-webengine: unbreak build on aarch64 (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ad0eea3f54d491dde005f71edad4b117d457a4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ad0eea3f54d491dde005f71edad4b117d457a4c commit 7ad0eea3f54d491dde005f71edad4b117d457a4c Author: Dima Panov AuthorDate: 2023-02-09 04:30:20 +0000 Commit: Dima Panov CommitDate: 2023-02-09 04:35:12 +0000 www/qt6-webengine: unbreak build on aarch64 (+) Backport Skia m103 changes to eliminate build error on arm64/aarch64: In file included from ../../../../../qtwebengine-everywhere-src-6.4.2/src/3rdparty/chromium/third_party/skia/src/core/SkOpts.cpp:46: ../../../../../qtwebengine-everywhere-src-6.4.2/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h:1007:5: warning: 'memcpy' will always overflow; destination buffer has size 2, but size argument is 8 [-Wfortify-source] memcpy(&fp16, &h, sizeof(U16)); ^ ../../../../../qtwebengine-everywhere-src-6.4.2/src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h:1032:19: error: functional-style cast from 'neon::F' (aka 'V') to '__fp16' is not allowed __fp16 fp16 = __fp16(f); ^~~~~~~~ 1 warning and 1 error generated. Sponsored by: Serenity Cybersecurity, LLC --- ...d__party_skia_src_opts_SkRasterPipeline__opts.h | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h new file mode 100644 index 000000000000..5ab894d0e355 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h @@ -0,0 +1,33 @@ +--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2022-12-12 18:53:13 UTC ++++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +@@ -1000,13 +1000,8 @@ SI F from_half(U16 h) { + SI F from_half(U16 h) { + #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ + && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(SK_BUILD_FOR_MAC) + return vcvt_f32_f16(h); +-#else +- __fp16 fp16; +- memcpy(&fp16, &h, sizeof(U16)); +- return float(fp16); +-#endif ++ + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) + return _mm256_cvtph_ps(h); + +@@ -1026,14 +1021,8 @@ SI U16 to_half(F f) { + SI U16 to_half(F f) { + #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ + && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(SK_BUILD_FOR_MAC) + return vcvt_f16_f32(f); +-#else +- __fp16 fp16 = __fp16(f); +- U16 u16; +- memcpy(&u16, &fp16, sizeof(U16)); +- return u16; +-#endif ++ + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) + return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); +