From 76e3f25e417608130956831e0ab13d752326f3e5 Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Mon, 13 Apr 2026 18:43:20 +0100 Subject: [PATCH 1/2] meson.build: Require Meson 0.60.0 or newer --- .gitlab-ci.yml | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b09fd7f32..4e8dc8d67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ variables: - Import-Certificate -CertStoreLocation "Cert:\LocalMachine\Root" "C:\roots.sst" # Make sure meson is up to date so we don't need to rebuild the image # with each release. - - pip3 install -U 'meson==0.59.*' + - pip3 install -U 'meson==0.60.*' - pip3 install -U ninja script: # For some reason, options are separated by newlines instead of spaces, diff --git a/meson.build b/meson.build index eec558373..1138600cf 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ # project('freetype2', 'c', - meson_version: '>= 0.55.0', + meson_version: '>= 0.60.0', version: run_command('builds/meson/extract_freetype_version.py', 'include/freetype/freetype.h', check: true).stdout().strip(), From 77a840cf25326615162d0ffd314e1c1c83e23ada Mon Sep 17 00:00:00 2001 From: TheLastRar Date: Mon, 13 Apr 2026 18:43:20 +0100 Subject: [PATCH 2/2] meson.build: include CMake name of libpng in dependency search --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1138600cf..4ac5c96d7 100644 --- a/meson.build +++ b/meson.build @@ -339,7 +339,7 @@ if bzip2_dep.found() endif # PNG support. -libpng_dep = dependency('libpng', +libpng_dep = dependency('libpng', 'PNG', required: get_option('png'), fallback: 'libpng')