Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
Changes from v2:
- Re-add and adapt patch to fix broken freetype-config
Changes from v1:
- Forgot to remove a now obsolete patch and autogen.sh link
...reetype-config-and-freetype2.pc-correctly.patch | 60 +++++++++-------------
.../{freetype-2.6.3 => freetype-2.8}/autogen.sh | 0
patches/{freetype-2.6.3 => freetype-2.8}/series | 0
rules/freetype.make | 15 ++++--
4 files changed, 37 insertions(+), 38 deletions(-)
rename patches/{freetype-2.6.3 =>
freetype-2.8}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
(71%)
rename patches/{freetype-2.6.3 => freetype-2.8}/autogen.sh (100%)
rename patches/{freetype-2.6.3 => freetype-2.8}/series (100%)
diff --git
a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
b/patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
similarity index 71%
rename from
patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
rename to
patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
index a6a2272c1..773b1f0fa 100644
---
a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++
b/patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index b568e51e04e2..cdb0df29d72f 100644
+index 7cdafccc1769..ef07c0578549 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
-@@ -1006,7 +1006,9 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in],
+@@ -1012,7 +1012,9 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in],
# and `builds/unix/unix-cc.mk' that will be used by the build system
#
AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
@@ -26,43 +26,33 @@ index b568e51e04e2..cdb0df29d72f 100644
# re-generate the Jamfile to use libtool now
#
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index f74707d5aea1..e18f5cd76e77 100644
+index 97de13449851..0afe3763e862 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
-@@ -12,11 +12,11 @@
- LC_ALL=C
- export LC_ALL
+@@ -35,17 +35,17 @@ if test $? -eq 0 ; then
+ dynamic_libs=`pkg-config --libs freetype2`
+ static_libs=`pkg-config --static --libs freetype2`
+ else
+- prefix="%prefix%"
+- exec_prefix="%exec_prefix%"
++ prefix="@prefix@"
++ exec_prefix="@exec_prefix@"
--prefix="%prefix%"
--exec_prefix="%exec_prefix%"
-+prefix="@prefix@"
-+exec_prefix="@exec_prefix@"
- exec_prefix_set="no"
--includedir="%includedir%"
--libdir="%libdir%"
-+includedir="@includedir@"
-+libdir="@libdir@"
+- includedir="%includedir%"
+- libdir="%libdir%"
++ includedir="@includedir@"
++ libdir="@libdir@"
- usage()
- {
-@@ -74,7 +74,7 @@ while test $# -gt 0 ; do
- echo_exec_prefix=yes
- ;;
- --version)
-- echo %ft_version%
-+ echo @ft_version@
- exit 0
- ;;
- --ftversion)
-@@ -141,7 +141,7 @@ fi
+- version=%ft_version%
++ version=@ft_version@
- if test "$echo_libs" = "yes" ; then
- libs="-lfreetype"
-- staticlibs="%LIBSSTATIC_CONFIG%"
-+ staticlibs="@LIBSSTATIC_CONFIG@"
- if test "$show_static" = "yes" ; then
- libs="$staticlibs"
- fi
+ cflags="-I${SYSROOT}$includedir/freetype2"
+ dynamic_libs="-lfreetype"
+- static_libs="%LIBSSTATIC_CONFIG%"
++ static_libs="@LIBSSTATIC_CONFIG@"
+ if test "${SYSROOT}$libdir" != "/usr/lib" &&
+ test "${SYSROOT}$libdir" != "/usr/lib64" ; then
+ libs_L="-L${SYSROOT}$libdir"
diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
index c4dfda4abcca..8c4d7e184293 100644
--- a/builds/unix/freetype2.in
@@ -90,7 +80,7 @@ index c4dfda4abcca..8c4d7e184293 100644
+Libs.private: @LIBS_PRIVATE@
Cflags: -I${includedir}/freetype2
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
-index f7b557fb4094..71bb39cb3959 100644
+index feae99b6583b..74c87dec10a2 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -142,7 +142,4 @@ $(OBJ_BUILD)/freetype2.pc:
$(TOP_DIR)/builds/unix/freetype2.in
diff --git a/patches/freetype-2.6.3/autogen.sh b/patches/freetype-2.8/autogen.sh
similarity index 100%
rename from patches/freetype-2.6.3/autogen.sh
rename to patches/freetype-2.8/autogen.sh
diff --git a/patches/freetype-2.6.3/series b/patches/freetype-2.8/series
similarity index 100%
rename from patches/freetype-2.6.3/series
rename to patches/freetype-2.8/series
diff --git a/rules/freetype.make b/rules/freetype.make
index 2ee85ef15..c306f9466 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
#
# Paths and names
#
-FREETYPE_VERSION := 2.6.3
-FREETYPE_MD5 := 0037b25a8c090bc8a1218e867b32beb1
+FREETYPE_VERSION := 2.8
+FREETYPE_MD5 := 2413ac3eaf508ada019c63959ea81a92
FREETYPE := freetype-$(FREETYPE_VERSION)
FREETYPE_SUFFIX := tar.bz2
FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
@@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL := autoconf
FREETYPE_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--disable-static \
+ --disable-biarch-config \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --enable-mmap \
--with-zlib \
--without-bzip2 \
--without-png \
- --without-harfbuzz
+ --without-harfbuzz \
+ --without-old-mac-fonts \
+ --without-fsspec \
+ --without-fsref \
+ --without-quickdraw-toolbox \
+ --without-quickdraw-carbon \
+ --without-ats
# ----------------------------------------------------------------------------
--
2.13.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
