* freetype: update to freetype-2.2.1, fixed crosscompiling

	  issues


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6699 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 163 insertions, 0 deletions

diff --git a/patches/freetype-2.2.1/generic/builds_unix_freetype-cc_for_build.diff b/patches/freetype-2.2.1/generic/builds_unix_freetype-cc_for_build.diff
new file mode 100644
index 000000000..c044f904b
--- /dev/null
+++ b/patches/freetype-2.2.1/generic/builds_unix_freetype-cc_for_build.diff
@@ -0,0 +1,87 @@
+#
+# Submitted-By: Robert Schwebel, 2007-01-03
+# Committed-By: Robert Schwebel
+#
+# Error:
+#
+# freetype-2.2.1/objs/apinames: cannot execute binary file
+#
+# Description:
+#
+# The make system does not differentiate between tools for the "host"
+# and "build" system, so we introduce CC_FOR_BUILD here.
+#
+# State:
+#
+# not reported yet
+#
+
+Index: builds/exports.mk
+===================================================================
+--- a/builds/exports.mk.orig
++++ b/builds/exports.mk
+@@ -51,7 +51,7 @@ ifneq ($(EXPORTS_LIST),)
+   APINAMES_EXE := $(OBJ_DIR)/apinames$E
+ 
+   $(APINAMES_EXE): $(APINAMES_SRC)
+-	  $(CCexe) $(TE)$@ $<
++	  $(CC_FOR_BUILDexe) $(TE)$@ $<
+ 
+   .PHONY: symbols_list
+ 
+Index: builds/unix/configure.ac
+===================================================================
+--- a/builds/unix/configure.ac.orig
++++ b/builds/unix/configure.ac
+@@ -33,6 +33,14 @@ AC_CANONICAL_TARGET
+ AC_PROG_CC
+ AC_PROG_CPP
+ 
++if test "x$cross_compiling" = "xno"; then
++  CC_FOR_BUILD=${CC_FOR_BUILD-${CC-gcc}}
++else
++  CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++fi
++
++AC_SUBST(CC_FOR_BUILD)
++
+ 
+ # get compiler flags right
+ 
+Index: builds/unix/unix-cc.in
+===================================================================
+--- a/builds/unix/unix-cc.in.orig
++++ b/builds/unix/unix-cc.in
+@@ -13,6 +13,7 @@
+ 
+ 
+ CC           := @CC@
++CC_FOR_BUILD := @CC_FOR_BUILD@
+ COMPILER_SEP := $(SEP)
+ 
+ LIBTOOL ?= $(BUILD_DIR)/libtool
+@@ -80,8 +81,10 @@ ANSIFLAGS := @XX_ANSIFLAGS@
+ # C compiler to use -- we use libtool!
+ #
+ #
+-CCraw := $(CC)
+-CC    := $(LIBTOOL) --mode=compile $(CCraw)
++CCraw           := $(CC)
++CC              := $(LIBTOOL) --mode=compile $(CCraw)
++CC_FOR_BUILDraw := $(CC_FOR_BUILD)
++CC_FOR_BUILD    := $(LIBTOOL) --mode=compile $(CC_FOR_BUILDraw)
+ 
+ # Linker flags.
+ #
+@@ -90,8 +93,9 @@ LDFLAGS := @LDFLAGS@
+ 
+ # export symbols (XXX: HOW TO DEAL WITH CROSS COMPILATION ?)
+ #
+-EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
+-CCexe        := $(CCraw)   # used to compile "apinames" only
++EXPORTS_LIST    := $(OBJ_DIR)/ftexport.sym
++CCexe           := $(CCraw)   # used to compile "apinames" only
++CC_FOR_BUILDexe := $(CC_FOR_BUILDraw)
+ 
+ 
+ # Library linking
diff --git a/patches/freetype-2.2.1/generic/builds_unix_freetype-config_in_sysroot.diff b/patches/freetype-2.2.1/generic/builds_unix_freetype-config_in_sysroot.diff
new file mode 100644
index 000000000..d63c94826
--- /dev/null
+++ b/patches/freetype-2.2.1/generic/builds_unix_freetype-config_in_sysroot.diff
@@ -0,0 +1,41 @@
+#
+# Submitted-By: Marc Kleine-Budde, 2006-02-28
+# Committed-By: Marc Kleine-Budde
+#
+# Error:
+#
+# freetype-config is not $SYSROOT aware
+#
+# Description: 
+#
+# this patch adds $SYSROOT support to freetype-config
+#
+# State:
+# 
+# not commited, but should be :)
+#
+Index: freetype-2.1.10/builds/unix/freetype-config.in
+===================================================================
+--- freetype-2.1.10.orig/builds/unix/freetype-config.in
++++ freetype-2.1.10/builds/unix/freetype-config.in
+@@ -9,7 +9,7 @@
+ # indicate that you have read the license and understand and accept it
+ # fully.
+ 
+-prefix=@prefix@
++prefix=${SYSROOT}@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ includedir=@includedir@
+@@ -141,9 +141,9 @@ if test "$echo_libs" = "yes" ; then
+   if test "$enable_shared" = "yes" ; then
+     eval "rpath=\"$hardcode_libdir_flag_spec\""
+   fi
+-  libs="-lfreetype @LIBZ@"
++  libs="-Wl,-lfreetype @LIBZ@"
+   if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
+-    echo -L$libdir $rpath $libs
++    echo -L$libdir $libs
+   else
+     echo $libs
+   fi
diff --git a/patches/freetype-2.2.1/generic/builds_unix_unix-cc_in.diff b/patches/freetype-2.2.1/generic/builds_unix_unix-cc_in.diff
new file mode 100644
index 000000000..5245d7b3a
--- /dev/null
+++ b/patches/freetype-2.2.1/generic/builds_unix_unix-cc_in.diff
@@ -0,0 +1,31 @@
+#
+# Submitted-By: Robert Schwebel, 2007-01-03
+# Committed-By: Robert Schwebel
+#
+# Error:
+#
+# Lots of undefined FT_* macros.
+#
+# Description:
+#
+# The -I order is so that the wrong ftconfig.h is found (there's another
+# one) Change it so that it points to the intended file.
+#
+# State:
+#
+# Not reported yet.
+#
+
+Index: builds/unix/unix-cc.in
+===================================================================
+--- a/builds/unix/unix-cc.in.orig
++++ b/builds/unix/unix-cc.in
+@@ -72,7 +72,7 @@ T := -o$(space)
+ #   We use our own FreeType configuration file.
+ #
+ CPPFLAGS := @CPPFLAGS@
+-CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
++CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<freetype/config/ftconfig.h>"
+ 
+ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+ #
diff --git a/patches/freetype-2.2.1/generic/freetype-2.2.1-autoreconf.diff.bz2 b/patches/freetype-2.2.1/generic/freetype-2.2.1-autoreconf.diff.bz2
new file mode 100644
index 000000000..5fc4a8e0d
--- /dev/null
+++ b/patches/freetype-2.2.1/generic/freetype-2.2.1-autoreconf.diff.bz2
diff --git a/patches/freetype-2.2.1/generic/series b/patches/freetype-2.2.1/generic/series
new file mode 100644
index 000000000..2fe116196
--- /dev/null
+++ b/patches/freetype-2.2.1/generic/series
@@ -0,0 +1,4 @@
+builds_unix_freetype-config_in_sysroot.diff
+builds_unix_freetype-cc_for_build.diff
+builds_unix_unix-cc_in.diff
+freetype-2.2.1-autoreconf.diff.bz2