From nobody Mon Jan 15 03:06:25 2024 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 4TCxqj6xlvz57RWl; Mon, 15 Jan 2024 03:06:25 +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 4TCxqj6Vq2z457Y; Mon, 15 Jan 2024 03:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705287985; 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=6DblHnk4HPo8wKn5ph37YUmT05+5Jxgyzq5HyUJUeAI=; b=P+gtOfbflcglq7h1MDn/F8sxat3+2Foajs4NYRv8MchnJaMf8Ubo0hn26nKXqmNST2V8Sh bC3WKVmG0jBCgKUA8t2hOKWl2NepJGmprxnhjjljjheCc2YwdDSp2QUPow7vNNvf+HO0ss YW7LMwDCPQ/XJ0K0/u4p8gjqBtrP7zAsiaY/C/e5Q+9hRKvNvf7wB7OwoKL6CxAs56BGmb 3PCh9BYQdx+i99EBltq27zST9JF/va5Ibo9aau5PsHVk1S5Om7HlY1Hc8nBsjcAu6Mvtm1 30SxDTbcn0QBr+GB/KShr7biTjS6BsL+TwuqBTY/YH8sgw/YaXsMqLObI1vHpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705287985; 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=6DblHnk4HPo8wKn5ph37YUmT05+5Jxgyzq5HyUJUeAI=; b=u2izXCDaHf1+bQDA1cha1I5Zfqg0eJvpNGbGr6Es/qQQunj0i+bCr1hYeeGJrYbCKDH9Qk B3QtTIE/3+OIM+a7dPvpVmLjQxvQz0RtWdkWMCFPldAz1MDiB/RWsticYUy71g7F8ElqTS AZYE3JGdvFuU5LaM6AvTBqF4wqKJzqkUYiAxBGJcxGdmvF0E8UStpxttV9artHeDzUo3YF zGMKExsZacz//aiJ0T+iwjTF7Q3GsjEpuzGw8nVHXJz47Ua1j/gJuKcFImGeoaQmEPZE6L DGYzHsmkjh1ir1YZwSZLj3blCiC1YJQgqUWFS+PgKVz2Oy2B6HE7vRyLRStgPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705287985; a=rsa-sha256; cv=none; b=skQ5d5htiyXbRquLSPQvygF3zl6cMQe5RoUeaS+L4sOL8ms1rASCMgsaA1WzRHshdlN5nu glPrKc79OkSO51L4lUpqv4s8gq0sm4xILdPIRmc81jyn7K0Nm4RGLbApgESWJT+TPw//h0 098KraItvE6qknOzNc2hsYIA10m8u71pZ17NaXvkr194CH8/egTUkLAycrLhAKZgOGoFI9 R0yvn0g+EJ+zEtyUp88RdPzyUtZ1Q29GpPPDOl5n38wYdu7lFu/Ba5B4oP1LowUJKE18uL w/vGz0+r/Wri3x0OOh+eNIjU3wQYL+6xYkU30UF0LRKlIugezr6f1aDz1a4lEw== 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 4TCxqj5bMpzgRf; Mon, 15 Jan 2024 03:06:25 +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 40F36Pwd062534; Mon, 15 Jan 2024 03:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40F36PIq062531; Mon, 15 Jan 2024 03:06:25 GMT (envelope-from git) Date: Mon, 15 Jan 2024 03:06:25 GMT Message-Id: <202401150306.40F36PIq062531@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 6fbf33981764 - main - www/qt6-webengine: Fix build on armv7 (hopefully) 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fbf33981764df19398eab41edbc688f767d1e8b Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fbf33981764df19398eab41edbc688f767d1e8b commit 6fbf33981764df19398eab41edbc688f767d1e8b Author: Jason E. Hale AuthorDate: 2024-01-15 02:33:30 +0000 Commit: Jason E. Hale CommitDate: 2024-01-15 02:59:59 +0000 www/qt6-webengine: Fix build on armv7 (hopefully) I accidentally removed parts of certain patches meant to fix build on armv7 in [1] which were introduced in [2]. QtWebEngine was building at the tail end of 6.5.3 on armv7, but I seem to have regressed it with the update to 6.6.0. [1] https://cgit.freebsd.org/ports/commit/?id=1d76bdf62dffad91834699701f41d3374dfb6a3a [2] https://cgit.freebsd.org/ports/commit/?id=dd2c7b778901a7b310d37f044c0018de1603c37f MFH: 2024Q1 --- ...y_chromium_third__party_skia_src_core_SkCpu.cpp | 26 +++++++++++++++++++++- ...romium_v8_src_base_platform_platform-freebsd.cc | 4 ++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp index d36141b5240f..85318d909ea7 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp.orig 2022-04-21 18:48:31 UTC +--- src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp.orig 2023-11-20 16:08:07 UTC +++ src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp @@ -73,6 +73,42 @@ return features; @@ -43,3 +43,27 @@ #elif defined(SK_CPU_ARM64) && __has_include() #include +@@ -110,6 +146,23 @@ + if (std::size(buf) != midr_el1.read(buf, std::size(buf)) + || 0 == memcmp(kMongoose3, buf, std::size(buf))) { + features &= ~(SkCpu::ASIMDHP); ++ } ++ } ++ return features; ++ } ++ ++#elif defined(SK_CPU_ARM32) && defined(__FreeBSD__) ++ #include ++ ++ static uint32_t read_cpu_features() { ++ unsigned long hwcaps = 0; ++ uint32_t features = 0; ++ ++ elf_aux_info(AT_HWCAP, (void *)&hwcaps, sizeof hwcaps); ++ if (hwcaps & HWCAP_NEON) { ++ features |= SkCpu::NEON; ++ if (hwcaps & HWCAP_VFPv4) { ++ features |= SkCpu::NEON_FMA|SkCpu::VFP_FP16; + } + } + return features; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc index 3c3165a63310..e03d9e35b45c 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig 2022-02-07 13:39:41 UTC +--- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig 2023-11-20 16:08:07 UTC +++ src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc @@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache() { return new PosixDefaultTimezoneCache(); @@ -20,7 +20,7 @@ lib_name = std::string(path); } result.push_back(SharedLibraryAddress( -+#if defined(__i386__) || defined(OS_FREEBSD) ++#if defined(__i386__) || defined(__arm__) || defined(OS_FREEBSD) + lib_name, static_cast(map->kve_start), + static_cast(map->kve_end))); +#else