From b16599a516e0f5e73673ba101ae0a852d8a14cf0 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 17 Oct 2019 09:34:13 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.14 branch. Task-number: QTBUG-77876 Change-Id: I2b539ee3c0687bf9bc16787878ad0e8e09e8b4d7 Reviewed-by: Samuli Piippo --- .../0006-chromium-aarch64-skia-build-fix.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch index b97b2dca..451ec3ee 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch @@ -1,4 +1,4 @@ -From 564eb25c70160f6b3f20a6eb5727427efc78b695 Mon Sep 17 00:00:00 2001 +From d9ff98eec574e87bf320fabc360c582f49c5d40a Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Thu, 8 Mar 2018 15:39:55 +0100 Subject: [PATCH] chromium: aarch64 skia build fix @@ -24,18 +24,19 @@ moment. Signed-off-by: Raphael Kubo da Costa --- - .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -index de14e65b94e..b8be7852086 100644 +index b59506d..b8f22c9 100644 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { +@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) { } SI F from_half(U16 h) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - __fp16 fp16; - memcpy(&fp16, &h, sizeof(U16)); - return float(fp16); @@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644 return _mm256_cvtph_ps(h); #else -@@ -751,13 +746,7 @@ SI F from_half(U16 h) { +@@ -995,14 +989,7 @@ SI F from_half(U16 h) { } SI U16 to_half(F f) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ +- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - __fp16 fp16 = __fp16(f); - U16 u16; - memcpy(&u16, &fp16, sizeof(U16)); -- cgit v1.2.3-54-g00ecf