From c47e8c6ebeb05d9947f8757acfc0a12c7ca854ae Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sat, 24 Oct 2015 15:46:16 +0200
Subject: freetype: update to latest stable version

---
 package/freetype/Makefile                                 |  4 ++--
 .../freetype/patches/patch-builds_unix_freetype-config_in |  6 +++---
 package/freetype/patches/patch-builds_unix_freetype2_in   | 15 +++++----------
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'package/freetype')

diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index db761582d..70aa31a4a 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		freetype
-PKG_VERSION:=		2.6
+PKG_VERSION:=		2.6.1
 PKG_RELEASE:=		1
-PKG_HASH:=		f5a78da18fa548f6ef325edfbd91d3088c010d896b21863beec5a7ab34188d2c
+PKG_HASH:=		0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
 PKG_DESCR:=		free, high-quality and portable font engine
 PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		zlib
diff --git a/package/freetype/patches/patch-builds_unix_freetype-config_in b/package/freetype/patches/patch-builds_unix_freetype-config_in
index 0348c4f56..74135b0fd 100644
--- a/package/freetype/patches/patch-builds_unix_freetype-config_in
+++ b/package/freetype/patches/patch-builds_unix_freetype-config_in
@@ -1,5 +1,5 @@
---- freetype-2.5.1.orig/builds/unix/freetype-config.in	2013-11-12 13:33:36.000000000 +0100
-+++ freetype-2.5.1/builds/unix/freetype-config.in	2013-12-06 15:56:16.000000000 +0100
+--- freetype-2.6.1.orig/builds/unix/freetype-config.in	2015-09-25 07:58:57.000000000 +0200
++++ freetype-2.6.1/builds/unix/freetype-config.in	2015-10-23 10:37:49.000000000 +0200
 @@ -13,10 +13,10 @@ LC_ALL=C
  export LC_ALL
  
@@ -11,6 +11,6 @@
 -libdir="%libdir%"
 +includedir="${prefix}/include"
 +libdir="${prefix}/lib"
- enable_shared="%build_libtool_libs%"
  
  usage()
+ {
diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in
index 8bf7b63af..306057eb3 100644
--- a/package/freetype/patches/patch-builds_unix_freetype2_in
+++ b/package/freetype/patches/patch-builds_unix_freetype2_in
@@ -1,19 +1,14 @@
---- freetype-2.6.orig/builds/unix/freetype2.in	2015-06-01 02:39:54.000000000 -0500
-+++ freetype-2.6/builds/unix/freetype2.in	2015-06-14 05:48:22.752795001 -0500
-@@ -1,7 +1,7 @@
+--- freetype-2.6.1.orig/builds/unix/freetype2.in	2015-09-25 07:58:57.000000000 +0200
++++ freetype-2.6.1/builds/unix/freetype2.in	2015-10-23 10:43:36.000000000 +0200
+@@ -1,7 +1,8 @@
  prefix=%prefix%
 -exec_prefix=%exec_prefix%
 -libdir=%libdir%
--includedir=%includedir%/freetype2
+-includedir=%includedir%
 +exec_prefix=${prefix}
 +libdir=${prefix}/lib
 +includedir=${prefix}/include
++
  
  Name: FreeType 2
  URL: http://freetype.org
-@@ -11,4 +11,4 @@ Requires:
- Requires.private: %REQUIRES_PRIVATE%
- Libs: -L${libdir} -lfreetype
- Libs.private: %LIBS_PRIVATE%
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/freetype2
-- 
cgit v1.2.3