Freetype: version bump 2.11.1 -> 2.12.1

- It now handles OT-SVG fonts, can be controlled with the
FT_CONFIG_OPTION_SVG macro.
- Some improvements on font handling and other things.
- Some bug fixes.
- The internal zlib is in sync with zlib v. 1.2.12.
- In version 2.12.1 there are some fixes for bugs introduced
in version 2.12.0.
- New config option for demo.
- New md5sum for license, its a new url and some text changes,
nothing important.

Signed-off-by: Linnea Gunnarsson <linnea.gunnarsson@t2data.com>
Message-Id: <20220513075442.48049-1-linnea.gunnarsson@t2data.com>
[mol: cleanup patch]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 16 insertions, 14 deletions

diff --git a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
index 9f6d6b5fc..961b984fe 100644
--- a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++ b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -6,15 +6,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
  builds/unix/configure.ac       |  4 +++-
  builds/unix/freetype-config.in | 19 ++++++-------------
- builds/unix/freetype2.in       | 14 +++++++-------
+ builds/unix/freetype2.in       | 18 +++++++++---------
  builds/unix/unix-def.in        |  3 ---
- 4 files changed, 16 insertions(+), 24 deletions(-)
+ 4 files changed, 18 insertions(+), 26 deletions(-)
 
 diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index d1b7f1a78c59..11490364fd51 100644
+index 393ec3bb69a7..c58607c69fbd 100644
 --- a/builds/unix/configure.ac
 +++ b/builds/unix/configure.ac
-@@ -1094,7 +1094,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
+@@ -1147,7 +1147,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
  # and `builds/unix/unix-cc.mk' that will be used by the build system
  #
  AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
@@ -26,7 +26,7 @@ index d1b7f1a78c59..11490364fd51 100644
  AC_OUTPUT
  
 diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index 4edb092d09c4..f0864cbec48b 100644
+index c076bc1f8222..166afc685009 100644
 --- a/builds/unix/freetype-config.in
 +++ b/builds/unix/freetype-config.in
 @@ -16,13 +16,6 @@ export LC_ALL
@@ -68,7 +68,7 @@ index 4edb092d09c4..f0864cbec48b 100644
       test "${SYSROOT}$libdir" != "/usr/lib64" ; then
      libs_L="-L${SYSROOT}$libdir"
 diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
-index 2d759ecf8bfd..f44f14cabf9a 100644
+index fe389f4b6fef..885444efebf7 100644
 --- a/builds/unix/freetype2.in
 +++ b/builds/unix/freetype2.in
 @@ -1,14 +1,14 @@
@@ -85,19 +85,21 @@ index 2d759ecf8bfd..f44f14cabf9a 100644
  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%
 +Version: @ft_version@
- Requires:
--Requires.private: %REQUIRES_PRIVATE%
-+Requires.private: @REQUIRES_PRIVATE@
- Libs: -L${libdir} -lfreetype
--Libs.private: %LIBS_PRIVATE%
-+Libs.private: @LIBS_PRIVATE@
++Requires: @PKGCONFIG_REQUIRES@
++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
++Libs: @PKGCONFIG_LIBS@
++Libs.private: @PKGCONFIG_LIBS_PRIVATE@
  Cflags: -I${includedir}/freetype2
 diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
-index d0c758d03fb2..dbfc40bf303e 100644
+index 8e298ac59107..519d5958dce5 100644
 --- a/builds/unix/unix-def.in
 +++ b/builds/unix/unix-def.in
-@@ -153,7 +153,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
+@@ -157,7 +157,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
  # defines whether we should install `freetype-config' or not
  INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@
  
diff --git a/patches/freetype-2.11.1/autogen.sh b/patches/freetype-2.12.1/autogen.sh
index 1056b101c..1056b101c 100755
--- a/patches/freetype-2.11.1/autogen.sh
+++ b/patches/freetype-2.12.1/autogen.sh
diff --git a/patches/freetype-2.11.1/series b/patches/freetype-2.12.1/series
index ab166a354..ab166a354 100644
--- a/patches/freetype-2.11.1/series
+++ b/patches/freetype-2.12.1/series