diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-05-25 12:13:24 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-08-26 10:27:57 +0200 |
| commit | a0edcc68f94915a78fcc08e70d2cdd752abd9ebb (patch) | |
| tree | cdbe1279877c3071ca84ef03ed317830a85a724f /bin | |
| parent | b67f42c4c2906b7059b93d748c8efccd588b1e1c (diff) | |
update Skia to chrome/m94
Updating to m91 or newer required handling the problem with Vulkan
crashing, but that's been finally fixed by the previous commit.
This Skia version also requires at least freetype-2.8.1, so disable
Skia if that's not available (LO's minimum is lower). Additionally
patch out Skia's use of TT_SUPPORT_COLRV1, which seems to be
an unstable freetype API from the git version and it doesn't even
compile with the latest stable 2.9.11 release
Change-Id: I4a17effb912468c43fc7cdb69fe453062e4d2447
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120967
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/update_pch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/update_pch b/bin/update_pch index e47a97994bb2..e59e72172deb 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -474,7 +474,8 @@ def filter_ignore(line, module): 'src/sksl/SkSLCPP.h', 'src/gpu/vk/GrVkAMDMemoryAllocator.h', 'src/gpu/GrUtil.h', - 'src/sksl/dsl/', + 'src/sksl/', # conflict between SkSL::Expression and SkSL::dsl::Expression + 'include/sksl/', ] for i in ignore_list: |