--- freetype-2.13.2.old/devel/ftoption.h +++ freetype-2.13.2/devel/ftoption.h @@ -290,7 +290,7 @@ * options set by those programs have precedence, overwriting the value * here with the configured one. */ -#define FT_CONFIG_OPTION_USE_HARFBUZZ +/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */ /************************************************************************** --- freetype-2.13.2.old/meson.build +++ freetype-2.13.2/meson.build @@ -335,15 +335,14 @@ ft2_deps += [libpng_dep] endif -# Harfbuzz support -harfbuzz_dep = dependency('harfbuzz', - version: '>= 2.0.0', - required: get_option('harfbuzz'), - default_options: ['freetype=disabled']) - -if harfbuzz_dep.found() - ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ'] - ft2_deps += [harfbuzz_dep] +# Harbuzz support + harfbuzz_option = get_option('harfbuzz') +if harfbuzz_option.disabled() + ftoption_command += ['--disable=FT_CONFIG_OPTION_USE_HARFBUZZ' ] +else + harfbuzz_dep = dependency('harfbuzz', required: harfbuzz_option.enabled()) + ftoption_command += [ '--enable=FT_CONFIG_OPTION_USE_HARFBUZZ' ] + ft2_deps += [harfbuzz_dep] endif # Brotli decompression support @@ -463,7 +462,7 @@ summary({'Zlib': zlib_option, 'Bzip2': bzip2_dep.found() ? 'yes' : 'no', 'Png': libpng_dep.found() ? 'yes' : 'no', - 'Harfbuzz': harfbuzz_dep.found() ? 'yes' : 'no', + 'Harfbuzz': harfbuzz_option.enabled() ? 'yes' : 'no', 'Brotli': brotli_dep.found() ? 'yes' : 'no', }, section: 'Used Libraries')