mesa: update to 6.5.2

diff --git a/packages/mesa/mesa-6.0.1/.mtn2git_empty b/packages/mesa/mesa-6.0.1/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mesa/Make-config.patch b/packages/mesa/mesa-6.0.1/Make-config.patch
similarity index 100%
rename from packages/mesa/Make-config.patch
rename to packages/mesa/mesa-6.0.1/Make-config.patch

diff --git a/packages/mesa/mklib.patch b/packages/mesa/mesa-6.0.1/mklib.patch
similarity index 100%
rename from packages/mesa/mklib.patch
rename to packages/mesa/mesa-6.0.1/mklib.patch

diff --git a/packages/mesa/mesa-6.5.2/.mtn2git_empty b/packages/mesa/mesa-6.5.2/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch
new file mode 100644 (file)
index 0000000..e59513a
--- /dev/null
+++ b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch
@@ -0,0 +1,23 @@
+--- Mesa/bin/mklib.orig        2006-06-04 20:56:22.000000000 -0600
++++ Mesa/bin/mklib     2006-06-04 20:57:04.000000000 -0600
+@@ -98,6 +98,9 @@
+       -L*)
+           DEPS="$DEPS $1"
+           ;;
++      -Wl*)
++          DEPS="$DEPS $1"
++          ;;
+       '-cplusplus')
+           CPLUSPLUS=1
+           ;;
+--- Mesa-6.5.2/configs/default.old     2007-01-26 11:49:32.000000000 +0000
++++ Mesa-6.5.2/configs/default 2007-01-26 11:49:49.000000000 +0000
+@@ -73,7 +73,7 @@
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+ 
+ 
+ 

diff --git a/packages/mesa/mesa_6.5.2.bb b/packages/mesa/mesa_6.5.2.bb
new file mode 100644 (file)
index 0000000..5cbc2bb
--- /dev/null
+++ b/packages/mesa/mesa_6.5.2.bb
@@ -0,0 +1,50 @@
+SECTION = "x11"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
+       file://mklib-rpath-link.patch;patch=1"
+S = "${WORKDIR}/Mesa-${PV}"
+
+LICENSE = "LGPL"
+
+RDEPENDS = "expat"
+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
+
+       ln -sf 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}/
+}