diff options
author | Martin.Jansa <Martin.Jansa@gmail.com> | 2009-10-16 21:48:14 +0000 |
---|---|---|
committer | Klaus Kurzmann <mok@fluxnetz.de> | 2009-10-17 08:25:09 +0200 |
commit | a728ea6600dae1889572bbea0db516ed4184b421 (patch) | |
tree | 3029731f7106e307d4a04e870e7f08b1a9db73d2 | |
parent | 85fc8ff5f21fa47e196f281662e7378bf93d670d (diff) | |
download | openembedded-a728ea6600dae1889572bbea0db516ed4184b421.tar.gz |
shr/merge: replace mesa by virtual/libgl
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
-rw-r--r-- | recipes/opencv/artoolkit_2.72.1.bb | 4 | ||||
-rw-r--r-- | recipes/qt/qt-x11-free_3.3.6.bb | 4 | ||||
-rw-r--r-- | recipes/qt/qt-x11-free_3.3.7.bb | 4 | ||||
-rw-r--r-- | 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 2dfbc429bc..1863844c9e 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 719215c5d2..f5ff6b0cdd 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 7e430c8024..e218073cce 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 33a7075799..b031238da3 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 |