[meson] Update cairo subproject

Update to the current master branch so that is has
cairo_user_font_face_set_render_color_glyph_func().

I had to disable optimized builds on win[32|64] crossbuild setups
because they are now broken in the CI (something about cairo defining
_FORTIFY_SOURCE for optimized builds that MingW does not like).
This commit is contained in:
Khaled Hosny 2022-02-08 22:44:11 +02:00 committed by Behdad Esfahbod
parent 628847b5c8
commit 74ebfc646a
4 changed files with 2 additions and 5 deletions

View File

@ -3,7 +3,6 @@ set -e
meson --cross-file=.ci/win32-cross-file.txt \ meson --cross-file=.ci/win32-cross-file.txt \
--wrap-mode=forcefallback \ --wrap-mode=forcefallback \
--buildtype=release \
-Dtests=disabled \ -Dtests=disabled \
-Dcairo=enabled \ -Dcairo=enabled \
-Dcairo:fontconfig=disabled \ -Dcairo:fontconfig=disabled \

View File

@ -3,7 +3,6 @@ set -e
meson --cross-file=.ci/win64-cross-file.txt \ meson --cross-file=.ci/win64-cross-file.txt \
--wrap-mode=forcefallback \ --wrap-mode=forcefallback \
--buildtype=release \
-Dtests=disabled \ -Dtests=disabled \
-Dcairo=enabled \ -Dcairo=enabled \
-Dcairo:fontconfig=disabled \ -Dcairo:fontconfig=disabled \

View File

@ -187,8 +187,7 @@ endif
if cairo_dep.found() if cairo_dep.found()
conf.set('HAVE_CAIRO', 1) conf.set('HAVE_CAIRO', 1)
if cairo_dep.type_name() == 'internal' if cairo_dep.type_name() == 'internal'
# FIXME: uncomment this when we update Ciaro subproject conf.set('HAVE_CAIRO_USER_FONT_FACE_SET_RENDER_COLOR_GLYPH_FUNC', 1)
#conf.set('HAVE_CAIRO_USER_FONT_FACE_SET_RENDER_COLOR_GLYPH_FUNC', 1)
else else
check_funcs += [['cairo_user_font_face_set_render_color_glyph_func', {'deps': cairo_dep}]] check_funcs += [['cairo_user_font_face_set_render_color_glyph_func', {'deps': cairo_dep}]]
endif endif

View File

@ -2,7 +2,7 @@
directory=cairo directory=cairo
url=https://gitlab.freedesktop.org/cairo/cairo.git url=https://gitlab.freedesktop.org/cairo/cairo.git
depth=1 depth=1
revision=1.17.4 revision=fb3734fac0b41eb370911b04cbfa6604a99e6bf7
[provide] [provide]
dependency_names = cairo, cairo-ft dependency_names = cairo, cairo-ft