--- freetype-2.14.1.old/devel/ftoption.h +++ freetype-2.14.1/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.14.1.old/meson.build +++ freetype-2.14.1/meson.build @@ -348,48 +348,16 @@ ft2_deps += [libpng_dep] endif -# HarfBuzz support. +# Harfbuzz support. harfbuzz_opt = get_option('harfbuzz') -harfbuzz_dep = disabler() - -if harfbuzz_opt == 'enabled' or harfbuzz_opt == 'auto' - harfbuzz_dep = dependency('harfbuzz', - version: '>= 2.0.0', - required: harfbuzz_opt == 'enabled', - default_options: ['freetype=disabled']) - if harfbuzz_dep.found() - harfbuzz_opt = 'YES' - ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ'] - ft2_deps += [harfbuzz_dep] - endif -endif - -if not harfbuzz_dep.found() and \ - (harfbuzz_opt == 'dynamic' or harfbuzz_opt == 'auto') - # On Windows we don't need libdl, but on other platforms we need it. - if host_machine.system() == 'windows' - harfbuzz_opt = 'dynamic' - ftoption_command += [ - '--enable=FT_CONFIG_OPTION_USE_HARFBUZZ', - '--enable=FT_CONFIG_OPTION_USE_HARFBUZZ_DYNAMIC', - ] - else - harfbuzz_dep = meson.get_compiler('c').find_library('dl', - required: harfbuzz_opt == 'dynamic', - ) - if harfbuzz_dep.found() - harfbuzz_opt = 'dynamic' - ftoption_command += [ - '--enable=FT_CONFIG_OPTION_USE_HARFBUZZ', - '--enable=FT_CONFIG_OPTION_USE_HARFBUZZ_DYNAMIC', - ] - ft2_deps += [harfbuzz_dep] - endif - endif -endif - -if harfbuzz_opt == 'disabled' or harfbuzz_opt == 'auto' - harfbuzz_opt = 'NO' +if harfbuzz_opt == 'disabled' + ftoption_command += ['--disable=FT_CONFIG_OPTION_USE_HARFBUZZ' ] + harfbuzz_opt = 'NO' +else + harfbuzz_dep = dependency('harfbuzz', required: harfbuzz_opt == 'enabled') + ftoption_command += [ '--enable=FT_CONFIG_OPTION_USE_HARFBUZZ' ] + ft2_deps += [harfbuzz_dep] + harfbuzz_opt = 'YES' endif # Brotli decompression support.