[oe-commits] Martin Jansa : x11 recipes: use virtual/libgl instead of mesa

[git version control]

Module: openembedded.git
Branch: martin_jansa/xorg-7.5
Commit: ea37e4b9b1f04d2c1714a2d4172f9bc03f49bf23
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ea37e4b9b1f04d2c1714a2d4172f9bc03f49bf23

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov 18 12:43:15 2009 +0100

x11 recipes: use virtual/libgl instead of mesa

---

 recipes/fltk/fltk_1.1.4.bb         |    4 ++--
 recipes/libsdl/libsdl.inc          |    4 +++-
 recipes/mesa/freeglut_2.4.0.bb     |    2 +-
 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 ++-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/recipes/fltk/fltk_1.1.4.bb b/recipes/fltk/fltk_1.1.4.bb
index ae7c0e1..d9c8c00 100644
--- a/recipes/fltk/fltk_1.1.4.bb
+++ b/recipes/fltk/fltk_1.1.4.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.fltk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "jpeg libpng mesa zlib"
-PR = "r1"
+DEPENDS = "jpeg libpng virtual/libgl zlib"
+PR = "r2"
 
 SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz"
 
diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc
index 5653925..0db0be8 100644
--- a/recipes/libsdl/libsdl.inc
+++ b/recipes/libsdl/libsdl.inc
@@ -1,11 +1,13 @@
 DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
+DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext"
 DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
 
+PR = "r1"
+
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://extra-keys.patch;patch=1 \
diff --git a/recipes/mesa/freeglut_2.4.0.bb b/recipes/mesa/freeglut_2.4.0.bb
index a244fb2..cfc9ec1 100644
--- a/recipes/mesa/freeglut_2.4.0.bb
+++ b/recipes/mesa/freeglut_2.4.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library. "
 LICENSE = "MIT/X11"
 
-DEPENDS = "mesa"
+DEPENDS = "virtual/libgl"
 
 SRC_URI = "http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-${PV}.tar.gz"
 
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