Date: Sat, 30 May 2020 17:31:10 +0000 (UTC) From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537095 - head/www/qt5-webengine/files Message-ID: <202005301731.04UHVAW8029606@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mikael Date: Sat May 30 17:31:09 2020 New Revision: 537095 URL: https://svnweb.freebsd.org/changeset/ports/537095 Log: www/qt5-webengine: fix build on aarch64 PR: 246756 Approved by: kde (tcberner) Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h (contents, props changed) Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_arm__features.c Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h Sat May 30 17:31:09 2020 (r537095) @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2020-05-25 17:49:17 UTC ++++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +@@ -996,7 +996,7 @@ SI F from_half(U16 h) { + + SI U16 to_half(F f) { + #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++ && ! (defined(SK_BUILD_FOR_GOOGLE3 || defined(ARMV8_OS_FREEBSD)) // Temporary workaround for some Google3 builds. + __fp16 fp16 = __fp16(f); + U16 u16; + memcpy(&u16, &fp16, sizeof(U16)); Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn Sat May 30 16:43:43 2020 (r537094) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn Sat May 30 17:31:09 2020 (r537095) @@ -1,6 +1,15 @@ --- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/third_party/zlib/BUILD.gn -@@ -359,7 +359,7 @@ static_library("bundled_minizip") { +@@ -82,6 +82,8 @@ if (use_arm_neon_optimizations) { + defines = [ "CRC32_ARMV8_CRC32" ] + if (is_android) { + defines += [ "ARMV8_OS_ANDROID" ] ++ } else if (is_bsd) { ++ defines += [ "ARMV8_OS_FREEBSD" ] + } else if (is_linux || is_chromeos) { + defines += [ "ARMV8_OS_LINUX" ] + } else if (is_fuchsia) { +@@ -367,7 +369,7 @@ static_library("bundled_minizip") { ] } Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_arm__features.c ============================================================================== --- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_arm__features.c Sat May 30 16:43:43 2020 (r537094) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_arm__features.c Sat May 30 17:31:09 2020 (r537095) @@ -1,6 +1,15 @@ --- src/3rdparty/chromium/third_party/zlib/arm_features.c.orig 2020-03-22 20:03:48 UTC +++ src/3rdparty/chromium/third_party/zlib/arm_features.c -@@ -27,6 +27,15 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; +@@ -12,7 +12,7 @@ + int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0; + int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_FREEBSD) + #include <pthread.h> + #endif + +@@ -27,13 +27,22 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; #include <zircon/types.h> #elif defined(ARMV8_OS_WINDOWS) #include <windows.h> @@ -16,6 +25,14 @@ #else #error arm_features.c ARM feature detection in not defined for your platform #endif + + static void _arm_check_features(void); + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_FREEBSD) + static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT; + void ZLIB_INTERNAL arm_check_features(void) + { @@ -86,5 +95,12 @@ static void _arm_check_features(void) #elif defined(ARMV8_OS_WINDOWS) arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005301731.04UHVAW8029606>