From a2a9f6358d3c1442028a7fd5366651b8826d4547 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Thu, 2 Feb 2012 11:31:09 +0000 Subject: [PATCH] pixman: Bump version to 0.24.2 [Peter: depend on pkg-config, forcibly disable gtk-based demos] Signed-off-by: Will Newton Signed-off-by: Peter Korsgaard --- package/pixman/pixman-0.10.0-no-tests.patch | 11 ----------- package/pixman/pixman.mk | 6 ++++-- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 package/pixman/pixman-0.10.0-no-tests.patch diff --git a/package/pixman/pixman-0.10.0-no-tests.patch b/package/pixman/pixman-0.10.0-no-tests.patch deleted file mode 100644 index fbd0d26892..0000000000 --- a/package/pixman/pixman-0.10.0-no-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000 -+++ b/Makefile.in 2008-05-23 14:04:50.000000000 +0000 -@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = pixman test -+SUBDIRS = pixman - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = pixman-1.pc - USERNAME = $$USER diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 2b39a77c0f..a2e1832250 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -3,11 +3,13 @@ # pixman # ################################################################################ -PIXMAN_VERSION = 0.17.6 +PIXMAN_VERSION = 0.24.2 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz PIXMAN_SITE = http://cairographics.org/releases/ -PIXMAN_AUTORECONF = NO PIXMAN_INSTALL_STAGING = YES +PIXMAN_DEPENDENCIES = host-pkg-config +# don't build gtk based demos +PIXMAN_CONF_OPT = --disable-gtk $(eval $(call AUTOTARGETS)) $(eval $(call AUTOTARGETS,host)) -- 2.30.2