x11 recipes: use virtual/libgl instead of mesa

diff --git a/recipes/fltk/fltk_1.1.4.bb b/recipes/fltk/fltk_1.1.4.bb
index ae7c0e1c950e15621a50eabf4fbc2026009ba64f..d9c8c00a14a5cc39ab40eb05a157cc06dfe3894f 100644 (file)
--- 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 5653925d681fd7ca90f0d6a794bc3001756faa81..0db0be8e1448393e55c736fc84bae5cbb30da1ff 100644 (file)
--- 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 a244fb23e11c680b680cfd7b5d4779cc7e819293..cfc9ec175f34fa3522d276a886d22ac973e30bb8 100644 (file)
--- 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 2dfbc429bc3bb632a6d3704c95932af180e4b4ac..1863844c9ed988db88c02ae6e446db6946700784 100644 (file)
--- 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 719215c5d2bed1db0ad4af4e12ae0e2988fdc474..f5ff6b0cdd4d2076dc79a05896d77d0cfafca7e0 100644 (file)
--- 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 7e430c802465b56918e9e0d8c04f0d092328c21b..e218073cce4c8e3bf96a8fa053fdf89aa64a5898 100644 (file)
--- 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 33a707579985a146201c90b30aa402917c5292c5..b031238da3538ee571b7c2ac6a5a635f94632cfc 100644 (file)
--- 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