[cairo-commit] 2 commits - meson.build

[GitLab Mirror]

 meson.build |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 7f6526e652f3d3115af5c0e3007166a350ca27f3
Merge: f2f2d20a3 d01222a69
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Feb 11 04:18:09 2023 +0000

    Merge branch 'enable-colorv1-fonts' into 'master'
    
    Enable COLRv1 fonts
    
    See merge request cairo/cairo!454

commit d01222a6930e11e5269d9939b025668277964dcf
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Feb 9 20:09:08 2023 +1030

    Enable COLRv1 fonts
    
    Now that FreeType 2.13.0 has been released with a stable COLRv1 API,
    the meson configuration can be updated to enable COLRv1 when this
    version is available.

diff --git a/meson.build b/meson.build
index 12512d115..5b6f9ebd5 100644
--- a/meson.build
+++ b/meson.build
@@ -4,8 +4,8 @@ project('cairo', 'c', 'cpp',
   default_options: ['warning_level=2'],
 )
 
-# Keep in sync with configure.ac!
 freetype_required_version = '>= 9.7.3'
+freetype_colrv1_required_version = '>= 25.0.19'
 fontconfig_required_version = '>= 2.2.95'
 xrender_required_version = '>= 0.6'
 xcb_required_version = '>= 1.6'
@@ -342,9 +342,8 @@ if freetype_dep.found()
         conf.set('CAIRO_CAN_TEST_TTX_FONT', 1)
       endif
     endif
-    # When FT COLRv1 API is no longer experimental we can change this to a
-    # version check for the stable COLRv1 API.
-    if cc.get_define('DEBUG_ENABLE_COLR_V1') != ''
+    if freetype_dep.version().version_compare(freetype_colrv1_required_version) and \
+       cc.has_function('FT_Get_Color_Glyph_Paint', dependencies: freetype_dep)
       conf.set('HAVE_FT_COLR_V1', 1)
     endif
     check_funcs += ft_check_funcs