From d94f4c86e5bff81bc67fa6ea5dde71bf6e538fc4 Mon Sep 17 00:00:00 2001
From: Ivan Kuten <ivan.kuten@promwad.com>
Date: Fri, 16 Nov 2007 10:16:48 +0000
Subject: [PATCH] add more recent version of freetype, required at least for
 avr32 to build correctly

---
 package/freetype/Config.in   | 20 ++++++++++++++++++++
 package/freetype/freetype.mk |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/package/freetype/Config.in b/package/freetype/Config.in
index f3ce268e0..515dd1511 100644
--- a/package/freetype/Config.in
+++ b/package/freetype/Config.in
@@ -4,3 +4,23 @@ config BR2_PACKAGE_FREETYPE
 	help
 
 	http://www.freetype.org/
+
+choice
+	prompt "Freetype Version"
+	depends BR2_PACKAGE_FREETYPE
+	default BR2_FREETYPE_VERSION_2_2_1
+	help
+	  Select the version of Freetype you wish to use.
+
+	config BR2_FREETYPE_VERSION_2_2_1
+		bool "Freetype 2.2.1"
+
+	config BR2_FREETYPE_VERSION_2_3_5
+		bool "Freetype 2.3.5"
+
+endchoice
+
+config BR2_FREETYPE_VERSION
+	string
+	default "2.2.1"		if BR2_FREETYPE_VERSION_2_2_1
+	default "2.3.5"		if BR2_FREETYPE_VERSION_2_3_5
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 1c98fd199..e7e8666be 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -3,7 +3,7 @@
 # freetype
 #
 #############################################################
-FREETYPE_VERSION:=2.2.1
+FREETYPE_VERSION:=$(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
 FREETYPE_SOURCE:=freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_CAT:=$(BZCAT)