diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/freetype | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/freetype')
| -rw-r--r-- | package/freetype/Makefile | 13 | ||||
| -rw-r--r-- | package/freetype/ipkg/libfreetype.control | 16 |
2 files changed, 9 insertions, 20 deletions
diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 6d146978d..d9cd8bf96 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -6,16 +6,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libfreetype -PKG_VERSION:= 2.1.9 +PKG_VERSION:= 2.3.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= ec1b903e4be5f073caa72458ea58c29c +PKG_MD5SUM:= d76233108aca9c9606cdbd341562ad9a +PKG_DESCR:= A free, high-quality and portable font engine +PKG_SECTION:= libs +PKG_DEPENDS:= zlib +PKG_URL:= http://www.freetype.org +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} + DISTFILES:= freetype-${PKG_VERSION}.tar.bz2 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/} WRKDIST= ${WRKDIR}/freetype-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/freetype/ipkg/libfreetype.control b/package/freetype/ipkg/libfreetype.control deleted file mode 100644 index c1e0ec54c..000000000 --- a/package/freetype/ipkg/libfreetype.control +++ /dev/null @@ -1,16 +0,0 @@ -Package: libfreetype -Priority: optional -Section: libs -Depends: zlib -Description: A free, high-quality and portable font engine. - The FreeType project is a team of volunteers who develop free, - portable and high-quality software solutions for digital typography. - They specifically target embedded systems and focus on bringing small, - efficient and ubiquitous products. - . - The FreeType 2 library is their new software font engine. It has been - designed to provide the following important features: - * A universal and simple API to manage font files - * Support for several font formats through loadable modules - * High-quality anti-aliasing - * High portability & performance |