[ptxdist] [PATCH v3] freetype: Version bump. 2.10.4 -> 2.11.1

[Christian Melki <christian.melki@t2data.com>]

Various fixes and improvements.
Changelog at: https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/CHANGES

* LICENSE.TXT moved location with minor changes.
Minor in the sense that they are whitespace and path changes.
But they indirectly touch a lot of lines (line break position).
* Change options. disable-biarch-config is gone.
Also disable new brotli option.
* Make comment about freetypes top level "configure".
It is handcrafted.
* Regenerate previous patch set, cosmetic line offset.
Patch seems to work fine.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...freetype-config-and-freetype2.pc-correctly.patch |  8 ++++----
 .../{freetype-2.10.4 => freetype-2.11.1}/autogen.sh |  0
 patches/{freetype-2.10.4 => freetype-2.11.1}/series |  0
 rules/freetype.make                                 | 13 ++++++-------
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename patches/{freetype-2.10.4 => freetype-2.11.1}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (95%)
 rename patches/{freetype-2.10.4 => freetype-2.11.1}/autogen.sh (100%)
 rename patches/{freetype-2.10.4 => freetype-2.11.1}/series (100%)

diff --git a/patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
similarity index 95%
rename from patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
rename to patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
index 62052db8c..9f6d6b5fc 100644
--- a/patches/freetype-2.10.4/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++ b/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  4 files changed, 16 insertions(+), 24 deletions(-)
 
 diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index f54b94631d27..28420c6ba3bd 100644
+index d1b7f1a78c59..11490364fd51 100644
 --- a/builds/unix/configure.ac
 +++ b/builds/unix/configure.ac
-@@ -1164,7 +1164,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
+@@ -1094,7 +1094,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 f54b94631d27..28420c6ba3bd 100644
  AC_OUTPUT
  
 diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index 3918ddb92f74..847d9393f09c 100644
+index 4edb092d09c4..f0864cbec48b 100644
 --- a/builds/unix/freetype-config.in
 +++ b/builds/unix/freetype-config.in
 @@ -16,13 +16,6 @@ export LC_ALL
@@ -94,7 +94,7 @@ index 2d759ecf8bfd..f44f14cabf9a 100644
 +Libs.private: @LIBS_PRIVATE@
  Cflags: -I${includedir}/freetype2
 diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
-index 5e04f1c6a705..8ed66631dfb9 100644
+index d0c758d03fb2..dbfc40bf303e 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
diff --git a/patches/freetype-2.10.4/autogen.sh b/patches/freetype-2.11.1/autogen.sh
similarity index 100%
rename from patches/freetype-2.10.4/autogen.sh
rename to patches/freetype-2.11.1/autogen.sh
diff --git a/patches/freetype-2.10.4/series b/patches/freetype-2.11.1/series
similarity index 100%
rename from patches/freetype-2.10.4/series
rename to patches/freetype-2.11.1/series
diff --git a/rules/freetype.make b/rules/freetype.make
index ed6d22379..c65a2dbcf 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
 #
 # Paths and names
 #
-FREETYPE_VERSION	:= 2.10.4
-FREETYPE_MD5		:= 0e6c0e9b218be3ba3e26e1d23b1c80dd
+FREETYPE_VERSION	:= 2.11.1
+FREETYPE_MD5		:= 24e79233d607ded439ef36ff1f3ab68f
 FREETYPE		:= freetype-$(FREETYPE_VERSION)
 FREETYPE_SUFFIX		:= tar.xz
 FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
 FREETYPE_DIR		:= $(BUILDDIR)/$(FREETYPE)
 FREETYPE_LICENSE	:= BSD-2-Clause AND FTL AND GPL-2.0-or-later
 FREETYPE_LICENSE_FILES	:= \
-	file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
+	file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \
 	file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \
 	file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
 	file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \
@@ -37,14 +37,12 @@ FREETYPE_URL := \
 # Prepare
 # ----------------------------------------------------------------------------
 
-#
-# autoconf
-#
+# freetype's top level configure is handcrafted
+
 FREETYPE_CONF_TOOL	:= autoconf
 FREETYPE_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-static \
-	--disable-biarch-config \
 	--enable-freetype-config \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-mmap \
@@ -52,6 +50,7 @@ FREETYPE_CONF_OPT	:= \
 	--without-bzip2 \
 	--without-png \
 	--without-harfbuzz \
+	--without-brotli \
 	--without-old-mac-fonts \
 	--without-fsspec \
 	--without-fsref \
-- 
2.32.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de