[oe-commits] Thomas Zimmermann : shr/merge: replace mesa by virtual/libgl

[git version control]

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

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Fri Oct 16 20:42:08 2009 +0000

shr/merge: replace mesa by virtual/libgl

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

---

 recipes/clutter/clutter.inc |    2 +-
 recipes/fltk/fltk_1.1.4.bb  |    4 ++--
 recipes/libsdl/libsdl.inc   |    4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc
index 705cece..7e2af3f 100644
--- a/recipes/clutter/clutter.inc
+++ b/recipes/clutter/clutter.inc
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qe
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 
-DEPENDS = "${STDDEPENDS} mesa"
+DEPENDS = "${STDDEPENDS} virtual/libgl"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
 
 DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
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 \