freetype: version bump 2.5.2 -> 2.6.3

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 38 insertions, 36 deletions

diff --git a/patches/freetype-2.5.2/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
index d6946401e..a6a2272c1 100644
--- a/patches/freetype-2.5.2/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++ b/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -5,16 +5,16 @@ Subject: [PATCH] generate freetype-config and freetype2.pc correctly
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
  builds/unix/configure.ac       |  4 +++-
- builds/unix/freetype-config.in | 14 +++++++-------
- builds/unix/freetype2.in       | 12 ++++++------
+ builds/unix/freetype-config.in | 12 ++++++------
+ builds/unix/freetype2.in       | 14 +++++++-------
  builds/unix/unix-def.in        |  3 ---
  4 files changed, 16 insertions(+), 17 deletions(-)
 
 diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index 0a67dce..d3f17d1 100644
+index b568e51e04e2..cdb0df29d72f 100644
 --- a/builds/unix/configure.ac
 +++ b/builds/unix/configure.ac
-@@ -765,7 +765,9 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in],
+@@ -1006,7 +1006,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,10 +26,10 @@ index 0a67dce..d3f17d1 100644
  # re-generate the Jamfile to use libtool now
  #
 diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index e4c504d..49be65f 100644
+index f74707d5aea1..e18f5cd76e77 100644
 --- a/builds/unix/freetype-config.in
 +++ b/builds/unix/freetype-config.in
-@@ -12,12 +12,12 @@
+@@ -12,11 +12,11 @@
  LC_ALL=C
  export LC_ALL
  
@@ -40,14 +40,12 @@ index e4c504d..49be65f 100644
  exec_prefix_set="no"
 -includedir="%includedir%"
 -libdir="%libdir%"
--enable_shared="%build_libtool_libs%"
 +includedir="@includedir@"
 +libdir="@libdir@"
-+enable_shared="@build_libtool_libs@"
  
  usage()
  {
-@@ -73,7 +73,7 @@ while test $# -gt 0 ; do
+@@ -74,7 +74,7 @@ while test $# -gt 0 ; do
      echo_exec_prefix=yes
      ;;
    --version)
@@ -56,47 +54,50 @@ index e4c504d..49be65f 100644
      exit 0
      ;;
    --ftversion)
-@@ -137,7 +137,7 @@ if test "$echo_cflags" = "yes" ; then
- fi
+@@ -141,7 +141,7 @@ fi
  
  if test "$echo_libs" = "yes" ; then
--  libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"
-+  libs="-lfreetype @LIBZ@ @LIBBZ2@ @LIBPNG@ @FT2_EXTRA_LIBS@"
-   if test "${SYSROOT}$libdir" != "/usr/lib"  &&
-      test "${SYSROOT}$libdir" != "/usr/lib64"; then
-     echo -L${SYSROOT}$libdir $libs
+   libs="-lfreetype"
+-  staticlibs="%LIBSSTATIC_CONFIG%"
++  staticlibs="@LIBSSTATIC_CONFIG@"
+   if test "$show_static" = "yes" ; then
+     libs="$staticlibs"
+   fi
 diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
-index 5e545b6..b8accab 100644
+index c4dfda4abcca..8c4d7e184293 100644
 --- a/builds/unix/freetype2.in
 +++ b/builds/unix/freetype2.in
-@@ -1,12 +1,12 @@
--prefix="%prefix%"
--exec_prefix="%exec_prefix%"
--libdir="%libdir%"
--includedir="%includedir%/freetype2"
-+prefix="@prefix@"
-+exec_prefix="@exec_prefix@"
-+libdir="@libdir@"
-+includedir="@includedir@/freetype2"
+@@ -1,14 +1,14 @@
+-prefix=%prefix%
+-exec_prefix=%exec_prefix%
+-libdir=%libdir%
+-includedir=%includedir%
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
  
  Name: FreeType 2
+ URL: http://freetype.org
  Description: A free, high-quality, and portable font engine.
 -Version: %ft_version%
 +Version: @ft_version@
  Requires:
+-Requires.private: %REQUIRES_PRIVATE%
++Requires.private: @REQUIRES_PRIVATE@
  Libs: -L${libdir} -lfreetype
--Libs.private: %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%
-+Libs.private: @LIBZ@ @LIBBZ2@ @LIBPNG@ @FT2_EXTRA_LIBS@
- Cflags: -I${includedir}
+-Libs.private: %LIBS_PRIVATE%
++Libs.private: @LIBS_PRIVATE@
+ Cflags: -I${includedir}/freetype2
 diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
-index 491e974..968d095 100644
+index f7b557fb4094..71bb39cb3959 100644
 --- a/builds/unix/unix-def.in
 +++ b/builds/unix/unix-def.in
-@@ -133,7 +133,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
+@@ -142,7 +142,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
  	chmod a-w $@.tmp
  	mv $@.tmp $@
  
--all: $(OBJ_BUILD)/freetype-config \
+-all install: $(OBJ_BUILD)/freetype-config \
 -     $(OBJ_BUILD)/freetype2.pc
 -
  # EOF
diff --git a/patches/freetype-2.5.2/autogen.sh b/patches/freetype-2.6.3/autogen.sh
index 1056b101c..1056b101c 100755
--- a/patches/freetype-2.5.2/autogen.sh
+++ b/patches/freetype-2.6.3/autogen.sh
diff --git a/patches/freetype-2.5.2/series b/patches/freetype-2.6.3/series
index ab166a354..ab166a354 100644
--- a/patches/freetype-2.5.2/series
+++ b/patches/freetype-2.6.3/series
diff --git a/rules/freetype.make b/rules/freetype.make
index 09d49fd3e..2ee85ef15 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -17,15 +17,15 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
 #
 # Paths and names
 #
-FREETYPE_VERSION	:= 2.5.2
-FREETYPE_MD5		:= 10e8f4d6a019b124088d18bc26123a25
+FREETYPE_VERSION	:= 2.6.3
+FREETYPE_MD5		:= 0037b25a8c090bc8a1218e867b32beb1
 FREETYPE		:= freetype-$(FREETYPE_VERSION)
 FREETYPE_SUFFIX		:= tar.bz2
 FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
 FREETYPE_DIR		:= $(BUILDDIR)/$(FREETYPE)
 FREETYPE_LICENSE	:= BSD-2-Clause, FTL, GPL-2.0+
 FREETYPE_LICENSE_FILES	:= \
-	file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \
+	file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
 	file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \
 	file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \
 	file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \
@@ -48,7 +48,8 @@ FREETYPE_CONF_OPT	:= \
 	--disable-static \
 	--with-zlib \
 	--without-bzip2 \
-	--without-png
+	--without-png \
+	--without-harfbuzz
 
 
 # ----------------------------------------------------------------------------