From c6345ca36de9d396b4dbef2aeab73a5a838c46b6 Mon Sep 17 00:00:00 2001 From: Torsten Hilbrich Date: Wed, 6 Jan 2021 08:55:16 +0100 Subject: [PATCH] * meson.build: Fix 'png' build option (#59458). Without this patch, 'png' is always required. --- ChangeLog | 6 ++++++ meson.build | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90c97e52e..13545132d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-01-06 Torsten Hilbrich + + * meson.build: Fix 'png' build option (#59458). + + Without this patch, 'png' is always required. + 2021-01-04 Alexei Podtelezhnikov [builds/windows] Add SDF to VC2010 project. diff --git a/meson.build b/meson.build index d0f5783fe..895ebb397 100644 --- a/meson.build +++ b/meson.build @@ -264,8 +264,10 @@ endif # PNG support libpng_dep = dependency('libpng', required: get_option('png')) -ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG'] -ft2_deps += [libpng_dep] +if libpng_dep.found() + ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG'] + ft2_deps += [libpng_dep] +endif # Harfbuzz support harfbuzz_dep = dependency('harfbuzz',