Merge pull request #1790 from tonytheodore/freetype-pkg-config

freetype: use prefixed pkg-config in freetype-config script

src/freetype-1-fixes.patch

@@ -0,0 +1,71 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Tue, 20 Jun 2017 19:34:02 +1000
+Subject: [PATCH] fix PKG_CONFIG program in freetype-config for cross-compiling
+
+Taken from:
+https://savannah.nongnu.org/bugs/index.php?51274
+
+diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
+index 1111111..2222222 100644
+--- a/builds/unix/freetype-config.in
++++ b/builds/unix/freetype-config.in
+@@ -14,7 +14,7 @@ export LC_ALL
+ 
+ 
+ # if `pkg-config' is available, use values from `freetype2.pc'
+-pkg-config --version >/dev/null 2>&1
++%PKG_CONFIG% --version >/dev/null 2>&1
+ if test $? -eq 0 ; then
+   # note that option `--variable' is not affected by the
+   # PKG_CONFIG_SYSROOT_DIR environment variable
+@@ -23,17 +23,17 @@ if test $? -eq 0 ; then
+     export PKG_CONFIG_SYSROOT_DIR
+   fi
+ 
+-  prefix=`pkg-config --variable prefix freetype2`
+-  exec_prefix=`pkg-config --variable exec_prefix freetype2`
++  prefix=`%PKG_CONFIG% --variable prefix freetype2`
++  exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2`
+ 
+-  includedir=`pkg-config --variable includedir freetype2`
+-  libdir=`pkg-config --variable libdir freetype2`
++  includedir=`%PKG_CONFIG% --variable includedir freetype2`
++  libdir=`%PKG_CONFIG% --variable libdir freetype2`
+ 
+-  version=`pkg-config --modversion freetype2`
++  version=`%PKG_CONFIG% --modversion freetype2`
+ 
+-  cflags=`pkg-config --cflags freetype2`
+-  dynamic_libs=`pkg-config --libs freetype2`
+-  static_libs=`pkg-config --static --libs freetype2`
++  cflags=`%PKG_CONFIG% --cflags freetype2`
++  dynamic_libs=`%PKG_CONFIG% --libs freetype2`
++  static_libs=`%PKG_CONFIG% --static --libs freetype2`
+ else
+   prefix="%prefix%"
+   exec_prefix="%exec_prefix%"
+diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
+index 1111111..2222222 100644
+--- a/builds/unix/unix-def.in
++++ b/builds/unix/unix-def.in
+@@ -62,6 +62,7 @@ version_info := @version_info@
+ 
+ # Variables needed for `freetype-config' and `freetype.pc'.
+ #
++PKG_CONFIG         := @PKG_CONFIG@
+ REQUIRES_PRIVATE   := @REQUIRES_PRIVATE@
+ LIBS_PRIVATE       := @LIBS_PRIVATE@
+ LIBSSTATIC_CONFIG  := @LIBSSTATIC_CONFIG@
+@@ -102,6 +103,7 @@ NO_OUTPUT := 2> /dev/null
+ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
+ 	rm -f $@ $@.tmp
+ 	sed -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|'   \
++	    -e 's|%PKG_CONFIG%|$(PKG_CONFIG)|'                 \
+ 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
+ 	    -e 's|%exec_prefix%|$(exec_prefix)|'               \
+ 	    -e 's|%ft_version%|$(ft_version)|'                 \