From owner-svn-ports-all@freebsd.org Tue Mar 31 15:13:25 2020 Return-Path: Delivered-To: svn-ports-all@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 6734A260890; Tue, 31 Mar 2020 15:13:25 +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) server-signature RSA-PSS (4096 bits) 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 48sCWn13Tpz3MGw; Tue, 31 Mar 2020 15:13:25 +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 9ADDBBD7E; Tue, 31 Mar 2020 15:13:16 +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 02VFDG6B070290; Tue, 31 Mar 2020 15:13:16 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02VFDFZY070288; Tue, 31 Mar 2020 15:13:15 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202003311513.02VFDFZY070288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Tue, 31 Mar 2020 15:13:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529979 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files X-SVN-Commit-Revision: 529979 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2020 15:13:26 -0000 Author: mikael Date: Tue Mar 31 15:13:15 2020 New Revision: 529979 URL: https://svnweb.freebsd.org/changeset/ports/529979 Log: www/firefox: fix build on aarch64 The interface has changed a bit on -current: In file included from Unified_cpp_gfx_skia1.cpp:137: /wrkdirs/usr/ports/www/firefox/work/firefox-71.0/gfx/skia/skia/src/core/SkCpu.cpp:81:13: error: use of undeclared identifier 'ID_AA64ISAR0_CRC32' if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { PR: 243653 Reviewed by: jbeich Approved by: jbeich , manu (mentor, implicit) Modified: head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Modified: head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp ============================================================================== --- head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Tue Mar 31 15:01:10 2020 (r529978) +++ head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Tue Mar 31 15:13:15 2020 (r529979) @@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of uint32_t hwcaps = getauxval(AT_HWCAP); ^ ---- gfx/skia/skia/src/core/SkCpu.cpp.orig 2019-02-27 22:18:23 UTC +--- gfx/skia/skia/src/core/SkCpu.cpp.orig 2020-02-10 09:43:20 UTC +++ gfx/skia/skia/src/core/SkCpu.cpp -@@ -70,6 +70,20 @@ +@@ -70,6 +70,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(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { + features |= SkCpu::CRC32; + } + return features; Modified: head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp ============================================================================== --- head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Tue Mar 31 15:01:10 2020 (r529978) +++ head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Tue Mar 31 15:13:15 2020 (r529979) @@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of uint32_t hwcaps = getauxval(AT_HWCAP); ^ ---- gfx/skia/skia/src/core/SkCpu.cpp.orig 2019-02-27 22:18:23 UTC +--- gfx/skia/skia/src/core/SkCpu.cpp.orig 2020-02-07 01:27:03 UTC +++ gfx/skia/skia/src/core/SkCpu.cpp -@@ -70,6 +70,20 @@ +@@ -70,6 +70,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(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { + features |= SkCpu::CRC32; + } + return features; Modified: head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp ============================================================================== --- head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Tue Mar 31 15:01:10 2020 (r529978) +++ head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp Tue Mar 31 15:13:15 2020 (r529979) @@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of uint32_t hwcaps = getauxval(AT_HWCAP); ^ ---- gfx/skia/skia/src/core/SkCpu.cpp.orig 2019-02-27 22:18:23 UTC +--- gfx/skia/skia/src/core/SkCpu.cpp.orig 2020-02-07 22:13:22 UTC +++ gfx/skia/skia/src/core/SkCpu.cpp -@@ -70,6 +70,20 @@ +@@ -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(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { + features |= SkCpu::CRC32; + } + return features;