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

[git version control]

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

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Thu Oct 15 21:32:34 2009 +0000

shr/merge: replace mesa depencies by virtual/libgl

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

---

 recipes/xorg-app/xdriinfo_1.0.1.bb             |    2 +-
 recipes/xorg-app/xdriinfo_1.0.2.bb             |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb |    2 +-
 recipes/xorg-xserver/xserver-xorg_1.7.0.bb     |    2 +-
 recipes/xscreensaver/xscreensaver.inc          |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes/xorg-app/xdriinfo_1.0.1.bb b/recipes/xorg-app/xdriinfo_1.0.1.bb
index 42541cd..7198a79 100644
--- a/recipes/xorg-app/xdriinfo_1.0.1.bb
+++ b/recipes/xorg-app/xdriinfo_1.0.1.bb
@@ -1,5 +1,5 @@
 require xorg-app-common.inc
 PE = "1"
 
-DEPENDS += " virtual/libx11 glproto mesa"
+DEPENDS += " virtual/libx11 glproto virtual/libgl"
 
diff --git a/recipes/xorg-app/xdriinfo_1.0.2.bb b/recipes/xorg-app/xdriinfo_1.0.2.bb
index 3d1c9e9..b995e91 100644
--- a/recipes/xorg-app/xdriinfo_1.0.2.bb
+++ b/recipes/xorg-app/xdriinfo_1.0.2.bb
@@ -1,4 +1,4 @@
 require xorg-app-common.inc
 DESCRIPTION = "query configuration information of DRI drivers"
-DEPENDS += " virtual/libx11 glproto mesa"
+DEPENDS += " virtual/libx11 glproto virtual/libgl"
 PE = "1"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb b/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
index 5095a0b..8f72741 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
@@ -1,7 +1,7 @@
 require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "r1"
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb b/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
index 5095a0b..8f72741 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
@@ -1,7 +1,7 @@
 require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
 PR = "r1"
 
diff --git a/recipes/xscreensaver/xscreensaver.inc b/recipes/xscreensaver/xscreensaver.inc
index 5f8cdc0..628f120 100644
--- a/recipes/xscreensaver/xscreensaver.inc
+++ b/recipes/xscreensaver/xscreensaver.inc
@@ -6,7 +6,7 @@ DESCRIPTION = "*The* screensaver package for X11"
 HOMEPAGE = "http://www.jwz.org/xscreensaver/"
 SECTION = "x11-misc"
 LICENSE = "BSD"
-DEPENDS = "intltool mesa freeglut virtual/libx11 gtk+ libxml2 libglade"
+DEPENDS = "intltool virtual/libgl freeglut virtual/libx11 gtk+ libxml2 libglade"
 
 # xscreensaver-demo is a glade app
 LDFLAGS_append = " -Wl,--export-dynamic"