From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 14 Dec 2014 20:42:07 +0000 (-0500)
Subject: Upgrade to fontconfig-2.11.1 and freetype-2.5.4
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=0df93c3689975a73bc08bb9cbfca912b715128c9;p=hvlinux.git

Upgrade to fontconfig-2.11.1 and freetype-2.5.4
---

diff --git a/config/packages-list b/config/packages-list
index 5449003..04e748c 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -95,11 +95,11 @@ FINDUTILS="findutils-4.4.2"
 FIRMWARE_B43_LPPHY="broadcom-wl-5.100.138"
 FLAC="flac-1.3.0"
 FLEX="flex-2.5.37"
-FONTCONFIG="fontconfig-2.10.1"
+FONTCONFIG="fontconfig-2.11.1"
 FONTFORGE="fontforge_full-20120731-b"
 FOO2ZJS="foo2zjs"
 FOOMATIC_FILTERS="foomatic-filters-4.0.17"
-FREETYPE="freetype-2.4.10"
+FREETYPE="freetype-2.5.4"
 FRIBIDI="fribidi-0.19.2"
 FUSE="fuse-2.9.1"
 B43_FWCUTTER="b43-fwcutter-015"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 1c21acd..ff66308 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -142,7 +142,7 @@ ipkg -m acnb ${HICOLOR_ICON_THEME}
 ipkg ${GIFLIB}
 ipkg -m noac ${LIBMNG}
 
-ipkg ${FREETYPE}
+ipkg ${FREETYPE} "--disable-static"
 ipkg ${FONTCONFIG}
 
 ipkg -m noac ${CKERMIT}
diff --git a/stage3/patches/common/freetype-2.5.4-enable-gx-ot.patch b/stage3/patches/common/freetype-2.5.4-enable-gx-ot.patch
new file mode 100644
index 0000000..c1ae723
--- /dev/null
+++ b/stage3/patches/common/freetype-2.5.4-enable-gx-ot.patch
@@ -0,0 +1,21 @@
+diff -Naur freetype-2.5.4.orig/modules.cfg freetype-2.5.4.new/modules.cfg
+--- freetype-2.5.4.orig/modules.cfg	2014-04-20 12:18:50.479380666 -0400
++++ freetype-2.5.4.new/modules.cfg	2014-12-09 22:49:00.290333666 -0500
+@@ -110,7 +110,7 @@
+ AUX_MODULES += cache
+ 
+ # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -129,7 +129,7 @@
+ 
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #
diff --git a/stage3/patches/common/freetype-2.5.4-enable-subpixel.patch b/stage3/patches/common/freetype-2.5.4-enable-subpixel.patch
new file mode 100644
index 0000000..16ac285
--- /dev/null
+++ b/stage3/patches/common/freetype-2.5.4-enable-subpixel.patch
@@ -0,0 +1,21 @@
+diff -Naur freetype-2.5.4.orig2/include/config/ftoption.h freetype-2.5.4.new/include/config/ftoption.h
+--- freetype-2.5.4.orig2/include/config/ftoption.h	2014-11-19 16:38:59.612015975 -0500
++++ freetype-2.5.4.new/include/config/ftoption.h	2014-12-09 22:41:35.854352254 -0500
+@@ -92,7 +92,7 @@
+   /* This is done to allow FreeType clients to run unmodified, forcing     */
+   /* them to display normal gray-level anti-aliased glyphs.                */
+   /*                                                                       */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /*************************************************************************/
+@@ -604,7 +604,7 @@
+   /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
+   /*   defined.                                                            */
+   /*                                                                       */
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+ 
+ 
+   /*************************************************************************/
diff --git a/stage3/pkg/freetype b/stage3/pkg/freetype
deleted file mode 100644
index 4d24af0..0000000
--- a/stage3/pkg/freetype
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-
-    sed -i -r 's:.*(#.*SUBPIXEL.*) .*:\1:' \
-        include/freetype/config/ftoption.h
-}