diff options
| author | wbx <wbx@openadk.org> | 2011-04-08 12:37:48 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-08 12:37:48 +0200 |
| commit | 34fc06736330cc993fd1c936ed9205cdc73aa0fd (patch) | |
| tree | 42319fe9aa25f82370948335d6dccd571da945d6 /package/cairo | |
| parent | 6ea415c59b9ced9d08be7348d268ae4543017a56 (diff) | |
| parent | 297e4004d154572e29ee71f8ed852b022686e852 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cairo')
| -rw-r--r-- | package/cairo/Makefile | 5 | ||||
| -rw-r--r-- | package/cairo/patches/patch-src_cairo-features_h | 15 |
2 files changed, 3 insertions, 17 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile index a3d957acd..b15efd5e2 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.8.10 +PKG_VERSION:= 1.10.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= b60a82f405f9400bbfdcf850b1728d25 +PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman @@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS})) +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --enable-ft=yes \ --enable-xlib=yes diff --git a/package/cairo/patches/patch-src_cairo-features_h b/package/cairo/patches/patch-src_cairo-features_h deleted file mode 100644 index 6466deec7..000000000 --- a/package/cairo/patches/patch-src_cairo-features_h +++ /dev/null @@ -1,15 +0,0 @@ ---- cairo-1.8.10.orig/src/cairo-features.h 2010-02-19 22:34:38.000000000 +0100 -+++ cairo-1.8.10/src/cairo-features.h 2011-01-14 20:12:28.000000000 +0100 -@@ -10,11 +10,11 @@ - #define CAIRO_HAS_SVG_SURFACE 1 - #define CAIRO_HAS_USER_FONT 1 - #define CAIRO_HAS_XLIB_SURFACE 1 --#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1 - - /*#undef CAIRO_HAS_QUARTZ_FONT */ - /*#undef CAIRO_HAS_QUARTZ_SURFACE */ - /*#undef CAIRO_HAS_WIN32_FONT */ - /*#undef CAIRO_HAS_WIN32_SURFACE */ -+/*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */ - - #endif |