Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 33 insertions, 24 deletions

diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 7db8a879e..b5d239569 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freetype
-PKG_VERSION:=		2.4.4
+PKG_VERSION:=		2.5.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9273efacffb683483e58a9e113efae9f
+PKG_MD5SUM:=		a359993ad0dc23323c676b04fdb57110
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
@@ -24,6 +24,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIGURE_ARGS+=	--without-png
+
 libfreetype-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib
diff --git a/package/freetype/patches/patch-builds_unix_freetype-config_in b/package/freetype/patches/patch-builds_unix_freetype-config_in
new file mode 100644
index 000000000..0348c4f56
--- /dev/null
+++ b/package/freetype/patches/patch-builds_unix_freetype-config_in
@@ -0,0 +1,16 @@
+--- 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
+@@ -13,10 +13,10 @@ LC_ALL=C
+ export LC_ALL
+ 
+ prefix="%prefix%"
+-exec_prefix="%exec_prefix%"
++exec_prefix="${prefix}/bin"
+ exec_prefix_set="no"
+-includedir="%includedir%"
+-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
new file mode 100644
index 000000000..9abb5afd9
--- /dev/null
+++ b/package/freetype/patches/patch-builds_unix_freetype2_in
@@ -0,0 +1,13 @@
+--- freetype-2.5.1.orig/builds/unix/freetype2.in	2013-11-12 13:53:44.000000000 +0100
++++ freetype-2.5.1/builds/unix/freetype2.in	2013-12-06 16:08:11.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix="%prefix%"
+-exec_prefix="%exec_prefix%"
+-libdir="%libdir%"
+-includedir="%includedir%/freetype2"
++exec_prefix="${prefix}"
++libdir="${prefix}/lib"
++includedir="${prefix}/include/freetype2"
+ 
+ Name: FreeType 2
+ Description: A free, high-quality, and portable font engine.
diff --git a/package/freetype/patches/patch-builds_unix_ltmain_sh b/package/freetype/patches/patch-builds_unix_ltmain_sh
deleted file mode 100644
index 89bf461e4..000000000
--- a/package/freetype/patches/patch-builds_unix_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- freetype-2.3.11.orig/builds/unix/ltmain.sh	2009-10-10 20:37:53.000000000 +0200
-+++ freetype-2.3.11/builds/unix/ltmain.sh	2011-01-14 00:21:25.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/freetype/patches/patch-builds_unix_unix-cc_in b/package/freetype/patches/patch-builds_unix_unix-cc_in
deleted file mode 100644
index b4b1df60d..000000000
--- a/package/freetype/patches/patch-builds_unix_unix-cc_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- freetype-2.4.4.orig/builds/unix/unix-cc.in	2010-08-31 13:04:28.000000000 +0200
-+++ freetype-2.4.4/builds/unix/unix-cc.in	2011-02-05 18:05:59.000000000 +0100
-@@ -101,7 +101,7 @@ LDFLAGS := @LDFLAGS@
- CCraw_build  := @CC_BUILD@	# native CC of building system
- E_BUILD      := @EXEEXT_BUILD@	# extension for exexutable on building system
- EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
--CCexe        := $(CCraw_build)	# used to compile `apinames' only
-+CCexe        := $(CCraw_build) $(CFLAGS_FOR_BUILD)	# used to compile `apinames' only
- 
- 
- # Library linking