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

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

[Christian Melki]

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

* LICENSE.TXT moved location with minor changes.
* 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>
---
 ...erate-freetype-config-and-freetype2.pc-correctly.patch | 8 ++++----
 patches/{freetype-2.10.4 => freetype-2.11.1}/autogen.sh   | 0
 patches/{freetype-2.10.4 => freetype-2.11.1}/series       | 0
 3 files changed, 4 insertions(+), 4 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
-- 
2.32.0


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