Update freetype to 2.10.4

Also includes:
Work around a change in the zlib API for 1.2.11

where it's used in the Freetype/zlib interface debugging code.

1 files changed, 47 insertions, 0 deletions

diff --git a/freetype/meson_options.txt b/freetype/meson_options.txt
new file mode 100644
index 000000000..74ed16baa
--- /dev/null
+++ b/freetype/meson_options.txt
@@ -0,0 +1,47 @@
+#
+# meson_options.txt
+#
+
+# Copyright (C) 2020 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+
+
+option('zlib',
+  type: 'combo',
+  choices: ['disabled', 'auto', 'builtin', 'system'],
+  value: 'auto',
+  description: 'Support reading gzip-compressed font files.')
+
+option('bzip2',
+  type: 'feature',
+  value: 'auto',
+  description: 'Support reading bzip2-compressed font files.')
+
+option('png',
+  type: 'feature',
+  value: 'auto',
+  description: 'Support color bitmap glyph formats in the PNG format.'
+               + 'Requires libpng.')
+
+option('harfbuzz',
+  type: 'feature',
+  value: 'auto',
+  description: 'Use Harfbuzz library to improve auto-hinting.'
+               + ' If available, many glyphs not directly addressable'
+               + ' by a font\'s character map will be hinted also.')
+
+option('brotli',
+  type: 'feature',
+  value: 'auto',
+  description: 'Use Brotli library to support decompressing WOFF2 fonts.')
+
+option('mmap',
+  type: 'feature',
+  value: 'auto',
+  description: 'Use mmap() to open font files for faster parsing.')