Optionally set cairo version so it doesn't overwrite the poky-bleeding version

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1026 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 2864894..f93f0af 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -140,7 +140,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.9"
 PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
 PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
 PREFERRED_VERSION_atk ?= "1.10.3"
-PREFERRED_VERSION_cairo = "1.0.4"
+PREFERRED_VERSION_cairo ?= "1.0.4"
 PREFERRED_VERSION_gtk+ ?= "2.6.8"
 #PREFERRED_VERSION_gtk+ ?= "2.8.16"
 PREFERRED_VERSION_pango ?= "1.10.2"