openMSX/build/3rdparty/freetype-2.9.1.diff

diff -ru freetype-2.9.1.orig/include/freetype/config/ftoption.h freetype-2.9.1/include/freetype/config/ftoption.h
--- freetype-2.9.1.orig/include/freetype/config/ftoption.h	2018-04-22 11:41:36.000000000 +0200
+++ freetype-2.9.1/include/freetype/config/ftoption.h	2019-01-29 22:06:21.130522767 +0100
@@ -178,7 +178,7 @@
   /*                                                                       */
   /*   Define this macro if you want to enable this `feature'.             */
   /*                                                                       */
-#define FT_CONFIG_OPTION_USE_LZW
+/* #define FT_CONFIG_OPTION_USE_LZW */
 
 
   /*************************************************************************/
@@ -193,7 +193,7 @@
   /*   Define this macro if you want to enable this `feature'.  See also   */
   /*   the macro FT_CONFIG_OPTION_SYSTEM_ZLIB below.                       */
   /*                                                                       */
-#define FT_CONFIG_OPTION_USE_ZLIB
+/* #define FT_CONFIG_OPTION_USE_ZLIB */
 
 
   /*************************************************************************/
@@ -309,7 +309,7 @@
   /*   You would normally undefine this configuration macro when building  */
   /*   a version of FreeType that doesn't contain a Type 1 or CFF driver.  */
   /*                                                                       */
-#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
+#undef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
 
 
   /*************************************************************************/
@@ -327,7 +327,7 @@
   /*   able to synthesize a Unicode charmap out of the glyphs found in the */
   /*   fonts.                                                              */
   /*                                                                       */
-#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
+#undef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
 
 
   /*************************************************************************/
@@ -340,7 +340,7 @@
   /*                                                                       */
   /*   Note that the `FOND' resource isn't checked.                        */
   /*                                                                       */
-#define FT_CONFIG_OPTION_MAC_FONTS
+/* #define FT_CONFIG_OPTION_MAC_FONTS */
 
 
   /*************************************************************************/
@@ -530,7 +530,7 @@
   /* embedded bitmaps in all formats using the SFNT module (namely         */
   /* TrueType & OpenType).                                                 */
   /*                                                                       */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+/* #define TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
 
 
   /*************************************************************************/
@@ -545,7 +545,7 @@
   /*                                                                       */
   /* (By default, the module uses `PSNames' to extract glyph names.)       */
   /*                                                                       */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
+#undef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
 
 
   /*************************************************************************/
@@ -559,7 +559,7 @@
   /* Accessing SFNT names is done through the functions declared in        */
   /* `ftsnames.h'.                                                         */
   /*                                                                       */
-#define TT_CONFIG_OPTION_SFNT_NAMES
+/* #define TT_CONFIG_OPTION_SFNT_NAMES */
 
 
   /*************************************************************************/
@@ -696,7 +696,7 @@
   /* Define TT_CONFIG_OPTION_BDF if you want to include support for        */
   /* an embedded `BDF ' table within SFNT-based bitmap formats.            */
   /*                                                                       */
-#define TT_CONFIG_OPTION_BDF
+/* #define TT_CONFIG_OPTION_BDF */
 
 
   /*************************************************************************/
@@ -760,7 +760,7 @@
   /* files into an existing face.  Note that if set, the T1 driver will be */
   /* unable to produce kerning distances.                                  */
   /*                                                                       */
-#undef T1_CONFIG_OPTION_NO_AFM
+#define T1_CONFIG_OPTION_NO_AFM
 
 
   /*************************************************************************/
diff -ru freetype-2.9.1.orig/modules.cfg freetype-2.9.1/modules.cfg
--- freetype-2.9.1.orig/modules.cfg	2018-04-22 11:41:36.000000000 +0200
+++ freetype-2.9.1/modules.cfg	2019-01-29 21:51:32.331946425 +0100
@@ -38,41 +38,41 @@
 #
 # This driver needs the `psaux', `pshinter', and `psnames' modules.
 # No FT_CONFIG_OPTION_PIC support.
-FONT_MODULES += type1
+#FONT_MODULES += type1
 
 # CFF/OpenType font driver.
 #
 # This driver needs the `sfnt', `psaux', `pshinter', and `psnames' modules.
-FONT_MODULES += cff
+#FONT_MODULES += cff
 
 # Type 1 CID-keyed font driver.
 #
 # This driver needs the `psaux', `pshinter', and `psnames' modules.
 # No FT_CONFIG_OPTION_PIC support.
-FONT_MODULES += cid
+#FONT_MODULES += cid
 
 # PFR/TrueDoc font driver.  See optional extension ftpfr.c below also.
 # No FT_CONFIG_OPTION_PIC support.
-FONT_MODULES += pfr
+#FONT_MODULES += pfr
 
 # PostScript Type 42 font driver.
 #
 # This driver needs the `truetype' and `psaux' modules.
 # No FT_CONFIG_OPTION_PIC support.
-FONT_MODULES += type42
+#FONT_MODULES += type42
 
 # Windows FONT/FNT font driver.  See optional extension ftwinfnt.c below
 # also.
 # No FT_CONFIG_OPTION_PIC support.
-FONT_MODULES += winfonts
+#FONT_MODULES += winfonts
 
 # PCF font driver.  If debugging and tracing is enabled, needs `ftbitmap.c'.
 # No FT_CONFIG_OPTION_PIC support.
-FONT_MODULES += pcf
+#FONT_MODULES += pcf
 
 # BDF font driver.  See optional extension ftbdf.c below also.
 # No FT_CONFIG_OPTION_PIC support.
-FONT_MODULES += bdf
+#FONT_MODULES += bdf
 
 # SFNT files support.  If used without `truetype' or `cff', it supports
 # bitmap-only fonts within an SFNT wrapper.
@@ -86,10 +86,10 @@
 ####
 
 # FreeType's auto hinter.
-HINTING_MODULES += autofit
+#HINTING_MODULES += autofit
 
 # PostScript hinter.
-HINTING_MODULES += pshinter
+#HINTING_MODULES += pshinter
 
 # The TrueType hinting engine doesn't have a module of its own but is
 # controlled in file include/freetype/config/ftoption.h
@@ -101,7 +101,7 @@
 ####
 
 # Monochrome rasterizer.
-RASTER_MODULES += raster
+#RASTER_MODULES += raster
 
 # Anti-aliasing rasterizer.
 RASTER_MODULES += smooth
@@ -115,7 +115,7 @@
 # that its public API is subject to change if necessary).  See
 # include/freetype/ftcache.h.  Needs `ftglyph.c'.
 # No FT_CONFIG_OPTION_PIC support.
-AUX_MODULES += cache
+#AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
 #
@@ -126,19 +126,19 @@
 #
 # See include/freetype/ftgzip.h for the API.
 # No FT_CONFIG_OPTION_PIC support.
-AUX_MODULES += gzip
+#AUX_MODULES += gzip
 
 # Support for streams compressed with LZW (files with suffix .Z).
 #
 # See include/freetype/ftlzw.h for the API.
 # No FT_CONFIG_OPTION_PIC support.
-AUX_MODULES += lzw
+#AUX_MODULES += lzw
 
 # Support for streams compressed with bzip2 (files with suffix .bz2).
 #
 # See include/freetype/ftbzip2.h for the API.
 # No FT_CONFIG_OPTION_PIC support.
-AUX_MODULES += bzip2
+#AUX_MODULES += bzip2
 
 # OpenType table validation.  Needs `ftotval.c' below.
 #
@@ -149,7 +149,7 @@
 #
 # This module depends on `psnames'.
 # No FT_CONFIG_OPTION_PIC support.
-AUX_MODULES += psaux
+#AUX_MODULES += psaux
 
 # Support for PostScript glyph names.
 #
@@ -165,12 +165,12 @@
 # Exact bounding box calculation.
 #
 # See include/freetype/ftbbox.h for the API.
-BASE_EXTENSIONS += ftbbox.c
+#BASE_EXTENSIONS += ftbbox.c
 
 # Access BDF-specific strings.  Needs BDF font driver.
 #
 # See include/freetype/ftbdf.h for the API.
-BASE_EXTENSIONS += ftbdf.c
+#BASE_EXTENSIONS += ftbdf.c
 
 # Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into
 # 8bpp format, and for emboldening of bitmap glyphs.
@@ -181,17 +181,17 @@
 # Access CID font information.
 #
 # See include/freetype/ftcid.h for the API.
-BASE_EXTENSIONS += ftcid.c
+#BASE_EXTENSIONS += ftcid.c
 
 # Access FSType information.  Needs `fttype1.c'.
 #
 # See include/freetype/freetype.h for the API.
-BASE_EXTENSIONS += ftfstype.c
+#BASE_EXTENSIONS += ftfstype.c
 
 # Support for GASP table queries.
 #
 # See include/freetype/ftgasp.h for the API.
-BASE_EXTENSIONS += ftgasp.c
+#BASE_EXTENSIONS += ftgasp.c
 
 # Convenience functions to handle glyphs.  Needs `ftbitmap.c'.
 #
@@ -201,27 +201,27 @@
 # Interface for gxvalid module.
 #
 # See include/freetype/ftgxval.h for the API.
-BASE_EXTENSIONS += ftgxval.c
+#BASE_EXTENSIONS += ftgxval.c
 
 # Multiple Master font interface.
 #
 # See include/freetype/ftmm.h for the API.
-BASE_EXTENSIONS += ftmm.c
+#BASE_EXTENSIONS += ftmm.c
 
 # Interface for otvalid module.
 #
 # See include/freetype/ftotval.h for the API.
-BASE_EXTENSIONS += ftotval.c
+#BASE_EXTENSIONS += ftotval.c
 
 # Support for FT_Face_CheckTrueTypePatents.
 #
 # See include/freetype/freetype.h for the API.
-BASE_EXTENSIONS += ftpatent.c
+#BASE_EXTENSIONS += ftpatent.c
 
 # Interface for accessing PFR-specific data.  Needs PFR font driver.
 #
 # See include/freetype/ftpfr.h for the API.
-BASE_EXTENSIONS += ftpfr.c
+#BASE_EXTENSIONS += ftpfr.c
 
 # Path stroker.  Needs `ftglyph.c'.
 #
@@ -232,19 +232,19 @@
 # `ftbitmap.c'.
 #
 # See include/freetype/ftsynth.h for the API.
-BASE_EXTENSIONS += ftsynth.c
+#BASE_EXTENSIONS += ftsynth.c
 
 # Interface to access data specific to PostScript Type 1 and Type 2 (CFF)
 # fonts.
 #
 # See include/freetype/t1tables.h for the API.
-BASE_EXTENSIONS += fttype1.c
+#BASE_EXTENSIONS += fttype1.c
 
 # Interface for accessing data specific to Windows FNT files.  Needs winfnt
 # driver.
 #
 # See include/freetype/ftwinfnt.h for the API.
-BASE_EXTENSIONS += ftwinfnt.c
+#BASE_EXTENSIONS += ftwinfnt.c
 
 ####
 #### The components `ftsystem.c' (for memory allocation and stream I/O