meson: update to latest master

This commit is contained in:
Aaron Boxer 2019-07-22 12:12:02 -06:00 committed by Ebrahim Byagowi
parent 535186fd84
commit 68f982415b
3 changed files with 13 additions and 11 deletions

View File

@ -13,8 +13,6 @@ option('graphite', 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')
option('ucdn', type: 'feature', value: 'auto',
description: 'Use internal HarfBuzz-provided UCDN library')
option('uniscribe', type: 'feature', value: 'disabled', option('uniscribe', type: 'feature', value: 'disabled',
description: 'Enable Uniscribe shaper backend (Windows only)') description: 'Enable Uniscribe shaper backend (Windows only)')
option('directwrite', type: 'feature', value: 'disabled', option('directwrite', type: 'feature', value: 'disabled',

View File

@ -2,13 +2,13 @@ hb_base_sources = [
'hb-blob.cc', 'hb-blob.cc',
'hb-buffer-serialize.cc', 'hb-buffer-serialize.cc',
'hb-buffer.cc', 'hb-buffer.cc',
'hb-draw.cc',
'hb-common.cc', 'hb-common.cc',
'hb-face.cc', 'hb-face.cc',
'hb-font.cc', 'hb-font.cc',
'hb-map.cc', 'hb-map.cc',
'hb-ot-cff1-table.cc', 'hb-ot-cff1-table.cc',
'hb-ot-cff2-table.cc', 'hb-ot-cff2-table.cc',
'hb-ot-name-language.cc',
'hb-ot-name.cc', 'hb-ot-name.cc',
'hb-ot-tag.cc', 'hb-ot-tag.cc',
'hb-set.cc', 'hb-set.cc',
@ -17,13 +17,15 @@ hb_base_sources = [
'hb-shaper.cc', 'hb-shaper.cc',
'hb-static.cc', 'hb-static.cc',
'hb-unicode.cc', 'hb-unicode.cc',
'hb-warning.cc', 'hb-ucd.cc',
'hb-number.cc'
] ]
hb_base_headers = files([ hb_base_headers = files([
'hb.h', 'hb.h',
'hb-blob.h', 'hb-blob.h',
'hb-buffer.h', 'hb-buffer.h',
'hb-draw.h',
'hb-common.h', 'hb-common.h',
'hb-deprecated.h', 'hb-deprecated.h',
'hb-face.h', 'hb-face.h',
@ -34,6 +36,7 @@ hb_base_headers = files([
'hb-shape-plan.h', 'hb-shape-plan.h',
'hb-unicode.h', 'hb-unicode.h',
'hb-version.h', 'hb-version.h',
'hb-number.hh'
]) ])
hb_base_ragel_sources = [ hb_base_ragel_sources = [
@ -50,6 +53,7 @@ hb_ot_sources = [
'hb-aat-map.cc', 'hb-aat-map.cc',
'hb-ot-face.cc', 'hb-ot-face.cc',
'hb-ot-font.cc', 'hb-ot-font.cc',
'hb-ot-metrics.cc',
'hb-ot-layout.cc', 'hb-ot-layout.cc',
'hb-ot-color.cc', 'hb-ot-color.cc',
'hb-ot-map.cc', 'hb-ot-map.cc',
@ -76,6 +80,8 @@ hb_ot_sources = [
hb_ot_headers = files([ hb_ot_headers = files([
'hb-ot.h', 'hb-ot.h',
'hb-ot-deprecated.h',
'hb-ot-metrics.h',
'hb-ot-color.h', 'hb-ot-color.h',
'hb-ot-font.h', 'hb-ot-font.h',
'hb-ot-layout.h', 'hb-ot-layout.h',
@ -132,13 +138,16 @@ hb_subset_sources = [
'hb-subset-cff1.cc', 'hb-subset-cff1.cc',
'hb-subset-cff2.cc', 'hb-subset-cff2.cc',
'hb-subset-cff-common.cc', 'hb-subset-cff-common.cc',
'hb-subset-glyf.cc',
'hb-subset-input.cc', 'hb-subset-input.cc',
'hb-subset-plan.cc', 'hb-subset-plan.cc',
'hb-number.cc',
'hb-ot-meta.cc'
] ]
hb_subset_headers = files([ hb_subset_headers = files([
'hb-subset.h', 'hb-subset.h',
'hb-number.hh',
'hb-ot-meta.h'
]) ])
hb_gobject_sources = [ hb_gobject_sources = [
@ -156,12 +165,6 @@ incsrc = include_directories('.')
hb_sources = hb_base_sources + hb_fallback_sources + hb_ot_sources hb_sources = hb_base_sources + hb_fallback_sources + hb_ot_sources
hb_headers = hb_base_headers + hb_ot_headers hb_headers = hb_base_headers + hb_ot_headers
if not get_option('ucdn').disabled()
conf.set('HAVE_UCDN', 1)
hb_sources += ['hb-ucdn.cc', 'hb-ucdn/ucdn.c']
incucdn = include_directories('hb-ucdn')
endif
if conf.get('HAVE_FREETYPE', 0) == 1 if conf.get('HAVE_FREETYPE', 0) == 1
hb_sources += hb_ft_sources hb_sources += hb_ft_sources
hb_headers += hb_ft_headers hb_headers += hb_ft_headers

View File

@ -20,6 +20,7 @@ hb_ot_shape_closure_sources = [
hb_subset_cli_sources = [ hb_subset_cli_sources = [
'hb-subset.cc', 'hb-subset.cc',
'options.cc', 'options.cc',
'options-subset.cc',
] ]
if conf.get('HAVE_GLIB', 0) == 1 if conf.get('HAVE_GLIB', 0) == 1