1diff -urN skia-old/src/ports/SkFontHost_FreeType_common.cpp skia/src/ports/SkFontHost_FreeType_common.cpp 2--- skia-old/src/ports/SkFontHost_FreeType_common.cpp 2021-03-01 15:53:09.178606791 +0100 3+++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-09-14 21:58:59.996633457 +0200 4@@ -372,6 +372,7 @@ 5 // Only build COLRv1 rendering code if FreeType is new enough to have COLRv1 6 // additions. FreeType defines a macro in the ftoption header to tell us whether 7 // it does support these features. 8+#undef TT_SUPPORT_COLRV1 // Unstable API. 9 #ifdef TT_SUPPORT_COLRV1 10 11 bool generateFacePathCOLRv1(FT_Face face, SkGlyphID glyphID, SkPath* path); 12diff -urN skia-old/src/ports/SkFontHost_FreeType.cpp skia/src/ports/SkFontHost_FreeType.cpp 13--- skia-old/src/ports/SkFontHost_FreeType.cpp 2021-03-01 15:53:09.178606791 +0100 14+++ skia/src/ports/SkFontHost_FreeType.cpp 2021-09-14 21:59:08.916715446 +0200 15@@ -1299,6 +1299,7 @@ 16 FT_UInt layerGlyphIndex; 17 FT_UInt layerColorIndex; 18 19+#undef TT_SUPPORT_COLRV1 // Unstable API. 20 #ifdef TT_SUPPORT_COLRV1 21 FT_OpaquePaint opaqueLayerPaint; 22 opaqueLayerPaint.p = nullptr; 23