[truetype] Binary search through `hdmx` records.

The `hdmx` table is supposed to be sorted by ppem size, which enables binary search. We also drop the check for the sufficient length of the record because it is now enforced when the table is loaded. * include/freetype/internal/tttypes.h (TT_FaceRec): Store the `hdmx` record pointers sorted by ppem instead of ppem's themselves. * src/truetype/ttpload.c (tt_face_load_hdmx): Prudently sort records. (tt_face_get_device_metrics): Implement binary search to retrieve advances.
[truetype] Honor FT_LOAD_ADVANCE_ONLY if `hdmx` is usable.
2021-12-10 22:32:05 -05:00 · 2021-12-10 22:29:21 -05:00 · 2021-12-10 22:23:56 -05:00 · 2021-12-10 22:05:51 -05:00 · 2021-12-10 21:55:08 -05:00
632 changed files with 4533 additions and 22469 deletions
--- a/.gitlab-ci.yml
+++ b/.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'
@ -36,75 +34,50 @@ 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
-    # with the `$env:MESON_ARGS` line in the `script:` blocks.
+    # Uncomment the following key if need to pass custom args, as well with
+    # 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.
-    - 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
+    # 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 --upgrade certifi
+    - pip3 install meson==0.59.1
    - 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 &&
-        meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
-        meson compile --verbose -C build
-        $env:MESON_WINDOWS_TESTS"
+    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
+        meson setup build $env:MESON_ARGS_WINDOWS &&
+        meson compile --verbose -C build &&
+        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: |
@ -147,8 +120,7 @@ linux autotools libs clang:
 linux meson:
  extends: '.build linux common'
  script: |
-    meson setup build ${MESON_ARGS} \
-                      -Dbrotli=disabled \
+    meson setup build -Dbrotli=disabled \
                      -Dbzip2=disabled \
                      -Dharfbuzz=disabled \
                      -Dpng=disabled \
@ -160,8 +132,7 @@ linux meson:
 linux meson libs:
  extends: '.build linux common'
  script: |
-    meson setup build ${MESON_ARGS} \
-                      -Dbrotli=enabled \
+    meson setup build -Dbrotli=enabled \
                      -Dbzip2=enabled \
                      -Dharfbuzz=disabled \
                      -Dpng=disabled \
@ -192,9 +163,6 @@ linux cmake libs:

    cmake --build build --target install

-
-# MacOS jobs.
-
 macos autotools:
  extends: '.build macos common'
  before_script:
@ -224,7 +192,7 @@ macos meson:
    - pip3 install -U meson
    - pip3 install --upgrade certifi
    - pip3 install -U ninja
-
-    - meson setup build ${MESON_ARGS}
+    
+    - meson setup build
    - meson compile --verbose -C build
    - sudo meson install -C build
--- a/.mailmap
+++ b/.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>
--- a/CMakeLists.txt
+++ b/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,
-# CMake >= 3 is requested.
-cmake_minimum_required(VERSION 3.0)
+# FreeType explicitly marks the API to be exported and relies on the compiler
+# to hide all other symbols. CMake supports a C_VISBILITY_PRESET property
+# starting with 2.8.12.
+cmake_minimum_required(VERSION 2.8.12)

 if (NOT CMAKE_VERSION VERSION_LESS 3.3)
  # Allow symbol visibility settings also on static libraries. CMake < 3.3
@ -161,7 +162,7 @@ endif ()
 project(freetype C)

 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "12")
+set(VERSION_MINOR "11")
 set(VERSION_PATCH "1")

 # Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
@ -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(PKGCONFIG_REQUIRES_PRIVATE "")
-set(PKGCONFIG_LIBS "-L\${libdir} -lfreetype")
-set(PKGCONFIG_LIBS_PRIVATE "")
+set(PKG_CONFIG_REQUIRED_PRIVATE "")
+set(PKG_CONFIG_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 PKGCONFIG_REQUIRES_PRIVATE "bzip2")
-  else ()
-    list(APPEND PKGCONFIG_LIBS_PRIVATE "-lbz2")
-  endif ()
+  list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")
 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})
-
-  if (BUILD_SHARED_LIBS)
-    string(REPLACE "%PKGCONFIG_REQUIRES%" "${PKGCONFIG_REQUIRES}"
-            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 ()
+  string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
+          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
+  string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"
+          FREETYPE2_PC_IN ${FREETYPE2_PC_IN})

  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}
--- a/2
+++ b/2
@ -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,
--- a/14
+++ b/14
@ -1,4 +1,4 @@
-FreeType 2.12.1
+FreeType 2.11.1
 ===============

 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
-the repository; using a snapshot will  not work (in other words, don't
-use gitlab's 'Download' button).
+please read file `README.git`.

 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.12.1.tar.gz
-  ftdoc2121.zip
+  freetype-doc-2.11.1.tar.xz
+  freetype-doc-2.11.1.tar.gz
+  ftdoc2111.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,
--- a/README.git
+++ b/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,
--- a/autogen.sh
+++ b/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,
@ -182,7 +182,7 @@ copy_submodule_files ()
  cp $DLG_SRC_DIR/* src/dlg
 }

-if test -e ".git"; then
+if test -d ".git"; then
  DLG_INC_DIR=subprojects/dlg/include/dlg
  DLG_SRC_DIR=subprojects/dlg/src/dlg

--- a/builds/amiga/README
+++ b/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,
--- a/builds/amiga/include/config/ftconfig.h
+++ b/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,       */
--- a/builds/amiga/include/config/ftmodule.h
+++ b/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,       */
--- a/builds/amiga/makefile
+++ b/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,
--- a/builds/amiga/makefile.os4
+++ b/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,
--- a/builds/amiga/smakefile
+++ b/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,
--- a/builds/amiga/src/base/ftdebug.c
+++ b/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,
--- a/builds/amiga/src/base/ftsystem.c
+++ b/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,       */
--- a/builds/ansi/ansi-def.mk
+++ b/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,
--- a/builds/ansi/ansi.mk
+++ b/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,
--- a/builds/beos/beos-def.mk
+++ b/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,
--- a/builds/beos/beos.mk
+++ b/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,
--- a/builds/beos/detect.mk
+++ b/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,
--- a/builds/cmake/FindBrotliDec.cmake
+++ b/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>
--- a/builds/cmake/iOS.cmake
+++ b/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>
--- a/builds/cmake/testbuild.sh
+++ b/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,
--- a/builds/compiler/ansi-cc.mk
+++ b/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,
--- a/builds/compiler/bcc-dev.mk
+++ b/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,
--- a/builds/compiler/bcc.mk
+++ b/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,
--- a/builds/compiler/emx.mk
+++ b/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,
--- a/builds/compiler/gcc-dev.mk
+++ b/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,
--- a/builds/compiler/gcc.mk
+++ b/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,
--- a/builds/compiler/intelc.mk
+++ b/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,
--- a/builds/compiler/unix-lcc.mk
+++ b/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,
--- a/builds/compiler/visualage.mk
+++ b/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,
--- a/builds/compiler/visualc.mk
+++ b/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,
--- a/builds/compiler/watcom.mk
+++ b/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,
--- a/builds/compiler/win-lcc.mk
+++ b/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,
--- a/builds/detect.mk
+++ b/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,
--- a/builds/dos/detect.mk
+++ b/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,
--- a/builds/dos/dos-def.mk
+++ b/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,
--- a/builds/dos/dos-emx.mk
+++ b/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,
--- a/builds/dos/dos-gcc.mk
+++ b/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,
--- a/builds/dos/dos-wat.mk
+++ b/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,
--- a/builds/exports.mk
+++ b/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,
--- a/builds/freetype.mk
+++ b/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,
--- a/builds/link_dos.mk
+++ b/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,
--- a/builds/link_std.mk
+++ b/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,
--- a/builds/mac/freetype-Info.plist
+++ b/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>
--- a/builds/mac/ftmac.c
+++ b/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
--- a/builds/meson/extract_freetype_version.py
+++ b/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,
--- a/builds/meson/extract_libtool_version.py
+++ b/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,
--- a/builds/meson/generate_reference_docs.py
+++ b/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,
--- a/builds/meson/parse_modules_cfg.py
+++ b/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
--- a/builds/meson/process_ftoption_h.py
+++ b/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,
--- a/builds/modules.mk
+++ b/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,
--- a/builds/os2/detect.mk
+++ b/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,
--- a/builds/os2/os2-def.mk
+++ b/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,
--- a/builds/os2/os2-dev.mk
+++ b/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,
--- a/builds/os2/os2-gcc.mk
+++ b/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,
--- a/builds/symbian/bld.inf
+++ b/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,
--- a/builds/symbian/freetype.mmp
+++ b/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,
--- a/builds/toplevel.mk
+++ b/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,
@ -304,12 +304,13 @@ 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).
+	@# Generate `ChangeLog' file with commits since previous release.
 	$(CHANGELOG_SCRIPT) \
 	  --format='%B%n' \
 	  --no-cluster \
-	  -- VER-2-11-0..$(version_tag) \
+	  -- `git describe --tags \
+	                   --abbrev=0 \
+	                   $(version_tag)^`..$(version_tag) \
 	> ChangeLog

 	@# Remove intermediate files created by the `refdoc' target.
@ -317,6 +318,6 @@ do-dist: distclean refdoc
 	rm -f docs/mkdocs.yml

 	@# Remove more stuff related to git.
-	rm -rf subprojects/dlg
+	rm -rf subprojects

 # EOF
--- a/builds/unix/configure.raw
+++ b/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:1:18'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@ -317,12 +317,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 +508,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
-# 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.
+# We need `clock_gettime' 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])
-
-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])
+AC_SUBST([LIB_CLOCK_GETTIME])


 # Some options handling SDKs/archs in CFLAGS should be copied
@ -997,32 +962,32 @@ fi


 # entries in Requires.private are separated by commas
-PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv,     \
-                            $bzip2_reqpriv,    \
-                            $libpng_reqpriv,   \
-                            $harfbuzz_reqpriv, \
-                            $brotli_reqpriv"
+REQUIRES_PRIVATE="$zlib_reqpriv,     \
+                  $bzip2_reqpriv,    \
+                  $libpng_reqpriv,   \
+                  $harfbuzz_reqpriv, \
+                  $brotli_reqpriv"
 # beautify
-PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \
-                            | sed -e 's/^  *//'      \
-                                  -e 's/  *$//'      \
-                                  -e 's/, */,/g'     \
-                                  -e 's/,,*/,/g'     \
-                                  -e 's/^,*//'       \
-                                  -e 's/,*$//'       \
-                                  -e 's/,/, /g'`
+REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
+                  | sed -e 's/^  *//'      \
+                        -e 's/  *$//'      \
+                        -e 's/, */,/g'     \
+                        -e 's/,,*/,/g'     \
+                        -e 's/^,*//'       \
+                        -e 's/,*$//'       \
+                        -e 's/,/, /g'`

-PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv     \
-                        $bzip2_libspriv    \
-                        $libpng_libspriv   \
-                        $harfbuzz_libspriv \
-                        $brotli_libspriv   \
-                        $ft2_extra_libs"
+LIBS_PRIVATE="$zlib_libspriv     \
+              $bzip2_libspriv    \
+              $libpng_libspriv   \
+              $harfbuzz_libspriv \
+              $brotli_libspriv   \
+              $ft2_extra_libs"
 # beautify
-PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE"  \
-                        | sed -e 's/^  *//'   \
-                              -e 's/  *$//'   \
-                              -e 's/  */ /g'`
+LIBS_PRIVATE=`echo "$LIBS_PRIVATE"  \
+              | sed -e 's/^  *//'   \
+                    -e 's/  *$//'   \
+                    -e 's/  */ /g'`

 LIBSSTATIC_CONFIG="-lfreetype               \
                   $zlib_libsstaticconf     \
@ -1040,28 +1005,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([PKGCONFIG_LIBS])
-AC_SUBST([PKGCONFIG_REQUIRES_PRIVATE])
-AC_SUBST([PKGCONFIG_LIBS_PRIVATE])
+AC_SUBST([REQUIRES_PRIVATE])
+AC_SUBST([LIBS_PRIVATE])
 AC_SUBST([LIBSSTATIC_CONFIG])

 AC_SUBST([hardcode_libdir_flag_spec])
--- a/builds/unix/detect.mk
+++ b/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,
--- a/builds/unix/freetype-config.in
+++ b/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,
--- a/builds/unix/freetype2.in
+++ b/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.private: %PKGCONFIG_REQUIRES_PRIVATE%
-Libs: %PKGCONFIG_LIBS%
-Libs.private: %PKGCONFIG_LIBS_PRIVATE%
+Requires:
+Requires.private: %REQUIRES_PRIVATE%
+Libs: -L${libdir} -lfreetype
+Libs.private: %LIBS_PRIVATE%
 Cflags: -I${includedir}/freetype2
--- a/builds/unix/freetype2.m4
+++ b/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,
--- a/builds/unix/ft-munmap.m4
+++ b/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,
--- a/builds/unix/ftconfig.h.in
+++ b/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,
--- a/builds/unix/ftsystem.c
+++ b/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,
--- a/builds/unix/install.mk
+++ b/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,
--- a/builds/unix/unix-cc.in
+++ b/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
--- a/builds/unix/unix-def.in
+++ b/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@
-PKGCONFIG_REQUIRES         := @PKGCONFIG_REQUIRES@
-PKGCONFIG_REQUIRES_PRIVATE := @PKGCONFIG_REQUIRES_PRIVATE@
-PKGCONFIG_LIBS             := @PKGCONFIG_LIBS@
-PKGCONFIG_LIBS_PRIVATE     := @PKGCONFIG_LIBS_PRIVATE@
-LIBSSTATIC_CONFIG          := @LIBSSTATIC_CONFIG@
-build_libtool_libs         := @build_libtool_libs@
-ft_version                 := @ft_version@
+PKG_CONFIG         := @PKG_CONFIG@
+REQUIRES_PRIVATE   := @REQUIRES_PRIVATE@
+LIBS_PRIVATE       := @LIBS_PRIVATE@
+LIBSSTATIC_CONFIG  := @LIBSSTATIC_CONFIG@
+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)|'                 \
-	    -e 's|%PKGCONFIG_REQUIRES_PRIVATE%|$(PKGCONFIG_REQUIRES_PRIVATE)|' \
-	    -e 's|%PKGCONFIG_LIBS%|$(PKGCONFIG_LIBS)|'                         \
-	    -e 's|%PKGCONFIG_LIBS_PRIVATE%|$(PKGCONFIG_LIBS_PRIVATE)|'         \
-	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|'                 \
-	    -e 's|%exec_prefix%|$(exec_prefix_x)|'                             \
-	    -e 's|%ft_version%|$(ft_version)|'                                 \
-	    -e 's|%includedir%|$(includedir_x)|'                               \
-	    -e 's|%libdir%|$(libdir_x)|'                                       \
-	    -e 's|%prefix%|$(prefix_x)|'                                       \
-	    $<                                                                 \
+	sed -e 's|%REQUIRES_PRIVATE%|$(REQUIRES_PRIVATE)|'     \
+	    -e 's|%LIBS_PRIVATE%|$(LIBS_PRIVATE)|'             \
+	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
+	    -e 's|%exec_prefix%|$(exec_prefix_x)|'             \
+	    -e 's|%ft_version%|$(ft_version)|'                 \
+	    -e 's|%includedir%|$(includedir_x)|'               \
+	    -e 's|%libdir%|$(libdir_x)|'                       \
+	    -e 's|%prefix%|$(prefix_x)|'                       \
+	    $<                                                 \
 	    > $@.tmp
 	chmod a-w $@.tmp
 	mv $@.tmp $@
--- a/builds/unix/unix-dev.mk
+++ b/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,
--- a/builds/unix/unix-lcc.mk
+++ b/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,
--- a/builds/unix/unix.mk
+++ b/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,
--- a/builds/unix/unixddef.mk
+++ b/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,
--- a/builds/vms/ftconfig.h
+++ b/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,
--- a/builds/vms/ftsystem.c
+++ b/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,       */
--- a/builds/wince/ftdebug.c
+++ b/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,
--- a/builds/wince/vc2005-ce/index.html
+++ b/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.1 sources:</p>

 <ul>
  <pre>
--- a/builds/wince/vc2008-ce/index.html
+++ b/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.1 sources:</p>

 <ul>
  <pre>
--- a/builds/windows/detect.mk
+++ b/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,
--- a/builds/windows/ftdebug.c
+++ b/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,
--- a/builds/windows/ftsystem.c
+++ b/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,
@ -196,77 +196,19 @@
  }


-  /* 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 )
+#ifdef _WIN32_WCE

  FT_LOCAL_DEF( HANDLE )
-  CreateFileA( LPCSTR                 lpFileName,
-               DWORD                  dwDesiredAccess,
-               DWORD                  dwShareMode,
-               LPSECURITY_ATTRIBUTES  lpSecurityAttributes,
-               DWORD                  dwCreationDisposition,
-               DWORD                  dwFlagsAndAttributes,
-               HANDLE                 hTemplateFile )
+  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;
+    int            len;
+    LPWSTR         lpFileNameW;


    /* allocate memory space for converted path name */
@ -293,13 +235,12 @@

 #endif

-
 #if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
    !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400

  FT_LOCAL_DEF( BOOL )
-  GetFileSizeEx( HANDLE          hFile,
-                 PLARGE_INTEGER  lpFileSize )
+  GetFileSizeEx( HANDLE         hFile,
+                 PLARGE_INTEGER lpFileSize )
  {
    lpFileSize->u.LowPart = GetFileSize( hFile,
                                         (DWORD *)&lpFileSize->u.HighPart );
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@ -485,7 +485,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" />
--- a/builds/windows/vc2010/freetype.vcxproj.filters
+++ b/builds/windows/vc2010/freetype.vcxproj.filters
@ -68,9 +68,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>
@ -146,4 +143,4 @@
      <Filter>Source Files</Filter>
    </ResourceCompile>
  </ItemGroup>
-</Project>
+</Project>
--- a/builds/windows/vc2010/index.html
+++ b/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.1 sources:</p>

 <ul>
  <li>freetype.dll using 'Release' or 'Debug' configurations</li>
--- a/builds/windows/visualc/freetype.vcproj
+++ b/builds/windows/visualc/freetype.vcproj
@ -442,10 +442,6 @@
 				RelativePath="..\..\..\src\smooth\smooth.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\svg\svg.c"
-				>
-			</File>
 			<Filter
 				Name="FT_MODULES"
 				>
--- a/builds/windows/visualc/index.html
+++ b/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.1 sources:</p>

 <ul>
  <li>freetype.dll using 'Release' or 'Debug' configurations</li>
--- a/builds/windows/visualce/index.html
+++ b/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.1 sources:</p>

 <ul>
  <pre>
--- a/builds/windows/w32-bcc.mk
+++ b/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,
--- a/builds/windows/w32-bccd.mk
+++ b/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,
--- a/builds/windows/w32-dev.mk
+++ b/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,
--- a/builds/windows/w32-gcc.mk
+++ b/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,
--- a/builds/windows/w32-icc.mk
+++ b/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,
--- a/builds/windows/w32-intl.mk
+++ b/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,
--- a/builds/windows/w32-lcc.mk
+++ b/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,
--- a/builds/windows/w32-mingw32.mk
+++ b/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,
--- a/builds/windows/w32-vcc.mk
+++ b/builds/windows/w32-vcc.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,
--- a/builds/windows/w32-wat.mk
+++ b/builds/windows/w32-wat.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,
--- a/builds/windows/win32-def.mk
+++ b/builds/windows/win32-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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexei Podtelezhnikov	0dc811b548	[truetype] Binary search through `hdmx` records. The `hdmx` table is supposed to be sorted by ppem size, which enables binary search. We also drop the check for the sufficient length of the record because it is now enforced when the table is loaded. * include/freetype/internal/tttypes.h (TT_FaceRec): Store the `hdmx` record pointers sorted by ppem instead of ppem's themselves. * src/truetype/ttpload.c (tt_face_load_hdmx): Prudently sort records. (tt_face_get_device_metrics): Implement binary search to retrieve advances.	2021-12-10 22:32:05 -05:00
Alexei Podtelezhnikov	eaa10b993b	[truetype] Honor FT_LOAD_ADVANCE_ONLY if `hdmx` is usable. This simply shortcuts the glyph loading if FT_LOAD_ADVANCE_ONLY is specified and the `hdmx` data are located. * src/truetype/ttgload.c (TT_Load_Glyph): Insert the shortcut.	2021-12-10 22:29:21 -05:00
Alexei Podtelezhnikov	fa35370135	[truetype] Initialize the loader with `hdmx` data. * include/freetype/internal/tttypes.h (TT_LoaderRec): Add field. * src/truetype/ttgload.c (compute_glyph_metrics): Relocate the `hdmx` code from here... (tt_loader_init): ... to here, before the glyph is loaded.	2021-12-10 22:23:56 -05:00
Alexei Podtelezhnikov	2e3455b135	[truetype] Limit INSTCTRL appication within specs. * src/truetype/ttinterp.c (Ins_INSTCTRL): Limit its global effects to the CVT program and local effects to the glyph program.	2021-12-10 22:05:51 -05:00
Alexei Podtelezhnikov	34fc55de47	[truetype] Relocate subpixel flag setting. Eventually, we will use these flags to assess the `hdmx` usability prior to the glyph parsing. * src/truetype/ttinterp.c (TT_RunIns): Move the flag setting to... * src/truetype/ttgload.c (tt_loader_init): ...here where it belongs and which is executed before each glyph is loaded.	2021-12-10 21:55:08 -05:00