diff --git a/meson.build b/meson.build index 210ba3711..b2337bca9 100644 --- a/meson.build +++ b/meson.build @@ -330,6 +330,11 @@ if freetype_dep.found() foreach func : ft_check_funcs conf.set('HAVE_@0@'.format(func.to_upper()), 1) endforeach + if freetype_dep.version().version_compare(freetype_colrv1_required_version) + conf.set('HAVE_FT_SVG_DOCUMENT', 1) + conf.set('HAVE_FT_LOAD_NO_SVG', 1) + conf.set('HAVE_FT_COLR_V1', 1) + endif internal_deps += [freetype_dep] else if not cc.links(files('meson-cc-tests/ft_has_color.c'), dependencies: freetype_dep, name: 'FT has color') diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap index 3f7091485..36be273c6 100644 --- a/subprojects/expat.wrap +++ b/subprojects/expat.wrap @@ -1,11 +1,13 @@ [wrap-file] -directory = expat-2.2.9 -source_url = https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.xz -source_filename = expat-2.2.9.tar.bz2 -source_hash = 1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4 -patch_filename = expat_2.2.9-4_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.2.9-4/get_patch -patch_hash = 8337fcf3928bbf9048a1a6a93b41a55588a5c9838a860bcc7c57f0e2a9517e95 +directory = expat-2.6.0 +source_url = https://github.com/libexpat/libexpat/releases/download/R_2_6_0/expat-2.6.0.tar.xz +source_filename = expat-2.6.0.tar.bz2 +source_hash = cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e +patch_filename = expat_2.6.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.6.0-1/get_patch +patch_hash = 7452665b0cf413f87fae1dc4d5c779bc2c8f0ccf3ba637140c9d46eacf521604 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/expat_2.6.0-1/expat-2.6.0.tar.bz2 +wrapdb_version = 2.6.0-1 [provide] -expat = expat_dep \ No newline at end of file +expat = expat_dep diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap index b6b77f4fe..7dc416811 100644 --- a/subprojects/fontconfig.wrap +++ b/subprojects/fontconfig.wrap @@ -1,5 +1,10 @@ -[wrap-git] -directory=fontconfig -url=https://gitlab.freedesktop.org/fontconfig/fontconfig.git -push-url=git@gitlab.freedesktop.org:fontconfig/fontconfig.git -revision=main +[wrap-file] +directory = fontconfig-2.14.2 +source_url = https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz +source_filename = fontconfig-2.14.2.tar.xz +source_hash = dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fontconfig_2.14.2-1/fontconfig-2.14.2.tar.xz +wrapdb_version = 2.14.2-1 + +[provide] +fontconfig = fontconfig_dep diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap index c346deb01..e3554c9a1 100644 --- a/subprojects/freetype2.wrap +++ b/subprojects/freetype2.wrap @@ -1,4 +1,11 @@ -[wrap-git] -directory=freetype -url=https://gitlab.freedesktop.org/freetype/freetype.git -revision=VER-2-11-0 +[wrap-file] +directory = freetype-2.13.2 +source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.13.2-1/freetype-2.13.2.tar.xz +source_filename = freetype-2.13.2.tar.xz +source_hash = 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d +wrapdb_version = 2.13.2-1 + +[provide] +freetype2 = freetype_dep +freetype = freetype_dep diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap index 599045ba8..d8a4abffa 100644 --- a/subprojects/libpng.wrap +++ b/subprojects/libpng.wrap @@ -1,11 +1,13 @@ [wrap-file] -directory = libpng-1.6.37 -source_url = https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz -source_filename = libpng-1.6.37.tar.gz -source_hash = ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307 -patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.37/3/get_zip -patch_filename = libpng-1.6.37-3-wrap.zip -patch_hash = 6c9f32fd9150b3a96ab89be52af664e32207e10aa9f5fb9aa015989ee2dd7100 +directory = libpng-1.6.43 +source_url = https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz +source_filename = libpng-1.6.43.tar.gz +source_hash = fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a +patch_filename = libpng_1.6.43-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.43-1/get_patch +patch_hash = 0e995446c607ef2e618fb561929acf91e4bdd8017d2e18a7a3b68ba41da345e6 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.43-1/libpng-1.6.43.tar.gz +wrapdb_version = 1.6.43-1 [provide] libpng = libpng_dep diff --git a/subprojects/pixman.wrap b/subprojects/pixman.wrap index 71d585829..6ce238b84 100644 --- a/subprojects/pixman.wrap +++ b/subprojects/pixman.wrap @@ -1,5 +1,10 @@ -[wrap-git] -directory=pixman -url=https://gitlab.freedesktop.org/pixman/pixman.git -push-url=git@gitlab.freedesktop.org:pixman/pixman.git -revision=master +[wrap-file] +directory = pixman-0.43.4 +source_url = https://www.cairographics.org/releases/pixman-0.43.4.tar.gz +source_filename = pixman-0.43.4.tar.gz +source_hash = a0624db90180c7ddb79fc7a9151093dc37c646d8c38d3f232f767cf64b85a226 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/pixman_0.43.4-1/pixman-0.43.4.tar.gz +wrapdb_version = 0.43.4-1 + +[provide] +pixman-1 = idep_pixman diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap index 4595c930a..aa14de177 100644 --- a/subprojects/zlib.wrap +++ b/subprojects/zlib.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = zlib-1.2.11 -source_url = https://zlib.net/fossils/zlib-1.2.11.tar.gz -source_fallback_url = https://gstreamer.freedesktop.org/data/src/mirror/zlib-1.2.11.tar.gz -source_filename = zlib-1.2.11.tar.gz -source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 -patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/5/get_zip -patch_filename = zlib-1.2.11-5-wrap.zip -patch_hash = 728c8e24acbc2e6682fbd950fec39e2fc77528af361adb87259f8a8511434004 +directory = zlib-1.3.1 +source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz +source_filename = zlib-1.3.1.tar.gz +source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 +patch_filename = zlib_1.3.1-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch +patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095 +wrapdb_version = 1.3.1-1 [provide] zlib = zlib_dep -