From nobody Sun Jul 7 21:30:51 2024 X-Original-To: dev-commits-ports-branches@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 4WHL5l2XWcz5Q5TM; Sun, 07 Jul 2024 21:30:51 +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 4WHL5l26Ywz4Qkb; Sun, 7 Jul 2024 21:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720387851; 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=hwZi4SVbM8Sf7q0/HSX5VzYUcVwmN37gJ4BuilOh9NA=; b=dbiDTNiAjjqEPTb+gUj3CDpG1UWFUTciQ0McauwoK5eCotpqEdiQE5tAikA+NNcWo4Ucit 4dt3J3JwcFf6RNtnZDw5/pje5lX2AMhFZbOzQqVpDCm+qrr3F4ORDHdc7oXyaZYxd7Nue0 +T6bjktDnrIuEMbkHgnAIMyjor1dt+NeOuzvjgojqNOT+/g+uso3Oz2PbHJfWXaVGCcLs/ qaF/tVyZ6yhE+504Xu6mAUoQm2o0dWLFSXPyllsSJWrqN4YfbJWgVHTxUZP4Pg9NdS/q0W EbGqpGhIdEMUcccRhq/PXC36zNrjXS+PthdlZcBKeQPjSHGbbPOkdP67U2VA4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720387851; a=rsa-sha256; cv=none; b=N3DjRZgiS9xIwzHWqCxKrleXzAA4+RFkEvk59jwKbVOyykxCFyUDSqQSv67gWxAh3syziE K2bqoKm3Lxf7cXudzlRfWcrjd+Zrz2MzqR8PVDmswQ8dWYR159wRCD7Wn1Mqr8M5+ZjgAE l6Z6zzsu48zveWiAANM5chjNYDUy4noDiR7ZUtveVFsUz67dUOoE9I1roLcqSiMYY00MZC m2bG4RFgRVslM1jis0L9+r+R39A6jciPZLJRQtGPutzLHmUmaWqRNS//hdFqc+7k1A6VLW gYia5rbfzsn1v4MEfabH0pSTzoRIHMNOkCMDkrYfNWgEPRpxBz2n5+XXyeVoKA== 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=1720387851; 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=hwZi4SVbM8Sf7q0/HSX5VzYUcVwmN37gJ4BuilOh9NA=; b=bagC1eli8B03DBGBFKirUjQaDTQplLJ/vZvjULoPYG7g12vwVDHpGq+eaAcqINajHiLeUm yeW2w8ADz6m2IzRf0sjwuXghCSgm5DFlNjANS3+yLhJ6G8c7V+Zpylubna2nURVeUQrwRD mFIMOQxzCdceUrHEJ7ksf0/pT2OSCKAEH39kuBHdPyxzs4KAI2F/RPJCMedqqU+za9LlvD yBL1QnEkRA2Vt6FyVK8+jXzlTXThK3Lb6DINQYZEBdQfCHLoR+Xebkf1aGJOy81XawafRg bY5y9Z9Uy95GsuQZ8YPD8CYV/3XZv63hGD39QJP7Z0ale+iD+10nQ1iFf6rjqA== 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 4WHL5l1kMyzPb1; Sun, 7 Jul 2024 21:30:51 +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 467LUplf075460; Sun, 7 Jul 2024 21:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 467LUpUW075457; Sun, 7 Jul 2024 21:30:51 GMT (envelope-from git) Date: Sun, 7 Jul 2024 21:30:51 GMT Message-Id: <202407072130.467LUpUW075457@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 0635c7453f2c - 2024Q3 - www/firefox: drop obsolete patch List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 0635c7453f2ca1f2eced4ca75ab3788057db09b0 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0635c7453f2ca1f2eced4ca75ab3788057db09b0 commit 0635c7453f2ca1f2eced4ca75ab3788057db09b0 Author: Christoph Moench-Tegeder AuthorDate: 2024-07-07 21:26:01 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-07-07 21:30:38 +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@ (cherry picked from commit 8565550e2557fc339bb8e10f0197c6de36a154d1) --- .../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