update freetype to 2.12.1

brugal · Jun 1, 2022 · fd6c371 · fd6c371
1 parent 0d5a24a
commit fd6c371
Show file tree

Hide file tree

Showing 106 changed files with 7 additions and 20 deletions.
diff --git a/FIXME b/FIXME
@@ -2404,19 +2404,6 @@ Q_GetCpFromUtf8  invalid number of bytes specified in utf8 character 255
 * update SDL2 to 2.0.16 to try and match ioquake3
 
 * 32-bit windows build:  cl_cgame build error (string format)
-* 32-bit windows build:  vm create fail with cgame*.dll
-
-    2022-04-29  has libgcc_s_dw2-1.dll dependency, Dependency Walker shows
-       __divdi3 and __udivdi3 imports
-
-    https://www.spinics.net/lists/newbies/msg60799.html
-
-    """
-     2. Link statically libgcc using flags:
-	-static-libgcc -lgcc
-    """
-
-* freetype CVE-2022-27404 -- 2022-05-11 not vulnerable since face index is always zero
 
 * czm*.dm_68 armor/health bug
 * backtrace binutils upgrade

diff --git a/Makefile b/Makefile
@@ -290,7 +290,7 @@ NDIR=$(MOUNT_DIR)/null
 UIDIR=$(MOUNT_DIR)/ui
 Q3UIDIR=$(MOUNT_DIR)/q3_ui
 JPDIR=$(MOUNT_DIR)/jpeg-9d
-FREETYPEDIR=$(MOUNT_DIR)/freetype-2.12.0
+FREETYPEDIR=$(MOUNT_DIR)/freetype-2.12.1
 SPEEXDIR=$(MOUNT_DIR)/libspeex-1.2.0
 SPEEXDSPDIR=$(MOUNT_DIR)/libspeexdsp-1.2rc3
 OGGDIR=$(MOUNT_DIR)/libogg-1.3.5

diff --git a/...2.12.0/include/freetype/config/ftconfig.h → ...2.12.1/include/freetype/config/ftconfig.h b/...2.12.0/include/freetype/config/ftconfig.h → ...2.12.1/include/freetype/config/ftconfig.h
diff --git a/...2.12.0/include/freetype/config/ftheader.h → ...2.12.1/include/freetype/config/ftheader.h b/...2.12.0/include/freetype/config/ftheader.h → ...2.12.1/include/freetype/config/ftheader.h
diff --git a/...2.12.0/include/freetype/config/ftmodule.h → ...2.12.1/include/freetype/config/ftmodule.h b/...2.12.0/include/freetype/config/ftmodule.h → ...2.12.1/include/freetype/config/ftmodule.h
diff --git a/...2.12.0/include/freetype/config/ftoption.h → ...2.12.1/include/freetype/config/ftoption.h b/...2.12.0/include/freetype/config/ftoption.h → ...2.12.1/include/freetype/config/ftoption.h
diff --git a/...2.12.0/include/freetype/config/ftstdlib.h → ...2.12.1/include/freetype/config/ftstdlib.h b/...2.12.0/include/freetype/config/ftstdlib.h → ...2.12.1/include/freetype/config/ftstdlib.h
diff --git a/...0/include/freetype/config/integer-types.h → ...1/include/freetype/config/integer-types.h b/...0/include/freetype/config/integer-types.h → ...1/include/freetype/config/integer-types.h
diff --git a/...2.0/include/freetype/config/mac-support.h → ...2.1/include/freetype/config/mac-support.h b/...2.0/include/freetype/config/mac-support.h → ...2.1/include/freetype/config/mac-support.h
diff --git a/...0/include/freetype/config/public-macros.h → ...1/include/freetype/config/public-macros.h b/...0/include/freetype/config/public-macros.h → ...1/include/freetype/config/public-macros.h
diff --git a/...eetype-2.12.0/include/freetype/freetype.h → ...eetype-2.12.1/include/freetype/freetype.h b/...eetype-2.12.0/include/freetype/freetype.h → ...eetype-2.12.1/include/freetype/freetype.h
@@ -4942,7 +4942,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  12
-#define FREETYPE_PATCH  0
+#define FREETYPE_PATCH  1
 
 
   /**************************************************************************

diff --git a/...eetype-2.12.0/include/freetype/ftadvanc.h → ...eetype-2.12.1/include/freetype/ftadvanc.h b/...eetype-2.12.0/include/freetype/ftadvanc.h → ...eetype-2.12.1/include/freetype/ftadvanc.h
diff --git a/...freetype-2.12.0/include/freetype/ftbbox.h → ...freetype-2.12.1/include/freetype/ftbbox.h b/...freetype-2.12.0/include/freetype/ftbbox.h → ...freetype-2.12.1/include/freetype/ftbbox.h
diff --git a/.../freetype-2.12.0/include/freetype/ftbdf.h → .../freetype-2.12.1/include/freetype/ftbdf.h b/.../freetype-2.12.0/include/freetype/ftbdf.h → .../freetype-2.12.1/include/freetype/ftbdf.h
diff --git a/...eetype-2.12.0/include/freetype/ftbitmap.h → ...eetype-2.12.1/include/freetype/ftbitmap.h b/...eetype-2.12.0/include/freetype/ftbitmap.h → ...eetype-2.12.1/include/freetype/ftbitmap.h
diff --git a/...reetype-2.12.0/include/freetype/ftbzip2.h → ...reetype-2.12.1/include/freetype/ftbzip2.h b/...reetype-2.12.0/include/freetype/ftbzip2.h → ...reetype-2.12.1/include/freetype/ftbzip2.h
diff --git a/...reetype-2.12.0/include/freetype/ftcache.h → ...reetype-2.12.1/include/freetype/ftcache.h b/...reetype-2.12.0/include/freetype/ftcache.h → ...reetype-2.12.1/include/freetype/ftcache.h
diff --git a/...type-2.12.0/include/freetype/ftchapters.h → ...type-2.12.1/include/freetype/ftchapters.h b/...type-2.12.0/include/freetype/ftchapters.h → ...type-2.12.1/include/freetype/ftchapters.h
diff --git a/.../freetype-2.12.0/include/freetype/ftcid.h → .../freetype-2.12.1/include/freetype/ftcid.h b/.../freetype-2.12.0/include/freetype/ftcid.h → .../freetype-2.12.1/include/freetype/ftcid.h
diff --git a/...reetype-2.12.0/include/freetype/ftcolor.h → ...reetype-2.12.1/include/freetype/ftcolor.h b/...reetype-2.12.0/include/freetype/ftcolor.h → ...reetype-2.12.1/include/freetype/ftcolor.h
@@ -528,14 +528,14 @@ FT_BEGIN_HEADER
    * @fields:
    *   num_color_stops ::
    *     The number of color stops for the requested glyph index.  Set by
-   *     @FT_Get_Colorline_Stops.
+   *     @FT_Get_Paint.
    *
    *   current_color_stop ::
    *     The current color stop.  Set by @FT_Get_Colorline_Stops.
    *
    *   p ::
-   *     An opaque pointer into 'COLR' table data.  The caller must set this
-   *     to `NULL` before the first call of @FT_Get_Colorline_Stops.
+   *     An opaque pointer into 'COLR' table data.  Set by @FT_Get_Paint.
+   *     Updated by @FT_Get_Colorline_Stops.
    *
    * @since:
    *   2.11 -- **currently experimental only!**  There might be changes

diff --git a/...eetype-2.12.0/include/freetype/ftdriver.h → ...eetype-2.12.1/include/freetype/ftdriver.h b/...eetype-2.12.0/include/freetype/ftdriver.h → ...eetype-2.12.1/include/freetype/ftdriver.h
diff --git a/...eetype-2.12.0/include/freetype/fterrdef.h → ...eetype-2.12.1/include/freetype/fterrdef.h b/...eetype-2.12.0/include/freetype/fterrdef.h → ...eetype-2.12.1/include/freetype/fterrdef.h
diff --git a/...eetype-2.12.0/include/freetype/fterrors.h → ...eetype-2.12.1/include/freetype/fterrors.h b/...eetype-2.12.0/include/freetype/fterrors.h → ...eetype-2.12.1/include/freetype/fterrors.h
diff --git a/...eetype-2.12.0/include/freetype/ftfntfmt.h → ...eetype-2.12.1/include/freetype/ftfntfmt.h b/...eetype-2.12.0/include/freetype/ftfntfmt.h → ...eetype-2.12.1/include/freetype/ftfntfmt.h
diff --git a/...freetype-2.12.0/include/freetype/ftgasp.h → ...freetype-2.12.1/include/freetype/ftgasp.h b/...freetype-2.12.0/include/freetype/ftgasp.h → ...freetype-2.12.1/include/freetype/ftgasp.h
diff --git a/...reetype-2.12.0/include/freetype/ftglyph.h → ...reetype-2.12.1/include/freetype/ftglyph.h b/...reetype-2.12.0/include/freetype/ftglyph.h → ...reetype-2.12.1/include/freetype/ftglyph.h
diff --git a/...reetype-2.12.0/include/freetype/ftgxval.h → ...reetype-2.12.1/include/freetype/ftgxval.h b/...reetype-2.12.0/include/freetype/ftgxval.h → ...reetype-2.12.1/include/freetype/ftgxval.h
diff --git a/...freetype-2.12.0/include/freetype/ftgzip.h → ...freetype-2.12.1/include/freetype/ftgzip.h b/...freetype-2.12.0/include/freetype/ftgzip.h → ...freetype-2.12.1/include/freetype/ftgzip.h
diff --git a/...reetype-2.12.0/include/freetype/ftimage.h → ...reetype-2.12.1/include/freetype/ftimage.h b/...reetype-2.12.0/include/freetype/ftimage.h → ...reetype-2.12.1/include/freetype/ftimage.h
diff --git a/...eetype-2.12.0/include/freetype/ftincrem.h → ...eetype-2.12.1/include/freetype/ftincrem.h b/...eetype-2.12.0/include/freetype/ftincrem.h → ...eetype-2.12.1/include/freetype/ftincrem.h
diff --git a/...eetype-2.12.0/include/freetype/ftlcdfil.h → ...eetype-2.12.1/include/freetype/ftlcdfil.h b/...eetype-2.12.0/include/freetype/ftlcdfil.h → ...eetype-2.12.1/include/freetype/ftlcdfil.h
diff --git a/...freetype-2.12.0/include/freetype/ftlist.h → ...freetype-2.12.1/include/freetype/ftlist.h b/...freetype-2.12.0/include/freetype/ftlist.h → ...freetype-2.12.1/include/freetype/ftlist.h
diff --git a/...etype-2.12.0/include/freetype/ftlogging.h → ...etype-2.12.1/include/freetype/ftlogging.h b/...etype-2.12.0/include/freetype/ftlogging.h → ...etype-2.12.1/include/freetype/ftlogging.h
diff --git a/.../freetype-2.12.0/include/freetype/ftlzw.h → .../freetype-2.12.1/include/freetype/ftlzw.h b/.../freetype-2.12.0/include/freetype/ftlzw.h → .../freetype-2.12.1/include/freetype/ftlzw.h
diff --git a/.../freetype-2.12.0/include/freetype/ftmac.h → .../freetype-2.12.1/include/freetype/ftmac.h b/.../freetype-2.12.0/include/freetype/ftmac.h → .../freetype-2.12.1/include/freetype/ftmac.h
diff --git a/code/freetype-2.12.0/include/freetype/ftmm.h → code/freetype-2.12.1/include/freetype/ftmm.h b/code/freetype-2.12.0/include/freetype/ftmm.h → code/freetype-2.12.1/include/freetype/ftmm.h
diff --git a/...eetype-2.12.0/include/freetype/ftmodapi.h → ...eetype-2.12.1/include/freetype/ftmodapi.h b/...eetype-2.12.0/include/freetype/ftmodapi.h → ...eetype-2.12.1/include/freetype/ftmodapi.h
diff --git a/...eetype-2.12.0/include/freetype/ftmoderr.h → ...eetype-2.12.1/include/freetype/ftmoderr.h b/...eetype-2.12.0/include/freetype/ftmoderr.h → ...eetype-2.12.1/include/freetype/ftmoderr.h
diff --git a/...reetype-2.12.0/include/freetype/ftotval.h → ...reetype-2.12.1/include/freetype/ftotval.h b/...reetype-2.12.0/include/freetype/ftotval.h → ...reetype-2.12.1/include/freetype/ftotval.h
diff --git a/...reetype-2.12.0/include/freetype/ftoutln.h → ...reetype-2.12.1/include/freetype/ftoutln.h b/...reetype-2.12.0/include/freetype/ftoutln.h → ...reetype-2.12.1/include/freetype/ftoutln.h
diff --git a/...eetype-2.12.0/include/freetype/ftparams.h → ...eetype-2.12.1/include/freetype/ftparams.h b/...eetype-2.12.0/include/freetype/ftparams.h → ...eetype-2.12.1/include/freetype/ftparams.h
diff --git a/.../freetype-2.12.0/include/freetype/ftpfr.h → .../freetype-2.12.1/include/freetype/ftpfr.h b/.../freetype-2.12.0/include/freetype/ftpfr.h → .../freetype-2.12.1/include/freetype/ftpfr.h
diff --git a/...eetype-2.12.0/include/freetype/ftrender.h → ...eetype-2.12.1/include/freetype/ftrender.h b/...eetype-2.12.0/include/freetype/ftrender.h → ...eetype-2.12.1/include/freetype/ftrender.h
diff --git a/...reetype-2.12.0/include/freetype/ftsizes.h → ...reetype-2.12.1/include/freetype/ftsizes.h b/...reetype-2.12.0/include/freetype/ftsizes.h → ...reetype-2.12.1/include/freetype/ftsizes.h
diff --git a/...eetype-2.12.0/include/freetype/ftsnames.h → ...eetype-2.12.1/include/freetype/ftsnames.h b/...eetype-2.12.0/include/freetype/ftsnames.h → ...eetype-2.12.1/include/freetype/ftsnames.h
diff --git a/...eetype-2.12.0/include/freetype/ftstroke.h → ...eetype-2.12.1/include/freetype/ftstroke.h b/...eetype-2.12.0/include/freetype/ftstroke.h → ...eetype-2.12.1/include/freetype/ftstroke.h
diff --git a/...reetype-2.12.0/include/freetype/ftsynth.h → ...reetype-2.12.1/include/freetype/ftsynth.h b/...reetype-2.12.0/include/freetype/ftsynth.h → ...reetype-2.12.1/include/freetype/ftsynth.h
diff --git a/...eetype-2.12.0/include/freetype/ftsystem.h → ...eetype-2.12.1/include/freetype/ftsystem.h b/...eetype-2.12.0/include/freetype/ftsystem.h → ...eetype-2.12.1/include/freetype/ftsystem.h
diff --git a/...eetype-2.12.0/include/freetype/fttrigon.h → ...eetype-2.12.1/include/freetype/fttrigon.h b/...eetype-2.12.0/include/freetype/fttrigon.h → ...eetype-2.12.1/include/freetype/fttrigon.h
diff --git a/...reetype-2.12.0/include/freetype/fttypes.h → ...reetype-2.12.1/include/freetype/fttypes.h b/...reetype-2.12.0/include/freetype/fttypes.h → ...reetype-2.12.1/include/freetype/fttypes.h
diff --git a/...eetype-2.12.0/include/freetype/ftwinfnt.h → ...eetype-2.12.1/include/freetype/ftwinfnt.h b/...eetype-2.12.0/include/freetype/ftwinfnt.h → ...eetype-2.12.1/include/freetype/ftwinfnt.h
diff --git a/...12.0/include/freetype/internal/autohint.h → ...12.1/include/freetype/internal/autohint.h b/...12.0/include/freetype/internal/autohint.h → ...12.1/include/freetype/internal/autohint.h
diff --git a/...2.0/include/freetype/internal/cffotypes.h → ...2.1/include/freetype/internal/cffotypes.h b/...2.0/include/freetype/internal/cffotypes.h → ...2.1/include/freetype/internal/cffotypes.h
diff --git a/...12.0/include/freetype/internal/cfftypes.h → ...12.1/include/freetype/internal/cfftypes.h b/...12.0/include/freetype/internal/cfftypes.h → ...12.1/include/freetype/internal/cfftypes.h
diff --git a/...clude/freetype/internal/compiler-macros.h → ...clude/freetype/internal/compiler-macros.h b/...clude/freetype/internal/compiler-macros.h → ...clude/freetype/internal/compiler-macros.h
diff --git a/...2.12.0/include/freetype/internal/ftcalc.h → ...2.12.1/include/freetype/internal/ftcalc.h b/...2.12.0/include/freetype/internal/ftcalc.h → ...2.12.1/include/freetype/internal/ftcalc.h
diff --git a/....12.0/include/freetype/internal/ftdebug.h → ....12.1/include/freetype/internal/ftdebug.h b/....12.0/include/freetype/internal/ftdebug.h → ....12.1/include/freetype/internal/ftdebug.h
diff --git a/...-2.12.0/include/freetype/internal/ftdrv.h → ...-2.12.1/include/freetype/internal/ftdrv.h b/...-2.12.0/include/freetype/internal/ftdrv.h → ...-2.12.1/include/freetype/internal/ftdrv.h
diff --git a/...12.0/include/freetype/internal/ftgloadr.h → ...12.1/include/freetype/internal/ftgloadr.h b/...12.0/include/freetype/internal/ftgloadr.h → ...12.1/include/freetype/internal/ftgloadr.h
diff --git a/...2.12.0/include/freetype/internal/fthash.h → ...2.12.1/include/freetype/internal/fthash.h b/...2.12.0/include/freetype/internal/fthash.h → ...2.12.1/include/freetype/internal/fthash.h
diff --git a/...12.0/include/freetype/internal/ftmemory.h → ...12.1/include/freetype/internal/ftmemory.h b/...12.0/include/freetype/internal/ftmemory.h → ...12.1/include/freetype/internal/ftmemory.h
diff --git a/...2.12.0/include/freetype/internal/ftobjs.h → ...2.12.1/include/freetype/internal/ftobjs.h b/...2.12.0/include/freetype/internal/ftobjs.h → ...2.12.1/include/freetype/internal/ftobjs.h
diff --git a/...12.0/include/freetype/internal/ftpsprop.h → ...12.1/include/freetype/internal/ftpsprop.h b/...12.0/include/freetype/internal/ftpsprop.h → ...12.1/include/freetype/internal/ftpsprop.h
diff --git a/....12.0/include/freetype/internal/ftrfork.h → ....12.1/include/freetype/internal/ftrfork.h b/....12.0/include/freetype/internal/ftrfork.h → ....12.1/include/freetype/internal/ftrfork.h
diff --git a/...2.12.0/include/freetype/internal/ftserv.h → ...2.12.1/include/freetype/internal/ftserv.h b/...2.12.0/include/freetype/internal/ftserv.h → ...2.12.1/include/freetype/internal/ftserv.h
diff --git a/...12.0/include/freetype/internal/ftstream.h → ...12.1/include/freetype/internal/ftstream.h b/...12.0/include/freetype/internal/ftstream.h → ...12.1/include/freetype/internal/ftstream.h
diff --git a/....12.0/include/freetype/internal/fttrace.h → ....12.1/include/freetype/internal/fttrace.h b/....12.0/include/freetype/internal/fttrace.h → ....12.1/include/freetype/internal/fttrace.h
diff --git a/....12.0/include/freetype/internal/ftvalid.h → ....12.1/include/freetype/internal/ftvalid.h b/....12.0/include/freetype/internal/ftvalid.h → ....12.1/include/freetype/internal/ftvalid.h
diff --git a/...-2.12.0/include/freetype/internal/psaux.h → ...-2.12.1/include/freetype/internal/psaux.h b/...-2.12.0/include/freetype/internal/psaux.h → ...-2.12.1/include/freetype/internal/psaux.h
diff --git a/....12.0/include/freetype/internal/pshints.h → ....12.1/include/freetype/internal/pshints.h b/....12.0/include/freetype/internal/pshints.h → ....12.1/include/freetype/internal/pshints.h
diff --git a/...nclude/freetype/internal/services/svbdf.h → ...nclude/freetype/internal/services/svbdf.h b/...nclude/freetype/internal/services/svbdf.h → ...nclude/freetype/internal/services/svbdf.h
diff --git a/...lude/freetype/internal/services/svcfftl.h → ...lude/freetype/internal/services/svcfftl.h b/...lude/freetype/internal/services/svcfftl.h → ...lude/freetype/internal/services/svcfftl.h
diff --git a/...nclude/freetype/internal/services/svcid.h → ...nclude/freetype/internal/services/svcid.h b/...nclude/freetype/internal/services/svcid.h → ...nclude/freetype/internal/services/svcid.h
diff --git a/...ude/freetype/internal/services/svfntfmt.h → ...ude/freetype/internal/services/svfntfmt.h b/...ude/freetype/internal/services/svfntfmt.h → ...ude/freetype/internal/services/svfntfmt.h
diff --git a/...ude/freetype/internal/services/svgldict.h → ...ude/freetype/internal/services/svgldict.h b/...ude/freetype/internal/services/svgldict.h → ...ude/freetype/internal/services/svgldict.h
diff --git a/...lude/freetype/internal/services/svgxval.h → ...lude/freetype/internal/services/svgxval.h b/...lude/freetype/internal/services/svgxval.h → ...lude/freetype/internal/services/svgxval.h
diff --git a/...clude/freetype/internal/services/svkern.h → ...clude/freetype/internal/services/svkern.h b/...clude/freetype/internal/services/svkern.h → ...clude/freetype/internal/services/svkern.h
diff --git a/...ude/freetype/internal/services/svmetric.h → ...ude/freetype/internal/services/svmetric.h b/...ude/freetype/internal/services/svmetric.h → ...ude/freetype/internal/services/svmetric.h
diff --git a/...include/freetype/internal/services/svmm.h → ...include/freetype/internal/services/svmm.h b/...include/freetype/internal/services/svmm.h → ...include/freetype/internal/services/svmm.h
diff --git a/...lude/freetype/internal/services/svotval.h → ...lude/freetype/internal/services/svotval.h b/...lude/freetype/internal/services/svotval.h → ...lude/freetype/internal/services/svotval.h
diff --git a/...nclude/freetype/internal/services/svpfr.h → ...nclude/freetype/internal/services/svpfr.h b/...nclude/freetype/internal/services/svpfr.h → ...nclude/freetype/internal/services/svpfr.h
diff --git a/...ude/freetype/internal/services/svpostnm.h → ...ude/freetype/internal/services/svpostnm.h b/...ude/freetype/internal/services/svpostnm.h → ...ude/freetype/internal/services/svpostnm.h
diff --git a/...clude/freetype/internal/services/svprop.h → ...clude/freetype/internal/services/svprop.h b/...clude/freetype/internal/services/svprop.h → ...clude/freetype/internal/services/svprop.h
diff --git a/...ude/freetype/internal/services/svpscmap.h → ...ude/freetype/internal/services/svpscmap.h b/...ude/freetype/internal/services/svpscmap.h → ...ude/freetype/internal/services/svpscmap.h
diff --git a/...ude/freetype/internal/services/svpsinfo.h → ...ude/freetype/internal/services/svpsinfo.h b/...ude/freetype/internal/services/svpsinfo.h → ...ude/freetype/internal/services/svpsinfo.h
diff --git a/...clude/freetype/internal/services/svsfnt.h → ...clude/freetype/internal/services/svsfnt.h b/...clude/freetype/internal/services/svsfnt.h → ...clude/freetype/internal/services/svsfnt.h
diff --git a/...ude/freetype/internal/services/svttcmap.h → ...ude/freetype/internal/services/svttcmap.h b/...ude/freetype/internal/services/svttcmap.h → ...ude/freetype/internal/services/svttcmap.h
diff --git a/...lude/freetype/internal/services/svtteng.h → ...lude/freetype/internal/services/svtteng.h b/...lude/freetype/internal/services/svtteng.h → ...lude/freetype/internal/services/svtteng.h
diff --git a/...ude/freetype/internal/services/svttglyf.h → ...ude/freetype/internal/services/svttglyf.h b/...ude/freetype/internal/services/svttglyf.h → ...ude/freetype/internal/services/svttglyf.h
diff --git a/...ude/freetype/internal/services/svwinfnt.h → ...ude/freetype/internal/services/svwinfnt.h b/...ude/freetype/internal/services/svwinfnt.h → ...ude/freetype/internal/services/svwinfnt.h
diff --git a/...e-2.12.0/include/freetype/internal/sfnt.h → ...e-2.12.1/include/freetype/internal/sfnt.h b/...e-2.12.0/include/freetype/internal/sfnt.h → ...e-2.12.1/include/freetype/internal/sfnt.h
diff --git a/.../include/freetype/internal/svginterface.h → .../include/freetype/internal/svginterface.h b/.../include/freetype/internal/svginterface.h → .../include/freetype/internal/svginterface.h
diff --git a/....12.0/include/freetype/internal/t1types.h → ....12.1/include/freetype/internal/t1types.h b/....12.0/include/freetype/internal/t1types.h → ....12.1/include/freetype/internal/t1types.h
diff --git a/....12.0/include/freetype/internal/tttypes.h → ....12.1/include/freetype/internal/tttypes.h b/....12.0/include/freetype/internal/tttypes.h → ....12.1/include/freetype/internal/tttypes.h
diff --git a/...2.0/include/freetype/internal/wofftypes.h → ...2.1/include/freetype/internal/wofftypes.h b/...2.0/include/freetype/internal/wofftypes.h → ...2.1/include/freetype/internal/wofftypes.h
diff --git a/.../freetype-2.12.0/include/freetype/otsvg.h → .../freetype-2.12.1/include/freetype/otsvg.h b/.../freetype-2.12.0/include/freetype/otsvg.h → .../freetype-2.12.1/include/freetype/otsvg.h
diff --git a/...eetype-2.12.0/include/freetype/t1tables.h → ...eetype-2.12.1/include/freetype/t1tables.h b/...eetype-2.12.0/include/freetype/t1tables.h → ...eetype-2.12.1/include/freetype/t1tables.h
diff --git a/...eetype-2.12.0/include/freetype/ttnameid.h → ...eetype-2.12.1/include/freetype/ttnameid.h b/...eetype-2.12.0/include/freetype/ttnameid.h → ...eetype-2.12.1/include/freetype/ttnameid.h
diff --git a/...eetype-2.12.0/include/freetype/tttables.h → ...eetype-2.12.1/include/freetype/tttables.h b/...eetype-2.12.0/include/freetype/tttables.h → ...eetype-2.12.1/include/freetype/tttables.h
diff --git a/...freetype-2.12.0/include/freetype/tttags.h → ...freetype-2.12.1/include/freetype/tttags.h b/...freetype-2.12.0/include/freetype/tttags.h → ...freetype-2.12.1/include/freetype/tttags.h
diff --git a/code/freetype-2.12.0/include/ft2build.h → code/freetype-2.12.1/include/ft2build.h b/code/freetype-2.12.0/include/ft2build.h → code/freetype-2.12.1/include/ft2build.h
diff --git a/code/libs/macosx/libfreetype.a b/code/libs/macosx/libfreetype.a
diff --git a/code/libs/win32/libfreetype.a b/code/libs/win32/libfreetype.a
diff --git a/code/libs/win64/libfreetype.a b/code/libs/win64/libfreetype.a
diff --git a/code/renderercommon/tr_font.c b/code/renderercommon/tr_font.c
@@ -74,7 +74,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef BUILD_FREETYPE
 
 //#ifdef USE_LOCAL_HEADERS
-//  #include "../freetype-2.12.0/include/ft2build.h"
+//  #include "../freetype-2.12.1/include/ft2build.h"
 //#else
 //  #include <ft2build.h>
 //#endif

diff --git a/version.txt b/version.txt
@@ -138,7 +138,7 @@
 * update zlib to version 1.2.12
 * update libogg to version 1.3.5
 * update libspeex to version 1.2.0
-* update freetype to version 2.12.0
+* update freetype to version 2.12.1
 * check demo file extension for protocol number if it's not set in config strings
 * update libcurl to version 7.83.1