bump version libfreetype-2.6.3

diff --git a/archive-patches/freetype-2.3.9-coolstream.diff b/archive-patches/freetype-2.3.9-coolstream.diff
deleted file mode 100644 (file)
index 30a7f13..0000000
--- a/archive-patches/freetype-2.3.9-coolstream.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-    freetype-2.3.9 from coolstream
-
- freetype-2.3.9/README.COOLSTREAM                  |    2 ++
- freetype-2.3.9/hd_config                          |    2 ++
- freetype-2.3.9/include/freetype/config/ftoption.h |    2 +-
- freetype-2.3.9/modules.cfg                        |   12 ++++++------
- 4 files changed, 11 insertions(+), 7 deletions(-)
-
-Index: b/README.COOLSTREAM
-===================================================================
---- /dev/null
-+++ b/README.COOLSTREAM
-@@ -0,0 +1,2 @@
-+To compile FreeType check and, ifnecessary, adjust the prefix in the hd1_config script, 
-+run hd1_config followe by make and make install.
-Index: b/hd_config
-===================================================================
---- /dev/null
-+++ b/hd_config
-@@ -0,0 +1,2 @@
-+
-+CC=arm-cx2450x-linux-gnueabi-gcc ./configure --host=arm-cx2450x-linux-gnueabi --prefix=/hd1
-Index: b/include/freetype/config/ftoption.h
-===================================================================
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -668,11 +668,11 @@ FT_BEGIN_HEADER
-    *
-    * For embedded systems or building a new distribution from scratch, it
-    * is recommended to disable the macro since it reduces the library's code
-    * size and activates a few memory-saving optimizations as well.
-    */
--#define FT_CONFIG_OPTION_OLD_INTERNALS
-+/*#define FT_CONFIG_OPTION_OLD_INTERNALS */
- 
- 
-   /*
-    * This macro is defined if either unpatented or native TrueType
-    * hinting is requested by the definitions above.
-Index: b/modules.cfg
-===================================================================
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -35,39 +35,39 @@
- FONT_MODULES += truetype
- 
- # PostScript Type 1 font driver.
- #
- # This driver needs the `psaux', `pshinter', and `psnames' modules.
--FONT_MODULES += type1
-+#FONT_MODULES += type1
- 
- # CFF/OpenType font driver.
- #
- # This driver needs the `sfnt', `pshinter', and `psnames' modules.
- FONT_MODULES += cff
- 
- # Type 1 CID-keyed font driver.
- #
- # This driver needs the `psaux', `pshinter', and `psnames' modules.
--FONT_MODULES += cid
-+#FONT_MODULES += cid
- 
- # PFR/TrueDoc font driver.  See optional extension ftpfr.c below also.
--FONT_MODULES += pfr
-+#FONT_MODULES += pfr
- 
- # PostScript Type 42 font driver.
- #
- # This driver needs the `truetype' module.
--FONT_MODULES += type42
-+#FONT_MODULES += type42
- 
- # Windows FONT/FNT font driver.  See optional extension ftwinfnt.c below
- # also.
- FONT_MODULES += winfonts
- 
- # PCF font driver.
--FONT_MODULES += pcf
-+#FONT_MODULES += pcf
- 
- # BDF font driver.  See optional extension ftbdf.c below also.
--FONT_MODULES += bdf
-+#FONT_MODULES += bdf
- 
- # SFNT files support.  If used without `truetype' or `cff', it supports
- # bitmap-only fonts within an SFNT wrapper.
- #
- # This driver needs the `psnames' module.

diff --git a/archive-patches/freetype-2.4.4-coolstream.diff b/archive-patches/freetype-2.4.4-coolstream.diff
deleted file mode 100644 (file)
index 1135738..0000000
--- a/archive-patches/freetype-2.4.4-coolstream.diff
+++ /dev/null
@@ -1,115 +0,0 @@
-    freetype-2.4.4 from coolstream
-
- freetype-2.4.4/README.COOLSTREAM                  |    2 ++
- freetype-2.4.4/hd_config                          |    2 ++
- freetype-2.4.4/include/freetype/config/ftoption.h |    2 +-
- freetype-2.4.4/modules.cfg                        |   12 ++++++------
- 4 files changed, 11 insertions(+), 7 deletions(-)
-
-Index: b/README.COOLSTREAM
-===================================================================
---- /dev/null
-+++ b/README.COOLSTREAM
-@@ -0,0 +1,2 @@
-+To compile FreeType check and, ifnecessary, adjust the prefix in the hd1_config script, 
-+run hd1_config followe by make and make install.
-Index: b/hd_config
-===================================================================
---- /dev/null
-+++ b/hd_config
-@@ -0,0 +1,2 @@
-+
-+CC=arm-cx2450x-linux-gnueabi-gcc ./configure --host=arm-cx2450x-linux-gnueabi --prefix=/hd1
-Index: b/include/freetype/config/ftoption.h
-===================================================================
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -494,11 +494,11 @@
-   /* TrueType glyphs without hinting.                                      */
-   /*                                                                       */
-   /*   Do not #undef this macro here, since the build system might         */
-   /*   define it for certain configurations only.                          */
-   /*                                                                       */
--#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-+/*#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
- 
- 
-   /*************************************************************************/
-   /*                                                                       */
-   /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version  */
-@@ -544,11 +544,11 @@
-   /*                                                                       */
-   /*     error = FT_Open_Face( library, &open_args, index, &face );        */
-   /*     ...                                                               */
-   /*   }                                                                   */
-   /*                                                                       */
--/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
-+#define TT_CONFIG_OPTION_UNPATENTED_HINTING
- 
- 
-   /*************************************************************************/
-   /*                                                                       */
-   /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType    */
-@@ -687,11 +687,11 @@
-    *
-    * For embedded systems or building a new distribution from scratch, it
-    * is recommended to disable the macro since it reduces the library's code
-    * size and activates a few memory-saving optimizations as well.
-    */
--#define FT_CONFIG_OPTION_OLD_INTERNALS
-+/*#define FT_CONFIG_OPTION_OLD_INTERNALS */
- 
- 
-   /*
-    * This macro is defined if either unpatented or native TrueType
-    * hinting is requested by the definitions above.
-Index: b/modules.cfg
-===================================================================
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -35,39 +35,39 @@
- FONT_MODULES += truetype
- 
- # PostScript Type 1 font driver.
- #
- # This driver needs the `psaux', `pshinter', and `psnames' modules.
--FONT_MODULES += type1
-+#FONT_MODULES += type1
- 
- # CFF/OpenType font driver.
- #
- # This driver needs the `sfnt', `pshinter', and `psnames' modules.
- FONT_MODULES += cff
- 
- # Type 1 CID-keyed font driver.
- #
- # This driver needs the `psaux', `pshinter', and `psnames' modules.
--FONT_MODULES += cid
-+#FONT_MODULES += cid
- 
- # PFR/TrueDoc font driver.  See optional extension ftpfr.c below also.
--FONT_MODULES += pfr
-+#FONT_MODULES += pfr
- 
- # PostScript Type 42 font driver.
- #
- # This driver needs the `truetype' module.
--FONT_MODULES += type42
-+#FONT_MODULES += type42
- 
- # Windows FONT/FNT font driver.  See optional extension ftwinfnt.c below
- # also.
- FONT_MODULES += winfonts
- 
- # PCF font driver.
--FONT_MODULES += pcf
-+#FONT_MODULES += pcf
- 
- # BDF font driver.  See optional extension ftbdf.c below also.
--FONT_MODULES += bdf
-+#FONT_MODULES += bdf
- 
- # SFNT files support.  If used without `truetype' or `cff', it supports
- # bitmap-only fonts within an SFNT wrapper.
- #
- # This driver needs the `psnames' module.

diff --git a/make/archives.mk b/make/archives.mk
index a7216307f27eab6fa66baec992a7ec7e867fe932..00463e1cda5120e39456a7ce173ad1a8a7a659f0 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -33,8 +33,8 @@ $(ARCHIVE)/hotplug.tar.gz:
 $(ARCHIVE)/fbshot-0.3.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/fbshot-0.3.tar.gz
 
-$(ARCHIVE)/freetype-2.4.9.tar.bz2:
-       $(WGET) http://www.fhloston-paradise.de/freetype-2.4.9.tar.bz2
+$(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2:
+       $(WGET) http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VER)/freetype-$(FREETYPE_VER).tar.bz2
 
 $(ARCHIVE)/gettext-$(GETTEXT_VER).tar.xz:
        $(WGET) http://ftp.gnu.org/pub/gnu/gettext/gettext-$(GETTEXT_VER).tar.xz

diff --git a/make/libraries.mk b/make/libraries.mk
index 9f03c1055133e784f7ae917b26ae799696461c47..6bfb5f609d5c0ed67e5d66b4c3e78ff3d97b847a 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -200,19 +200,20 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz |
        $(REMOVE)/rtmpdump-$(LIBRTMP_VER)
        touch $@
 
-$(D)/freetype: $(D)/libpng $(ARCHIVE)/freetype-2.4.9.tar.bz2 | $(TARGETPREFIX)
-       $(UNTAR)/freetype-2.4.9.tar.bz2
-       pushd $(BUILD_TMP)/freetype-2.4.9 && \
-               patch -p1 < $(PATCHES)/freetype-2.4.4-coolstream.diff && \
-               $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) && \
-               $(MAKE) all && \
-               sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < builds/unix/freetype-config > $(HOSTPREFIX)/bin/freetype-config && \
-               chmod 755 $(HOSTPREFIX)/bin/freetype-config && \
+$(D)/freetype: $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGETPREFIX)
+       $(UNTAR)/freetype-$(FREETYPE_VER).tar.bz2
+       pushd $(BUILD_TMP)/freetype-$(FREETYPE_VER); \
+               sed -i '/#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER/d' include/freetype/config/ftoption.h; \
+               sed -i '/^FONT_MODULES += \(type1\|cid\|pfr\|type42\|pcf\|bdf\)/d' modules.cfg; \
+               $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET); \
+               $(MAKE) all; \
+               sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < builds/unix/freetype-config > $(HOSTPREFIX)/bin/freetype-config; \
+               chmod 755 $(HOSTPREFIX)/bin/freetype-config; \
                $(MAKE) install libdir=$(TARGETPREFIX)/lib includedir=$(TARGETPREFIX)/include bindir=$(TARGETPREFIX)/bin prefix=$(TARGETPREFIX)
        rm $(TARGETPREFIX)/bin/freetype-config
        $(REWRITE_LIBTOOL)/libfreetype.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/freetype2.pc
-       $(REMOVE)/freetype-2.4.9
+       $(REMOVE)/freetype-$(FREETYPE_VER)
        touch $@
 
 $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-1.6.8.tar.gz | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index 7fc827bb6e4990e8a86cd1f8774fdeaecb39a734..903e7204144528771e80d5a4409ba450435e9dbf 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -38,6 +38,9 @@ EXPAT_VER = 2.1.0
 # FLEX (the fast lexical analyser)
 FLEX_VER=2.5.35
 
+# FREETYPE free high-quality and portable Font engine
+FREETYPE_VER=2.6.3
+
 # hd-idle is a utility program for spinning-down external disks after a period of idle time
 HD_IDLE_VER=1.04