From def27ab1829a9677d8263ab5bc99d8600732ac0b Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 28 Oct 2022 10:45:41 -0700
Subject: [PATCH] Upgrade freetype port from v2.6 to v2.13.3

Also, switch from a fork to using the upstream github repo.  We had a
single patch in our fork:

https://github.com/emscripten-ports/FreeType/commit/40a760c963bc2b76575918ff91a515c8474db4e0

However, this was upstreamed in:

https://github.com/freetype/freetype/commit/2f4b740ce435bc1ad5ef8570bb91ab7cd5682720

This change is based on #18088.

Fixes: #22571
---
 ChangeLog.md                       |   1 +
 test/browser/test_sdl2_ttf.png     | Bin 10831 -> 8261 bytes
 test/browser/test_sdl2_ttf_rtl.png | Bin 8411 -> 7980 bytes
 test/test_freetype.out             |  24 +-
 tools/ports/freetype.py            | 550 ++---------------------------
 tools/system_libs.py               |  10 +-
 6 files changed, 55 insertions(+), 530 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 54b51f998f55b..e1712e283c4a4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -20,6 +20,7 @@ See docs/process.md for more on how version tagging works.
 
 3.1.68 (in development)
 -----------------------
+- The freetype port was updated from v2.6 to v2.13.3. (#22585)
 
 3.1.67 - 09/17/24
 -----------------
diff --git a/test/browser/test_sdl2_ttf.png b/test/browser/test_sdl2_ttf.png
index 6d7b12f1de5d90663bffb9bb0402f2620ac0e056..10aedc82d42e49ed5c89bc699c9c59d22da767a2 100644
GIT binary patch
literal 8261
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
bSM4P>zp>*{EWqCbn6$3yT`Bm(D)c`94f`?V

literal 10831
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
W`pKmJ{qqp~BX6_an!UySyZ-{iZv2-3

diff --git a/test/browser/test_sdl2_ttf_rtl.png b/test/browser/test_sdl2_ttf_rtl.png
index f788f57398fae98175c252a5e2aa52cd8ff29c67..39118d12dbcd03f793a36d49817ab83a9fad6a51 100644
GIT binary patch
literal 7980
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
B!b$)D

literal 8411
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

diff --git a/test/test_freetype.out b/test/test_freetype.out
index 536477f83bdd8..87e18e6a0b3d1 100644
--- a/test/test_freetype.out
+++ b/test/test_freetype.out
@@ -2,15 +2,15 @@
                 
                 
                 
-***    +***+    
-***+   *****   +
-+**+   *****   +
-+***  +**+**+  *
- ***+ ***+**+ +*
- +**+ *** *** +*
- +**++**+ +**+**
-  ***+**+ +**+**
-  ******   *****
-  +****+   +****
-  +****+   +****
-   ****     ****
+***   +***+   **
+***+  +****  +**
++**+  *****  +**
++**+ +**+**+ +**
++*** +**+**+ ***
+ *** +** *** ***
+ +**+*** +**+***
+ +**+**+ +**+**+
+ +*****+ +*****+
+  *****   ***** 
+  +****   +***+ 
+  +***+   +***+ 
diff --git a/tools/ports/freetype.py b/tools/ports/freetype.py
index b668856ac0736..9b877aa22a57a 100644
--- a/tools/ports/freetype.py
+++ b/tools/ports/freetype.py
@@ -5,8 +5,8 @@
 
 import os
 
-TAG = 'version_1'
-HASH = '0d0b1280ba0501ad0a23cf1daa1f86821c722218b59432734d3087a89acd22aabd5c3e5e1269700dcd41e87073046e906060f167c032eb91a3ac8c5808a02783'
+TAG = 'VER-2-13-3'
+HASH = 'ce413487c24e689631d705f53b64725256f89fffe9aade7cf07bbd785a9cd49eb6b8d2297a55554f3fee0a50b17e8af78f505cdab565768afab833794f968c2f'
 
 variants = {'freetype-wasm-sjlj': {'SUPPORT_LONGJMP': 'wasm'}}
 deps = ['zlib']
@@ -24,47 +24,35 @@ def get_lib_name(settings):
 
 
 def get(ports, settings, shared):
-  ports.fetch_project('freetype', f'https://github.com/emscripten-ports/FreeType/archive/{TAG}.zip', sha512hash=HASH)
+  ports.fetch_project('freetype', f'https://github.com/freetype/freetype/archive/{TAG}.zip', sha512hash=HASH)
 
   def create(final):
-    source_path = ports.get_dir('freetype', 'FreeType-' + TAG)
+    source_path = ports.get_dir('freetype', f'freetype-{TAG}')
     ports.write_file(os.path.join(source_path, 'include/ftconfig.h'), ftconf_h)
     ports.install_header_dir(os.path.join(source_path, 'include'),
                              target=os.path.join('freetype2'))
 
     # build
-    srcs = ['src/autofit/autofit.c',
-            'src/base/ftadvanc.c',
+    srcs = ['builds/unix/ftsystem.c',
+            'src/autofit/autofit.c',
+            'src/base/ftbase.c',
             'src/base/ftbbox.c',
             'src/base/ftbdf.c',
             'src/base/ftbitmap.c',
-            'src/base/ftcalc.c',
             'src/base/ftcid.c',
-            'src/base/ftdbgmem.c',
             'src/base/ftdebug.c',
-            'src/base/ftfntfmt.c',
             'src/base/ftfstype.c',
             'src/base/ftgasp.c',
-            'src/base/ftgloadr.c',
             'src/base/ftglyph.c',
             'src/base/ftgxval.c',
             'src/base/ftinit.c',
-            'src/base/ftlcdfil.c',
             'src/base/ftmm.c',
-            'src/base/ftobjs.c',
             'src/base/ftotval.c',
-            'src/base/ftoutln.c',
             'src/base/ftpatent.c',
             'src/base/ftpfr.c',
-            'src/base/ftrfork.c',
-            'src/base/ftsnames.c',
-            'src/base/ftstream.c',
             'src/base/ftstroke.c',
             'src/base/ftsynth.c',
-            'src/base/ftsystem.c',
-            'src/base/fttrigon.c',
             'src/base/fttype1.c',
-            'src/base/ftutil.c',
             'src/base/ftwinfnt.c',
             'src/bdf/bdf.c',
             'src/bzip2/ftbzip2.c',
@@ -77,10 +65,12 @@ def create(final):
             'src/pfr/pfr.c',
             'src/psaux/psaux.c',
             'src/pshinter/pshinter.c',
-            'src/psnames/psmodule.c',
+            'src/psnames/psnames.c',
             'src/raster/raster.c',
+            'src/sdf/sdf.c',
             'src/sfnt/sfnt.c',
             'src/smooth/smooth.c',
+            'src/svg/svg.c',
             'src/truetype/truetype.c',
             'src/type1/type1.c',
             'src/type42/type42.c',
@@ -88,6 +78,7 @@ def create(final):
 
     flags = [
       '-DFT2_BUILD_LIBRARY',
+      '-DFT_CONFIG_CONFIG_H=<ftconfig.h>',
       '-DFT_CONFIG_OPTION_SYSTEM_ZLIB',
       '-I' + source_path + '/include',
       '-I' + source_path + '/truetype',
@@ -121,501 +112,36 @@ def show():
   return 'freetype (-sUSE_FREETYPE=1 or --use-port=freetype; freetype license)'
 
 
-ftconf_h = r'''/***************************************************************************/
-/*                                                                         */
-/*  ftconfig.in                                                            */
-/*                                                                         */
-/*    UNIX-specific configuration file (specification only).               */
-/*                                                                         */
-/*  Copyright 1996-2015 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.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This header file contains a number of macro definitions that are used */
-  /* by the rest of the engine.  Most of the macros here are automatically */
-  /* determined at compile time, and you should not need to change it to   */
-  /* port FreeType, except to compile the library with a non-ANSI          */
-  /* compiler.                                                             */
-  /*                                                                       */
-  /* Note however that if some specific modifications are needed, we       */
-  /* advise you to place a modified copy in your build directory.          */
-  /*                                                                       */
-  /* The build directory is usually `builds/<system>', and contains        */
-  /* system-specific files that are always included first when building    */
-  /* the library.                                                          */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTCONFIG_H__
-#define __FTCONFIG_H__
+ftconf_h = r'''
+  /**************************************************************************
+   *
+   * This header file contains a number of macro definitions that are used by
+   * the rest of the engine.  Most of the macros here are automatically
+   * determined at compile time, and you should not need to change it to port
+   * FreeType, except to compile the library with a non-ANSI compiler.
+   *
+   * Note however that if some specific modifications are needed, we advise
+   * you to place a modified copy in your build directory.
+   *
+   * The build directory is usually `builds/<system>`, and contains
+   * system-specific files that are always included first when building the
+   * library.
+   *
+   */
+
+#ifndef FTCONFIG_H_
+#define FTCONFIG_H_
 
 #include <ft2build.h>
-#include <ftoption.h>
-#include <ftstdlib.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* These macros can be toggled to suit a specific system.  The current   */
-  /* ones are defaults used to compile FreeType in an ANSI C environment   */
-  /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `builds/<system>' directory, and edit it to port the engine.          */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#undef HAVE_UNISTD_H
-#undef HAVE_FCNTL_H
-#undef HAVE_STDINT_H
-
-
-  /* There are systems (like the Texas Instruments 'C54x) where a `char' */
-  /* has 16 bits.  ANSI C says that sizeof(char) is always 1.  Since an  */
-  /* `int' has 16 bits also for this system, sizeof(int) gives 1 which   */
-  /* is probably unexpected.                                             */
-  /*                                                                     */
-  /* `CHAR_BIT' (defined in limits.h) gives the number of bits in a      */
-  /* `char' type.                                                        */
-
-#ifndef FT_CHAR_BIT
-#define FT_CHAR_BIT  CHAR_BIT
-#endif
-
-
-#undef FT_USE_AUTOCONF_SIZEOF_TYPES
-#ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
-
-#undef SIZEOF_INT
-#undef SIZEOF_LONG
-#define FT_SIZEOF_INT  SIZEOF_INT
-#define FT_SIZEOF_LONG SIZEOF_LONG
-
-#else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
-
-  /* Following cpp computation of the bit length of int and long */
-  /* is copied from default include/config/ftconfig.h.           */
-  /* If any improvement is required for this file, it should be  */
-  /* applied to the original header file for the builders that   */
-  /* do not use configure script.                                */
-
-  /* The size of an `int' type.  */
-#if                                 FT_UINT_MAX == 0xFFFFUL
-#define FT_SIZEOF_INT  (16 / FT_CHAR_BIT)
-#elif                               FT_UINT_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_INT  (32 / FT_CHAR_BIT)
-#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_INT  (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `int' type!"
-#endif
-
-  /* The size of a `long' type.  A five-byte `long' (as used e.g. on the */
-  /* DM642) is recognized but avoided.                                   */
-#if                                  FT_ULONG_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
-#define FT_SIZEOF_LONG  (32 / FT_CHAR_BIT)
-#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
-#define FT_SIZEOF_LONG  (64 / FT_CHAR_BIT)
-#else
-#error "Unsupported size of `long' type!"
-#endif
-
-#endif /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
-
-
-  /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
-  /* used -- this is only used to get rid of unpleasant compiler warnings */
-#ifndef FT_UNUSED
-#define FT_UNUSED( arg )  ( (arg) = (arg) )
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     AUTOMATIC CONFIGURATION MACROS                    */
-  /*                                                                       */
-  /* These macros are computed from the ones defined above.  Don't touch   */
-  /* their definition, unless you know precisely what you are doing.  No   */
-  /* porter should need to mess with them.                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Mac support                                                           */
-  /*                                                                       */
-  /*   This is the only necessary change, so it is defined here instead    */
-  /*   providing a new configuration file.                                 */
-  /*                                                                       */
-#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
-  /* no Carbon frameworks for 64bit 10.4.x */
-  /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
-  /* so guess the system version by maximum errno before inclusion */
-#include <errno.h>
-#ifdef ECANCELED /* defined since 10.2 */
-#include "AvailabilityMacros.h"
-#endif
-#if defined( __LP64__ ) && \
-    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#undef FT_MACINTOSH
-#endif
-
-#elif defined( __SC__ ) || defined( __MRC__ )
-  /* Classic MacOS compilers */
-#include "ConditionalMacros.h"
-#if TARGET_OS_MAC
-#define FT_MACINTOSH 1
-#endif
-
-#endif
-
-
-  /* Fix compiler warning with sgi compiler */
-#if defined( __sgi ) && !defined( __GNUC__ )
-#if defined( _COMPILER_VERSION ) && ( _COMPILER_VERSION >= 730 )
-#pragma set woff 3505
-#endif
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int16                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 16bit signed integer type.                         */
-  /*                                                                       */
-  typedef signed short  FT_Int16;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt16                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 16bit unsigned integer type.                       */
-  /*                                                                       */
-  typedef unsigned short  FT_UInt16;
-
-  /* */
-
-
-  /* this #if 0 ... #endif clause is for documentation purposes */
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int32                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for a 32bit signed integer type.  The size depends on    */
-  /*    the configuration.                                                 */
-  /*                                                                       */
-  typedef signed XXX  FT_Int32;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt32                                                          */
-  /*                                                                       */
-  /*    A typedef for a 32bit unsigned integer type.  The size depends on  */
-  /*    the configuration.                                                 */
-  /*                                                                       */
-  typedef unsigned XXX  FT_UInt32;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int64                                                           */
-  /*                                                                       */
-  /*    A typedef for a 64bit signed integer type.  The size depends on    */
-  /*    the configuration.  Only defined if there is real 64bit support;   */
-  /*    otherwise, it gets emulated with a structure (if necessary).       */
-  /*                                                                       */
-  typedef signed XXX  FT_Int64;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt64                                                          */
-  /*                                                                       */
-  /*    A typedef for a 64bit unsigned integer type.  The size depends on  */
-  /*    the configuration.  Only defined if there is real 64bit support;   */
-  /*    otherwise, it gets emulated with a structure (if necessary).       */
-  /*                                                                       */
-  typedef unsigned XXX  FT_UInt64;
-
-  /* */
-
-#endif
-
-#if FT_SIZEOF_INT == 4
-
-  typedef signed int      FT_Int32;
-  typedef unsigned int    FT_UInt32;
-
-#elif FT_SIZEOF_LONG == 4
-
-  typedef signed long     FT_Int32;
-  typedef unsigned long   FT_UInt32;
-
-#else
-#error "no 32bit type found -- please check your configuration files"
-#endif
-
-
-  /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= 4
-
-  typedef int            FT_Fast;
-  typedef unsigned int   FT_UFast;
-
-#elif FT_SIZEOF_LONG >= 4
-
-  typedef long           FT_Fast;
-  typedef unsigned long  FT_UFast;
-
-#endif
-
-
-  /* determine whether we have a 64-bit int type for platforms without */
-  /* Autoconf                                                          */
-#if FT_SIZEOF_LONG == 8
-
-  /* FT_LONG64 must be defined if a 64-bit type is available */
-#define FT_LONG64
-#define FT_INT64   long
-#define FT_UINT64  unsigned long
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A 64-bit data type may create compilation problems if you compile     */
-  /* in strict ANSI mode.  To avoid them, we disable other 64-bit data     */
-  /* types if __STDC__ is defined.  You can however ignore this rule       */
-  /* by defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro.     */
-  /*                                                                       */
-#elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 )
-
-#if defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64   __int64
-#define FT_UINT64  unsigned __int64
-
-#elif defined( __BORLANDC__ )  /* Borland C++ */
-
-  /* XXXX: We should probably check the value of __BORLANDC__ in order */
-  /*       to test the compiler version.                               */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64   __int64
-#define FT_UINT64  unsigned __int64
-
-#elif defined( __WATCOMC__ )   /* Watcom C++ */
-
-  /* Watcom doesn't provide 64-bit data types */
-
-#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
-
-#define FT_LONG64
-#define FT_INT64   long long int
-#define FT_UINT64  unsigned long long int
-
-#elif defined( __GNUC__ )
-
-  /* GCC provides the `long long' type */
-#define FT_LONG64
-#define FT_INT64   long long int
-#define FT_UINT64  unsigned long long int
-
-#endif /* _MSC_VER */
-
-#endif /* FT_SIZEOF_LONG == 8 */
-
-#ifdef FT_LONG64
-  typedef FT_INT64   FT_Int64;
-  typedef FT_UINT64  FT_UInt64;
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* miscellaneous                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define FT_BEGIN_STMNT  do {
-#define FT_END_STMNT    } while ( 0 )
-#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
-
-
-  /* typeof condition taken from gnulib's `intprops.h' header file */
-#if ( __GNUC__ >= 2                         || \
-      defined( __IBM__TYPEOF__ )            || \
-      ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
-#define TYPEOF( type )  (__typeof__ (type))
-#else
-#define TYPEOF( type )  /* empty */
-#endif
-
-
-#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
-
-#define FT_LOCAL( x )      static  x
-#define FT_LOCAL_DEF( x )  static  x
-
-#else
-
-#ifdef __cplusplus
-#define FT_LOCAL( x )      extern "C"  x
-#define FT_LOCAL_DEF( x )  extern "C"  x
-#else
-#define FT_LOCAL( x )      extern  x
-#define FT_LOCAL_DEF( x )  x
-#endif
-
-#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
-
-#define FT_LOCAL_ARRAY( x )      extern const  x
-#define FT_LOCAL_ARRAY_DEF( x )  const  x
-
-
-#ifndef FT_BASE
-
-#ifdef __cplusplus
-#define FT_BASE( x )  extern "C"  x
-#else
-#define FT_BASE( x )  extern  x
-#endif
-
-#endif /* !FT_BASE */
-
-
-#ifndef FT_BASE_DEF
-
-#ifdef __cplusplus
-#define FT_BASE_DEF( x )  x
-#else
-#define FT_BASE_DEF( x )  x
-#endif
-
-#endif /* !FT_BASE_DEF */
-
-
-#ifndef FT_EXPORT
-
-#ifdef __cplusplus
-#define FT_EXPORT( x )  extern "C"  x
-#else
-#define FT_EXPORT( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT */
-
-
-#ifndef FT_EXPORT_DEF
-
-#ifdef __cplusplus
-#define FT_EXPORT_DEF( x )  extern "C"  x
-#else
-#define FT_EXPORT_DEF( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_DEF */
-
-
-#ifndef FT_EXPORT_VAR
-
-#ifdef __cplusplus
-#define FT_EXPORT_VAR( x )  extern "C"  x
-#else
-#define FT_EXPORT_VAR( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_VAR */
-
-  /* The following macros are needed to compile the library with a   */
-  /* C++ compiler and with 16bit compilers.                          */
-  /*                                                                 */
-
-  /* This is special.  Within C++, you must specify `extern "C"' for */
-  /* functions which are used via function pointers, and you also    */
-  /* must do that for structures which contain function pointers to  */
-  /* assure C linkage -- it's not possible to have (local) anonymous */
-  /* functions which are accessed by (global) function pointers.     */
-  /*                                                                 */
-  /*                                                                 */
-  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
-  /* contains pointers to callback functions.                        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable   */
-  /* that contains pointers to callback functions.                   */
-  /*                                                                 */
-  /*                                                                 */
-  /* Some 16bit compilers have to redefine these macros to insert    */
-  /* the infamous `_cdecl' or `__fastcall' declarations.             */
-  /*                                                                 */
-#ifndef FT_CALLBACK_DEF
-#ifdef __cplusplus
-#define FT_CALLBACK_DEF( x )  extern "C"  x
-#else
-#define FT_CALLBACK_DEF( x )  static  x
-#endif
-#endif /* FT_CALLBACK_DEF */
-
-#ifndef FT_CALLBACK_TABLE
-#ifdef __cplusplus
-#define FT_CALLBACK_TABLE      extern "C"
-#define FT_CALLBACK_TABLE_DEF  extern "C"
-#else
-#define FT_CALLBACK_TABLE      extern
-#define FT_CALLBACK_TABLE_DEF  /* nothing */
-#endif
-#endif /* FT_CALLBACK_TABLE */
-
-
-FT_END_HEADER
-
+#include FT_CONFIG_OPTIONS_H
+#include FT_CONFIG_STANDARD_LIBRARY_H
 
-#endif /* __FTCONFIG_H__ */
+#define HAVE_UNISTD_H
+#define HAVE_FCNTL_H
 
+#include <freetype/config/integer-types.h>
+#include <freetype/config/public-macros.h>
+#include <freetype/config/mac-support.h>
 
-/* END */
+#endif /* FTCONFIG_H_ */
 '''
diff --git a/tools/system_libs.py b/tools/system_libs.py
index 4ad44faaa5661..464c96de2445c 100644
--- a/tools/system_libs.py
+++ b/tools/system_libs.py
@@ -12,6 +12,7 @@
 import os
 import shutil
 import textwrap
+import shlex
 from enum import IntEnum, auto
 from glob import iglob
 from typing import List, Optional
@@ -168,16 +169,13 @@ def create_ninja_file(input_files, filename, libname, cflags, asflags=None, cust
   if asflags is None:
     asflags = []
 
-  def join(flags):
-    return ' '.join(flags)
-
   out = f'''\
 # Automatically generated by tools/system_libs.py.  DO NOT EDIT
 
 ninja_required_version = 1.5
 
-ASFLAGS = {join(asflags)}
-CFLAGS = {join(cflags)}
+ASFLAGS = {shlex.join(asflags)}
+CFLAGS = {shlex.join(cflags)}
 EMCC = {shared.EMCC}
 EMXX = {shared.EMXX}
 EMAR = {shared.EMAR}
@@ -257,7 +255,7 @@ def join(flags):
       if customize_build_flags:
         custom_flags = customize_build_flags(flags, src)
         if custom_flags != flags:
-          out += f'  CFLAGS = {join(custom_flags)}'
+          out += f'  CFLAGS = {shlex.join(custom_flags)}'
       out += '\n'
 
     objects = sorted(objects, key=objectfile_sort_key)