1 files changed, 46 insertions, 2 deletions

diff --git a/meta/packages/mesa/mesa_7.0.2.bb b/meta/packages/mesa/mesa_7.0.2.bb
index 3eb1fbef8b..a6cbef07d4 100644
--- a/meta/packages/mesa/mesa_7.0.2.bb
+++ b/meta/packages/mesa/mesa_7.0.2.bb
@@ -1,6 +1,50 @@
-include mesa-mesa.inc
+# Note: we don't require mesa-common.inc since going forward mesa will
+# be autotool based.
 
-SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
+           file://mklib-rpath-link.patch;patch=1 \
+           file://fix-host-compile.patch;patch=1 "
+S = "${WORKDIR}/Mesa-${PV}"
 
+DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
 
+PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+
+FILES_libgl = "${libdir}/libGL.so.*"
+FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
+FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+do_configure() {
+        cd configs
+
+        cp linux current
+        sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+        sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+        sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+        sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+        sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+        sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+        sed -i s:\$\(CC\):gcc:g  ../src/mesa/x86/Makefile
+        echo "SRC_DIRS = mesa glu glut/glx" >> current
+}
+
+do_compile() {
+        oe_runmake default
+}
+
+do_install() {
+        install -d ${D}${libdir}
+        cp -pP lib/* ${D}${libdir}/
+        install -d ${D}${includedir}
+        cp -R include/GL ${D}${includedir}/
+}
+
+do_stage() {
+        cp -pP lib/* ${STAGING_LIBDIR}/
+        cp -R include/GL ${STAGING_INCDIR}/
+}