From 68f982415be747b8fd675d3eb55332a8277805e5 Mon Sep 17 00:00:00 2001
From: Aaron Boxer <aaron.boxer@collabora.com>
Date: Mon, 22 Jul 2019 12:12:02 -0600
Subject: [PATCH] meson: update to latest master

---
 meson_options.txt |  2 --
 src/meson.build   | 21 ++++++++++++---------
 util/meson.build  |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index 75ff9039c..1e0a3a843 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,8 +13,6 @@ option('graphite', type: 'feature', value: 'disabled',
   description: 'Enable Graphite2 complementary shaper')
 option('freetype', type: 'feature', value: 'auto',
   description: 'Enable freetype interop helpers')
-option('ucdn', type: 'feature', value: 'auto',
-  description: 'Use internal HarfBuzz-provided UCDN library')
 option('uniscribe', type: 'feature', value: 'disabled',
   description: 'Enable Uniscribe shaper backend (Windows only)')
 option('directwrite', type: 'feature', value: 'disabled',
diff --git a/src/meson.build b/src/meson.build
index 94c7d0442..315b781e6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,13 +2,13 @@ hb_base_sources = [
   'hb-blob.cc',
   'hb-buffer-serialize.cc',
   'hb-buffer.cc',
+  'hb-draw.cc',
   'hb-common.cc',
   'hb-face.cc',
   'hb-font.cc',
   'hb-map.cc',
   'hb-ot-cff1-table.cc',
   'hb-ot-cff2-table.cc',
-  'hb-ot-name-language.cc',
   'hb-ot-name.cc',
   'hb-ot-tag.cc',
   'hb-set.cc',
@@ -17,13 +17,15 @@ hb_base_sources = [
   'hb-shaper.cc',
   'hb-static.cc',
   'hb-unicode.cc',
-  'hb-warning.cc',
+  'hb-ucd.cc',
+  'hb-number.cc'
 ]
 
 hb_base_headers = files([
   'hb.h',
   'hb-blob.h',
   'hb-buffer.h',
+  'hb-draw.h',
   'hb-common.h',
   'hb-deprecated.h',
   'hb-face.h',
@@ -34,6 +36,7 @@ hb_base_headers = files([
   'hb-shape-plan.h',
   'hb-unicode.h',
   'hb-version.h',
+  'hb-number.hh'
 ])
 
 hb_base_ragel_sources = [
@@ -50,6 +53,7 @@ hb_ot_sources = [
   'hb-aat-map.cc',
   'hb-ot-face.cc',
   'hb-ot-font.cc',
+  'hb-ot-metrics.cc',
   'hb-ot-layout.cc',
   'hb-ot-color.cc',
   'hb-ot-map.cc',
@@ -76,6 +80,8 @@ hb_ot_sources = [
 
 hb_ot_headers = files([
   'hb-ot.h',
+  'hb-ot-deprecated.h',
+  'hb-ot-metrics.h',
   'hb-ot-color.h',
   'hb-ot-font.h',
   'hb-ot-layout.h',
@@ -132,13 +138,16 @@ hb_subset_sources = [
   'hb-subset-cff1.cc',
   'hb-subset-cff2.cc',
   'hb-subset-cff-common.cc',
-  'hb-subset-glyf.cc',
   'hb-subset-input.cc',
   'hb-subset-plan.cc',
+  'hb-number.cc',
+  'hb-ot-meta.cc'
 ]
 
 hb_subset_headers = files([
   'hb-subset.h',
+  'hb-number.hh',
+  'hb-ot-meta.h'
 ])
 
 hb_gobject_sources = [
@@ -156,12 +165,6 @@ incsrc = include_directories('.')
 hb_sources = hb_base_sources + hb_fallback_sources + hb_ot_sources
 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
   hb_sources += hb_ft_sources
   hb_headers += hb_ft_headers
diff --git a/util/meson.build b/util/meson.build
index e4b4c1aa9..59fde47a4 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -20,6 +20,7 @@ hb_ot_shape_closure_sources = [
 hb_subset_cli_sources = [
   'hb-subset.cc',
   'options.cc',
+  'options-subset.cc',
 ]
 
 if conf.get('HAVE_GLIB', 0) == 1