walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[meson] Add graphite2 option and deprecate graphite 

Fixes https://github.com/harfbuzz/harfbuzz/issues/3241

Should be better handled when we can use https://github.com/mesonbuild/meson/pull/9184
This commit is contained in:
Khaled Hosny 2021-10-05 19:00:29 +02:00 committed by Behdad Esfahbod
parent c6557747ef
commit 792ca307b0
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -96,7 +96,8 @@ glib_dep = dependency('glib-2.0', required: get_option('glib'),
fallback: ['glib', 'libglib_dep']) fallback: ['glib', 'libglib_dep'])
gobject_dep = dependency('gobject-2.0', required: get_option('gobject'), gobject_dep = dependency('gobject-2.0', required: get_option('gobject'),
fallback: ['glib', 'libgobject_dep']) fallback: ['glib', 'libgobject_dep'])
graphite2_dep = dependency('graphite2', required: get_option('graphite')) graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
graphite_dep = dependency('graphite2', required: get_option('graphite'))
icu_dep = null_dep icu_dep = null_dep
if not get_option('icu').disabled() if not get_option('icu').disabled()
@ -188,7 +189,7 @@ if chafa_dep.found()
conf.set('HAVE_CHAFA', 1) conf.set('HAVE_CHAFA', 1)
endif endif
if graphite2_dep.found() if graphite2_dep.found() or graphite_dep.found()
conf.set('HAVE_GRAPHITE2', 1) conf.set('HAVE_GRAPHITE2', 1)
endif endif

2
meson_options.txt
View File

@ -10,6 +10,8 @@ option('chafa', type: 'feature', value: 'auto',
option('icu', type: 'feature', value: 'auto', option('icu', type: 'feature', value: 'auto',
description: 'Enable ICU library unicode functions') description: 'Enable ICU library unicode functions')
option('graphite', type: 'feature', value: 'disabled', option('graphite', type: 'feature', value: 'disabled',
description: 'Deprecated use graphite2 option instead')
option('graphite2', type: 'feature', value: 'disabled',
description: 'Enable Graphite2 complementary shaper') description: 'Enable Graphite2 complementary shaper')
option('freetype', type: 'feature', value: 'auto', option('freetype', type: 'feature', value: 'auto',
description: 'Enable freetype interop helpers') description: 'Enable freetype interop helpers')

2
src/meson.build
View File

@ -345,7 +345,7 @@ endif
if conf.get('HAVE_GRAPHITE2', 0) == 1 if conf.get('HAVE_GRAPHITE2', 0) == 1
hb_sources += hb_graphite2_sources hb_sources += hb_graphite2_sources
hb_headers += hb_graphite2_headers hb_headers += hb_graphite2_headers
harfbuzz_deps += [graphite2_dep] harfbuzz_deps += [graphite2_dep, graphite_dep]
endif endif
if conf.get('HAVE_GLIB', 0) == 1 if conf.get('HAVE_GLIB', 0) == 1