From nobody Sun Jul 7 21:30:16 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 4WHL5429Tnz5Q5Vy; Sun, 07 Jul 2024 21:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WHL541TYqz4Qmk; Sun, 7 Jul 2024 21:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720387816; 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=+fER0u3pjJNhArQpOgMJ9pWWu6NIGNfsTCKzSOYokb0=; b=cRPyN+8vaVfSHhhjHJxcTuRZUuv1GHWgR/tZxndOGv/KBx+KzrqiCox7CKW4qH9VgNC8p9 i2aYy5HeC504gA0KlnGP4Tl15n8eIUscCQaBS01MkGzSepfJ0fzNjNAQyyqCGu+IjSkcgH FQPQ5WrCoHY/LzZpw7CChc/QWoOZGM53Iha1N5UCwAgkmO2Fi7TYqdUshD4ysyMbL21yhI Dq6csUMXYN6wv11s/AJPe8ukVNa64fECo9G29G8Jj2yIIm/r542K6iYKfMPx43Myxg1cl/ z/5KiTsPQNrUfxHstqdG55EgE90YixxJYyb1sw9FrdgmB4RCy5KIvfT2vHsddw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720387816; a=rsa-sha256; cv=none; b=yLKm4XgTK8b9FE5ViMh72NzbZyAFFcSmxgnU8Fgqc7/ZPOOsJtU1axRozJjaTR0arzRO+W QhAa4ifQVNz/y2tFXsbqy9HwYzlxuVkgrNML22FXQBhZguF3AUuUnh9Sx4N/IQQcGkjZth dbk9EQYQp42nKeMPc7A3Lq9aL/wU8BfwqfPWgPFJ9Zmm/3VklNyw7s+9cQFoPvlGGzR36m N8IS30+41Fjrr3HkDgG12svTDTiCgF72Qlvg/ZIv9+llqwe2zDLu7n2f+eTmlJm0GLpO5k J8AmI1gmHRoYDveG8FDlh1chULJ4bvWN6R2CCmmmnhpY8NTl/rwRXinMcaAO4Q== 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=1720387816; 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=+fER0u3pjJNhArQpOgMJ9pWWu6NIGNfsTCKzSOYokb0=; b=qZh14kjVYnEwtVT5GrStqceh6xkeSEO2WtpBPY8LgxVbzLgj5uR1eMgpXDiPTkLT9Zw8kK bWt8IHd0/f8LETBhHCOhhUa0sPFeAAQYAHIySo+RsNRORZGtdfjXAH0alMpDOB28BCiEp9 e5eP34/jxmCVs1wsG8QrfaCBAnV/DxpB8BwIeBJqHvvVjg3XtJrD7xEflLpqfclxwfvSAR kT5SO5+1VXE5+I0I86kkz1/my5Om1+9bpIDI2bj8qPnnHdUWlCP7AhFLcIzAmB/HrAN35r iC/HXh11vDFRC+Np7w78u0Bmlil0qhyBSay8AOJIm60y8VPA9l9uG3jZ2PFUmg== 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 4WHL5415BLzPB5; Sun, 7 Jul 2024 21:30:16 +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 467LUGXY073506; Sun, 7 Jul 2024 21:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 467LUGIk073494; Sun, 7 Jul 2024 21:30:16 GMT (envelope-from git) Date: Sun, 7 Jul 2024 21:30:16 GMT Message-Id: <202407072130.467LUGIk073494@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 8565550e2557 - main - www/firefox: drop obsolete patch 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8565550e2557fc339bb8e10f0197c6de36a154d1 Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8565550e2557fc339bb8e10f0197c6de36a154d1 commit 8565550e2557fc339bb8e10f0197c6de36a154d1 Author: Christoph Moench-Tegeder AuthorDate: 2024-07-07 21:26:01 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-07-07 21:26:01 +0000 www/firefox: drop obsolete patch In Skia m125 all extra ARM feature detection was removed (ref skia 571b4cf2e359), so we do not have to roll our own. This also should fix built on ARM, which was failing over the detection of native CRC32 instructions (which are not used anymore by Skia, and whose dis-use triggered the whole feature detection removal) Reported by: eduardo@ --- .../files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 33 ---------------------- 1 file changed, 33 deletions(-) diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp deleted file mode 100644 index fe73016d6618..000000000000 --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp +++ /dev/null @@ -1,33 +0,0 @@ -Regressed by https://svnweb.freebsd.org/changeset/base/324815 - -gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'getauxval' - uint32_t hwcaps = getauxval(AT_HWCAP); - ^ - -diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.cpp -index cdac7db2be2c..88391138880a 100644 ---- gfx/skia/skia/src/core/SkCpu.cpp -+++ gfx/skia/skia/src/core/SkCpu.cpp -@@ -81,6 +81,22 @@ - if (hwcap & HWCAP_LOONGARCH_LSX) { features |= SkCpu::LOONGARCH_SX; } - if (hwcap & HWCAP_LOONGARCH_LASX) { features |= SkCpu::LOONGARCH_ASX; } - -+ return features; -+ } -+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__) -+ #include -+ #ifndef ID_AA64ISAR0_CRC32_VAL -+ #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 -+ #endif -+ -+ static uint32_t read_cpu_features() { -+ uint32_t features = 0; -+ uint64_t id_aa64isar0; -+ -+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); -+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { -+ features |= SkCpu::CRC32; -+ } - return features; - } - #else