svn commit: r564180 - head/editors/libreoffice/files
Dima Panov
fluffy at FreeBSD.org
Sat Feb 6 02:13:48 UTC 2021
Author: fluffy
Date: Sat Feb 6 02:13:47 2021
New Revision: 564180
URL: https://svnweb.freebsd.org/changeset/ports/564180
Log:
editors/libreoffice: Fix build on aarch64
Submitted by: Michael Urankar via github
MFH: 2021Q1
Added:
head/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk (contents, props changed)
head/editors/libreoffice/files/patch-external_skia_gfx-skia-skia-src-core-SkCpu.cpp.patch.0 (contents, props changed)
Added: head/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk Sat Feb 6 02:13:47 2021 (r564180)
@@ -0,0 +1,12 @@
+--- external/skia/UnpackedTarball_skia.mk.orig 2021-02-05 14:00:19 UTC
++++ external/skia/UnpackedTarball_skia.mk
+@@ -36,7 +36,8 @@ skia_patches := \
+ c++20.patch.0 \
+ constexpr-debug-std-max.patch.1 \
+ swap-buffers-rect.patch.1 \
+- ubsan.patch.0
++ ubsan.patch.0 \
++ gfx-skia-skia-src-core-SkCpu.cpp.patch.0
+
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
+
Added: head/editors/libreoffice/files/patch-external_skia_gfx-skia-skia-src-core-SkCpu.cpp.patch.0
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-external_skia_gfx-skia-skia-src-core-SkCpu.cpp.patch.0 Sat Feb 6 02:13:47 2021 (r564180)
@@ -0,0 +1,35 @@
+--- external/skia/gfx-skia-skia-src-core-SkCpu.cpp.patch.0.orig 2020-11-11 11:31:37 UTC
++++ external/skia/gfx-skia-skia-src-core-SkCpu.cpp.patch.0
+@@ -0,0 +1,32 @@
++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);
++ ^
++
++--- src/core/SkCpu.cpp.orig 2020-02-07 22:13:22 UTC
+++++ src/core/SkCpu.cpp
++@@ -72,6 +72,23 @@
++ 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;
+++ }
+++
++ #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
++ #include <sys/auxv.h>
++
More information about the svn-ports-head
mailing list