Date: Sun, 7 Jul 2024 21:30:16 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8565550e2557 - main - www/firefox: drop obsolete patch Message-ID: <202407072130.467LUGIk073494@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8565550e2557fc339bb8e10f0197c6de36a154d1 commit 8565550e2557fc339bb8e10f0197c6de36a154d1 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2024-07-07 21:26:01 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> 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 <machine/armreg.h> -+ #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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407072130.467LUGIk073494>