summaryrefslogtreecommitdiff
path: root/recipes/mesa
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-06-22 13:58:08 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-06-25 15:03:19 +0200
commit63014f14897d7ed06c8a5371fbbc2dfe71847c04 (patch)
tree78806296ef6e0e8c837bfe5d2d501b899289b694 /recipes/mesa
parent371343e2ccc38648bbcc35599b48d12e98d3a7cc (diff)
mesa: remove old 6.0 and 6.4 recipes which are not using any include file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Henning Heinold <heinold@inf.fu-berlin.de> Acked-by: Graeme Gregory <dp@xora.org.uk>
Diffstat (limited to 'recipes/mesa')
-rw-r--r--recipes/mesa/mesa-6.0.1/Make-config.patch26
-rw-r--r--recipes/mesa/mesa-6.0.1/mklib.patch22
-rw-r--r--recipes/mesa/mesa_6.0.1.bb29
-rw-r--r--recipes/mesa/mesa_6.4.1+cvs20060101.bb48
4 files changed, 0 insertions, 125 deletions
diff --git a/recipes/mesa/mesa-6.0.1/Make-config.patch b/recipes/mesa/mesa-6.0.1/Make-config.patch
deleted file mode 100644
index cfe8890e3b..0000000000
--- a/recipes/mesa/mesa-6.0.1/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/recipes/mesa/mesa-6.0.1/mklib.patch b/recipes/mesa/mesa-6.0.1/mklib.patch
deleted file mode 100644
index 7dc1ec76a7..0000000000
--- a/recipes/mesa/mesa-6.0.1/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
diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb
deleted file mode 100644
index 3b37b8fd11..0000000000
--- a/recipes/mesa/mesa_6.0.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SECTION = "unknown"
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
- file://Make-config.patch \
- file://mklib.patch"
-S = "${WORKDIR}/Mesa-${PV}"
-PE = "2"
-LICENSE = "LGPL"
-# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
-CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
-DEPENDS = "makedepend-native"
-
-do_compile() {
- oe_runmake linux CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
-}
-
-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}/
-}
-
-SRC_URI[md5sum] = "b7f14088c5c2f14490d2739a91102112"
-SRC_URI[sha256sum] = "2de039f7abe10569b681ea1d9e21fb65fd0081c8f4db40fb62b332acb11679fb"
diff --git a/recipes/mesa/mesa_6.4.1+cvs20060101.bb b/recipes/mesa/mesa_6.4.1+cvs20060101.bb
deleted file mode 100644
index 9fceca1648..0000000000
--- a/recipes/mesa/mesa_6.4.1+cvs20060101.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-SECTION = "unknown"
-
-SRCDATE = "20060101"
-PV = "6.4.1+cvs${SRCDATE}"
-PE = "2"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \
- file://mklib-rpath-link.patch"
-S = "${WORKDIR}/Mesa"
-
-LICENSE = "LGPL"
-
-RDEPENDS_${PN} = "expat"
-DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
-
-# gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
-CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
-
-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}/
-}