[oe-commits] Martin Jansa : mesa: update git version, set default preference -1 for older mesa-dri too

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 23325b7a1a56df92d539683161ea5d0b74e90f0c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=23325b7a1a56df92d539683161ea5d0b74e90f0c

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Nov  2 15:45:51 2009 +0100

mesa: update git version, set default preference -1 for older mesa-dri too

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/mesa/mesa-dri_6.5.2.bb |    3 +++
 recipes/mesa/mesa-dri_7.0.3.bb |    3 +++
 recipes/mesa/mesa-dri_git.bb   |    4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipes/mesa/mesa-dri_6.5.2.bb b/recipes/mesa/mesa-dri_6.5.2.bb
index f94ea8b..28e27cd 100644
--- a/recipes/mesa/mesa-dri_6.5.2.bb
+++ b/recipes/mesa/mesa-dri_6.5.2.bb
@@ -8,6 +8,9 @@ PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
 PR = "r2"
 
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
 RRECOMMENDS += " kernel-module-drm kernel-module-radeon "
diff --git a/recipes/mesa/mesa-dri_7.0.3.bb b/recipes/mesa/mesa-dri_7.0.3.bb
index 330efb2..25d78cc 100644
--- a/recipes/mesa/mesa-dri_7.0.3.bb
+++ b/recipes/mesa/mesa-dri_7.0.3.bb
@@ -9,6 +9,9 @@ PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
 PR = "r1"
 
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
 RRECOMMENDS += " kernel-module-drm kernel-module-radeon "
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index 1676b7c..1c61072 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -5,11 +5,11 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PV = "7.5.1+gitr${SRCREV}"
+PV = "7.6+gitr${SRCREV}"
 PR = "${INC_PR}.3"
 PE = "1"
 
-DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-2"
 DEFAULT_PREFERENCE_om-gta02 = "2"
 
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"