diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2021-01-27 09:21:29 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-02-05 14:56:55 +0200 |
commit | a73de388e628a67490cdd7734779d405740b7fa3 (patch) | |
tree | c6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch | |
parent | 7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff) | |
download | meta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz |
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based.
- PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations
has been removed from src/buildtools/configure.json
- DEPENDS nodejs-native added. This mandatory for chromium build.
Task-number: QTBUG-90623
Change-Id: Ic933c88399422941114915afe5baa202850928f4
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch new file mode 100644 index 00000000..c3b3c830 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From abe0a1c661241943b40192cf3fe73227123d7369 Mon Sep 17 00:00:00 2001 | ||
2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
3 | Date: Thu, 8 Mar 2018 15:39:55 +0100 | ||
4 | Subject: [PATCH] chromium: aarch64 skia build fix | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | GCC (tested rocko's 7.3.0) cannot find these intrinsics and the build fails: | ||
9 | |||
10 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::F neon::from_half(neon::U16)': | ||
11 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h:657:26: error: cannot convert 'neon::U16 {aka short unsigned int}' to 'float16x4_ t {aka __vector(4) __ fp16}' for argument '1' to ' | ||
12 | float32x4_t vcvt_f32_f16(float16x4_t)' | ||
13 | return vcvt_f32_f16(h); | ||
14 | ^ | ||
15 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::U16 neon::to_half(neon::F)': | ||
16 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h:677:26: error: cannot convert 'neon::F {aka float}' to 'float32x4_t {aka __vector (4) float}' for argum ent '1' to 'float16x4_t vcvt | ||
17 | _f16_f32(float32x4_t)' | ||
18 | return vcvt_f16_f32(f); | ||
19 | ^ | ||
20 | |||
21 | Upstream seems to have had similar issues according to | ||
22 | https://skia-review.googlesource.com/c/skia/+/84222, but there is no fix at the | ||
23 | moment. | ||
24 | |||
25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
26 | --- | ||
27 | chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 4 ++-- | ||
28 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
29 | |||
30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
31 | index 659794d1b50..d5b609ba93d 100644 | ||
32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
34 | @@ -984,7 +984,7 @@ SI F from_half(U16 h) { | ||
35 | memcpy(&fp16, &h, sizeof(U16)); | ||
36 | return float(fp16); | ||
37 | |||
38 | -#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) | ||
39 | +#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512) | ||
40 | return _mm256_cvtph_ps(h); | ||
41 | |||
42 | #else | ||
43 | @@ -1008,7 +1008,7 @@ SI U16 to_half(F f) { | ||
44 | memcpy(&u16, &fp16, sizeof(U16)); | ||
45 | return u16; | ||
46 | |||
47 | -#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) | ||
48 | +#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512) | ||
49 | return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); | ||
50 | |||
51 | #else | ||