From 241ac6ad60e3add4230747faae95d4b5329cab87 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 26 Jan 2007 12:32:03 +0000 Subject: mesa: update to 6.5.2 --- packages/mesa/Make-config.patch | 26 ------------- packages/mesa/mesa-6.0.1/.mtn2git_empty | 0 packages/mesa/mesa-6.0.1/Make-config.patch | 26 +++++++++++++ packages/mesa/mesa-6.0.1/mklib.patch | 22 +++++++++++ packages/mesa/mesa-6.5.2/.mtn2git_empty | 0 packages/mesa/mesa-6.5.2/mklib-rpath-link.patch | 23 ++++++++++++ packages/mesa/mesa_6.5.2.bb | 50 +++++++++++++++++++++++++ packages/mesa/mklib.patch | 22 ----------- 8 files changed, 121 insertions(+), 48 deletions(-) delete mode 100644 packages/mesa/Make-config.patch create mode 100644 packages/mesa/mesa-6.0.1/.mtn2git_empty create mode 100644 packages/mesa/mesa-6.0.1/Make-config.patch create mode 100644 packages/mesa/mesa-6.0.1/mklib.patch create mode 100644 packages/mesa/mesa-6.5.2/.mtn2git_empty create mode 100644 packages/mesa/mesa-6.5.2/mklib-rpath-link.patch create mode 100644 packages/mesa/mesa_6.5.2.bb delete mode 100644 packages/mesa/mklib.patch diff --git a/packages/mesa/Make-config.patch b/packages/mesa/Make-config.patch deleted file mode 100644 index cfe8890e3b..0000000000 --- a/packages/mesa/Make-config.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- mesa/Make-config.orig 2004-06-25 13:09:44.000000000 +0100 -+++ mesa/Make-config 2004-06-25 14:18:27.000000000 +0100 -@@ -643,16 +643,16 @@ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ -- "CC = gcc" \ -- "CXX = g++" \ -- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \ -- "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \ -+ "CC = $(CC)" \ -+ "CXX = $(CXX)" \ -+ "CFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS $(CFLAGS)" \ -+ "CXXFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE $(CXXFLAGS)" \ - "GLUT_CFLAGS = -fexceptions" \ -- "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ -+ "GL_LIB_DEPS = $(LDFLAGS) -lX11 -lXext -lm -lpthread" \ - "OSMESA_LIB_DEPS = -L$(TOP)/lib -lGL" \ - "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ -- "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ -- "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ -+ "GLUT_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \ -+ "GLW_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGL -lXt -lX11" \ - "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" - - linux-static: diff --git a/packages/mesa/mesa-6.0.1/.mtn2git_empty b/packages/mesa/mesa-6.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mesa/mesa-6.0.1/Make-config.patch b/packages/mesa/mesa-6.0.1/Make-config.patch new file mode 100644 index 0000000000..cfe8890e3b --- /dev/null +++ b/packages/mesa/mesa-6.0.1/Make-config.patch @@ -0,0 +1,26 @@ +--- mesa/Make-config.orig 2004-06-25 13:09:44.000000000 +0100 ++++ mesa/Make-config 2004-06-25 14:18:27.000000000 +0100 +@@ -643,16 +643,16 @@ + "GLUT_LIB = libglut.so" \ + "GLW_LIB = libGLw.so" \ + "OSMESA_LIB = libOSMesa.so" \ +- "CC = gcc" \ +- "CXX = g++" \ +- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \ +- "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \ ++ "CC = $(CC)" \ ++ "CXX = $(CXX)" \ ++ "CFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS $(CFLAGS)" \ ++ "CXXFLAGS = -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE $(CXXFLAGS)" \ + "GLUT_CFLAGS = -fexceptions" \ +- "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ ++ "GL_LIB_DEPS = $(LDFLAGS) -lX11 -lXext -lm -lpthread" \ + "OSMESA_LIB_DEPS = -L$(TOP)/lib -lGL" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ +- "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ +- "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ ++ "GLUT_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm" \ ++ "GLW_LIB_DEPS = $(LDFLAGS) -L$(TOP)/lib -lGL -lXt -lX11" \ + "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" + + linux-static: diff --git a/packages/mesa/mesa-6.0.1/mklib.patch b/packages/mesa/mesa-6.0.1/mklib.patch new file mode 100644 index 0000000000..7dc1ec76a7 --- /dev/null +++ b/packages/mesa/mesa-6.0.1/mklib.patch @@ -0,0 +1,22 @@ +--- mesa/bin/mklib.old 2004-06-25 14:08:41.000000000 +0100 ++++ mesa/bin/mklib 2004-06-25 14:23:09.000000000 +0100 +@@ -64,6 +64,7 @@ + '-install') shift 1; INSTALLDIR=$1;; + '-arch') shift 1; ARCH=$1;; + '-archopt') shift 1; ARCHOPT=$1;; ++ -Wl*) DEPS="$DEPS $1";; + -*) echo "mklib: Unknown option: " $1 ; exit 1;; + *) break + esac +@@ -137,9 +138,9 @@ + echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION} + + if [ $CPLUSPLUS = 1 ] ; then +- LINK="g++" ++ LINK="$CXX" + else +- LINK="gcc" ++ LINK="$CC" + fi + + # rm any old libs diff --git a/packages/mesa/mesa-6.5.2/.mtn2git_empty b/packages/mesa/mesa-6.5.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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 index 0000000000..e59513abfe --- /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 index 0000000000..5cbc2bbc56 --- /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}/ +} diff --git a/packages/mesa/mklib.patch b/packages/mesa/mklib.patch deleted file mode 100644 index 7dc1ec76a7..0000000000 --- a/packages/mesa/mklib.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mesa/bin/mklib.old 2004-06-25 14:08:41.000000000 +0100 -+++ mesa/bin/mklib 2004-06-25 14:23:09.000000000 +0100 -@@ -64,6 +64,7 @@ - '-install') shift 1; INSTALLDIR=$1;; - '-arch') shift 1; ARCH=$1;; - '-archopt') shift 1; ARCHOPT=$1;; -+ -Wl*) DEPS="$DEPS $1";; - -*) echo "mklib: Unknown option: " $1 ; exit 1;; - *) break - esac -@@ -137,9 +138,9 @@ - echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION} - - if [ $CPLUSPLUS = 1 ] ; then -- LINK="g++" -+ LINK="$CXX" - else -- LINK="gcc" -+ LINK="$CC" - fi - - # rm any old libs -- cgit v1.2.3