[oe-commits] Martin.Jansa : shr/merge: replace mesa by virtual/libgl

[git version control]

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

Author: Martin.Jansa <Martin.Jansa at gmail.com>
Date:   Fri Oct 16 21:48:14 2009 +0000

shr/merge: replace mesa by virtual/libgl

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/opencv/artoolkit_2.72.1.bb |    4 +++-
 recipes/qt/qt-x11-free_3.3.6.bb    |    4 ++--
 recipes/qt/qt-x11-free_3.3.7.bb    |    4 ++--
 recipes/quake/quetoo_0.6.1.bb      |    3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/recipes/opencv/artoolkit_2.72.1.bb b/recipes/opencv/artoolkit_2.72.1.bb
index 2dfbc42..1863844 100644
--- a/recipes/opencv/artoolkit_2.72.1.bb
+++ b/recipes/opencv/artoolkit_2.72.1.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "ARToolKit is a software library that allows for the creation of augmented reality applications. "
 LICENSE = "GPL/ARToolkit"
 
-DEPENDS = "libxi gstreamer virtual/libx11 freeglut mesa"
+DEPENDS = "libxi gstreamer virtual/libx11 freeglut virtual/libgl"
+
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \
            file://configure.diff;patch=1 \
diff --git a/recipes/qt/qt-x11-free_3.3.6.bb b/recipes/qt/qt-x11-free_3.3.6.bb
index 719215c..f5ff6b0 100644
--- a/recipes/qt/qt-x11-free_3.3.6.bb
+++ b/recipes/qt/qt-x11-free_3.3.6.bb
@@ -1,6 +1,6 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
 PROVIDES = "qt3x11"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/recipes/qt/qt-x11-free_3.3.7.bb b/recipes/qt/qt-x11-free_3.3.7.bb
index 7e430c8..e218073 100644
--- a/recipes/qt/qt-x11-free_3.3.7.bb
+++ b/recipes/qt/qt-x11-free_3.3.7.bb
@@ -1,6 +1,6 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql mesa"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
 PROVIDES = "qt3x11"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/recipes/quake/quetoo_0.6.1.bb b/recipes/quake/quetoo_0.6.1.bb
index 33a7075..b031238 100644
--- a/recipes/quake/quetoo_0.6.1.bb
+++ b/recipes/quake/quetoo_0.6.1.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Initially a fork of the Quake2Forge project, this engine aims to provide security and performance enhancements."
 LICENSE = "GPLv2"
 
-DEPENDS = "libsdl-x11 zlib mesa"
+DEPENDS = "libsdl-x11 zlib virtual/libgl"
 SRC_URI = "http://tastyspleen.net/~jdolan/quetoo-${PV}.tar.bz2"
 
+PR = "r1"
 inherit autotools pkgconfig