summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kuten <ivan.kuten@promwad.com>2007-11-16 10:16:48 +0000
committerIvan Kuten <ivan.kuten@promwad.com>2007-11-16 10:16:48 +0000
commitd94f4c86e5bff81bc67fa6ea5dde71bf6e538fc4 (patch)
tree6854d6539db5ef8f12d22d6d977e067c269b8716
parent1dabd712525ae5ac7a0df28ed05a19d834ff746c (diff)
add more recent version of freetype, required at least for avr32 to build correctly
-rw-r--r--package/freetype/Config.in20
-rw-r--r--package/freetype/freetype.mk2
2 files changed, 21 insertions, 1 deletions
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)