From 566708c52765f789902e683452f81d8d4efe23a8 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Fri, 3 Jun 2011 23:38:08 +0200
Subject: Packages: cairo: remove cairo-1.10.2 as it fails to check pthread
 correctly

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 packages/graphics/cairo/cairo.kconfig |  3 ---
 packages/graphics/cairo/cairo.mk      | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'packages/graphics/cairo')

diff --git a/packages/graphics/cairo/cairo.kconfig b/packages/graphics/cairo/cairo.kconfig
index 43b363e..cc5bdf1 100644
--- a/packages/graphics/cairo/cairo.kconfig
+++ b/packages/graphics/cairo/cairo.kconfig
@@ -53,8 +53,6 @@ choice
 	help
 	 Here you can choose which version of cairo you want to use.
 
-	config  EMBTK_CAIRO_VERSION_1_10_2
-		bool "cairo-1.10.2"
 	config  EMBTK_CAIRO_VERSION_1_8_10
 		bool "cairo-1.8.10"
 	config  EMBTK_CAIRO_VERSION_1_8_9
@@ -65,7 +63,6 @@ endchoice
 
 config EMBTK_CAIRO_VERSION_STRING
 	string
-	default "1.10.2"	if EMBTK_CAIRO_VERSION_1_10_2
 	default "1.8.10"	if EMBTK_CAIRO_VERSION_1_8_10
 	default "1.8.9"		if EMBTK_CAIRO_VERSION_1_8_9
 	default "1.8.8"		if EMBTK_CAIRO_VERSION_1_8_8
diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk
index d6f1f00..7d2df69 100644
--- a/packages/graphics/cairo/cairo.mk
+++ b/packages/graphics/cairo/cairo.mk
@@ -23,14 +23,14 @@
 # \date         December 2009
 ################################################################################
 
-CAIRO_NAME := cairo
-CAIRO_VERSION := $(call EMBTK_GET_PKG_VERSION,CAIRO)
-CAIRO_SITE := http://www.cairographics.org/releases
-CAIRO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-CAIRO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/cairo/$(CAIRO_VERSION)
-CAIRO_PACKAGE := cairo-$(CAIRO_VERSION).tar.gz
-CAIRO_SRC_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
-CAIRO_BUILD_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
+CAIRO_NAME		:= cairo
+CAIRO_VERSION		:= $(call EMBTK_GET_PKG_VERSION,CAIRO)
+CAIRO_SITE		:= http://www.cairographics.org/releases
+CAIRO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+CAIRO_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/cairo/$(CAIRO_VERSION)
+CAIRO_PACKAGE		:= cairo-$(CAIRO_VERSION).tar.gz
+CAIRO_SRC_DIR		:= $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
+CAIRO_BUILD_DIR		:= $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
 
 CAIRO_BINS =
 CAIRO_SBINS =
@@ -57,7 +57,8 @@ CAIRO_CONFIG_OPTS-n += --enable-xcb=no
 CAIRO_CONFIG_OPTS-n += --without-x
 endif
 
-CAIRO_CONFIGURE_OPTS := $(CAIRO_CONFIG_OPTS-n) $(CAIRO_CONFIG_OPTS-y)
+CAIRO_CONFIGURE_OPTS := $(CAIRO_CONFIG_OPTS-n) $(CAIRO_CONFIG_OPTS-y)	\
+		--enable-pthread=yes
 
 cairo_install:
 	$(call EMBTK_INSTALL_PKG,CAIRO)
-- 
cgit v1.2.3