[gzip] Update sources to zlib 1.2.11

* src/gzip/ftgzip.c, src/gzip/rules.mk: Updated for new zlib
  sources. Also removed the temporary fix introduced in
  commit 6a431038 [1] to work-around the fact that the
  internal sources were too old.

* src/gzip/README.freetype: Small README file
  describing the origin of the sources and how they
  were modified.

* src/gzip/patches/*: Patch files applied to original
  sources.

* src/gzip/*: Updated all zlib sources to 1.2.11 plus
  the patch from src/gzip/patches/ applied.

This can be tested by building with the Unix development build:

  make setup devel
  make

Or by building the freetype-demos programs with:

  meson setup build -Dfreetype2:zlib=internal
  meson compile -C out

Then trying to run 'ftview' with a .pcf.gz font file.

[1] 6a431038c9

.gitlab-ci.yml

@@ -1,17 +1,15 @@
-# CI setup for FreeType.
-
 stages:
  - build
 
 # FIXME: Use --werror once warnings are fixed.
 variables:
-  MESON_ARGS: --fatal-meson-warnings --default-library=both
+  MESON_ARGS: --fatal-meson-warnings
   MESON_ARGS_WINDOWS: ${MESON_ARGS} --force-fallback-for=zlib
 
 .build windows common:
   # See
   # https://gitlab.freedesktop.org/gstreamer/gst-ci/container_registry/213
-  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:2021-09-09.0-master'
+  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v14-master'
   stage: 'build'
   tags:
     - 'docker'
@@ -25,86 +23,55 @@ variables:
   image: 'registry.freedesktop.org/freetype/docker-images/debian:latest'
   stage: 'build'
 
-.build macos common:
-  stage: 'build'
-  tags:
-    - 'gst-macos-11.1'
-
 .build windows meson:
   extends: '.build windows common'
   variables:
     # Make sure any failure in PowerShell scripts is fatal.
     ErrorActionPreference: 'Stop'
     WarningPreference: 'Stop'
-    # Uncomment the following key if you need to pass custom args, as well
+    # Uncomment the following key if need to pass custom args, as well with
-    # with the `$env:MESON_ARGS` line in the `script:` blocks.
+    # the `$env:MESON_ARGS` line in the `script:` blocks.
     # MESON_ARGS: >-
     #   -Dfoo=enabled
     #   -Dbar=disabled
   before_script:
-    # Update RootCAs in order to access to some sites.
+    # Make sure meson is up to date, so we don't need to rebuild the image
-    - certutil -generateSSTFromWU "C:\roots.sst"
-    - Import-Certificate -CertStoreLocation "Cert:\LocalMachine\Root" "C:\roots.sst"
-    # Make sure meson is up to date so we don't need to rebuild the image
     # with each release.
-    - pip3 install -U 'meson==0.59.*'
+    - pip3 install -U meson ninja
-    - pip3 install --upgrade certifi
-    - pip3 install -U ninja
-
-    # Generate a UWP cross-file in case it's used
-    - $PSDefaultParameterValues['Out-File:Encoding'] = 'ASCII'
-    - echo "[binaries]" > uwp-crossfile.meson
-    - echo "c = 'cl'" >> uwp-crossfile.meson
-    - echo "strip = ['true']" >> uwp-crossfile.meson
-    - echo "[built-in options]" >> uwp-crossfile.meson
-    - echo "c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP', '-DUNICODE', '-D_WIN32_WINNT=0x0A00', '-we4013']" >> uwp-crossfile.meson
-    - echo "c_winlibs = ['windowsapp.lib']" >> uwp-crossfile.meson
   script:
     # For some reason, options are separated by newlines instead of spaces,
     # so we have to replace them first.
-    #
+    #- $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ")
-    # - $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ")
-    #
     # Gitlab executes PowerShell in docker, but `VsDevCmd.bat` is a batch
     # script.  Environment variables substitutions is done by PowerShell
     # before calling `cmd.exe`, that's why we use `$env:FOO` instead of
     # `%FOO%`.
-    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH $env:VS_UWP &&
+    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-        meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
+        meson setup build $env:MESON_ARGS_WINDOWS &&
-        meson compile --verbose -C build
+        meson compile --verbose -C build &&
-        $env:MESON_WINDOWS_TESTS"
+        meson test -C build &&
+        meson test -C build --benchmark"
 
 
 # Format of job names:
 # <OS> <Build-Tool> <Build-Params> <Architecture> 
 
 
-# Windows jobs.
+# Windows jobs
-
 windows meson vs2017 amd64:
   extends: '.build windows meson'
   variables:
     ARCH: 'amd64'
-    MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
 
 windows meson vs2017 x86:
   extends: '.build windows meson'
   variables:
     ARCH: 'x86'
-    MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
 
-windows meson vs2017 amd64 uwp:
-  extends: '.build windows meson'
-  variables:
-    ARCH: 'amd64'
-    VS_UWP: '-app_platform=UWP'
-    MESON_ARGS_UWP: '--cross-file uwp-crossfile.meson -Dc_winlibs="windowsapp.lib"'
-
-# Linux Jobs.
-#
-# Jobs with "libs" in the name force-enable libraries.
-# They are disabled for the remaining jobs.
 
+# Linux Jobs
+# Jobs with "libs" in the name force enable libraries.
+# They are disabled in rest of the jobs.
 linux autotools:
   extends: '.build linux common'
   script: |
@@ -113,8 +80,7 @@ linux autotools:
                 --with-bzip2=no \
                 --with-harfbuzz=no \
                 --with-png=no \
-                --with-zlib=no \
+                --with-zlib=no
-                CC=gcc
 
     make -j$(nproc) && make install
 
@@ -126,29 +92,14 @@ linux autotools libs:
                 --with-bzip2=yes \
                 --with-harfbuzz=yes \
                 --with-png=yes \
-                --with-zlib=yes \
+                --with-zlib=yes
-                CC=gcc
-
-    make -j$(nproc) && make install
-
-linux autotools libs clang:
-  extends: '.build linux common'
-  script: |
-    ./autogen.sh
-    ./configure --with-brotli=yes \
-                --with-bzip2=yes \
-                --with-harfbuzz=yes \
-                --with-png=yes \
-                --with-zlib=yes \
-                CC=clang
 
     make -j$(nproc) && make install
 
 linux meson:
   extends: '.build linux common'
   script: |
-    meson setup build ${MESON_ARGS} \
+    meson setup build -Dbrotli=disabled \
-                      -Dbrotli=disabled \
                       -Dbzip2=disabled \
                       -Dharfbuzz=disabled \
                       -Dpng=disabled \
@@ -160,8 +111,7 @@ linux meson:
 linux meson libs:
   extends: '.build linux common'
   script: |
-    meson setup build ${MESON_ARGS} \
+    meson setup build -Dbrotli=enabled \
-                      -Dbrotli=enabled \
                       -Dbzip2=enabled \
                       -Dharfbuzz=disabled \
                       -Dpng=disabled \
@@ -191,40 +141,3 @@ linux cmake libs:
                    -D FT_REQUIRE_ZLIB=TRUE
 
     cmake --build build --target install
-
-
-# MacOS jobs.
-
-macos autotools:
-  extends: '.build macos common'
-  before_script:
-    - '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
-  script:
-    - brew install autoconf automake libtool
-    - ./autogen.sh
-    - ./configure
-    - 'make -j$(sysctl -n hw.logicalcpu)'
-    - make install
-
-macos autotools clang:
-  extends: '.build macos common'
-  before_script:
-    - '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
-  script:
-    - brew install autoconf automake libtool
-    - ./autogen.sh
-    - './configure CC=clang'
-    - 'make -j$(sysctl -n hw.logicalcpu)'
-    - make install
-
-macos meson:
-  extends: '.build macos common'
-  script:
-    - pip3 install --upgrade pip
-    - pip3 install -U meson
-    - pip3 install --upgrade certifi
-    - pip3 install -U ninja
-
-    - meson setup build ${MESON_ARGS}
-    - meson compile --verbose -C build
-    - sudo meson install -C build

.mailmap

@@ -1,9 +1,7 @@
 Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org> <behdad.esfahbod@gmail.com>
 Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org> <behdad@google.com>
 Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org>
-Alexander Borsuk <me@alex.bio> <alexander.borsuk@qnective.com>
 Ewald Hew (Hew Yih Shiuan 丘毅宣) <ewaldhew@gmail.com>
-Moazin Khatti (موؤذن کھٹی) <moazinkhatri@gmail.com>
 Priyesh Kumar (प्रियेश कुमार) <priyeshkkumar@gmail.com>
 Alexei Podtelezhnikov (Алексей Подтележников) <apodtele@gmail.com>
 Nikhil Ramakrishnan (निखिल रामकृष्णन) <ramakrishnan.nikhil@gmail.com>
@@ -20,5 +18,4 @@ David Turner <david@freetype.org> <digit@google.com>
 Anuj Verma (अनुज वर्मा) <anujv@iitbhilai.ac.in>
 Ben Wagner <bungeman@gmail.com> Bungeman <bungeman@gmail.com>
 Ben Wagner <bungeman@gmail.com> <bungeman@google.com>
-Ben Wagner <bungeman@gmail.com> <bungeman@chromium.org>
 Nikolaus Waxweiler <madigens@gmail.com> <nikolaus.waxweiler@daltonmaag.com>

CMakeLists.txt

@@ -1,6 +1,6 @@
 # CMakeLists.txt
 #
-# Copyright (C) 2013-2022 by
+# Copyright (C) 2013-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written originally by John Cary <cary@txcorp.com>
@@ -106,9 +106,10 @@
 #   (this is compatible with the same CMake variables in zlib's CMake
 #   support).
 
-# To minimize the number of cmake_policy() workarounds,
+# FreeType explicitly marks the API to be exported and relies on the compiler
-# CMake >= 3 is requested.
+# to hide all other symbols. CMake supports a C_VISBILITY_PRESET property
-cmake_minimum_required(VERSION 3.0)
+# 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
@@ -161,8 +162,8 @@ endif ()
 project(freetype C)
 
 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "12")
+set(VERSION_MINOR "11")
-set(VERSION_PATCH "1")
+set(VERSION_PATCH "0")
 
 # Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
 set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
@@ -238,14 +239,12 @@ if (BUILD_FRAMEWORK)
     message(FATAL_ERROR
       "You should use Xcode generator with BUILD_FRAMEWORK enabled")
   endif ()
-  set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+  set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)")
   set(BUILD_SHARED_LIBS ON)
 endif ()
 
 
 # Find dependencies
-include(FindPkgConfig)
-
 if (NOT FT_DISABLE_HARFBUZZ)
   set(HARFBUZZ_MIN_VERSION "2.0.0")
   if (FT_REQUIRE_HARFBUZZ)
@@ -272,16 +271,11 @@ if (NOT FT_DISABLE_ZLIB)
 endif ()
 
 if (NOT FT_DISABLE_BZIP2)
-  # Genuine BZip2 does not provide bzip2.pc, but some platforms have it.
-  # For better dependency in freetype2.pc, bzip2.pc is searched
-  # regardless of the availability of libbz2. If bzip2.pc is found,
-  # Requires.private is used instead of Libs.private.
   if (FT_REQUIRE_BZIP2)
     find_package(BZip2 REQUIRED)
   else ()
     find_package(BZip2)
   endif ()
-  pkg_check_modules(PC_BZIP2 bzip2)
 endif ()
 
 if (NOT FT_DISABLE_BROTLI)
@@ -406,7 +400,6 @@ set(BASE_SRCS
   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
@@ -492,55 +485,42 @@ if (BUILD_FRAMEWORK)
   )
   set_target_properties(freetype PROPERTIES
     FRAMEWORK TRUE
-    MACOSX_FRAMEWORK_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/builds/mac/freetype-Info.plist
+    MACOSX_FRAMEWORK_INFO_PLIST builds/mac/freetype-Info.plist
     PUBLIC_HEADER "${PUBLIC_HEADERS}"
     XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
   )
 endif ()
 
-# 'freetype-interface' is an interface library, to be accessed with
-# `EXPORT_NAME Freetype::Freetype`.  This is the target name provided by
-# CMake's `FindFreetype.cmake`, so we provide it for compatibility.
-add_library(freetype-interface INTERFACE)
-set_target_properties(freetype-interface PROPERTIES
-  EXPORT_NAME Freetype::Freetype
-  INTERFACE_LINK_LIBRARIES freetype)
 
-set(PKGCONFIG_REQUIRES "")
+set(PKG_CONFIG_REQUIRED_PRIVATE "")
-set(PKGCONFIG_REQUIRES_PRIVATE "")
+set(PKG_CONFIG_LIBS_PRIVATE "")
-set(PKGCONFIG_LIBS "-L\${libdir} -lfreetype")
-set(PKGCONFIG_LIBS_PRIVATE "")
 
 if (ZLIB_FOUND)
   target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})
   target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS})
-  list(APPEND PKGCONFIG_REQUIRES_PRIVATE "zlib")
+  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib")
 endif ()
 if (BZIP2_FOUND)
   target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
   target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
-  if (PC_BZIP2_FOUND)
+  list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")
-    list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2")
-  else ()
-    list(APPEND PKGCONFIG_LIBS_PRIVATE "-lbz2")
-  endif ()
 endif ()
 if (PNG_FOUND)
   target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
   target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS})
   target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS})
-  list(APPEND PKGCONFIG_REQUIRES_PRIVATE "libpng")
+  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "libpng")
 endif ()
 if (HarfBuzz_FOUND)
   target_link_libraries(freetype PRIVATE ${HarfBuzz_LIBRARY})
   target_include_directories(freetype PRIVATE ${HarfBuzz_INCLUDE_DIRS})
-  list(APPEND PKGCONFIG_REQUIRES_PRIVATE "harfbuzz >= ${HARFBUZZ_MIN_VERSION}")
+  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "harfbuzz >= ${HARFBUZZ_MIN_VERSION}")
 endif ()
 if (BROTLIDEC_FOUND)
   target_link_libraries(freetype PRIVATE ${BROTLIDEC_LIBRARIES})
   target_compile_definitions(freetype PRIVATE ${BROTLIDEC_DEFINITIONS})
   target_include_directories(freetype PRIVATE ${BROTLIDEC_INCLUDE_DIRS})
-  list(APPEND PKGCONFIG_REQUIRES_PRIVATE "libbrotlidec")
+  list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "libbrotlidec")
 endif ()
 
 
@@ -567,7 +547,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
   # Generate the pkg-config file
   file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN)
 
-  string(REPLACE ";" ", " PKGCONFIG_REQUIRES_PRIVATE "${PKGCONFIG_REQUIRES_PRIVATE}")
+  string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}")
 
   string(REPLACE "%prefix%" ${CMAKE_INSTALL_PREFIX}
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
@@ -579,26 +559,10 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
   string(REPLACE "%ft_version%" "${LIBTOOL_CURRENT}.${LIBTOOL_REVISION}.${LIBTOOL_AGE}"
           FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-
+  string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
-  if (BUILD_SHARED_LIBS)
+          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-    string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES}"
+  string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
+          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-    string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" "${PKGCONFIG_REQUIRES_PRIVATE}"
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-    string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS}"
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-    string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" "${PKGCONFIG_LIBS_PRIVATE}"
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-  else ()
-    string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES} ${PKGCONFIG_REQUIRES_PRIVATE}"
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-    string(REPLACE "%PKGCONFIG_REQUIRES_PRIVATE%" ""
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-    string(REPLACE "%PKGCONFIG_LIBS%" "${PKGCONFIG_LIBS} ${PKGCONFIG_LIBS_PRIVATE}"
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-    string(REPLACE "%PKGCONFIG_LIBS_PRIVATE%" ""
-            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
-  endif ()
 
   set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
   if (EXISTS "${FREETYPE2_PC_IN_NAME}")
@@ -622,7 +586,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
     COMPATIBILITY SameMajorVersion)
 
   install(
-    TARGETS freetype freetype-interface
+    TARGETS freetype
       EXPORT freetype-targets
       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

Makefile

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

README

@@ -1,4 +1,4 @@
-FreeType 2.12.1
+FreeType 2.11.0
 ===============
 
 Homepage: https://www.freetype.org
@@ -16,9 +16,7 @@ Read the files `docs/INSTALL*`  for installation instructions; see the
 file `docs/LICENSE.TXT` for the available licenses.
 
 For using FreeType's git repository  instead of a distribution bundle,
-please read file  `README.git`.  Note that you have  to actually clone
+please read file `README.git`.
-the repository; using a snapshot will  not work (in other words, don't
-use gitlab's 'Download' button).
 
 The FreeType 2 API reference is located in directory `docs/reference`;
 use the file  `index.html` as the top entry point.   [Please note that
@@ -32,9 +30,9 @@ sites.  Go to
 
 and download one of the following files.
 
-  freetype-doc-2.12.1.tar.xz
+  freetype-doc-2.11.0.tar.xz
-  freetype-doc-2.12.1.tar.gz
+  freetype-doc-2.11.0.tar.gz
-  ftdoc2121.zip
+  ftdoc2110.zip
 
 To view the documentation online, go to
 
@@ -94,7 +92,7 @@ Enjoy!
 
 ----------------------------------------------------------------------
 
-Copyright (C) 2006-2022 by
+Copyright (C) 2006-2021 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,

README.git

@@ -89,7 +89,7 @@ address:
 
 ----------------------------------------------------------------------
 
-Copyright (C) 2005-2022 by
+Copyright (C) 2005-2021 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,

autogen.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -110,10 +110,7 @@ check_tool_version ()
   fi
 }
 
-# Solaris 10's shell doesn't like the `!` operator to negate the exit status.
+if test ! -f ./builds/unix/configure.raw; then
-if test -f ./builds/unix/configure.raw; then
-  :
-else
   echo "You must be in the same directory as \`autogen.sh'."
   echo "Bootstrapping doesn't work if srcdir != builddir."
   exit 1
@@ -182,19 +179,15 @@ copy_submodule_files ()
   cp $DLG_SRC_DIR/* src/dlg
 }
 
-if test -e ".git"; then
+DLG_INC_DIR=subprojects/dlg/include/dlg
-  DLG_INC_DIR=subprojects/dlg/include/dlg
+DLG_SRC_DIR=subprojects/dlg/src/dlg
-  DLG_SRC_DIR=subprojects/dlg/src/dlg
 
-  if test -d "$DLG_INC_DIR"; then
+if ! test -d "$DLG_INC_DIR"; then
-    :
+  echo "Checking out submodule in \`subprojects/dlg':"
-  else
+  git submodule init
-    echo "Checking out submodule in \`subprojects/dlg':"
+  git submodule update
-    git submodule init
-    git submodule update
-  fi
-
-  copy_submodule_files
 fi
 
+copy_submodule_files
+
 # EOF

builds/amiga/README

@@ -1,7 +1,7 @@
 
 README for the builds/amiga subdirectory.
 
-Copyright (C) 2005-2022 by
+Copyright (C) 2005-2021 by
 Werner Lemberg and Detlef Würkner.
 
 This file is part of the FreeType project, and may only be used, modified,

builds/amiga/include/config/ftconfig.h

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright (C) 2005-2022 by                                             */
+/*  Copyright (C) 2005-2021 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */

builds/amiga/include/config/ftmodule.h

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType module selection.                            */
 /*                                                                         */
-/*  Copyright (C) 2005-2022 by                                             */
+/*  Copyright (C) 2005-2021 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */

builds/amiga/makefile

@@ -5,7 +5,7 @@
 #
 
 
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/amiga/makefile.os4

@@ -4,7 +4,7 @@
 #
 
 
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/amiga/smakefile

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/amiga/src/base/ftdebug.c

@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component for amiga (body).
  *
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
  *
  * This file is part of the FreeType project, and may only be used,

builds/amiga/src/base/ftsystem.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType low-level system interface (body).           */
 /*                                                                         */
-/*  Copyright (C) 1996-2022 by                                             */
+/*  Copyright (C) 1996-2021 by                                             */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -264,7 +264,7 @@ Free_VecPooled( APTR  poolHeader,
 
     stream->descriptor.pointer = NULL;
     stream->size               = 0;
-    stream->base               = NULL;
+    stream->base               = 0;
   }
 
 

builds/ansi/ansi-def.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/ansi/ansi.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/beos/beos-def.mk

@@ -5,7 +5,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/beos/beos.mk

@@ -2,7 +2,7 @@
 # FreeType 2 configuration rules for a BeOS system
 #
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/beos/detect.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/cmake/FindBrotliDec.cmake

@@ -1,6 +1,6 @@
 # FindBrotliDec.cmake
 #
-# Copyright (C) 2019-2022 by
+# Copyright (C) 2019-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by Werner Lemberg <wl@gnu.org>

builds/cmake/iOS.cmake

@@ -1,6 +1,6 @@
 # iOS.cmake
 #
-# Copyright (C) 2014-2022 by
+# Copyright (C) 2014-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by David Wimsey <david@wimsey.us>

builds/cmake/testbuild.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-# Copyright (C) 2015-2022 by
+# Copyright (C) 2015-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/ansi-cc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/bcc-dev.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/bcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/emx.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 2003-2022 by
+# Copyright (C) 2003-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/gcc-dev.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/gcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/intelc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/unix-lcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/visualage.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/visualc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/watcom.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/compiler/win-lcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/detect.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/dos/detect.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/dos/dos-def.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/dos/dos-emx.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 2003-2022 by
+# Copyright (C) 2003-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/dos/dos-gcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/dos/dos-wat.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 2003-2022 by
+# Copyright (C) 2003-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/exports.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 2005-2022 by
+# Copyright (C) 2005-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/freetype.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/link_dos.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/link_std.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/mac/freetype-Info.plist

@@ -9,7 +9,7 @@
   <string>English</string>
 
   <key>CFBundleExecutable</key>
-  <string>freetype</string>
+  <string>FreeType</string>
 
   <key>CFBundleGetInfoString</key>
   <string>FreeType ${PROJECT_VERSION}</string>

builds/mac/ftmac.c

@@ -5,7 +5,7 @@
 /*    Mac FOND support.  Written by just@letterror.com.                    */
 /*  Heavily Fixed by mpsuzuki, George Williams and Sean McBride            */
 /*                                                                         */
-/*  Copyright (C) 1996-2022 by                                             */
+/*  Copyright (C) 1996-2021 by                                             */
 /*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -97,7 +97,7 @@
 
 #define FT_DEPRECATED_ATTRIBUTE
 
-#include <freetype/ftmac.h>
+#include FT_MAC_H
 
   /* undefine blocking-macros in ftmac.h */
 #undef FT_GetFile_From_Mac_Name
@@ -447,7 +447,7 @@ typedef short ResourceIndex;
 
     stream->descriptor.pointer = NULL;
     stream->size               = 0;
-    stream->base               = NULL;
+    stream->base               = 0;
   }
 
 
@@ -939,7 +939,7 @@ typedef short ResourceIndex;
     if ( lwfn_file_name[0] )
     {
       err = lookup_lwfn_by_fond( pathname, lwfn_file_name,
-                                 buff, sizeof ( buff ) );
+                                 buff, sizeof ( buff )  );
       if ( !err )
         have_lwfn = 1;
     }

builds/meson/extract_freetype_version.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/meson/extract_libtool_version.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/meson/generate_reference_docs.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/meson/parse_modules_cfg.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -87,7 +87,6 @@ def generate_ftmodule(lists):
         name = {
             "raster": "ft_raster1",
             "smooth": "ft_smooth",
-            "svg": "ft_svg",
         }.get(module)
         result += (
             "FT_USE_MODULE( FT_Renderer_Class, %s_renderer_class )\n" % name

builds/meson/process_ftoption_h.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
-# Copyright (C) 2020-2022 by
+# Copyright (C) 2020-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/modules.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/os2/detect.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/os2/os2-def.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/os2/os2-dev.mk

@@ -5,7 +5,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/os2/os2-gcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/symbian/bld.inf

@@ -2,7 +2,7 @@
 // FreeType 2 project for the symbian platform
 //
 
-// Copyright (C) 2008-2022 by
+// Copyright (C) 2008-2021 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,

builds/symbian/freetype.mmp

@@ -2,7 +2,7 @@
 // FreeType 2 makefile for the symbian platform
 //
 
-// Copyright (C) 2008-2022 by
+// Copyright (C) 2008-2021 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,

builds/toplevel.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -226,7 +226,6 @@ patch := $(firstword $(patch))
 # else
   version := $(major).$(minor).$(patch)
   winversion := $(major)$(minor)$(patch)
-  version_tag := VER-$(major)-$(minor)-$(patch)
 # endif
 
 
@@ -283,10 +282,6 @@ dist:
 CONFIG_GUESS = ~/git/config/config.guess
 CONFIG_SUB   = ~/git/config/config.sub
 
-# We also use this repository to access the gnulib script that converts git
-# commit messages to a ChangeLog file.
-CHANGELOG_SCRIPT = ~/git/config/gitlog-to-changelog
-
 
 # Don't say `make do-dist'.  Always use `make dist' instead.
 #
@@ -304,19 +299,11 @@ do-dist: distclean refdoc
 	cp $(CONFIG_GUESS) builds/unix
 	cp $(CONFIG_SUB) builds/unix
 
-	@# Generate `ChangeLog' file with commits since release 2.11.0
-	@# (when we stopped creating this file manually).
-	$(CHANGELOG_SCRIPT) \
-	  --format='%B%n' \
-	  --no-cluster \
-	  -- VER-2-11-0..$(version_tag) \
-	> ChangeLog
-
 	@# Remove intermediate files created by the `refdoc' target.
 	rm -rf docs/markdown
 	rm -f docs/mkdocs.yml
 
 	@# Remove more stuff related to git.
-	rm -rf subprojects/dlg
+	rm -rf subprojects
 
 # EOF

builds/unix/configure.raw

@@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright (C) 2001-2022 by
+# Copyright (C) 2001-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in])
 
 # Don't forget to update `docs/VERSIONS.TXT'!
 
-version_info='24:3:18'
+version_info='24:0:18'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@@ -103,6 +103,78 @@ AC_CHECK_HEADERS([fcntl.h unistd.h])
 # checks for typedefs, structures, and compiler characteristics
 
 AC_C_CONST
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([long])
+AC_TYPE_LONG_LONG_INT
+
+
+# check whether cpp computation of size of int and long in ftconfig.h.in works
+
+AC_MSG_CHECKING([whether cpp computation of bit length in ftconfig.h.in works])
+orig_CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS="-I${srcdir} -I. -I${srcdir}/../../include ${CPPFLAGS}"
+
+ac_clean_files=
+if test ! -f ft2build.h; then
+  ac_clean_files=ft2build.h
+  touch ft2build.h
+fi
+
+cat > conftest.c <<\_ACEOF
+#include <limits.h>
+#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
+#define FT_CONFIG_STANDARD_LIBRARY_H <freetype/config/ftstdlib.h>
+#define FT_UINT_MAX  UINT_MAX
+#define FT_ULONG_MAX ULONG_MAX
+#include "ftconfig.h.in"
+_ACEOF
+echo >> conftest.c "#if FT_SIZEOF_INT == "${ac_cv_sizeof_int}
+echo >> conftest.c "ac_cpp_ft_sizeof_int="${ac_cv_sizeof_int}
+echo >> conftest.c "#endif"
+echo >> conftest.c "#if FT_SIZEOF_LONG == "${ac_cv_sizeof_long}
+echo >> conftest.c "ac_cpp_ft_sizeof_long="${ac_cv_sizeof_long}
+echo >> conftest.c "#endif"
+
+${CPP} ${CPPFLAGS} conftest.c | ${GREP} ac_cpp_ft > conftest.sh
+eval `cat conftest.sh`
+rm -f conftest.* $ac_clean_files
+
+if test x != "x${ac_cpp_ft_sizeof_int}" \
+   -a x != x"${ac_cpp_ft_sizeof_long}"; then
+  unset ft_use_autoconf_sizeof_types
+else
+  ft_use_autoconf_sizeof_types=yes
+fi
+
+AC_ARG_ENABLE(biarch-config,
+[  --enable-biarch-config  install biarch ftconfig.h to support multiple
+                          architectures by single file], [], [])
+
+case :${ft_use_autoconf_sizeof_types}:${enable_biarch_config}: in
+  :yes:yes:)
+    AC_MSG_RESULT([broken but use it])
+    unset ft_use_autoconf_sizeof_types
+    ;;
+  ::no:)
+    AC_MSG_RESULT([works but ignore it])
+    ft_use_autoconf_sizeof_types=yes
+    ;;
+  ::yes: | :::)
+    AC_MSG_RESULT([yes])
+    unset ft_use_autoconf_sizeof_types
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ft_use_autoconf_sizeof_types=yes
+    ;;
+esac
+
+if test x"${ft_use_autoconf_sizeof_types}" = xyes; then
+  AC_DEFINE([FT_USE_AUTOCONF_SIZEOF_TYPES], [],
+            [Define if autoconf sizeof types should be used.])
+fi
+
+CPPFLAGS="${orig_CPPFLAGS}"
 
 AC_ARG_ENABLE([freetype-config],
   AS_HELP_STRING([--enable-freetype-config], [install freetype-config]),
@@ -317,12 +389,6 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then
   AC_MSG_ERROR([external zlib support requested but library not found])
 fi
 
-SYSTEM_ZLIB=
-if test "$have_zlib" != no; then
-  SYSTEM_ZLIB=yes
-fi
-AC_SUBST([SYSTEM_ZLIB])
-
 
 # check for system libbz2
 
@@ -514,48 +580,19 @@ if test x"$with_brotli" = xyes -a "$have_brotli" = no; then
 fi
 
 
-# Checks for the demo programs.
+# check for librt
 #
-# FreeType doesn't need this.  However, since the demo program repository
+# We need `clock_gettime' for the `ftbench' demo program.
-# doesn't come with a `configure` script of its own, we integrate the tests
-# here for simplicity.
-
-# We need `clock_gettime` from 'librt' for the `ftbench` demo program.
 #
-# The code is modeled after gnulib's file `clock_time.m4`, ignoring
+# The code is modeled after gnulib's file `clock_time.m4', ignoring
 # very old Solaris systems.
+
 LIB_CLOCK_GETTIME=
 AC_SEARCH_LIBS([clock_gettime],
                [rt],
                [test "$ac_cv_search_clock_gettime" = "none required" \
                 || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-
+AC_SUBST([LIB_CLOCK_GETTIME])
-FT_DEMO_CFLAGS=""
-FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
-
-# 'librsvg' is needed to demonstrate SVG support.
-AC_ARG_WITH([librsvg],
-  [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
-                  [support OpenType SVG fonts in FreeType demo programs @<:@default=auto@:>@])],
-  [], [with_librsvg=auto])
-
-have_librsvg=no
-if test x"$with_librsvg" = xyes -o x"$with_librsvg" = xauto; then
-  PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
-                    [have_librsvg="yes (pkg-config)"], [:])
-
-  if test "$have_librsvg" != no; then
-    FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
-    FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
-  fi
-fi
-
-if test x"$with_librsvg" = xyes -a "$have_librsvg" = no; then
-  AC_MSG_ERROR([librsvg support requested but library not found])
-fi
-
-AC_SUBST([FT_DEMO_CFLAGS])
-AC_SUBST([FT_DEMO_LDFLAGS])
 
 
 # Some options handling SDKs/archs in CFLAGS should be copied
@@ -997,32 +1034,32 @@ fi
 
 
 # entries in Requires.private are separated by commas
-PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv,     \
+REQUIRES_PRIVATE="$zlib_reqpriv,     \
-                            $bzip2_reqpriv,    \
+                  $bzip2_reqpriv,    \
-                            $libpng_reqpriv,   \
+                  $libpng_reqpriv,   \
-                            $harfbuzz_reqpriv, \
+                  $harfbuzz_reqpriv, \
-                            $brotli_reqpriv"
+                  $brotli_reqpriv"
 # beautify
-PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \
+REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
-                            | sed -e 's/^  *//'      \
+                  | sed -e 's/^  *//'      \
-                                  -e 's/  *$//'      \
+                        -e 's/  *$//'      \
-                                  -e 's/, */,/g'     \
+                        -e 's/, */,/g'     \
-                                  -e 's/,,*/,/g'     \
+                        -e 's/,,*/,/g'     \
-                                  -e 's/^,*//'       \
+                        -e 's/^,*//'       \
-                                  -e 's/,*$//'       \
+                        -e 's/,*$//'       \
-                                  -e 's/,/, /g'`
+                        -e 's/,/, /g'`
 
-PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv     \
+LIBS_PRIVATE="$zlib_libspriv     \
-                        $bzip2_libspriv    \
+              $bzip2_libspriv    \
-                        $libpng_libspriv   \
+              $libpng_libspriv   \
-                        $harfbuzz_libspriv \
+              $harfbuzz_libspriv \
-                        $brotli_libspriv   \
+              $brotli_libspriv   \
-                        $ft2_extra_libs"
+              $ft2_extra_libs"
 # beautify
-PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE"  \
+LIBS_PRIVATE=`echo "$LIBS_PRIVATE"  \
-                        | sed -e 's/^  *//'   \
+              | sed -e 's/^  *//'   \
-                              -e 's/  *$//'   \
+                    -e 's/  *$//'   \
-                              -e 's/  */ /g'`
+                    -e 's/  */ /g'`
 
 LIBSSTATIC_CONFIG="-lfreetype               \
                    $zlib_libsstaticconf     \
@@ -1040,28 +1077,10 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG"          \
                          -e 's/  *$//'                \
                          -e 's/  */ /g'`
 
-# If FreeType gets installed with `--disable-shared', don't use
-# 'private' fields.  `pkg-config' only looks into `.pc' files and is
-# completely agnostic to whether shared libraries are actually present
-# or not.  As a consequence, the user had to specify `--static' while
-# calling `pkg-config', which configure scripts are normally not
-# prepared for.
-
-PKGCONFIG_REQUIRES=
-PKGCONFIG_LIBS='-L${libdir} -lfreetype'
-
-if test $enable_shared = "no"; then
-  PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES $PKGCONFIG_REQUIRES_PRIVATE"
-  PKGCONFIG_REQUIRES_PRIVATE=
-  PKGCONFIG_LIBS="$PKGCONFIG_LIBS $PKGCONFIG_LIBS_PRIVATE"
-  PKGCONFIG_LIBS_PRIVATE=
-fi
 
 AC_SUBST([ftmac_c])
-AC_SUBST([PKGCONFIG_REQUIRES])
+AC_SUBST([REQUIRES_PRIVATE])
-AC_SUBST([PKGCONFIG_LIBS])
+AC_SUBST([LIBS_PRIVATE])
-AC_SUBST([PKGCONFIG_REQUIRES_PRIVATE])
-AC_SUBST([PKGCONFIG_LIBS_PRIVATE])
 AC_SUBST([LIBSSTATIC_CONFIG])
 
 AC_SUBST([hardcode_libdir_flag_spec])

builds/unix/detect.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/freetype-config.in

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2000-2022 by
+# Copyright (C) 2000-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/freetype2.in

@@ -7,8 +7,8 @@ Name: FreeType 2
 URL: https://freetype.org
 Description: A free, high-quality, and portable font engine.
 Version: %ft_version%
-Requires: %PKGCONFIG_REQUIRES%
+Requires:
-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE%
+Requires.private: %REQUIRES_PRIVATE%
-Libs: %PKGCONFIG_LIBS%
+Libs: -L${libdir} -lfreetype
-Libs.private: %PKGCONFIG_LIBS_PRIVATE%
+Libs.private: %LIBS_PRIVATE%
 Cflags: -I${includedir}/freetype2

builds/unix/freetype2.m4

@@ -1,7 +1,7 @@
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on `gtk.m4` by Owen Taylor
 #
-# Copyright (C) 2001-2022 by
+# Copyright (C) 2001-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/ft-munmap.m4

@@ -1,6 +1,6 @@
 ## FreeType specific autoconf tests
 #
-# Copyright (C) 2002-2022 by
+# Copyright (C) 2002-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/ftconfig.h.in

@@ -4,7 +4,7 @@
  *
  *   UNIX-specific configuration file (specification only).
  *
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -42,6 +42,16 @@
 #undef HAVE_UNISTD_H
 #undef HAVE_FCNTL_H
 
+#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
+
+#endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */
+
 #include <freetype/config/integer-types.h>
 #include <freetype/config/public-macros.h>
 #include <freetype/config/mac-support.h>

builds/unix/ftsystem.c

@@ -4,7 +4,7 @@
  *
  *   Unix-specific FreeType low-level system interface (body).
  *
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -215,7 +215,7 @@
 
     stream->descriptor.pointer = NULL;
     stream->size               = 0;
-    stream->base               = NULL;
+    stream->base               = 0;
   }
 
 
@@ -233,11 +233,11 @@
   FT_CALLBACK_DEF( void )
   ft_close_stream_by_free( FT_Stream  stream )
   {
-    ft_free( stream->memory, stream->descriptor.pointer );
+    ft_free( NULL, stream->descriptor.pointer );
 
     stream->descriptor.pointer = NULL;
     stream->size               = 0;
-    stream->base               = NULL;
+    stream->base               = 0;
   }
 
 
@@ -313,7 +313,8 @@
                                           file,
                                           0 );
 
-    if ( stream->base != MAP_FAILED )
+    /* on some RTOS, mmap might return 0 */
+    if ( (long)stream->base != -1 && stream->base != NULL )
       stream->close = ft_close_stream_by_munmap;
     else
     {
@@ -323,7 +324,7 @@
       FT_ERROR(( "FT_Stream_Open:" ));
       FT_ERROR(( " could not `mmap' file `%s'\n", filepathname ));
 
-      stream->base = (unsigned char*)ft_alloc( stream->memory, stream->size );
+      stream->base = (unsigned char*)ft_alloc( NULL, stream->size );
 
       if ( !stream->base )
       {
@@ -364,7 +365,7 @@
     stream->descriptor.pointer = stream->base;
     stream->pathname.pointer   = (char*)filepathname;
 
-    stream->read = NULL;
+    stream->read = 0;
 
     FT_TRACE1(( "FT_Stream_Open:" ));
     FT_TRACE1(( " opened `%s' (%ld bytes) successfully\n",
@@ -373,7 +374,7 @@
     return FT_Err_Ok;
 
   Fail_Read:
-    ft_free( stream->memory, stream->base );
+    ft_free( NULL, stream->base );
 
   Fail_Map:
     close( file );
@@ -408,7 +409,7 @@
     memory = (FT_Memory)malloc( sizeof ( *memory ) );
     if ( memory )
     {
-      memory->user    = NULL;
+      memory->user    = 0;
       memory->alloc   = ft_alloc;
       memory->realloc = ft_realloc;
       memory->free    = ft_free;

builds/unix/install.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/unix-cc.in

@@ -2,7 +2,7 @@
 # FreeType 2 template for Unix-specific compiler definitions
 #
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -106,7 +106,9 @@ endif
 
 # Linker flags.
 #
-LDFLAGS := @LDFLAGS@
+LDFLAGS           := @LDFLAGS@
+LIB_CLOCK_GETTIME := @LIB_CLOCK_GETTIME@  # for ftbench
+
 
 # export symbols
 #
@@ -116,15 +118,11 @@ EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
 CCexe        := $(CCraw_build)	# used to compile `apinames' only
 
 
-# Library linking.
+# Library linking
 #
 LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
                           -rpath $(libdir) -version-info $(version_info) \
                           $(LDFLAGS) -no-undefined \
                           -export-symbols $(EXPORTS_LIST)
 
-# For the demo programs.
-FT_DEMO_CFLAGS := @FT_DEMO_CFLAGS@
-FT_DEMO_LDFLAGS := @FT_DEMO_LDFLAGS@
-
 # EOF

builds/unix/unix-def.in

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -68,14 +68,12 @@ version_info := @version_info@
 
 # Variables needed for `freetype-config' and `freetype.pc'.
 #
-PKG_CONFIG                 := @PKG_CONFIG@
+PKG_CONFIG         := @PKG_CONFIG@
-PKGCONFIG_REQUIRES         := @PKGCONFIG_REQUIRES@
+REQUIRES_PRIVATE   := @REQUIRES_PRIVATE@
-PKGCONFIG_REQUIRES_PRIVATE := @PKGCONFIG_REQUIRES_PRIVATE@
+LIBS_PRIVATE       := @LIBS_PRIVATE@
-PKGCONFIG_LIBS             := @PKGCONFIG_LIBS@
+LIBSSTATIC_CONFIG  := @LIBSSTATIC_CONFIG@
-PKGCONFIG_LIBS_PRIVATE     := @PKGCONFIG_LIBS_PRIVATE@
+build_libtool_libs := @build_libtool_libs@
-LIBSSTATIC_CONFIG          := @LIBSSTATIC_CONFIG@
+ft_version         := @ft_version@
-build_libtool_libs         := @build_libtool_libs@
-ft_version                 := @ft_version@
 
 # The directory where all library files are placed.
 #
@@ -139,17 +137,15 @@ prefix_x      := $(subst $(space),\\$(space),$(prefix))
 
 $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
 	rm -f $@ $@.tmp
-	sed -e 's|%PKGCONFIG_REQUIRES%|$(PKGCONFIG_REQUIRES)|'                 \
+	sed -e 's|%REQUIRES_PRIVATE%|$(REQUIRES_PRIVATE)|'     \
-	    -e 's|%PKGCONFIG_REQUIRES_PRIVATE%|$(PKGCONFIG_REQUIRES_PRIVATE)|' \
+	    -e 's|%LIBS_PRIVATE%|$(LIBS_PRIVATE)|'             \
-	    -e 's|%PKGCONFIG_LIBS%|$(PKGCONFIG_LIBS)|'                         \
+	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
-	    -e 's|%PKGCONFIG_LIBS_PRIVATE%|$(PKGCONFIG_LIBS_PRIVATE)|'         \
+	    -e 's|%exec_prefix%|$(exec_prefix_x)|'             \
-	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|'                 \
+	    -e 's|%ft_version%|$(ft_version)|'                 \
-	    -e 's|%exec_prefix%|$(exec_prefix_x)|'                             \
+	    -e 's|%includedir%|$(includedir_x)|'               \
-	    -e 's|%ft_version%|$(ft_version)|'                                 \
+	    -e 's|%libdir%|$(libdir_x)|'                       \
-	    -e 's|%includedir%|$(includedir_x)|'                               \
+	    -e 's|%prefix%|$(prefix_x)|'                       \
-	    -e 's|%libdir%|$(libdir_x)|'                                       \
+	    $<                                                 \
-	    -e 's|%prefix%|$(prefix_x)|'                                       \
-	    $<                                                                 \
 	    > $@.tmp
 	chmod a-w $@.tmp
 	mv $@.tmp $@

builds/unix/unix-dev.mk

@@ -6,7 +6,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/unix-lcc.mk

@@ -6,7 +6,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/unix.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/unix/unixddef.mk

@@ -4,7 +4,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/vms/ftconfig.h

@@ -4,7 +4,7 @@
  *
  *   VMS-specific configuration file (specification only).
  *
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,

builds/vms/ftsystem.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    VMS-specific FreeType low-level system interface (body).             */
 /*                                                                         */
-/*  Copyright (C) 1996-2022 by                                             */
+/*  Copyright (C) 1996-2021 by                                             */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -197,7 +197,7 @@
 
     stream->descriptor.pointer = NULL;
     stream->size               = 0;
-    stream->base               = NULL;
+    stream->base               = 0;
   }
 
 
@@ -246,7 +246,7 @@
                                           file,
                                           0 );
 
-    if ( stream->base == MAP_FAILED )
+    if ( (long)stream->base == -1 )
     {
       FT_ERROR(( "FT_Stream_Open:" ));
       FT_ERROR(( " could not `mmap' file `%s'\n", filepathname ));
@@ -259,7 +259,7 @@
     stream->pathname.pointer   = (char*)filepathname;
 
     stream->close = ft_close_stream;
-    stream->read  = NULL;
+    stream->read  = 0;
 
     FT_TRACE1(( "FT_Stream_Open:" ));
     FT_TRACE1(( " opened `%s' (%d bytes) successfully\n",
@@ -300,7 +300,7 @@
     memory = (FT_Memory)malloc( sizeof ( *memory ) );
     if ( memory )
     {
-      memory->user    = NULL;
+      memory->user    = 0;
       memory->alloc   = ft_alloc;
       memory->realloc = ft_realloc;
       memory->free    = ft_free;

builds/wince/ftdebug.c

@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component for WinCE (body).
  *
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -230,7 +230,7 @@
 
     /* const char*  ft2_debug = getenv( "FT2_DEBUG" ); */
 
-    const char*  ft2_debug = NULL;
+    const char*  ft2_debug = 0;
 
 
     if ( ft2_debug )

builds/wince/vc2005-ce/index.html

@@ -21,7 +21,7 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.12.1 sources:</p>
+It compiles the following libraries from the FreeType 2.11.0 sources:</p>
 
 <ul>
   <pre>

builds/wince/vc2008-ce/index.html

@@ -21,7 +21,7 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.12.1 sources:</p>
+It compiles the following libraries from the FreeType 2.11.0 sources:</p>
 
 <ul>
   <pre>

builds/windows/detect.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/ftdebug.c

@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component for Win32 (body).
  *
- * Copyright (C) 1996-2022 by
+ * Copyright (C) 1996-2021 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -88,65 +88,33 @@
   dlg_handler            ft_default_log_handler = NULL;
   FT_Custom_Log_Handler  custom_output_handler  = NULL;
 
-#endif /* FT_DEBUG_LOGGING */
+#endif /* FT_DEBUG_LOGGING*/
 
 
 #ifdef FT_DEBUG_LEVEL_ERROR
 
-#define WIN32_LEAN_AND_MEAN
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <windows.h>
 
 
-#ifdef _WIN32_WCE
-
-  FT_LOACAL_DEF( void )
-  OutputDebugStringA( LPCSTR lpOutputString )
-  {
-    int            len;
-    LPWSTR         lpOutputStringW;
-
-
-    /* allocate memory space for converted string */
-    len = MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
-                               lpOutputString, -1, NULL, 0 );
-
-    lpOutputStringW = (LPWSTR)_alloca( len * sizeof ( WCHAR ) );
-
-    if ( !len || !lpOutputStringW )
-      return;
-
-    /* now it is safe to do the translation */
-    MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
-                         lpOutputString, -1, lpOutputStringW, len );
-
-    OutputDebugStringW( lpOutputStringW );
-  }
-
-#endif /* _WIN32_WCE */
-
-
   /* documentation is in ftdebug.h */
 
   FT_BASE_DEF( void )
   FT_Message( const char*  fmt,
               ... )
   {
-    va_list  ap;
+    static char  buf[8192];
+    va_list      ap;
 
 
     va_start( ap, fmt );
     vfprintf( stderr, fmt, ap );
-#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \
+    /* send the string to the debugger as well */
-    ( defined( _WIN32_WCE )   && _WIN32_WCE   >= 0x0600 )
+    vsprintf( buf, fmt, ap );
-    if ( IsDebuggerPresent() )
+    OutputDebugStringA( buf );
-    {
-      static char  buf[1024];
-
-
-      vsnprintf( buf, sizeof buf, fmt, ap );
-      OutputDebugStringA( buf );
-    }
-#endif
     va_end( ap );
   }
 
@@ -157,22 +125,13 @@
   FT_Panic( const char*  fmt,
             ... )
   {
-    va_list  ap;
+    static char  buf[8192];
+    va_list      ap;
 
 
     va_start( ap, fmt );
-    vfprintf( stderr, fmt, ap );
+    vsprintf( buf, fmt, ap );
-#if ( defined( _WIN32_WINNT ) && _WIN32_WINNT >= 0x0400 ) || \
+    OutputDebugStringA( buf );
-    ( defined( _WIN32_WCE )   && _WIN32_WCE   >= 0x0600 )
-    if ( IsDebuggerPresent() )
-    {
-      static char  buf[1024];
-
-
-      vsnprintf( buf, sizeof buf, fmt, ap );
-      OutputDebugStringA( buf );
-    }
-#endif
     va_end( ap );
 
     exit( EXIT_FAILURE );

builds/windows/ftsystem.c

@@ -4,7 +4,7 @@
  *
  *   Windows-specific FreeType low-level system interface (body).
  *
- * Copyright (C) 2021-2022 by
+ * Copyright (C) 2021 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -25,10 +25,11 @@
 #include <freetype/fttypes.h>
 #include <freetype/internal/ftstream.h>
 
-  /* memory mapping and allocation includes and definitions */
+  /* memory-mapping includes and definitions */
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+#include <stdlib.h>
+
 
   /**************************************************************************
    *
@@ -68,7 +69,9 @@
   ft_alloc( FT_Memory  memory,
             long       size )
   {
-    return HeapAlloc( memory->user, 0, size );
+    FT_UNUSED( memory );
+
+    return malloc( size );
   }
 
 
@@ -102,9 +105,10 @@
               long       new_size,
               void*      block )
   {
+    FT_UNUSED( memory );
     FT_UNUSED( cur_size );
 
-    return HeapReAlloc( memory->user, 0, block, new_size );
+    return realloc( block, new_size );
   }
 
 
@@ -127,7 +131,9 @@
   ft_free( FT_Memory  memory,
            void*      block )
   {
-    HeapFree( memory->user, 0, block );
+    FT_UNUSED( memory );
+
+    free( block );
   }
 
 
@@ -170,7 +176,7 @@
 
     stream->descriptor.pointer = NULL;
     stream->size               = 0;
-    stream->base               = NULL;
+    stream->base               = 0;
   }
 
 
@@ -188,132 +194,14 @@
   FT_CALLBACK_DEF( void )
   ft_close_stream_by_free( FT_Stream  stream )
   {
-    ft_free( stream->memory, stream->descriptor.pointer );
+    ft_free( NULL, stream->descriptor.pointer );
 
     stream->descriptor.pointer = NULL;
     stream->size               = 0;
-    stream->base               = NULL;
+    stream->base               = 0;
   }
 
 
-  /* non-desktop Universal Windows Platform */
-#if defined( WINAPI_FAMILY ) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP
-
-#define PACK_DWORD64( hi, lo )  ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )
-
-#define CreateFileMapping( a, b, c, d, e, f )                          \
-          CreateFileMappingFromApp( a, b, c, PACK_DWORD64( d, e ), f )
-#define MapViewOfFile( a, b, c, d, e )                                 \
-          MapViewOfFileFromApp( a, b, PACK_DWORD64( c, d ), e )
-
-  FT_LOCAL_DEF( HANDLE )
-  CreateFileA( LPCSTR                 lpFileName,
-               DWORD                  dwDesiredAccess,
-               DWORD                  dwShareMode,
-               LPSECURITY_ATTRIBUTES  lpSecurityAttributes,
-               DWORD                  dwCreationDisposition,
-               DWORD                  dwFlagsAndAttributes,
-               HANDLE                 hTemplateFile )
-  {
-    int     len;
-    LPWSTR  lpFileNameW;
-
-    CREATEFILE2_EXTENDED_PARAMETERS  createExParams = {
-      sizeof ( CREATEFILE2_EXTENDED_PARAMETERS ),
-      dwFlagsAndAttributes & 0x0000FFFF,
-      dwFlagsAndAttributes & 0xFFF00000,
-      dwFlagsAndAttributes & 0x000F0000,
-      lpSecurityAttributes,
-      hTemplateFile };
-
-
-    /* allocate memory space for converted path name */
-    len = MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
-                               lpFileName, -1, NULL, 0 );
-
-    lpFileNameW = (LPWSTR)_alloca( len * sizeof ( WCHAR ) );
-
-    if ( !len || !lpFileNameW )
-    {
-      FT_ERROR(( "FT_Stream_Open: cannot convert file name to LPWSTR\n" ));
-      return INVALID_HANDLE_VALUE;
-    }
-
-    /* now it is safe to do the translation */
-    MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
-                         lpFileName, -1, lpFileNameW, len );
-
-    /* open the file */
-    return CreateFile2( lpFileNameW, dwDesiredAccess, dwShareMode,
-                        dwCreationDisposition, &createExParams );
-  }
-
-#endif
-
-
-#if defined( _WIN32_WCE )
-
-  /* malloc.h provides implementation of alloca()/_alloca() */
-  #include <malloc.h>
-
-  FT_LOCAL_DEF( HANDLE )
-  CreateFileA( LPCSTR                 lpFileName,
-               DWORD                  dwDesiredAccess,
-               DWORD                  dwShareMode,
-               LPSECURITY_ATTRIBUTES  lpSecurityAttributes,
-               DWORD                  dwCreationDisposition,
-               DWORD                  dwFlagsAndAttributes,
-               HANDLE                 hTemplateFile )
-  {
-    int     len;
-    LPWSTR  lpFileNameW;
-
-
-    /* allocate memory space for converted path name */
-    len = MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
-                               lpFileName, -1, NULL, 0 );
-
-    lpFileNameW = (LPWSTR)_alloca( len * sizeof ( WCHAR ) );
-
-    if ( !len || !lpFileNameW )
-    {
-      FT_ERROR(( "FT_Stream_Open: cannot convert file name to LPWSTR\n" ));
-      return INVALID_HANDLE_VALUE;
-    }
-
-    /* now it is safe to do the translation */
-    MultiByteToWideChar( CP_ACP, MB_ERR_INVALID_CHARS,
-                         lpFileName, -1, lpFileNameW, len );
-
-    /* open the file */
-    return CreateFileW( lpFileNameW, dwDesiredAccess, dwShareMode,
-                        lpSecurityAttributes, dwCreationDisposition,
-                        dwFlagsAndAttributes, hTemplateFile );
-  }
-
-#endif
-
-
-#if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
-    !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400
-
-  FT_LOCAL_DEF( BOOL )
-  GetFileSizeEx( HANDLE          hFile,
-                 PLARGE_INTEGER  lpFileSize )
-  {
-    lpFileSize->u.LowPart = GetFileSize( hFile,
-                                         (DWORD *)&lpFileSize->u.HighPart );
-
-    if ( lpFileSize->u.LowPart == INVALID_FILE_SIZE &&
-         GetLastError() != NO_ERROR                 )
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-#endif
-
-
   /* documentation is in ftobjs.h */
 
   FT_BASE_DEF( FT_Error )
@@ -329,8 +217,8 @@
       return FT_THROW( Invalid_Stream_Handle );
 
     /* open the file */
-    file = CreateFileA( (LPCSTR)filepathname, GENERIC_READ, FILE_SHARE_READ,
+    file = CreateFile( (LPCTSTR)filepathname, GENERIC_READ, FILE_SHARE_READ,
-                        NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
+                       NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 );
     if ( file == INVALID_HANDLE_VALUE )
     {
       FT_ERROR(( "FT_Stream_Open:" ));
@@ -386,13 +274,13 @@
       FT_ERROR(( "FT_Stream_Open:" ));
       FT_ERROR(( " could not `mmap' file `%s'\n", filepathname ));
 
-      stream->base = (unsigned char*)ft_alloc( stream->memory, stream->size );
+      stream->base = (unsigned char*)ft_alloc( NULL, stream->size );
 
       if ( !stream->base )
       {
         FT_ERROR(( "FT_Stream_Open:" ));
         FT_ERROR(( " could not `alloc' memory\n" ));
-        goto Fail_Open;
+        goto Fail_Map;
       }
 
       total_read_count = 0;
@@ -423,7 +311,7 @@
     stream->descriptor.pointer = stream->base;
     stream->pathname.pointer   = (char*)filepathname;
 
-    stream->read = NULL;
+    stream->read = 0;
 
     FT_TRACE1(( "FT_Stream_Open:" ));
     FT_TRACE1(( " opened `%s' (%ld bytes) successfully\n",
@@ -432,7 +320,10 @@
     return FT_Err_Ok;
 
   Fail_Read:
-    ft_free( stream->memory, stream->base );
+    ft_free( NULL, stream->base );
+
+  Fail_Map:
+    CloseHandle( file );
 
   Fail_Open:
     CloseHandle( file );
@@ -461,17 +352,13 @@
   FT_BASE_DEF( FT_Memory )
   FT_New_Memory( void )
   {
-    HANDLE     heap;
     FT_Memory  memory;
 
 
-    heap   = GetProcessHeap();
+    memory = (FT_Memory)malloc( sizeof ( *memory ) );
-    memory = heap ? (FT_Memory)HeapAlloc( heap, 0, sizeof ( *memory ) )
-                  : NULL;
-
     if ( memory )
     {
-      memory->user    = heap;
+      memory->user    = 0;
       memory->alloc   = ft_alloc;
       memory->realloc = ft_realloc;
       memory->free    = ft_free;

builds/windows/vc2010/freetype.sln

@@ -4,49 +4,34 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxpro
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
-		Debug Static|x64 = Debug Static|x64
+		Debug|x64 = Debug|x64
-		Debug Static|ARM64 = Debug Static|ARM64
 		Debug Static|Win32 = Debug Static|Win32
-		Release|x64 = Release|x64
+		Debug Static|x64 = Debug Static|x64
-		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
-		Release Static|x64 = Release Static|x64
+		Release|x64 = Release|x64
-		Release Static|ARM64 = Release Static|ARM64
 		Release Static|Win32 = Release Static|Win32
+		Release Static|x64 = Release Static|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|ARM64.Build.0 = Debug|ARM64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.ActiveCfg = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.Build.0 = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|ARM64.ActiveCfg = Debug Static|ARM64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|ARM64.Build.0 = Debug Static|ARM64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.Build.0 = Debug Static|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.ActiveCfg = Debug Static|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.Build.0 = Debug Static|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|ARM64.Build.0 = Release|ARM64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.ActiveCfg = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.Build.0 = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|ARM64.ActiveCfg = Release Static|ARM64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|ARM64.Build.0 = Release Static|ARM64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.ActiveCfg = Release Static|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.Build.0 = Release Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.ActiveCfg = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.Build.0 = Release Static|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {90811697-0889-4381-80BC-C3FE8FA4931F}
-	EndGlobalSection
 EndGlobal

builds/windows/vc2010/freetype.vcxproj

@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  You can use this file to build FreeType with MSBuild as follows
-
-    MSBuild.exe -t:Rebuild
-                -p:Configuration=Debug
-                -p:Platform=x64
-                -p:UserDefines=FT_DEBUG_LOGGING
-                   builds/windows/vc2010/freetype.vcxproj
-
-  or with different appropriate switches. It also works with Visual Studio.
-  Additional customization can be made in `freetype.user.props`.
--->
-<Project DefaultTargets="DlgCopy;Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -29,10 +13,6 @@
       <Configuration>Debug Static</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Static|ARM64">
-      <Configuration>Debug Static</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug Static|x64">
       <Configuration>Debug Static</Configuration>
       <Platform>x64</Platform>
@@ -41,10 +21,6 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -53,10 +29,6 @@
       <Configuration>Release Static</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static|ARM64">
-      <Configuration>Release Static</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release Static|x64">
       <Configuration>Release Static</Configuration>
       <Platform>x64</Platform>
@@ -74,10 +46,6 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
@@ -86,10 +54,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
@@ -98,10 +62,6 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
@@ -110,10 +70,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
@@ -134,7 +90,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -150,45 +106,20 @@
       <PreprocessorDefinitions>_DEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
+    <Lib>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
-  </ItemDefinitionGroup>
+    <PreBuildEvent>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+      <Command>call $(SolutionDir)script.bat</Command>
-    <ClCompile>
+    </PreBuildEvent>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineARM64</TargetMachine>
-      <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -204,18 +135,20 @@
       <PreprocessorDefinitions>_DEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
+    <Lib>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
       <TargetMachine>MachineX64</TargetMachine>
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
+    <PreBuildEvent>
+      <Command>call $(SolutionDir)script.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -236,38 +169,15 @@
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
-  </ItemDefinitionGroup>
+    <PreBuildEvent>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|ARM64'">
+      <Command>call $(SolutionDir)script.bat</Command>
-    <ClCompile>
+    </PreBuildEvent>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <TargetMachine>MachineARM64</TargetMachine>
-      <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -288,6 +198,9 @@
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
+    <PreBuildEvent>
+      <Command>call $(SolutionDir)script.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -309,41 +222,12 @@
       <PreprocessorDefinitions>NDEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
+    <Lib>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-      <OptimizeReferences>true</OptimizeReferences>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <WarningLevel>Level4</WarningLevel>
-      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineARM64</TargetMachine>
-      <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -358,19 +242,19 @@
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4001</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
+    <Lib>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-      <OptimizeReferences>true</OptimizeReferences>
       <TargetMachine>MachineX64</TargetMachine>
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
     <ClCompile>
@@ -393,37 +277,12 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Lib>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|ARM64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <WarningLevel>Level4</WarningLevel>
-      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <TargetMachine>MachineARM64</TargetMachine>
-      <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -437,6 +296,7 @@
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4001</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <ResourceCompile>
@@ -444,6 +304,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Lib>
+      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
       <AdditionalLibraryDirectories>$(UserLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>$(UserDependencies);%(AdditionalDependencies)</AdditionalDependencies>
@@ -485,7 +346,6 @@
     <ClCompile Include="..\..\..\src\sfnt\sfnt.c" />
     <ClCompile Include="..\..\..\src\smooth\smooth.c" />
     <ClCompile Include="..\..\..\src\sdf\sdf.c" />
-    <ClCompile Include="..\..\..\src\svg\svg.c" />
     <ClCompile Include="..\..\..\src\truetype\truetype.c" />
     <ClCompile Include="..\..\..\src\type1\type1.c" />
     <ClCompile Include="..\..\..\src\type42\type42.c" />
@@ -501,20 +361,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-  <ItemGroup Condition="Exists('..\..\..\subprojects\dlg\.git')">
-    <DlgSrc Include="..\..\..\subprojects\dlg\include\dlg\output.h">
-      <DlgDst>..\..\..\include\dlg\output.h</DlgDst>
-    </DlgSrc>
-    <DlgSrc Include="..\..\..\subprojects\dlg\include\dlg\dlg.h">
-      <DlgDst>..\..\..\include\dlg\dlg.h</DlgDst>
-    </DlgSrc>
-    <DlgSrc Include="..\..\..\subprojects\dlg\src\dlg\dlg.c">
-      <DlgDst>..\..\..\src\dlg\dlg.c</DlgDst>
-    </DlgSrc>
-  </ItemGroup>
-  <Target Name="DlgCopy" Inputs="@(DlgSrc)" Outputs="@(DlgSrc->'%(DlgDst)')" Condition="Exists('..\..\..\subprojects\dlg\.git')">
-    <Copy SourceFiles="@(DlgSrc)" DestinationFiles="@(DlgSrc->'%(DlgDst)')" />
-  </Target>
   <Target Name="AfterBuild">
     <ItemGroup>
       <TargetFiles Include="$(TargetDir)$(TargetName).*" />

builds/windows/vc2010/freetype.vcxproj.filters

@@ -23,6 +23,9 @@
     <ClCompile Include="..\..\..\src\base\ftinit.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\base\ftsystem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\bdf\bdf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -68,9 +71,6 @@
     <ClCompile Include="..\..\..\src\smooth\smooth.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\svg\svg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\truetype\truetype.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -137,9 +137,6 @@
     <ClCompile Include="..\..\..\src\dlg\dlgwrap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ftsystem.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\src\base\ftver.rc">

builds/windows/vc2010/index.html

@@ -12,7 +12,7 @@
 <p>This directory contains solution and project files for
 Visual&nbsp;C++&nbsp;2010 or newer, named <tt>freetype.sln</tt>,
 and <tt>freetype.vcxproj</tt>.  It compiles the following libraries
-from the FreeType 2.12.1 sources:</p>
+from the FreeType 2.11.0 sources:</p>
 
 <ul>
   <li>freetype.dll using 'Release' or 'Debug' configurations</li>

builds/windows/vc2010/script.bat

@@ -0,0 +1,11 @@
+@echo OFF
+
+:: Move to Top Dir
+cd ..\..\..\
+
+:: Copy dlg's files from `subprojects\dlg' to `src\dlg'
+IF NOT EXIST include\dlg (
+	mkdir include\dlg
+	COPY subprojects\dlg\include\dlg\dlg.h include\dlg
+	COPY subprojects\dlg\include\dlg\output.h include\dlg
+	COPY subprojects\dlg\src\dlg\dlg.c src\dlg\ )

builds/windows/visualc/freetype.dsp

@@ -58,7 +58,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /opt:REF,ICF /out:"$(OutDir)\freetype.dll"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"$(OutDir)\freetype.dll"
 
 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"
 

builds/windows/visualc/freetype.vcproj

@@ -45,7 +45,6 @@
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;DLL_EXPORT"
 				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="2"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				WarningLevel="4"
@@ -66,8 +65,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -124,7 +121,6 @@
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY"
 				StringPooling="true"
 				RuntimeLibrary="0"
-				EnableEnhancedInstructionSet="2"
 				EnableFunctionLevelLinking="true"
 				DisableLanguageExtensions="true"
 				WarningLevel="4"
@@ -434,18 +430,10 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\..\src\sdf\sdf.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\smooth\smooth.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\svg\svg.c"
-				>
-			</File>
 			<Filter
 				Name="FT_MODULES"
 				>

builds/windows/visualc/index.html

@@ -12,7 +12,7 @@
 <p>This directory contains project files <tt>freetype.dsp</tt> for
 Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002
 through 2008, which you might need to upgrade automatically.
-It compiles the following libraries from the FreeType 2.12.1 sources:</p>
+It compiles the following libraries from the FreeType 2.11.0 sources:</p>
 
 <ul>
   <li>freetype.dll using 'Release' or 'Debug' configurations</li>

builds/windows/visualce/index.html

@@ -21,7 +21,7 @@ the following targets:
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.12.1 sources:</p>
+It compiles the following libraries from the FreeType 2.11.0 sources:</p>
 
 <ul>
   <pre>

builds/windows/w32-bcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/w32-bccd.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/w32-dev.mk

@@ -5,7 +5,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/w32-gcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/w32-icc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/w32-intl.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/w32-lcc.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

builds/windows/w32-mingw32.mk

@@ -3,7 +3,7 @@
 #
 
 
-# Copyright (C) 1996-2022 by
+# Copyright (C) 1996-2021 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,