From owner-svn-ports-head@freebsd.org Wed Nov 11 13:24:32 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8CB662E9C2A; Wed, 11 Nov 2020 13:24:32 +0000 (UTC) (envelope-from mikael@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CWQSJ3bfKz4ly1; Wed, 11 Nov 2020 13:24:32 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6395A15532; Wed, 11 Nov 2020 13:24:32 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ABDOWZB035164; Wed, 11 Nov 2020 13:24:32 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ABDOWah035163; Wed, 11 Nov 2020 13:24:32 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202011111324.0ABDOWah035163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Wed, 11 Nov 2020 13:24:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554892 - head/editors/libreoffice/files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: head/editors/libreoffice/files X-SVN-Commit-Revision: 554892 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2020 13:24:32 -0000 Author: mikael Date: Wed Nov 11 13:24:31 2020 New Revision: 554892 URL: https://svnweb.freebsd.org/changeset/ports/554892 Log: editors/libreoffice: fix build on aarch64 workdir/UnpackedTarball/skia/src/core/SkCpu.cpp:83:27: error: use of undeclared identifier 'getauxval' Reported by: linimon Approved by: portmgr (tier-2 blanket) 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 Wed Nov 11 13:24:31 2020 (r554892) @@ -0,0 +1,12 @@ +--- external/skia/UnpackedTarball_skia.mk.orig 2020-11-11 11:32:22 UTC ++++ external/skia/UnpackedTarball_skia.mk +@@ -38,7 +38,8 @@ skia_patches := \ + windows-typeface-directwrite.patch.0 \ + windows-raster-surface-no-copies.patch.1 \ + fix-windows-dwrite.patch.1 \ +- public-make-from-backend-texture.patch.1 \ ++ public-make-from-backend-texture.patch.1 \ ++ 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 Wed Nov 11 13:24:31 2020 (r554892) @@ -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 +++ #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() ++ #include ++