summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-01 10:47:33 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-01 10:47:33 +0200
commit91e9f3b90a7ac47f7ef1dc936c8721aa05c32264 (patch)
tree0e8429ec350a749029f78f915abd4febf953cc4a
parenta40ccadfab0cfecb0100ec4ea8c0f43357996212 (diff)
parent1eb84320303340f86c7f04a413109848377de0e8 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/fbsplash/Makefile6
-rw-r--r--package/freetype/Makefile14
2 files changed, 12 insertions, 8 deletions
diff --git a/package/fbsplash/Makefile b/package/fbsplash/Makefile
index 43ea99ca6..0d2ece693 100644
--- a/package/fbsplash/Makefile
+++ b/package/fbsplash/Makefile
@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= fbsplash
PKG_VERSION:= 1.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= aa0a9e735e086228bc245b18e231bf6c
PKG_DESCR:= framebuffer splash utility
PKG_SECTION:= misc
-PKG_BUILDDEP:= libjpeg-turbo libpng freetype bzip2
-PKG_DEPENDS:= libjpeg-turbo libpng libfreetype libbzip2
+PKG_BUILDDEP:= libjpeg-turbo libpng freetype
+PKG_DEPENDS:= libjpeg-turbo libpng libfreetype
PKG_URL:= https://github.com/alanhaggai/fbsplash
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 55fdd98af..e8bcb24ff 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -4,10 +4,10 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= freetype
-PKG_VERSION:= 2.5.1
+PKG_VERSION:= 2.5.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= a359993ad0dc23323c676b04fdb57110
-PKG_DESCR:= A free, high-quality and portable font engine
+PKG_MD5SUM:= cafe9f210e45360279c730d27bf071e9
+PKG_DESCR:= free, high-quality and portable font engine
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= zlib freetype-host
@@ -27,8 +27,12 @@ $(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE
$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
HOST_STYLE:= auto
-HOST_CONFIGURE_ARGS+= --without-png
-CONFIGURE_ARGS+= --without-png
+HOST_CONFIGURE_ARGS+= --with-zlib \
+ --without-png \
+ --without-bzip2
+CONFIGURE_ARGS+= --with-zlib \
+ --without-png \
+ --without-bzip2
libfreetype-install:
${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib