diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 18:41:11 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 18:41:11 +0100 |
commit | 272b9fb572a6b1f585cf6f4f4150b07f1c1537bf (patch) | |
tree | 5ede8c935478f6db39bf8efc7ea14919e58d6aa1 /package/cairo | |
parent | bde68f551d953927d476dc4f5ccd1c89ca001539 (diff) | |
parent | ed95e17c2e88caff425eca534a794ea0c489fc5c (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cairo')
-rw-r--r-- | package/cairo/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile index a1015c603..30894cab5 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.10.2 -PKG_RELEASE:= 3 -PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f +PKG_VERSION:= 1.12.16 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a1304edcdc99282f478b995ee5f8f854 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman @@ -17,7 +17,7 @@ PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ PKG_OPTS:= dev -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly @@ -34,11 +34,13 @@ ifeq (,$(filter cris,$(TARGET_ARCH))) TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) endif CONFIGURE_ARGS+= --enable-ft=yes \ + --enable-fc=yes \ --enable-tee=yes \ --enable-xlib=yes cairo-install: - ${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib + ${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo + ${CP} ${WRKINST}/usr/lib/libcairo*.so* ${IDIR_CAIRO}/usr/lib + ${CP} ${WRKINST}/usr/lib/cairo/*.so* ${IDIR_CAIRO}/usr/lib/cairo include ${TOPDIR}/mk/pkg-bottom.mk |