Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/freetype/dist re-merge freetype ...
details: https://anonhg.NetBSD.org/xsrc/rev/235eb91362f9
branches: trunk
changeset: 9965:235eb91362f9
user: mrg <mrg%NetBSD.org@localhost>
date: Wed May 09 07:57:57 2018 +0000
description:
re-merge freetype 2.9.1.
diffstat:
external/mit/freetype/dist/CMakeLists.txt | 436 +-
external/mit/freetype/dist/ChangeLog | 9010 ++++++--
external/mit/freetype/dist/ChangeLog.20 | 26 +-
external/mit/freetype/dist/ChangeLog.21 | 139 +-
external/mit/freetype/dist/ChangeLog.22 | 52 +-
external/mit/freetype/dist/ChangeLog.23 | 182 +-
external/mit/freetype/dist/ChangeLog.24 | 152 +-
external/mit/freetype/dist/Jamfile | 52 +-
external/mit/freetype/dist/Jamrules | 2 +-
external/mit/freetype/dist/Makefile | 2 +-
external/mit/freetype/dist/README | 21 +-
external/mit/freetype/dist/README.git | 2 +-
external/mit/freetype/dist/autogen.sh | 5 +-
external/mit/freetype/dist/builds/amiga/README | 17 +-
external/mit/freetype/dist/builds/amiga/include/config/ftconfig.h | 8 +-
external/mit/freetype/dist/builds/amiga/include/config/ftmodule.h | 2 +-
external/mit/freetype/dist/builds/amiga/makefile | 14 +-
external/mit/freetype/dist/builds/amiga/makefile.os4 | 14 +-
external/mit/freetype/dist/builds/amiga/smakefile | 12 +-
external/mit/freetype/dist/builds/amiga/src/base/ftdebug.c | 4 +-
external/mit/freetype/dist/builds/amiga/src/base/ftsystem.c | 2 +-
external/mit/freetype/dist/builds/ansi/ansi-def.mk | 2 +-
external/mit/freetype/dist/builds/ansi/ansi.mk | 2 +-
external/mit/freetype/dist/builds/atari/ATARI.H | 2 +-
external/mit/freetype/dist/builds/atari/README.TXT | 8 +-
external/mit/freetype/dist/builds/beos/beos-def.mk | 2 +-
external/mit/freetype/dist/builds/beos/beos.mk | 2 +-
external/mit/freetype/dist/builds/beos/detect.mk | 2 +-
external/mit/freetype/dist/builds/cmake/iOS.cmake | 7 +-
external/mit/freetype/dist/builds/compiler/ansi-cc.mk | 2 +-
external/mit/freetype/dist/builds/compiler/bcc-dev.mk | 2 +-
external/mit/freetype/dist/builds/compiler/bcc.mk | 2 +-
external/mit/freetype/dist/builds/compiler/emx.mk | 2 +-
external/mit/freetype/dist/builds/compiler/gcc-dev.mk | 2 +-
external/mit/freetype/dist/builds/compiler/gcc.mk | 2 +-
external/mit/freetype/dist/builds/compiler/intelc.mk | 2 +-
external/mit/freetype/dist/builds/compiler/unix-lcc.mk | 2 +-
external/mit/freetype/dist/builds/compiler/visualage.mk | 2 +-
external/mit/freetype/dist/builds/compiler/visualc.mk | 2 +-
external/mit/freetype/dist/builds/compiler/watcom.mk | 2 +-
external/mit/freetype/dist/builds/compiler/win-lcc.mk | 2 +-
external/mit/freetype/dist/builds/detect.mk | 66 +-
external/mit/freetype/dist/builds/dos/detect.mk | 4 +-
external/mit/freetype/dist/builds/dos/dos-def.mk | 2 +-
external/mit/freetype/dist/builds/dos/dos-emx.mk | 2 +-
external/mit/freetype/dist/builds/dos/dos-gcc.mk | 2 +-
external/mit/freetype/dist/builds/dos/dos-wat.mk | 2 +-
external/mit/freetype/dist/builds/exports.mk | 8 +-
external/mit/freetype/dist/builds/freetype.mk | 30 +-
external/mit/freetype/dist/builds/link_dos.mk | 2 +-
external/mit/freetype/dist/builds/link_std.mk | 2 +-
external/mit/freetype/dist/builds/mac/FreeType.m68k_cfm.make.txt | 3 +
external/mit/freetype/dist/builds/mac/FreeType.m68k_far.make.txt | 3 +
external/mit/freetype/dist/builds/mac/FreeType.ppc_carbon.make.txt | 3 +
external/mit/freetype/dist/builds/mac/FreeType.ppc_classic.make.txt | 3 +
external/mit/freetype/dist/builds/mac/ftmac.c | 24 +-
external/mit/freetype/dist/builds/modules.mk | 6 +-
external/mit/freetype/dist/builds/os2/detect.mk | 4 +-
external/mit/freetype/dist/builds/os2/os2-def.mk | 2 +-
external/mit/freetype/dist/builds/os2/os2-dev.mk | 2 +-
external/mit/freetype/dist/builds/os2/os2-gcc.mk | 2 +-
external/mit/freetype/dist/builds/symbian/bld.inf | 100 +-
external/mit/freetype/dist/builds/symbian/freetype.mmp | 14 +-
external/mit/freetype/dist/builds/toplevel.mk | 5 +-
external/mit/freetype/dist/builds/unix/aclocal.m4 | 114 -
external/mit/freetype/dist/builds/unix/config.guess | 680 +-
external/mit/freetype/dist/builds/unix/config.sub | 305 +-
external/mit/freetype/dist/builds/unix/configure | 1109 +-
external/mit/freetype/dist/builds/unix/configure.ac | 214 +-
external/mit/freetype/dist/builds/unix/configure.raw | 212 +-
external/mit/freetype/dist/builds/unix/detect.mk | 9 +-
external/mit/freetype/dist/builds/unix/freetype-config.in | 117 +-
external/mit/freetype/dist/builds/unix/freetype2.in | 6 +-
external/mit/freetype/dist/builds/unix/freetype2.m4 | 2 +-
external/mit/freetype/dist/builds/unix/ft-munmap.m4 | 2 +-
external/mit/freetype/dist/builds/unix/ftconfig.in | 137 +-
external/mit/freetype/dist/builds/unix/ftsystem.c | 2 +-
external/mit/freetype/dist/builds/unix/install.mk | 81 +-
external/mit/freetype/dist/builds/unix/pkg.m4 | 2 +-
external/mit/freetype/dist/builds/unix/unix-cc.in | 17 +-
external/mit/freetype/dist/builds/unix/unix-def.in | 16 +-
external/mit/freetype/dist/builds/unix/unix-dev.mk | 2 +-
external/mit/freetype/dist/builds/unix/unix-lcc.mk | 2 +-
external/mit/freetype/dist/builds/unix/unix.mk | 2 +-
external/mit/freetype/dist/builds/unix/unixddef.mk | 2 +-
external/mit/freetype/dist/builds/vms/ftconfig.h | 156 +-
external/mit/freetype/dist/builds/vms/ftsystem.c | 2 +-
external/mit/freetype/dist/builds/wince/ftdebug.c | 8 +-
external/mit/freetype/dist/builds/wince/vc2005-ce/freetype.sln | 1 +
external/mit/freetype/dist/builds/wince/vc2005-ce/freetype.vcproj | 3057 ++-
external/mit/freetype/dist/builds/wince/vc2005-ce/index.html | 14 +-
external/mit/freetype/dist/builds/wince/vc2008-ce/freetype.sln | 1 +
external/mit/freetype/dist/builds/wince/vc2008-ce/freetype.vcproj | 10079 +++++++++-
external/mit/freetype/dist/builds/wince/vc2008-ce/index.html | 14 +-
external/mit/freetype/dist/builds/windows/detect.mk | 28 +-
external/mit/freetype/dist/builds/windows/ftdebug.c | 8 +-
external/mit/freetype/dist/builds/windows/vc2005/freetype.vcproj | 463 +-
external/mit/freetype/dist/builds/windows/vc2005/index.html | 14 +-
external/mit/freetype/dist/builds/windows/vc2008/freetype.vcproj | 1546 +-
external/mit/freetype/dist/builds/windows/vc2008/index.html | 14 +-
external/mit/freetype/dist/builds/windows/vc2010/freetype.sln | 37 +-
external/mit/freetype/dist/builds/windows/vc2010/freetype.vcxproj | 1506 +-
external/mit/freetype/dist/builds/windows/vc2010/freetype.vcxproj.filters | 158 +-
external/mit/freetype/dist/builds/windows/vc2010/index.html | 42 +-
external/mit/freetype/dist/builds/windows/visualc/freetype.dsp | 57 +-
external/mit/freetype/dist/builds/windows/visualc/freetype.vcproj | 1546 +-
external/mit/freetype/dist/builds/windows/visualc/index.html | 14 +-
external/mit/freetype/dist/builds/windows/visualce/freetype.dsp | 57 +-
external/mit/freetype/dist/builds/windows/visualce/freetype.vcproj | 10298 +++++++++-
external/mit/freetype/dist/builds/windows/visualce/index.html | 14 +-
external/mit/freetype/dist/builds/windows/w32-bcc.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-bccd.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-dev.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-gcc.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-icc.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-intl.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-lcc.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-mingw32.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-vcc.mk | 2 +-
external/mit/freetype/dist/builds/windows/w32-wat.mk | 2 +-
external/mit/freetype/dist/builds/windows/win32-def.mk | 2 +-
external/mit/freetype/dist/configure | 6 +-
external/mit/freetype/dist/devel/ft2build.h | 10 +-
external/mit/freetype/dist/devel/ftoption.h | 321 +-
external/mit/freetype/dist/docs/CHANGES | 808 +-
external/mit/freetype/dist/docs/CUSTOMIZE | 23 +-
external/mit/freetype/dist/docs/DEBUG | 4 +-
external/mit/freetype/dist/docs/FTL.TXT | 4 +-
external/mit/freetype/dist/docs/INSTALL | 8 +-
external/mit/freetype/dist/docs/INSTALL.ANY | 18 +-
external/mit/freetype/dist/docs/INSTALL.CROSS | 4 +-
external/mit/freetype/dist/docs/INSTALL.GNU | 6 +-
external/mit/freetype/dist/docs/INSTALL.MAC | 42 +-
external/mit/freetype/dist/docs/INSTALL.UNIX | 7 +-
external/mit/freetype/dist/docs/INSTALL.VMS | 14 +-
external/mit/freetype/dist/docs/LICENSE.TXT | 6 +-
external/mit/freetype/dist/docs/MAKEPP | 2 +-
external/mit/freetype/dist/docs/TODO | 2 +-
external/mit/freetype/dist/docs/formats.txt | 268 +-
external/mit/freetype/dist/docs/freetype-config.1 | 50 +-
external/mit/freetype/dist/docs/raster.txt | 2 +-
external/mit/freetype/dist/docs/reference/ft2-auto_hinter.html | 294 +-
external/mit/freetype/dist/docs/reference/ft2-base_interface.html | 993 +-
external/mit/freetype/dist/docs/reference/ft2-basic_types.html | 100 +-
external/mit/freetype/dist/docs/reference/ft2-bdf_fonts.html | 18 +-
external/mit/freetype/dist/docs/reference/ft2-bitmap_handling.html | 22 +-
external/mit/freetype/dist/docs/reference/ft2-bzip2.html | 10 +-
external/mit/freetype/dist/docs/reference/ft2-cache_subsystem.html | 72 +-
external/mit/freetype/dist/docs/reference/ft2-cff_driver.html | 123 +-
external/mit/freetype/dist/docs/reference/ft2-cid_fonts.html | 18 +-
external/mit/freetype/dist/docs/reference/ft2-computations.html | 83 +-
external/mit/freetype/dist/docs/reference/ft2-font_formats.html | 10 +-
external/mit/freetype/dist/docs/reference/ft2-gasp_table.html | 19 +-
external/mit/freetype/dist/docs/reference/ft2-glyph_management.html | 167 +-
external/mit/freetype/dist/docs/reference/ft2-glyph_stroker.html | 64 +-
external/mit/freetype/dist/docs/reference/ft2-glyph_variants.html | 50 +-
external/mit/freetype/dist/docs/reference/ft2-gx_validation.html | 24 +-
external/mit/freetype/dist/docs/reference/ft2-gzip.html | 17 +-
external/mit/freetype/dist/docs/reference/ft2-header_file_macros.html | 222 +-
external/mit/freetype/dist/docs/reference/ft2-header_inclusion.html | 16 +-
external/mit/freetype/dist/docs/reference/ft2-incremental.html | 44 +-
external/mit/freetype/dist/docs/reference/ft2-index.html | 546 +-
external/mit/freetype/dist/docs/reference/ft2-lcd_filtering.html | 82 +-
external/mit/freetype/dist/docs/reference/ft2-list_processing.html | 34 +-
external/mit/freetype/dist/docs/reference/ft2-lzw.html | 10 +-
external/mit/freetype/dist/docs/reference/ft2-mac_specific.html | 24 +-
external/mit/freetype/dist/docs/reference/ft2-module_management.html | 163 +-
external/mit/freetype/dist/docs/reference/ft2-multiple_masters.html | 361 +-
external/mit/freetype/dist/docs/reference/ft2-ot_validation.html | 26 +-
external/mit/freetype/dist/docs/reference/ft2-outline_processing.html | 96 +-
external/mit/freetype/dist/docs/reference/ft2-pfr_fonts.html | 20 +-
external/mit/freetype/dist/docs/reference/ft2-quick_advance.html | 14 +-
external/mit/freetype/dist/docs/reference/ft2-raster.html | 47 +-
external/mit/freetype/dist/docs/reference/ft2-sfnt_names.html | 110 +-
external/mit/freetype/dist/docs/reference/ft2-sizes_management.html | 14 +-
external/mit/freetype/dist/docs/reference/ft2-system_interface.html | 28 +-
external/mit/freetype/dist/docs/reference/ft2-toc.html | 37 +-
external/mit/freetype/dist/docs/reference/ft2-truetype_engine.html | 15 +-
external/mit/freetype/dist/docs/reference/ft2-truetype_tables.html | 1182 +-
external/mit/freetype/dist/docs/reference/ft2-tt_driver.html | 125 +-
external/mit/freetype/dist/docs/reference/ft2-type1_tables.html | 55 +-
external/mit/freetype/dist/docs/reference/ft2-user_allocation.html | 8 +-
external/mit/freetype/dist/docs/reference/ft2-version.html | 29 +-
external/mit/freetype/dist/docs/reference/ft2-winfnt_fonts.html | 18 +-
external/mit/freetype/dist/docs/release | 6 +-
external/mit/freetype/dist/include/ft2build.h | 10 +-
external/mit/freetype/dist/modules.cfg | 88 +-
external/mit/freetype/dist/src/Jamfile | 8 +-
external/mit/freetype/dist/src/autofit/Jamfile | 20 +-
external/mit/freetype/dist/src/autofit/afangles.c | 2 +-
external/mit/freetype/dist/src/autofit/afblue.c | 670 +-
external/mit/freetype/dist/src/autofit/afblue.cin | 2 +-
external/mit/freetype/dist/src/autofit/afblue.dat | 856 +-
external/mit/freetype/dist/src/autofit/afblue.h | 358 +-
external/mit/freetype/dist/src/autofit/afblue.hin | 70 +-
external/mit/freetype/dist/src/autofit/afcjk.c | 264 +-
external/mit/freetype/dist/src/autofit/afcjk.h | 11 +-
external/mit/freetype/dist/src/autofit/afcover.h | 2 +-
external/mit/freetype/dist/src/autofit/afdummy.c | 18 +-
external/mit/freetype/dist/src/autofit/afdummy.h | 8 +-
external/mit/freetype/dist/src/autofit/aferrors.h | 11 +-
external/mit/freetype/dist/src/autofit/afglobal.c | 114 +-
external/mit/freetype/dist/src/autofit/afglobal.h | 45 +-
external/mit/freetype/dist/src/autofit/afhints.c | 260 +-
external/mit/freetype/dist/src/autofit/afhints.h | 17 +-
external/mit/freetype/dist/src/autofit/afindic.c | 47 +-
external/mit/freetype/dist/src/autofit/afindic.h | 8 +-
external/mit/freetype/dist/src/autofit/aflatin.c | 1732 +-
external/mit/freetype/dist/src/autofit/aflatin.h | 18 +-
external/mit/freetype/dist/src/autofit/aflatin2.c | 77 +-
external/mit/freetype/dist/src/autofit/aflatin2.h | 13 +-
external/mit/freetype/dist/src/autofit/afloader.c | 596 +-
external/mit/freetype/dist/src/autofit/afloader.h | 13 +-
external/mit/freetype/dist/src/autofit/afmodule.c | 239 +-
external/mit/freetype/dist/src/autofit/afmodule.h | 10 +-
external/mit/freetype/dist/src/autofit/afpic.c | 4 +-
external/mit/freetype/dist/src/autofit/afpic.h | 18 +-
external/mit/freetype/dist/src/autofit/afranges.c | 1074 +-
external/mit/freetype/dist/src/autofit/afranges.h | 16 +-
external/mit/freetype/dist/src/autofit/afscript.h | 351 +-
external/mit/freetype/dist/src/autofit/afstyles.h | 330 +-
external/mit/freetype/dist/src/autofit/aftypes.h | 104 +-
external/mit/freetype/dist/src/autofit/afwarp.c | 5 +-
external/mit/freetype/dist/src/autofit/afwarp.h | 10 +-
external/mit/freetype/dist/src/autofit/afwrtsys.h | 8 +-
external/mit/freetype/dist/src/autofit/autofit.c | 25 +-
external/mit/freetype/dist/src/autofit/module.mk | 2 +-
external/mit/freetype/dist/src/autofit/rules.mk | 6 +-
external/mit/freetype/dist/src/base/Jamfile | 49 +-
external/mit/freetype/dist/src/base/basepic.c | 2 +-
external/mit/freetype/dist/src/base/basepic.h | 17 +-
external/mit/freetype/dist/src/base/ftadvanc.c | 27 +-
external/mit/freetype/dist/src/base/ftapi.c | 4 +-
external/mit/freetype/dist/src/base/ftbase.c | 13 +-
external/mit/freetype/dist/src/base/ftbase.h | 19 +-
external/mit/freetype/dist/src/base/ftbbox.c | 28 +-
external/mit/freetype/dist/src/base/ftbdf.c | 2 +-
external/mit/freetype/dist/src/base/ftbitmap.c | 86 +-
external/mit/freetype/dist/src/base/ftcalc.c | 341 +-
external/mit/freetype/dist/src/base/ftcid.c | 2 +-
external/mit/freetype/dist/src/base/ftdbgmem.c | 43 +-
external/mit/freetype/dist/src/base/ftdebug.c | 8 +-
external/mit/freetype/dist/src/base/ftfntfmt.c | 2 +-
external/mit/freetype/dist/src/base/ftfstype.c | 2 +-
external/mit/freetype/dist/src/base/ftgasp.c | 2 +-
external/mit/freetype/dist/src/base/ftgloadr.c | 2 +-
external/mit/freetype/dist/src/base/ftglyph.c | 68 +-
external/mit/freetype/dist/src/base/ftgxval.c | 4 +-
external/mit/freetype/dist/src/base/ftinit.c | 96 +-
external/mit/freetype/dist/src/base/ftlcdfil.c | 327 +-
external/mit/freetype/dist/src/base/ftmac.c | 57 +-
external/mit/freetype/dist/src/base/ftmm.c | 298 +-
external/mit/freetype/dist/src/base/ftobjs.c | 1014 +-
external/mit/freetype/dist/src/base/ftotval.c | 2 +-
external/mit/freetype/dist/src/base/ftoutln.c | 181 +-
external/mit/freetype/dist/src/base/ftpatent.c | 246 +-
external/mit/freetype/dist/src/base/ftpfr.c | 2 +-
external/mit/freetype/dist/src/base/ftpic.c | 2 +-
external/mit/freetype/dist/src/base/ftrfork.c | 156 +-
external/mit/freetype/dist/src/base/ftsnames.c | 60 +-
external/mit/freetype/dist/src/base/ftstream.c | 4 +-
external/mit/freetype/dist/src/base/ftstroke.c | 28 +-
external/mit/freetype/dist/src/base/ftsynth.c | 6 +-
external/mit/freetype/dist/src/base/ftsystem.c | 2 +-
external/mit/freetype/dist/src/base/fttrigon.c | 5 +-
external/mit/freetype/dist/src/base/fttype1.c | 2 +-
external/mit/freetype/dist/src/base/ftutil.c | 18 +-
external/mit/freetype/dist/src/base/ftwinfnt.c | 2 +-
external/mit/freetype/dist/src/base/md5.c | 57 +-
external/mit/freetype/dist/src/base/rules.mk | 6 +-
external/mit/freetype/dist/src/bdf/Jamfile | 6 +-
external/mit/freetype/dist/src/bdf/README | 2 +-
external/mit/freetype/dist/src/bdf/bdf.c | 3 +-
external/mit/freetype/dist/src/bdf/bdf.h | 39 +-
external/mit/freetype/dist/src/bdf/bdfdrivr.c | 209 +-
external/mit/freetype/dist/src/bdf/bdfdrivr.h | 6 +-
external/mit/freetype/dist/src/bdf/bdferror.h | 8 +-
external/mit/freetype/dist/src/bdf/bdflib.c | 678 +-
external/mit/freetype/dist/src/bzip2/Jamfile | 2 +-
external/mit/freetype/dist/src/bzip2/ftbzip2.c | 27 +-
external/mit/freetype/dist/src/bzip2/rules.mk | 2 +-
external/mit/freetype/dist/src/cache/Jamfile | 16 +-
external/mit/freetype/dist/src/cache/ftcache.c | 11 +-
external/mit/freetype/dist/src/cache/ftcbasic.c | 91 +-
external/mit/freetype/dist/src/cache/ftccache.c | 28 +-
external/mit/freetype/dist/src/cache/ftccache.h | 40 +-
external/mit/freetype/dist/src/cache/ftccback.h | 9 +-
external/mit/freetype/dist/src/cache/ftccmap.c | 21 +-
external/mit/freetype/dist/src/cache/ftcerror.h | 11 +-
external/mit/freetype/dist/src/cache/ftcglyph.c | 4 +-
external/mit/freetype/dist/src/cache/ftcglyph.h | 14 +-
external/mit/freetype/dist/src/cache/ftcimage.c | 4 +-
external/mit/freetype/dist/src/cache/ftcimage.h | 12 +-
external/mit/freetype/dist/src/cache/ftcmanag.c | 39 +-
external/mit/freetype/dist/src/cache/ftcmanag.h | 10 +-
external/mit/freetype/dist/src/cache/ftcmru.c | 12 +-
external/mit/freetype/dist/src/cache/ftcmru.h | 16 +-
external/mit/freetype/dist/src/cache/ftcsbits.c | 8 +-
external/mit/freetype/dist/src/cache/ftcsbits.h | 12 +-
external/mit/freetype/dist/src/cache/rules.mk | 2 +-
external/mit/freetype/dist/src/cff/Jamfile | 11 +-
external/mit/freetype/dist/src/cff/cff.c | 19 +-
external/mit/freetype/dist/src/cff/cffcmap.c | 39 +-
external/mit/freetype/dist/src/cff/cffcmap.h | 10 +-
external/mit/freetype/dist/src/cff/cffdrivr.c | 558 +-
external/mit/freetype/dist/src/cff/cffdrivr.h | 8 +-
external/mit/freetype/dist/src/cff/cfferrs.h | 10 +-
external/mit/freetype/dist/src/cff/cffgload.c | 2525 ++-
external/mit/freetype/dist/src/cff/cffgload.h | 192 +-
external/mit/freetype/dist/src/cff/cffload.c | 1069 +-
external/mit/freetype/dist/src/cff/cffload.h | 62 +-
external/mit/freetype/dist/src/cff/cffobjs.c | 241 +-
external/mit/freetype/dist/src/cff/cffobjs.h | 112 +-
external/mit/freetype/dist/src/cff/cffparse.c | 623 +-
external/mit/freetype/dist/src/cff/cffparse.h | 64 +-
external/mit/freetype/dist/src/cff/cffpic.c | 2 +-
external/mit/freetype/dist/src/cff/cffpic.h | 51 +-
external/mit/freetype/dist/src/cff/cfftoken.h | 61 +-
external/mit/freetype/dist/src/cff/module.mk | 2 +-
external/mit/freetype/dist/src/cff/rules.mk | 19 +-
external/mit/freetype/dist/src/cid/Jamfile | 9 +-
external/mit/freetype/dist/src/cid/ciderrs.h | 10 +-
external/mit/freetype/dist/src/cid/cidgload.c | 155 +-
external/mit/freetype/dist/src/cid/cidgload.h | 8 +-
external/mit/freetype/dist/src/cid/cidload.c | 183 +-
external/mit/freetype/dist/src/cid/cidload.h | 8 +-
external/mit/freetype/dist/src/cid/cidobjs.c | 54 +-
external/mit/freetype/dist/src/cid/cidobjs.h | 8 +-
external/mit/freetype/dist/src/cid/cidparse.c | 115 +-
external/mit/freetype/dist/src/cid/cidparse.h | 8 +-
external/mit/freetype/dist/src/cid/cidriver.c | 82 +-
external/mit/freetype/dist/src/cid/cidriver.h | 8 +-
external/mit/freetype/dist/src/cid/cidtoken.h | 2 +-
external/mit/freetype/dist/src/cid/module.mk | 2 +-
external/mit/freetype/dist/src/cid/rules.mk | 2 +-
external/mit/freetype/dist/src/cid/type1cid.c | 8 +-
external/mit/freetype/dist/src/gxvalid/Jamfile | 29 +-
external/mit/freetype/dist/src/gxvalid/README | 16 +-
external/mit/freetype/dist/src/gxvalid/gxvalid.c | 16 +-
external/mit/freetype/dist/src/gxvalid/gxvalid.h | 10 +-
external/mit/freetype/dist/src/gxvalid/gxvbsln.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvcommn.c | 29 +-
external/mit/freetype/dist/src/gxvalid/gxvcommn.h | 14 +-
external/mit/freetype/dist/src/gxvalid/gxverror.h | 10 +-
external/mit/freetype/dist/src/gxvalid/gxvfeat.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvfeat.h | 8 +-
external/mit/freetype/dist/src/gxvalid/gxvfgen.c | 4 +-
external/mit/freetype/dist/src/gxvalid/gxvjust.c | 4 +-
external/mit/freetype/dist/src/gxvalid/gxvkern.c | 6 +-
external/mit/freetype/dist/src/gxvalid/gxvlcar.c | 4 +-
external/mit/freetype/dist/src/gxvalid/gxvmod.c | 14 +-
external/mit/freetype/dist/src/gxvalid/gxvmod.h | 8 +-
external/mit/freetype/dist/src/gxvalid/gxvmort.c | 4 +-
external/mit/freetype/dist/src/gxvalid/gxvmort.h | 8 +-
external/mit/freetype/dist/src/gxvalid/gxvmort0.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmort1.c | 4 +-
external/mit/freetype/dist/src/gxvalid/gxvmort2.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmort4.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmort5.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmorx.c | 4 +-
external/mit/freetype/dist/src/gxvalid/gxvmorx.h | 8 +-
external/mit/freetype/dist/src/gxvalid/gxvmorx0.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmorx1.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmorx2.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmorx4.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvmorx5.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvopbd.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvprop.c | 2 +-
external/mit/freetype/dist/src/gxvalid/gxvtrak.c | 6 +-
external/mit/freetype/dist/src/gxvalid/module.mk | 2 +-
external/mit/freetype/dist/src/gxvalid/rules.mk | 2 +-
external/mit/freetype/dist/src/gzip/Jamfile | 2 +-
external/mit/freetype/dist/src/gzip/ftgzip.c | 67 +-
external/mit/freetype/dist/src/gzip/rules.mk | 8 +-
external/mit/freetype/dist/src/gzip/zlib.h | 4 +-
external/mit/freetype/dist/src/lzw/Jamfile | 2 +-
external/mit/freetype/dist/src/lzw/ftlzw.c | 16 +-
external/mit/freetype/dist/src/lzw/ftzopen.c | 37 +-
external/mit/freetype/dist/src/lzw/ftzopen.h | 8 +-
external/mit/freetype/dist/src/lzw/rules.mk | 2 +-
external/mit/freetype/dist/src/otvalid/Jamfile | 12 +-
external/mit/freetype/dist/src/otvalid/module.mk | 2 +-
external/mit/freetype/dist/src/otvalid/otvalid.c | 5 +-
external/mit/freetype/dist/src/otvalid/otvalid.h | 8 +-
external/mit/freetype/dist/src/otvalid/otvbase.c | 35 +-
external/mit/freetype/dist/src/otvalid/otvcommn.c | 32 +-
external/mit/freetype/dist/src/otvalid/otvcommn.h | 60 +-
external/mit/freetype/dist/src/otvalid/otverror.h | 10 +-
external/mit/freetype/dist/src/otvalid/otvgdef.c | 113 +-
external/mit/freetype/dist/src/otvalid/otvgpos.c | 56 +-
external/mit/freetype/dist/src/otvalid/otvgpos.h | 8 +-
external/mit/freetype/dist/src/otvalid/otvgsub.c | 36 +-
external/mit/freetype/dist/src/otvalid/otvjstf.c | 2 +-
external/mit/freetype/dist/src/otvalid/otvmath.c | 24 +-
external/mit/freetype/dist/src/otvalid/otvmod.c | 12 +-
external/mit/freetype/dist/src/otvalid/otvmod.h | 8 +-
external/mit/freetype/dist/src/otvalid/rules.mk | 2 +-
external/mit/freetype/dist/src/pcf/Jamfile | 7 +-
external/mit/freetype/dist/src/pcf/README | 4 +-
external/mit/freetype/dist/src/pcf/pcf.c | 10 +-
external/mit/freetype/dist/src/pcf/pcf.h | 20 +-
external/mit/freetype/dist/src/pcf/pcfdrivr.c | 272 +-
external/mit/freetype/dist/src/pcf/pcfdrivr.h | 6 +-
external/mit/freetype/dist/src/pcf/pcferror.h | 8 +-
external/mit/freetype/dist/src/pcf/pcfread.c | 514 +-
external/mit/freetype/dist/src/pcf/pcfread.h | 6 +-
external/mit/freetype/dist/src/pcf/pcfutil.h | 6 +-
external/mit/freetype/dist/src/pfr/Jamfile | 10 +-
external/mit/freetype/dist/src/pfr/module.mk | 2 +-
external/mit/freetype/dist/src/pfr/pfr.c | 11 +-
external/mit/freetype/dist/src/pfr/pfrcmap.c | 18 +-
external/mit/freetype/dist/src/pfr/pfrcmap.h | 8 +-
external/mit/freetype/dist/src/pfr/pfrdrivr.c | 41 +-
external/mit/freetype/dist/src/pfr/pfrdrivr.h | 8 +-
external/mit/freetype/dist/src/pfr/pfrerror.h | 10 +-
external/mit/freetype/dist/src/pfr/pfrgload.c | 71 +-
external/mit/freetype/dist/src/pfr/pfrgload.h | 8 +-
external/mit/freetype/dist/src/pfr/pfrload.c | 190 +-
external/mit/freetype/dist/src/pfr/pfrload.h | 23 +-
external/mit/freetype/dist/src/pfr/pfrobjs.c | 49 +-
external/mit/freetype/dist/src/pfr/pfrobjs.h | 8 +-
external/mit/freetype/dist/src/pfr/pfrsbit.c | 219 +-
external/mit/freetype/dist/src/pfr/pfrsbit.h | 11 +-
external/mit/freetype/dist/src/pfr/pfrtypes.h | 122 +-
external/mit/freetype/dist/src/pfr/rules.mk | 2 +-
external/mit/freetype/dist/src/psaux/Jamfile | 20 +-
external/mit/freetype/dist/src/psaux/afmparse.c | 11 +-
external/mit/freetype/dist/src/psaux/afmparse.h | 8 +-
external/mit/freetype/dist/src/psaux/module.mk | 2 +-
external/mit/freetype/dist/src/psaux/psaux.c | 31 +-
external/mit/freetype/dist/src/psaux/psauxerr.h | 10 +-
external/mit/freetype/dist/src/psaux/psauxmod.c | 122 +-
external/mit/freetype/dist/src/psaux/psauxmod.h | 17 +-
external/mit/freetype/dist/src/psaux/psconv.c | 10 +-
external/mit/freetype/dist/src/psaux/psconv.h | 8 +-
external/mit/freetype/dist/src/psaux/psobjs.c | 808 +-
external/mit/freetype/dist/src/psaux/psobjs.h | 109 +-
external/mit/freetype/dist/src/psaux/rules.mk | 19 +-
external/mit/freetype/dist/src/psaux/t1cmap.c | 64 +-
external/mit/freetype/dist/src/psaux/t1cmap.h | 8 +-
external/mit/freetype/dist/src/psaux/t1decode.c | 530 +-
external/mit/freetype/dist/src/psaux/t1decode.h | 18 +-
external/mit/freetype/dist/src/pshinter/Jamfile | 9 +-
external/mit/freetype/dist/src/pshinter/module.mk | 2 +-
external/mit/freetype/dist/src/pshinter/pshalgo.c | 112 +-
external/mit/freetype/dist/src/pshinter/pshalgo.h | 8 +-
external/mit/freetype/dist/src/pshinter/pshglob.c | 10 +-
external/mit/freetype/dist/src/pshinter/pshglob.h | 8 +-
external/mit/freetype/dist/src/pshinter/pshinter.c | 10 +-
external/mit/freetype/dist/src/pshinter/pshmod.c | 14 +-
external/mit/freetype/dist/src/pshinter/pshmod.h | 8 +-
external/mit/freetype/dist/src/pshinter/pshnterr.h | 10 +-
external/mit/freetype/dist/src/pshinter/pshpic.c | 2 +-
external/mit/freetype/dist/src/pshinter/pshpic.h | 16 +-
external/mit/freetype/dist/src/pshinter/pshrec.c | 8 +-
external/mit/freetype/dist/src/pshinter/pshrec.h | 8 +-
external/mit/freetype/dist/src/pshinter/rules.mk | 2 +-
external/mit/freetype/dist/src/psnames/Jamfile | 6 +-
external/mit/freetype/dist/src/psnames/module.mk | 2 +-
external/mit/freetype/dist/src/psnames/psmodule.c | 63 +-
external/mit/freetype/dist/src/psnames/psmodule.h | 8 +-
external/mit/freetype/dist/src/psnames/psnamerr.h | 10 +-
external/mit/freetype/dist/src/psnames/psnames.c | 6 +-
external/mit/freetype/dist/src/psnames/pspic.c | 2 +-
external/mit/freetype/dist/src/psnames/pspic.h | 18 +-
external/mit/freetype/dist/src/psnames/pstables.h | 94 +-
external/mit/freetype/dist/src/psnames/rules.mk | 2 +-
external/mit/freetype/dist/src/raster/Jamfile | 7 +-
external/mit/freetype/dist/src/raster/ftmisc.h | 12 +-
external/mit/freetype/dist/src/raster/ftraster.c | 121 +-
external/mit/freetype/dist/src/raster/ftraster.h | 10 +-
external/mit/freetype/dist/src/raster/ftrend1.c | 144 +-
external/mit/freetype/dist/src/raster/ftrend1.h | 14 +-
external/mit/freetype/dist/src/raster/module.mk | 2 +-
external/mit/freetype/dist/src/raster/raster.c | 6 +-
external/mit/freetype/dist/src/raster/rasterrs.h | 10 +-
external/mit/freetype/dist/src/raster/rastpic.c | 22 +-
external/mit/freetype/dist/src/raster/rastpic.h | 18 +-
external/mit/freetype/dist/src/raster/rules.mk | 2 +-
external/mit/freetype/dist/src/sfnt/Jamfile | 15 +-
external/mit/freetype/dist/src/sfnt/module.mk | 2 +-
external/mit/freetype/dist/src/sfnt/pngshim.c | 118 +-
external/mit/freetype/dist/src/sfnt/pngshim.h | 11 +-
external/mit/freetype/dist/src/sfnt/rules.mk | 2 +-
external/mit/freetype/dist/src/sfnt/sfdriver.c | 987 +-
external/mit/freetype/dist/src/sfnt/sfdriver.h | 8 +-
external/mit/freetype/dist/src/sfnt/sferrors.h | 11 +-
external/mit/freetype/dist/src/sfnt/sfnt.c | 26 +-
external/mit/freetype/dist/src/sfnt/sfntpic.c | 2 +-
external/mit/freetype/dist/src/sfnt/sfntpic.h | 20 +-
external/mit/freetype/dist/src/sfnt/sfobjs.c | 507 +-
external/mit/freetype/dist/src/sfnt/sfobjs.h | 17 +-
external/mit/freetype/dist/src/sfnt/ttbdf.c | 15 +-
external/mit/freetype/dist/src/sfnt/ttbdf.h | 12 +-
external/mit/freetype/dist/src/sfnt/ttcmap.c | 927 +-
external/mit/freetype/dist/src/sfnt/ttcmap.h | 10 +-
external/mit/freetype/dist/src/sfnt/ttcmapc.h | 2 +-
external/mit/freetype/dist/src/sfnt/ttkern.c | 17 +-
external/mit/freetype/dist/src/sfnt/ttkern.h | 8 +-
external/mit/freetype/dist/src/sfnt/ttload.c | 279 +-
external/mit/freetype/dist/src/sfnt/ttload.h | 8 +-
external/mit/freetype/dist/src/sfnt/ttmtx.c | 48 +-
external/mit/freetype/dist/src/sfnt/ttmtx.h | 8 +-
external/mit/freetype/dist/src/sfnt/ttpost.c | 30 +-
external/mit/freetype/dist/src/sfnt/ttpost.h | 10 +-
external/mit/freetype/dist/src/sfnt/ttsbit.c | 408 +-
external/mit/freetype/dist/src/sfnt/ttsbit.h | 8 +-
external/mit/freetype/dist/src/smooth/Jamfile | 7 +-
external/mit/freetype/dist/src/smooth/ftgrays.c | 1539 +-
external/mit/freetype/dist/src/smooth/ftgrays.h | 10 +-
external/mit/freetype/dist/src/smooth/ftsmerrs.h | 10 +-
external/mit/freetype/dist/src/smooth/ftsmooth.c | 391 +-
external/mit/freetype/dist/src/smooth/ftsmooth.h | 17 +-
external/mit/freetype/dist/src/smooth/ftspic.c | 2 +-
external/mit/freetype/dist/src/smooth/ftspic.h | 13 +-
external/mit/freetype/dist/src/smooth/module.mk | 2 +-
external/mit/freetype/dist/src/smooth/rules.mk | 2 +-
external/mit/freetype/dist/src/smooth/smooth.c | 6 +-
external/mit/freetype/dist/src/tools/afblue.pl | 17 +-
external/mit/freetype/dist/src/tools/apinames.c | 33 +-
external/mit/freetype/dist/src/tools/chktrcmp.py | 2 +-
external/mit/freetype/dist/src/tools/docmaker/content.py | 73 +-
external/mit/freetype/dist/src/tools/docmaker/docbeauty.py | 18 +-
external/mit/freetype/dist/src/tools/docmaker/docmaker.py | 26 +-
external/mit/freetype/dist/src/tools/docmaker/formatter.py | 7 +-
external/mit/freetype/dist/src/tools/docmaker/sources.py | 41 +-
external/mit/freetype/dist/src/tools/docmaker/tohtml.py | 184 +-
external/mit/freetype/dist/src/tools/docmaker/utils.py | 4 +-
external/mit/freetype/dist/src/tools/ftrandom/Makefile | 26 +-
external/mit/freetype/dist/src/tools/ftrandom/README | 79 +-
external/mit/freetype/dist/src/tools/ftrandom/ftrandom.c | 161 +-
external/mit/freetype/dist/src/tools/glnames.py | 87 +-
external/mit/freetype/dist/src/tools/no-copyright | 4 -
external/mit/freetype/dist/src/tools/update-copyright-year | 2 +-
external/mit/freetype/dist/src/truetype/Jamfile | 12 +-
external/mit/freetype/dist/src/truetype/module.mk | 2 +-
external/mit/freetype/dist/src/truetype/rules.mk | 2 +-
external/mit/freetype/dist/src/truetype/truetype.c | 20 +-
external/mit/freetype/dist/src/truetype/ttdriver.c | 205 +-
external/mit/freetype/dist/src/truetype/ttdriver.h | 8 +-
external/mit/freetype/dist/src/truetype/tterrors.h | 11 +-
external/mit/freetype/dist/src/truetype/ttgload.c | 923 +-
external/mit/freetype/dist/src/truetype/ttgload.h | 8 +-
external/mit/freetype/dist/src/truetype/ttgxvar.c | 2881 +--
external/mit/freetype/dist/src/truetype/ttgxvar.h | 305 +-
external/mit/freetype/dist/src/truetype/ttinterp.c | 1586 +-
external/mit/freetype/dist/src/truetype/ttinterp.h | 169 +-
external/mit/freetype/dist/src/truetype/ttobjs.c | 396 +-
external/mit/freetype/dist/src/truetype/ttobjs.h | 31 +-
external/mit/freetype/dist/src/truetype/ttpic.c | 2 +-
external/mit/freetype/dist/src/truetype/ttpic.h | 39 +-
external/mit/freetype/dist/src/truetype/ttpload.c | 89 +-
external/mit/freetype/dist/src/truetype/ttpload.h | 8 +-
external/mit/freetype/dist/src/truetype/ttsubpix.c | 41 +-
external/mit/freetype/dist/src/truetype/ttsubpix.h | 13 +-
external/mit/freetype/dist/src/type1/Jamfile | 10 +-
external/mit/freetype/dist/src/type1/module.mk | 2 +-
external/mit/freetype/dist/src/type1/rules.mk | 2 +-
external/mit/freetype/dist/src/type1/t1afm.c | 35 +-
external/mit/freetype/dist/src/type1/t1afm.h | 8 +-
external/mit/freetype/dist/src/type1/t1driver.c | 126 +-
external/mit/freetype/dist/src/type1/t1driver.h | 8 +-
external/mit/freetype/dist/src/type1/t1errors.h | 10 +-
external/mit/freetype/dist/src/type1/t1gload.c | 151 +-
external/mit/freetype/dist/src/type1/t1gload.h | 8 +-
external/mit/freetype/dist/src/type1/t1load.c | 336 +-
external/mit/freetype/dist/src/type1/t1load.h | 27 +-
external/mit/freetype/dist/src/type1/t1objs.c | 71 +-
external/mit/freetype/dist/src/type1/t1objs.h | 14 +-
external/mit/freetype/dist/src/type1/t1parse.c | 31 +-
external/mit/freetype/dist/src/type1/t1parse.h | 8 +-
external/mit/freetype/dist/src/type1/t1tokens.h | 2 +-
external/mit/freetype/dist/src/type1/type1.c | 15 +-
external/mit/freetype/dist/src/type42/Jamfile | 7 +-
external/mit/freetype/dist/src/type42/module.mk | 2 +-
external/mit/freetype/dist/src/type42/rules.mk | 2 +-
external/mit/freetype/dist/src/type42/t42drivr.c | 54 +-
external/mit/freetype/dist/src/type42/t42drivr.h | 8 +-
external/mit/freetype/dist/src/type42/t42error.h | 10 +-
external/mit/freetype/dist/src/type42/t42objs.c | 21 +-
external/mit/freetype/dist/src/type42/t42objs.h | 8 +-
external/mit/freetype/dist/src/type42/t42parse.c | 111 +-
external/mit/freetype/dist/src/type42/t42parse.h | 8 +-
external/mit/freetype/dist/src/type42/t42types.h | 8 +-
external/mit/freetype/dist/src/type42/type42.c | 8 +-
external/mit/freetype/dist/src/winfonts/Jamfile | 2 +-
external/mit/freetype/dist/src/winfonts/fnterrs.h | 10 +-
external/mit/freetype/dist/src/winfonts/module.mk | 2 +-
external/mit/freetype/dist/src/winfonts/rules.mk | 2 +-
external/mit/freetype/dist/src/winfonts/winfnt.c | 174 +-
external/mit/freetype/dist/src/winfonts/winfnt.h | 8 +-
external/mit/freetype/dist/vms_make.com | 24 +-
592 files changed, 51950 insertions(+), 35705 deletions(-)
diffs (truncated from 127978 to 300 lines):
diff -r 4cbf454aee18 -r 235eb91362f9 external/mit/freetype/dist/CMakeLists.txt
--- a/external/mit/freetype/dist/CMakeLists.txt Wed May 09 07:21:07 2018 +0000
+++ b/external/mit/freetype/dist/CMakeLists.txt Wed May 09 07:57:57 2018 +0000
@@ -1,9 +1,9 @@
# CMakeLists.txt
#
-# Copyright 2013-2018 by
+# Copyright 2013-2015 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
-# Written originally by John Cary <cary%txcorp.com@localhost>
+# Written by John Cary <cary%txcorp.com@localhost>
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
@@ -12,84 +12,45 @@
# fully.
#
#
-# The following will 1. create a build directory and 2. change into it and
-# call cmake to configure the build with default parameters as a static
-# library.
+# Say
#
-# cmake -E make_directory build
-# cmake -E chdir build cmake ..
+# cmake CMakeLists.txt
+#
+# to create a Makefile that builds a static version of the library.
#
# For a dynamic library, use
#
-# cmake -E chdir build cmake -D BUILD_SHARED_LIBS:BOOL=true ..
+# cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true
#
# For a framework on OS X, use
#
-# cmake -E chdir build cmake -G Xcode -D BUILD_FRAMEWORK:BOOL=true ..
+# cmake CMakeLists.txt -DBUILD_FRAMEWORK:BOOL=true -G Xcode
+#
+# instead.
#
# For an iOS static library, use
#
-# cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=OS ..
+# cmake CMakeLists.txt -DIOS_PLATFORM=OS -G Xcode
#
# or
#
-# cmake -E chdir build cmake -G Xcode -D IOS_PLATFORM=SIMULATOR ..
-#
-# Finally, build the project with:
-#
-# cmake --build build
-#
-# Install it with
-#
-# (sudo) cmake --build build --target install
-#
-# A binary distribution can be made with
-#
-# cmake --build build --config Release --target package
+# cmake CMakeLists.txt -DIOS_PLATFORM=SIMULATOR -G Xcode
#
# Please refer to the cmake manual for further options, in particular, how
# to modify compilation and linking parameters.
#
# Some notes.
#
-# . `cmake' creates configuration files in
-#
-# <build-directory>/include/freetype/config
-#
-# which should be further modified if necessary.
+# . `cmake' will overwrite FreeType's original (top-level) `Makefile' file.
#
# . You can use `cmake' directly on a freshly cloned FreeType git
# repository.
#
-# . `CMakeLists.txt' is provided as-is since it is normally not used by the
+# . `CMakeLists.txt' is provided as-is since it is not used by the
# developer team.
-#
-# . Set the `FT_WITH_ZLIB', `FT_WITH_BZIP2', `FT_WITH_PNG', and
-# `FT_WITH_HARFBUZZ' CMake variables to `ON' to force using a dependency.
-# Leave a variable undefined (which is the default) to use the dependency
-# only if it is available. Set `CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE' to
-# disable a dependency completely (CMake package name, so `BZip2' instead of
-# `BZIP2'). Example:
-#
-# cmake -DFT_WITH_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE [...]
-#
-# . Installation of FreeType can be controlled with the CMake variables
-# `SKIP_INSTALL_HEADERS', `SKIP_INSTALL_LIBRARIES', and `SKIP_INSTALL_ALL'
-# (this is compatible with the same CMake variables in zlib's CMake
-# support).
+
-# FreeType explicitly marks the API to be exported and relies on the compiler
-# to hide all other symbols. CMake supports a C_VISBILITY_PRESET property
-# starting with 2.8.12.
-cmake_minimum_required(VERSION 2.8.12)
-
-if (NOT CMAKE_VERSION VERSION_LESS 3.3)
- # Allow symbol visibility settings also on static libraries. CMake < 3.3
- # only sets the propery on a shared library build.
- cmake_policy(SET CMP0063 NEW)
-endif ()
-
-include(CheckIncludeFile)
+cmake_minimum_required(VERSION 2.6)
# CMAKE_TOOLCHAIN_FILE must be set before `project' is called, which
# configures the base build environment and references the toolchain file
@@ -117,7 +78,7 @@
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_TOOLCHAIN_FILE
- ${CMAKE_SOURCE_DIR}/builds/cmake/iOS.cmake)
+ ${PROJECT_SOURCE_DIR}/builds/cmake/iOS.cmake)
endif ()
else ()
if (DEFINED IOS_PLATFORM)
@@ -125,49 +86,7 @@
endif ()
endif ()
-
-project(freetype C)
-
-set(VERSION_MAJOR "2")
-set(VERSION_MINOR "9")
-set(VERSION_PATCH "1")
-
-# SOVERSION scheme: CURRENT.AGE.REVISION
-# If there was an incompatible interface change:
-# Increment CURRENT. Set AGE and REVISION to 0
-# If there was a compatible interface change:
-# Increment AGE. Set REVISION to 0
-# If the source code was changed, but there were no interface changes:
-# Increment REVISION.
-set(LIBRARY_VERSION "6.16.0")
-set(LIBRARY_SOVERSION "6")
-
-# These options mean "require x and complain if not found". They'll get
-# optionally found anyway. Use `-DCMAKE_DISABLE_FIND_PACKAGE_x=TRUE` to disable
-# searching for a packge entirely (x is the CMake package name, so "BZip2"
-# instead of "BZIP2").
-option(FT_WITH_ZLIB "Use system zlib instead of internal library." OFF)
-option(FT_WITH_BZIP2 "Support bzip2 compressed fonts." OFF)
-option(FT_WITH_PNG "Support PNG compressed OpenType embedded bitmaps." OFF)
-option(FT_WITH_HARFBUZZ "Improve auto-hinting of OpenType fonts." OFF)
-
-
-# Disallow in-source builds
-if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
- message(FATAL_ERROR
- "In-source builds are not permitted! Make a separate folder for"
- " building, e.g.,\n"
- " cmake -E make_directory build\n"
- " cmake -E chdir build cmake ..\n"
- "Before that, remove the files created by this failed run with\n"
- " cmake -E remove CMakeCache.txt\n"
- " cmake -E remove_directory CMakeFiles")
-endif ()
-
-
-# Add local cmake modules
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/builds/cmake)
-
+project(freetype)
if (BUILD_FRAMEWORK)
if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
@@ -178,114 +97,67 @@
set(BUILD_SHARED_LIBS ON)
endif ()
-
-# Find dependencies
-if (FT_WITH_HARFBUZZ)
- find_package(HarfBuzz 1.3.0 REQUIRED)
-else ()
- find_package(HarfBuzz 1.3.0)
-endif ()
+set(VERSION_MAJOR "2")
+set(VERSION_MINOR "6")
+set(VERSION_PATCH "0")
+set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-if (FT_WITH_PNG)
- find_package(PNG REQUIRED)
-else ()
- find_package(PNG)
-endif ()
+# Compiler definitions for building the library
+add_definitions(-DFT2_BUILD_LIBRARY)
-if (FT_WITH_ZLIB)
- find_package(ZLIB REQUIRED)
-else ()
- find_package(ZLIB)
-endif ()
-
-if (FT_WITH_BZIP2)
- find_package(BZip2 REQUIRED)
-else ()
- find_package(BZip2)
-endif ()
+# Specify library include directories
+include_directories("${PROJECT_SOURCE_DIR}/include")
# Create the configuration file
-if (UNIX)
- check_include_file("unistd.h" HAVE_UNISTD_H)
- check_include_file("fcntl.h" HAVE_FCNTL_H)
- check_include_file("stdint.h" HAVE_STDINT_H)
-
- file(READ "${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in"
- FTCONFIG_H)
- if (HAVE_UNISTD_H)
- string(REGEX REPLACE
- "#undef +(HAVE_UNISTD_H)" "#define \\1 1"
- FTCONFIG_H "${FTCONFIG_H}")
- endif ()
- if (HAVE_FCNTL_H)
- string(REGEX REPLACE
- "#undef +(HAVE_FCNTL_H)" "#define \\1 1"
- FTCONFIG_H "${FTCONFIG_H}")
- endif ()
- if (HAVE_STDINT_H)
- string(REGEX REPLACE
- "#undef +(HAVE_STDINT_H)" "#define \\1 1"
- FTCONFIG_H "${FTCONFIG_H}")
- endif ()
- string(REPLACE "/undef " "#undef "
- FTCONFIG_H "${FTCONFIG_H}")
- file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
- "${FTCONFIG_H}")
-endif ()
-
+message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype2.")
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype2)
-# Create the options file
-file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftoption.h"
- FTOPTION_H)
-if (ZLIB_FOUND)
- string(REGEX REPLACE
- "/\\* +(#define +FT_CONFIG_OPTION_SYSTEM_ZLIB) +\\*/" "\\1"
- FTOPTION_H "${FTOPTION_H}")
-endif ()
-if (BZIP2_FOUND)
- string(REGEX REPLACE
- "/\\* +(#define +FT_CONFIG_OPTION_USE_BZIP2) +\\*/" "\\1"
- FTOPTION_H "${FTOPTION_H}")
-endif ()
-if (PNG_FOUND)
- string(REGEX REPLACE
- "/\\* +(#define +FT_CONFIG_OPTION_USE_PNG) +\\*/" "\\1"
- FTOPTION_H "${FTOPTION_H}")
-endif ()
-if (HARFBUZZ_FOUND)
- string(REGEX REPLACE
- "/\\* +(#define +FT_CONFIG_OPTION_USE_HARFBUZZ) +\\*/" "\\1"
- FTOPTION_H "${FTOPTION_H}")
-endif ()
-file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h"
- "${FTOPTION_H}")
+# For the auto-generated ftconfig.h file
+include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype2")
+message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h.")
+execute_process(
+ COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?"
+ INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in
+ OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h
+)
-
-file(GLOB PUBLIC_HEADERS "include/ft2build.h" "include/freetype/*.h")
-file(GLOB PUBLIC_CONFIG_HEADERS "include/freetype/config/*.h")
-file(GLOB PRIVATE_HEADERS "include/freetype/internal/*.h")
-
+file(GLOB PUBLIC_HEADERS "include/*.h")
+file(GLOB PUBLIC_CONFIG_HEADERS "include/config/*.h")
+file(GLOB PRIVATE_HEADERS "include/internal/*.h")
set(BASE_SRCS
src/autofit/autofit.c
- src/base/ftbase.c
+ src/base/ftadvanc.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
Home |
Main Index |
Thread Index |
Old Index