Skip to contentSkip to conversation

recipes/mesa cleanup

PATCH In review Martin Jansa 8 participants 20 messages Jun 25, 2010 – Jun 28, 2010

lore
Share & tools
lore
#0 lore raw

Hi,

i know the rules about removing old versions, but in this dir there were versions really old and I'm pretty sure they cant be even built with current OE (I tried in few cases and then refused to spend whole day just to confirm that some 6.0 version still builds after converting to new staging and cleanups..).

Please review/test.

FYI: all those patches are often rebased on top of oe.dev also here
http://gitorious.org/~jama/angstrom/jama-shr-experimental
if cherry-picking is more effective way for you to test

Regards,

#1 lore raw

PATCH 1/9 mesa: remove old 6.0 and 6.4 recipes which are not using any include file

---
 recipes/mesa/mesa-6.0.1/Make-config.patch |   26 ---------------
 recipes/mesa/mesa-6.0.1/mklib.patch       |   22 -------------
 recipes/mesa/mesa_6.0.1.bb                |   29 -----------------
 recipes/mesa/mesa_6.4.1+cvs20060101.bb    |   48 -----------------------------
 4 files changed, 0 insertions(+), 125 deletions(-)
 delete mode 100644 recipes/mesa/mesa-6.0.1/Make-config.patch
 delete mode 100644 recipes/mesa/mesa-6.0.1/mklib.patch
 delete mode 100644 recipes/mesa/mesa_6.0.1.bb
 delete mode 100644 recipes/mesa/mesa_6.4.1+cvs20060101.bb
recipes/mesa/mesa-6.0.1/Make-config.patch deleted +0 -26
deleted file mode 100644
index cfe8890..0000000
@@ -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:
recipes/mesa/mesa-6.0.1/mklib.patch deleted +0 -22
deleted file mode 100644
index 7dc1ec7..0000000
@@ -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
recipes/mesa/mesa_6.0.1.bb deleted +0 -29
deleted file mode 100644
index 3b37b8f..0000000
@@ -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"
recipes/mesa/mesa_6.4.1+cvs20060101.bb deleted +0 -48

48 lines not on this page · raw message

Signature · 1 line
1.7.0.2
Acked-by on v1 1/9
#2 lore raw

Re: [PATCH 1/9] mesa: remove old 6.0 and 6.4 recipes which are not using any include file

2010/6/25 Martin Jansa <[email protected]>:

Quoted 162 lines

---
 recipes/mesa/mesa-6.0.1/Make-config.patch |   26 --------------- recipes/mesa/mesa-6.0.1/mklib.patch       |   22 ------------- recipes/mesa/mesa_6.0.1.bb                |   29 ----------------- recipes/mesa/mesa_6.4.1+cvs20060101.bb    |   48 -----------------------------

 4 files changed, 0 insertions(+), 125 deletions(-)

 delete mode 100644 recipes/mesa/mesa-6.0.1/Make-config.patch delete mode 100644 recipes/mesa/mesa-6.0.1/mklib.patch delete mode 100644 recipes/mesa/mesa_6.0.1.bb delete mode 100644 recipes/mesa/mesa_6.4.1+cvs20060101.bb

recipes/mesa/mesa-6.0.1/Make-config.patch deleted +0 -26
deleted file mode 100644
index cfe8890..0000000
@@ -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:
recipes/mesa/mesa-6.0.1/mklib.patch deleted +0 -22
deleted file mode 100644
index 7dc1ec7..0000000
@@ -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
recipes/mesa/mesa_6.0.1.bb deleted +0 -29
deleted file mode 100644
index 3b37b8f..0000000
@@ -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"
recipes/mesa/mesa_6.4.1+cvs20060101.bb deleted +0 -49
deleted file mode 100644
index 9fceca1..0000000
@@ -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}/
-}
--
Quoted 2 lines

1.7.0.2

#3 lore raw

Re: [PATCH 1/9] mesa: remove old 6.0 and 6.4 recipes which are not using any include file

Dnia sobota, 26 czerwca 2010 o 10:32:28 Frans Meulenbroeks napisał(a):

Quoted 1 line

2010/6/25 Martin Jansa <[email protected]>:

[ very long diff cut ]

Quoted 1 line

Can people cut mail contents when reply? Whole mail needs to be scrolled just to see "Acked"...

And it is not only Frans :(

Regards,

Signature · 3 lines
JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
#4 lore raw

Re: [PATCH 1/9] mesa: remove old 6.0 and 6.4 recipes which are not using any include file

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

And if cutting is too hard, there's always the option to top post :)

Quoted 5 lines · Marcin Juszkiewicz

Dnia sobota, 26 czerwca 2010 o 10:32:28 Frans Meulenbroeks napisał(a):

Quoted 1 line

2010/6/25 Martin Jansa <[email protected]>:

[ very long diff cut ]

Quoted 8 lines
Quoted 1 line

Can people cut mail contents when reply? Whole mail needs to be scrolled just to see "Acked"...

And it is not only Frans :(

Regards,

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMKIpZMkyGM64RGpERAngkAKCzTkI2ydJow1QqdE3wTVmZaSJ4aQCeMzBC eyls6sQw/ffntMdR8hb0Tl0=
=jbeZ
-----END PGP SIGNATURE-----

#5 lore raw

Re: [PATCH 1/9] mesa: remove old 6.0 and 6.4 recipes which are not using any include file

Am 28.06.2010 um 13:41 schrieb Koen Kooi:

Quoted 1 line

And if cutting is too hard, there's always the option to top post :)

Agreed. In that case I think top-posting is perfectly acceptable.

Cheers,

:M:

#6 lore raw

PATCH 2/9 preferred-om-2008-versions: remove pinned version of mesa/mesa-dri

In reply to Martin Jansa
---
 conf/distro/include/preferred-om-2008-versions.inc |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
conf/distro/include/preferred-om-2008-versions.inc +0 -2
index 3020fe9..79dde2e 100644
@@ -1196,8 +1196,6 @@ PREFERRED_VERSION_mdev ?= "1.2.1"
 PREFERRED_VERSION_mdk2 ?= "v33"
 PREFERRED_VERSION_memedit ?= "0.7"
 PREFERRED_VERSION_memtester ?= "4.0.6"
-PREFERRED_VERSION_mesa ?= "6.5.2"
-PREFERRED_VERSION_mesa-dri ?= "6.5.2"
 PREFERRED_VERSION_meta-e-x11 ?= "1.0"
 PREFERRED_VERSION_meta-e-x11-core ?= "1.0"
 PREFERRED_VERSION_meta-gpe ?= "1.0"
Signature · 1 line
1.7.0.2
#7 lore raw

PATCH 3/9 mesa: remove old releases 6.5.2, 7.0.2 using mesa-mesa.inc

In reply to Martin Jansa
---
 recipes/mesa/mesa-6.5.2/fix-host-compile.patch     |   30 ---------
 recipes/mesa/mesa-6.5.2/mklib-rpath-link.patch     |   23 -------
 recipes/mesa/mesa-7.0.2/fix-host-compile.patch     |   30 ---------
 recipes/mesa/mesa-7.0.2/mklib-rpath-link.patch     |   23 -------
 .../mesa/mesa-full-7.0.2/fix-host-compile.patch    |   30 ---------
 .../mesa/mesa-full-7.0.2/fix-progs-makefile.patch  |   65 --------------------
 .../mesa/mesa-full-7.0.2/mklib-rpath-link.patch    |   23 -------
 recipes/mesa/mesa-full_7.0.2.bb                    |   27 --------
 recipes/mesa/mesa-mesa.inc                         |   41 ------------
 recipes/mesa/mesa_6.5.2.bb                         |    8 ---
 recipes/mesa/mesa_7.0.2.bb                         |    8 ---
 11 files changed, 0 insertions(+), 308 deletions(-)
 delete mode 100644 recipes/mesa/mesa-6.5.2/fix-host-compile.patch
 delete mode 100644 recipes/mesa/mesa-6.5.2/mklib-rpath-link.patch
 delete mode 100644 recipes/mesa/mesa-7.0.2/fix-host-compile.patch
 delete mode 100644 recipes/mesa/mesa-7.0.2/mklib-rpath-link.patch
 delete mode 100644 recipes/mesa/mesa-full-7.0.2/fix-host-compile.patch
 delete mode 100644 recipes/mesa/mesa-full-7.0.2/fix-progs-makefile.patch
 delete mode 100644 recipes/mesa/mesa-full-7.0.2/mklib-rpath-link.patch
 delete mode 100644 recipes/mesa/mesa-full_7.0.2.bb
 delete mode 100644 recipes/mesa/mesa-mesa.inc
 delete mode 100644 recipes/mesa/mesa_6.5.2.bb
 delete mode 100644 recipes/mesa/mesa_7.0.2.bb
recipes/mesa/mesa-6.5.2/fix-host-compile.patch deleted +0 -30
deleted file mode 100644
index d24d03d..0000000
@@ -1,30 +0,0 @@
---- /src/mesa/x86/orig-Makefile	2005-07-01 04:54:38.000000000 +0300
-+++ /src/mesa/x86/Makefile	2007-06-07 21:52:31.000000000 +0300
-@@ -5,6 +5,7 @@
- 
- 
- INCLUDE_DIRS = \
-+        -I/usr/include \
- 	-I$(TOP)/include/GL \
- 	-I$(TOP)/include \
- 	-I.. \
-@@ -13,6 +14,10 @@
- 	-I../glapi \
- 	-I../tnl
- 
-+OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
-+
-+CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \
-+        $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
- 
- default: gen_matypes matypes.h
- 
-@@ -21,7 +26,7 @@
- 
- 
- gen_matypes: gen_matypes.c
--	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-+	$(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes
- 
- # need some special rules here, unfortunately
- matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
recipes/mesa/mesa-6.5.2/mklib-rpath-link.patch deleted +0 -23
deleted file mode 100644
index e59513a..0000000
@@ -1,23 +0,0 @@
---- 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
- 
- 
- 
recipes/mesa/mesa-7.0.2/fix-host-compile.patch deleted +0 -30
deleted file mode 100644
index d24d03d..0000000
@@ -1,30 +0,0 @@
---- /src/mesa/x86/orig-Makefile	2005-07-01 04:54:38.000000000 +0300
-+++ /src/mesa/x86/Makefile	2007-06-07 21:52:31.000000000 +0300
-@@ -5,6 +5,7 @@
- 
- 
- INCLUDE_DIRS = \
-+        -I/usr/include \
- 	-I$(TOP)/include/GL \
- 	-I$(TOP)/include \
- 	-I.. \
-@@ -13,6 +14,10 @@
- 	-I../glapi \
- 	-I../tnl
- 
-+OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
-+
-+CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \
-+        $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
- 
- default: gen_matypes matypes.h
- 
-@@ -21,7 +26,7 @@
- 
- 
- gen_matypes: gen_matypes.c
--	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-+	$(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes
- 
- # need some special rules here, unfortunately
- matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
recipes/mesa/mesa-7.0.2/mklib-rpath-link.patch deleted +0 -23
deleted file mode 100644
index 618f5b5..0000000
@@ -1,23 +0,0 @@
---- /tmp/mklib	2007-12-08 11:03:23.000000000 +0100
-+++ Mesa-7.0.2/bin/mklib	2007-12-08 11:04:02.509863000 +0100
-@@ -106,6 +106,9 @@
- 	-L*)
- 	    DEPS="$DEPS $1"
- 	    ;;
-+        -Wl*)
-+            DEPS="$DEPS $1"
-+            ;;
- 	-pthread)
- 	    # this is a special case (see bugzilla 10876)
- 	    DEPS="$DEPS $1"
---- /tmp/default	2007-12-08 11:04:17.000000000 +0100
-+++ Mesa-7.0.2/configs/default	2007-12-08 11:05:06.279863000 +0100
-@@ -76,7 +76,7 @@
- GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
- 
- # Program dependencies - specific GL/glut libraries added in Makefiles
--APP_LIB_DEPS = -lm
-+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm
- 
- 
- 
recipes/mesa/mesa-full-7.0.2/fix-host-compile.patch deleted +0 -30
deleted file mode 100644
index d24d03d..0000000
@@ -1,30 +0,0 @@
---- /src/mesa/x86/orig-Makefile	2005-07-01 04:54:38.000000000 +0300
-+++ /src/mesa/x86/Makefile	2007-06-07 21:52:31.000000000 +0300
-@@ -5,6 +5,7 @@
- 
- 
- INCLUDE_DIRS = \
-+        -I/usr/include \
- 	-I$(TOP)/include/GL \
- 	-I$(TOP)/include \
- 	-I.. \
-@@ -13,6 +14,10 @@
- 	-I../glapi \
- 	-I../tnl
- 
-+OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
-+
-+CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \
-+        $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
- 
- default: gen_matypes matypes.h
- 
-@@ -21,7 +26,7 @@
- 
- 
- gen_matypes: gen_matypes.c
--	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-+	$(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes
- 
- # need some special rules here, unfortunately
- matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
recipes/mesa/mesa-full-7.0.2/fix-progs-makefile.patch deleted +0 -65

65 lines not on this page · raw message

recipes/mesa/mesa-full-7.0.2/mklib-rpath-link.patch deleted +0 -23
deleted file mode 100644
index 618f5b5..0000000
@@ -1,23 +0,0 @@
---- /tmp/mklib	2007-12-08 11:03:23.000000000 +0100
-+++ Mesa-7.0.2/bin/mklib	2007-12-08 11:04:02.509863000 +0100
-@@ -106,6 +106,9 @@
- 	-L*)
- 	    DEPS="$DEPS $1"
- 	    ;;
-+        -Wl*)
-+            DEPS="$DEPS $1"
-+            ;;
- 	-pthread)
- 	    # this is a special case (see bugzilla 10876)
- 	    DEPS="$DEPS $1"
---- /tmp/default	2007-12-08 11:04:17.000000000 +0100
-+++ Mesa-7.0.2/configs/default	2007-12-08 11:05:06.279863000 +0100
-@@ -76,7 +76,7 @@
- GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
- 
- # Program dependencies - specific GL/glut libraries added in Makefiles
--APP_LIB_DEPS = -lm
-+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm
- 
- 
- 
recipes/mesa/mesa-full_7.0.2.bb deleted +0 -27
deleted file mode 100644
index 2f98eed..0000000
@@ -1,27 +0,0 @@
-include mesa-mesa.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
-        ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2;name=glut \
-        ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos \
-        file://mklib-rpath-link.patch \
-        file://fix-host-compile.patch \
-        file://fix-progs-makefile.patch \
-        "
-
-do_install_append = "install -d ${D}${bindir}; \
-                     for f in glxgears glxheads glxdemo glxinfo; do \
-                     cp progs/xdemos/${f} ${D}${bindir}; \
-                     done"
-
-PACKAGES =+ "libglut libglut-dev mesa-utils"
-
-FILES_libglut = "${libdir}/libglut.so.*"
-FILES_libglut-dev = "${libdir}/libglut.* ${includedir}/GL/glut*"
-FILES_mesa-utils = "${bindir}/*"
-
-SRC_URI[archive.md5sum] = "93e6ed7924ff069a4f883b4fce5349dc"
-SRC_URI[archive.sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e"
-SRC_URI[glut.md5sum] = "3a33f8efc8c58a592a854cfc7a643286"
-SRC_URI[glut.sha256sum] = "fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c"
-SRC_URI[demos.md5sum] = "11a10410bae7be85cf25bc7119966468"
-SRC_URI[demos.sha256sum] = "ce39b26085acd8e5dffa8233618acac2605cc42203bc4f81c6e4504265f0ffaa"
recipes/mesa/mesa-mesa.inc deleted +0 -41

41 lines not on this page · raw message

recipes/mesa/mesa_6.5.2.bb deleted +0 -8
deleted file mode 100644
index 8573ce3..0000000
@@ -1,8 +0,0 @@
-include mesa-mesa.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI_append = " file://fix-host-compile.patch "
-
-SRC_URI[md5sum] = "e4d894181f1859651658b3704633e10d"
-SRC_URI[sha256sum] = "137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f"
recipes/mesa/mesa_7.0.2.bb deleted +0 -8
deleted file mode 100644
index 96dd966..0000000
@@ -1,8 +0,0 @@
-include mesa-mesa.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI_append = " file://fix-host-compile.patch "
-
-SRC_URI[md5sum] = "93e6ed7924ff069a4f883b4fce5349dc"
-SRC_URI[sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e"
Signature · 1 line
1.7.0.2
#8 lore raw

PATCH 4/9 mesa-dri: remove old 7.0.3 and 6.5.2 relase using mesa-common-old.inc

In reply to Martin Jansa
---
 recipes/mesa/files/fix-progs-makefile.patch |   81 ---------------------------
 recipes/mesa/files/mklib-cross.patch        |   14 -----
 recipes/mesa/files/mklib-rpath-link.patch   |   20 -------
 recipes/mesa/mesa-common-old.inc            |   15 -----
 recipes/mesa/mesa-dri_6.5.2.bb              |   44 --------------
 recipes/mesa/mesa-dri_7.0.3.bb              |   45 ---------------
 6 files changed, 0 insertions(+), 219 deletions(-)
 delete mode 100644 recipes/mesa/files/fix-progs-makefile.patch
 delete mode 100644 recipes/mesa/files/mklib-cross.patch
 delete mode 100644 recipes/mesa/files/mklib-rpath-link.patch
 delete mode 100644 recipes/mesa/mesa-common-old.inc
 delete mode 100644 recipes/mesa/mesa-dri_6.5.2.bb
 delete mode 100644 recipes/mesa/mesa-dri_7.0.3.bb
recipes/mesa/files/fix-progs-makefile.patch deleted +0 -81
deleted file mode 100644
index f0a8293..0000000
@@ -1,81 +0,0 @@
-From e03daf13a562414f07230c17998edd39564b5f1b Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Thu, 4 Mar 2010 14:16:27 +0100
-Subject: [PATCH] fix libs
-
----
- progs/demos/Makefile   |    2 +-
- progs/glsl/Makefile    |    2 +-
- progs/redbook/Makefile |    2 +-
- progs/samples/Makefile |    2 +-
- progs/xdemos/Makefile  |    2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/progs/demos/Makefile b/progs/demos/Makefile
-index 5b1d2a0..121b862 100644
---- a/progs/demos/Makefile
-+++ b/progs/demos/Makefile
-@@ -8,7 +8,7 @@ INCDIR = $(TOP)/include
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
- 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
- 
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ \
- 	$(APP_LIB_DEPS)
- 
- PROGS = \
-diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
-index 3b5a595..836c4ac 100644
---- a/progs/glsl/Makefile
-+++ b/progs/glsl/Makefile
-@@ -10,7 +10,7 @@ LIB_DEP = \
- 	$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
- 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
- 
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -lstdc++ \
- 	-l$(GL_LIB) $(APP_LIB_DEPS)
- 
- # using : to avoid APP_CC pointing to CC loop
-diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile
-index b41e488..95ed746 100644
---- a/progs/redbook/Makefile
-+++ b/progs/redbook/Makefile
-@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
- 
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
- 
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
- 
- PROGS = aaindex \
- 	aapoly \
-diff --git a/progs/samples/Makefile b/progs/samples/Makefile
-index 64fa47a..9f72c8b 100644
---- a/progs/samples/Makefile
-+++ b/progs/samples/Makefile
-@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
- 
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
- 
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
- 
- PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
- 	font line logo nurb olympic overlay point prim rgbtoppm quad select \
-diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
-index f866a32..c0f4e06 100644
---- a/progs/xdemos/Makefile
-+++ b/progs/xdemos/Makefile
-@@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
- # Add X11 and pthread libs to satisfy GNU gold.
- APP_LIB_DEPS += -lX11 -lpthread
- 
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
- 
- PROGS = \
- 	corender \
--- 
-1.7.0
-
recipes/mesa/files/mklib-cross.patch deleted +0 -14
deleted file mode 100644
index fbe86e3..0000000
@@ -1,14 +0,0 @@
---- s/bin/mklib~	2008-02-19 15:30:18.000000000 +0000
-+++ s/bin/mklib	2008-07-27 11:15:25.000000000 +0100
-@@ -204,9 +204,9 @@
- 	if [ "x$LINK" = "x" ] ; then
- 	    # -linker was not specified so set default link command now
-             if [ $CPLUSPLUS = 1 ] ; then
--                LINK=g++
-+                LINK=$CXX
-             else
--                LINK=gcc
-+                LINK=$CC
-             fi
- 	fi
- 
recipes/mesa/files/mklib-rpath-link.patch deleted +0 -20
deleted file mode 100644
index 07361f5..0000000
@@ -1,20 +0,0 @@
---- 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/configs/default.orig	2006-06-04 21:01:47.000000000 -0600
-+++ Mesa/configs/default	2006-06-04 21:01:16.000000000 -0600
-@@ -71,4 +71,4 @@
- GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
- GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
- GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
--APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-+APP_LIB_DEPS = -L$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
recipes/mesa/mesa-common-old.inc deleted +0 -15
deleted file mode 100644
index 01f0adc..0000000
@@ -1,15 +0,0 @@
-SECTION = "x11"
-PE = "2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-	file://mklib-rpath-link.patch"
-
-S = "${WORKDIR}/Mesa-${PV}"
-
-PROVIDES = "virtual/libgl"
-
-LICENSE = "LGPL"
-
-INC_PR = "r3"
-
-DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
recipes/mesa/mesa-dri_6.5.2.bb deleted +0 -44

44 lines not on this page · raw message

recipes/mesa/mesa-dri_7.0.3.bb deleted +0 -45

45 lines not on this page · raw message

Signature · 1 line
1.7.0.2
Acked-by on v1 4/9
#9 lore raw

Re: [PATCH 4/9] mesa-dri: remove old 7.0.3 and 6.5.2 relase using mesa-common-old.inc

2010/6/25 Martin Jansa <[email protected]>:

Quoted 272 lines

---
 recipes/mesa/files/fix-progs-makefile.patch |   81 --------------------------- recipes/mesa/files/mklib-cross.patch        |   14 ----- recipes/mesa/files/mklib-rpath-link.patch   |   20 ------- recipes/mesa/mesa-common-old.inc            |   15 ----- recipes/mesa/mesa-dri_6.5.2.bb              |   44 -------------- recipes/mesa/mesa-dri_7.0.3.bb              |   45 ---------------

 6 files changed, 0 insertions(+), 219 deletions(-)

 delete mode 100644 recipes/mesa/files/fix-progs-makefile.patch delete mode 100644 recipes/mesa/files/mklib-cross.patch delete mode 100644 recipes/mesa/files/mklib-rpath-link.patch delete mode 100644 recipes/mesa/mesa-common-old.inc delete mode 100644 recipes/mesa/mesa-dri_6.5.2.bb delete mode 100644 recipes/mesa/mesa-dri_7.0.3.bb

recipes/mesa/files/fix-progs-makefile.patch deleted +0 -81
deleted file mode 100644
index f0a8293..0000000
@@ -1,81 +0,0 @@
-From e03daf13a562414f07230c17998edd39564b5f1b Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Thu, 4 Mar 2010 14:16:27 +0100
-Subject: [PATCH] fix libs
-
----
- progs/demos/Makefile   |    2 +-
- progs/glsl/Makefile    |    2 +-
- progs/redbook/Makefile |    2 +-
- progs/samples/Makefile |    2 +-
- progs/xdemos/Makefile  |    2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/progs/demos/Makefile b/progs/demos/Makefile
-index 5b1d2a0..121b862 100644
---- a/progs/demos/Makefile
-+++ b/progs/demos/Makefile
-@@ -8,7 +8,7 @@ INCDIR = $(TOP)/include
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
-       $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ \
-       $(APP_LIB_DEPS)
-
- PROGS = \
-diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
-index 3b5a595..836c4ac 100644
---- a/progs/glsl/Makefile
-+++ b/progs/glsl/Makefile
-@@ -10,7 +10,7 @@ LIB_DEP = \
-       $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
-       $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -lstdc++ \
-       -l$(GL_LIB) $(APP_LIB_DEPS)
-
- # using : to avoid APP_CC pointing to CC loop
-diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile
-index b41e488..95ed746 100644
---- a/progs/redbook/Makefile
-+++ b/progs/redbook/Makefile
-@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
-
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
-
- PROGS = aaindex \
-       aapoly \
-diff --git a/progs/samples/Makefile b/progs/samples/Makefile
-index 64fa47a..9f72c8b 100644
---- a/progs/samples/Makefile
-+++ b/progs/samples/Makefile
-@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
-
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
-
- PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-       font line logo nurb olympic overlay point prim rgbtoppm quad select \
-diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
-index f866a32..c0f4e06 100644
---- a/progs/xdemos/Makefile
-+++ b/progs/xdemos/Makefile
-@@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
- # Add X11 and pthread libs to satisfy GNU gold.
- APP_LIB_DEPS += -lX11 -lpthread
-
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lstdc++ $(APP_LIB_DEPS)
-
- PROGS = \
-       corender \
---
-1.7.0
-
recipes/mesa/files/mklib-cross.patch deleted +0 -14
deleted file mode 100644
index fbe86e3..0000000
@@ -1,14 +0,0 @@
---- s/bin/mklib~       2008-02-19 15:30:18.000000000 +0000
-+++ s/bin/mklib        2008-07-27 11:15:25.000000000 +0100
-@@ -204,9 +204,9 @@
-       if [ "x$LINK" = "x" ] ; then
-           # -linker was not specified so set default link command now
-             if [ $CPLUSPLUS = 1 ] ; then
--                LINK=g++
-+                LINK=$CXX
-             else
--                LINK=gcc
-+                LINK=$CC
-             fi
-       fi
-
recipes/mesa/files/mklib-rpath-link.patch deleted +0 -20
deleted file mode 100644
index 07361f5..0000000
@@ -1,20 +0,0 @@
---- 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/configs/default.orig  2006-06-04 21:01:47.000000000 -0600
-+++ Mesa/configs/default       2006-06-04 21:01:16.000000000 -0600
-@@ -71,4 +71,4 @@
- GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
- GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
- GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
--APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-+APP_LIB_DEPS = -L$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
recipes/mesa/mesa-common-old.inc deleted +0 -15
deleted file mode 100644
index 01f0adc..0000000
@@ -1,15 +0,0 @@
-SECTION = "x11"
-PE = "2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-       file://mklib-rpath-link.patch"
-
-S = "${WORKDIR}/Mesa-${PV}"
-
-PROVIDES = "virtual/libgl"
-
-LICENSE = "LGPL"
-
-INC_PR = "r3"
-
-DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
recipes/mesa/mesa-dri_6.5.2.bb deleted +0 -44
deleted file mode 100644
index d8f9506..0000000
@@ -1,44 +0,0 @@
-include mesa-common-old.inc
-
-SRC_URI += " file://mklib-cross.patch"
-
-FILESPATHPKG =. "mesa-${PV}:"
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-PR = "${INC_PR}.1"
-
-DEPENDS += "libdrm"
-# DRI is useless without the kernel drivers
-RRECOMMENDS_${PN} += " kernel-module-drm kernel-module-radeon "
-
-do_configure() {
-       cd configs
-
-       ln -sf linux-dri 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" >> current
-       echo "DRI_DRIVER_INSTALL_DIR = ${D}${libdir}/dri" >> current
-}
-
-do_install() {
-       oe_runmake -C src/mesa/drivers/dri install
-}
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug"
-
-python populate_packages_prepend () {
-        import re, os.path
-
-        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver', extra_depends='')
-}
-
-
-SRC_URI[md5sum] = "e4d894181f1859651658b3704633e10d"
-SRC_URI[sha256sum] = "137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f"
recipes/mesa/mesa-dri_7.0.3.bb deleted +0 -46
deleted file mode 100644
index dcf6fd3..0000000
@@ -1,45 +0,0 @@
-include mesa-common-old.inc
-
-# suppress mklib-rpath-link patch from mesa-common
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch"
-
-FILESPATHPKG =. "mesa-${PV}:"
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-PR = "${INC_PR}.1"
-
-DEPENDS += "libdrm"
-# DRI is useless without the kernel drivers
-RRECOMMENDS_${PN} += " kernel-module-drm kernel-module-radeon "
-
-do_configure() {
-       cd configs
-
-       ln -sf linux-dri 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" >> current
-       echo "DRI_DRIVER_INSTALL_DIR = ${D}${libdir}/dri" >> current
-}
-
-do_install() {
-       oe_runmake -C src/mesa/drivers/dri install
-}
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug"
-
-python populate_packages_prepend () {
-        import re, os.path
-
-        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver', extra_depends='')
-}
-
-
-SRC_URI[md5sum] = "e6e6379d7793af40a6bc3ce1bace572e"
-SRC_URI[sha256sum] = "ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22"
--
Quoted 2 lines

1.7.0.2

#10 lore raw

PATCH 5/9 mesa: remove 7.4 release, which is not pinned in any distro/include config

In reply to Martin Jansa
---
 recipes/mesa/mesa-dri_7.4.bb  |   27 ---------------------------
 recipes/mesa/mesa-xlib_7.4.bb |   24 ------------------------
 recipes/mesa/mesa_7.4.bb      |    2 --
 3 files changed, 0 insertions(+), 53 deletions(-)
 delete mode 100644 recipes/mesa/mesa-dri_7.4.bb
 delete mode 100644 recipes/mesa/mesa-xlib_7.4.bb
 delete mode 100644 recipes/mesa/mesa_7.4.bb
recipes/mesa/mesa-dri_7.4.bb deleted +0 -27
deleted file mode 100644
index a78c03f..0000000
@@ -1,27 +0,0 @@
-include mesa-common.inc
-
-PROTO_DEPS = "xf86driproto glproto dri2proto expat"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
-
-PR = "${INC_PR}.0"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-# ASUS EeePC 901 has DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_eee901 = "1"
-
-PACKAGES =+ "${PN}-xprogs"
-
-FILES_${PN} += "${libdir}/dri/*.so"
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
-
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-SRC_URI[archive.md5sum] = "7ecddb341a2691e0dfdb02f697109834"
-SRC_URI[archive.sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
-SRC_URI[demos.md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
-SRC_URI[demos.sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
recipes/mesa/mesa-xlib_7.4.bb deleted +0 -24
deleted file mode 100644
index 68e7218..0000000
@@ -1,24 +0,0 @@
-include mesa-common.inc
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
-
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF += "--with-driver=xlib"
-
-PACKAGES =+ "${PN}-xprogs"
-
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
-
-do_install_append () {
-    install -d ${D}/${bindir}
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
-}
-
-SRC_URI[archive.md5sum] = "7ecddb341a2691e0dfdb02f697109834"
-SRC_URI[archive.sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
-SRC_URI[demos.md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
-SRC_URI[demos.sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
recipes/mesa/mesa_7.4.bb deleted +0 -2
deleted file mode 100644
index 43cde67..0000000
@@ -1,2 +0,0 @@
-# This is a dummy package so OE can use the poky mesa files
-require mesa-dri_${PV}.bb
Signature · 1 line
1.7.0.2
Acked-by on v1 5/9
#11 lore raw

Re: [PATCH 5/9] mesa: remove 7.4 release, which is not pinned in any distro/include config

2010/6/25 Martin Jansa <[email protected]>:

Quoted 82 lines

---
 recipes/mesa/mesa-dri_7.4.bb  |   27 --------------------------- recipes/mesa/mesa-xlib_7.4.bb |   24 ------------------------ recipes/mesa/mesa_7.4.bb      |    2 --

 3 files changed, 0 insertions(+), 53 deletions(-)

 delete mode 100644 recipes/mesa/mesa-dri_7.4.bb
 delete mode 100644 recipes/mesa/mesa-xlib_7.4.bb
 delete mode 100644 recipes/mesa/mesa_7.4.bb

recipes/mesa/mesa-dri_7.4.bb deleted +0 -27
deleted file mode 100644
index a78c03f..0000000
@@ -1,27 +0,0 @@
-include mesa-common.inc
-
-PROTO_DEPS = "xf86driproto glproto dri2proto expat"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
-
-PR = "${INC_PR}.0"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-# ASUS EeePC 901 has DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_eee901 = "1"
-
-PACKAGES =+ "${PN}-xprogs"
-
-FILES_${PN} += "${libdir}/dri/*.so"
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
-
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-SRC_URI[archive.md5sum] = "7ecddb341a2691e0dfdb02f697109834"
-SRC_URI[archive.sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
-SRC_URI[demos.md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
-SRC_URI[demos.sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
recipes/mesa/mesa-xlib_7.4.bb deleted +0 -24
deleted file mode 100644
index 68e7218..0000000
@@ -1,24 +0,0 @@
-include mesa-common.inc
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
-
-DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
-
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF += "--with-driver=xlib"
-
-PACKAGES =+ "${PN}-xprogs"
-
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
-
-do_install_append () {
-    install -d ${D}/${bindir}
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
-}
-
-SRC_URI[archive.md5sum] = "7ecddb341a2691e0dfdb02f697109834"
-SRC_URI[archive.sha256sum] = "6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4"
-SRC_URI[demos.md5sum] = "02816f10f30b1dc5e069e0f68c177c98"
-SRC_URI[demos.sha256sum] = "c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897"
recipes/mesa/mesa_7.4.bb deleted +0 -3
deleted file mode 100644
index 43cde67..0000000
@@ -1,2 +0,0 @@
-# This is a dummy package so OE can use the poky mesa files
-require mesa-dri_${PV}.bb
--
Quoted 2 lines

1.7.0.2

#13 lore raw

Re: [PATCH 5/9] mesa: remove 7.4 release, which is not pinned in any distro/include config

Quoted 8 lines · Michael Smith
Quoted 6 lines

From: Frans Meulenbroeks <[email protected]>
To: [email protected]
Sent: 26.6.'10, 4:33

2010/6/25 Martin Jansa <[email protected]>:

Quoted 1 line

Nack here, I'm using 7.4.

7.4 also converted and readded, please test (I tried only if all patches apllies as before).

Regards,

Signature · 1 line
Jansa 'JaMa' Martin     jabber: [email protected]
#14 lore raw

PATCH 6/9 mesa: move 7.8 release to latest minor 7.8.2

In reply to Martin Jansa
---
 conf/distro/include/preferred-shr-versions.inc     |    1 -
 .../mesa/mesa-dri-7.8.1/fix-progs-makefile.patch   |   81 -
 recipes/mesa/mesa-dri-7.8.1/glamo.patch            | 2386 --------------------
 .../mesa/mesa-dri-7.8.2/fix-progs-makefile.patch   |   82 +
 recipes/mesa/mesa-dri-7.8.2/glamo.patch            | 2386 ++++++++++++++++++++
 recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch |   81 -
 recipes/mesa/mesa-dri-7.8/glamo.patch              | 2373 -------------------
 recipes/mesa/mesa-dri-glsl-native_7.8.2.bb         |   19 +
 recipes/mesa/mesa-dri-glsl-native_7.8.bb           |   20 -
 recipes/mesa/mesa-dri_7.8.1.bb                     |   43 -
 recipes/mesa/mesa-dri_7.8.2.bb                     |   43 +
 recipes/mesa/mesa-dri_7.8.bb                       |   41 -
 .../mesa/mesa-xlib-7.8.2/fix-progs-makefile.patch  |   81 +
 .../mesa/mesa-xlib-7.8/fix-progs-makefile.patch    |   81 -
 recipes/mesa/mesa-xlib_7.8.2.bb                    |   20 +
 recipes/mesa/mesa-xlib_7.8.bb                      |   20 -
 recipes/mesa/mesa_7.8.2.bb                         |    8 +
 recipes/mesa/mesa_7.8.bb                           |    8 -
 18 files changed, 2639 insertions(+), 5135 deletions(-)
 delete mode 100644 recipes/mesa/mesa-dri-7.8.1/fix-progs-makefile.patch
 delete mode 100644 recipes/mesa/mesa-dri-7.8.1/glamo.patch
 create mode 100644 recipes/mesa/mesa-dri-7.8.2/fix-progs-makefile.patch
 create mode 100644 recipes/mesa/mesa-dri-7.8.2/glamo.patch
 delete mode 100644 recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch
 delete mode 100644 recipes/mesa/mesa-dri-7.8/glamo.patch
 create mode 100644 recipes/mesa/mesa-dri-glsl-native_7.8.2.bb
 delete mode 100644 recipes/mesa/mesa-dri-glsl-native_7.8.bb
 delete mode 100644 recipes/mesa/mesa-dri_7.8.1.bb
 create mode 100644 recipes/mesa/mesa-dri_7.8.2.bb
 delete mode 100644 recipes/mesa/mesa-dri_7.8.bb
 create mode 100644 recipes/mesa/mesa-xlib-7.8.2/fix-progs-makefile.patch
 delete mode 100644 recipes/mesa/mesa-xlib-7.8/fix-progs-makefile.patch
 create mode 100644 recipes/mesa/mesa-xlib_7.8.2.bb
 delete mode 100644 recipes/mesa/mesa-xlib_7.8.bb
 create mode 100644 recipes/mesa/mesa_7.8.2.bb
 delete mode 100644 recipes/mesa/mesa_7.8.bb
conf/distro/include/preferred-shr-versions.inc +0 -1
index 168989b..30ff61e 100644
@@ -9,7 +9,6 @@ PREFERRED_VERSION_automake-native = "1.11.1"
 PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
 PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
 PREFERRED_VERSION_strace = "4.5.15"
-PREFERRED_VERSION_mesa-dri     = "7.8.1"
 PREFERRED_VERSION_emacs-x11 = "23.1"
 
 # We need this for jamvm
recipes/mesa/mesa-dri-7.8.1/fix-progs-makefile.patch deleted +0 -81

81 lines not on this page · raw message

recipes/mesa/mesa-dri-7.8.1/glamo.patch deleted +0 -2386

2,386 lines not on this page · raw message

recipes/mesa/mesa-dri-7.8.2/fix-progs-makefile.patch new file +82 -0

82 lines not on this page · raw message

recipes/mesa/mesa-dri-7.8.2/glamo.patch new file +2386 -0

444 lines not on this page · raw message

recipes/mesa/mesa-dri-7.8/fix-progs-makefile.patch deleted +0 -81

81 lines not on this page · raw message

recipes/mesa/mesa-dri-7.8/glamo.patch deleted +0 -2373

2,373 lines not on this page · raw message

recipes/mesa/mesa-dri-glsl-native_7.8.2.bb new file +19 -0
new file mode 100644
index 0000000..dd24f16

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-dri-glsl-native_7.8.bb deleted +0 -20
deleted file mode 100644
index eef5733..0000000

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-dri_7.8.1.bb deleted +0 -43

43 lines not on this page · raw message

recipes/mesa/mesa-dri_7.8.2.bb new file +43 -0

43 lines not on this page · raw message

recipes/mesa/mesa-dri_7.8.bb deleted +0 -41

41 lines not on this page · raw message

recipes/mesa/mesa-xlib-7.8.2/fix-progs-makefile.patch new file +81 -0

81 lines not on this page · raw message

recipes/mesa/mesa-xlib-7.8/fix-progs-makefile.patch deleted +0 -81

81 lines not on this page · raw message

recipes/mesa/mesa-xlib_7.8.2.bb new file +20 -0
new file mode 100644
index 0000000..6c0e7ea

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-xlib_7.8.bb deleted +0 -20
deleted file mode 100644
index 6c0e7ea..0000000

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa_7.8.2.bb new file +8 -0
new file mode 100644
index 0000000..bbd0c41

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa_7.8.bb deleted +0 -8
deleted file mode 100644
index bbd0c41..0000000

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.0.2

Part of the diff is not shown here. View the raw message.

#15 lore raw

PATCH 7/9 mesa: move common definitions to include file, change SRC_URI to freedesktop for releases newer than 7.5

In reply to Martin Jansa

* drop eee901 override (no such machine in OE, dropped from poky
http://git.pokylinux.org/cgit.cgi/poky/commit/?id=542eb3b16dc1c6fa7920257219ed5dac0b95c257)

---
 recipes/mesa/README                                |   12 +
 recipes/mesa/mesa-7.2.inc                          |    7 +
 recipes/mesa/mesa-7.6.inc                          |    6 +
 recipes/mesa/mesa-7.8.2.inc                        |   13 +
 recipes/mesa/mesa-7.8.2/glamo.patch                | 2386 ++++++++++++++++++++
 recipes/mesa/mesa-common.inc                       |   20 +-
 .../mesa/mesa-dri-7.8.2/fix-progs-makefile.patch   |   82 -
 recipes/mesa/mesa-dri-7.8.2/glamo.patch            | 2386 --------------------
 recipes/mesa/mesa-dri.inc                          |    8 +
 recipes/mesa/mesa-dri_7.2.bb                       |   29 +-
 recipes/mesa/mesa-dri_7.6.bb                       |   34 +-
 recipes/mesa/mesa-dri_7.8.2.bb                     |   40 +-
 recipes/mesa/mesa-dri_git.bb                       |   19 +-
 .../mesa/mesa-xlib-7.8.2/fix-progs-makefile.patch  |   81 -
 recipes/mesa/mesa-xlib.inc                         |    2 +
 recipes/mesa/mesa-xlib_7.2.bb                      |   26 +-
 recipes/mesa/mesa-xlib_7.6.bb                      |   21 +-
 recipes/mesa/mesa-xlib_7.8.2.bb                    |   22 +-
 recipes/mesa/mesa/fix-progs-makefile.patch         |   82 +
 19 files changed, 2553 insertions(+), 2723 deletions(-)
 create mode 100644 recipes/mesa/README
 create mode 100644 recipes/mesa/mesa-7.2.inc
 create mode 100644 recipes/mesa/mesa-7.6.inc
 create mode 100644 recipes/mesa/mesa-7.8.2.inc
 create mode 100644 recipes/mesa/mesa-7.8.2/glamo.patch
 delete mode 100644 recipes/mesa/mesa-dri-7.8.2/fix-progs-makefile.patch
 delete mode 100644 recipes/mesa/mesa-dri-7.8.2/glamo.patch
 create mode 100644 recipes/mesa/mesa-dri.inc
 delete mode 100644 recipes/mesa/mesa-xlib-7.8.2/fix-progs-makefile.patch
 create mode 100644 recipes/mesa/mesa-xlib.inc
 create mode 100644 recipes/mesa/mesa/fix-progs-makefile.patch
recipes/mesa/README new file +12 -0
new file mode 100644
index 0000000..3c6de3e
@@ -0,0 +1,12 @@
+mesa-common.inc
+* Settings shared by ALL recipes
+
+mesa-${PV}.inc
+* Settings for particular version, mostly checksums and additional patches
+* Patches are stored mesa-${PV} dir and -dri and xlib has adjusted FILESPATHPKG
+
+mesa-dri.inc
+* Setting shared by ALL dri recipes - defines what is mesa-dri
+
+mesa-xlib.inc
+* Setting shared by ALL xlib recipes - defines what is mesa-xlib
recipes/mesa/mesa-7.2.inc new file +7 -0
new file mode 100644
index 0000000..88513ab
@@ -0,0 +1,7 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
+           ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos "
+
+SRC_URI[archive.md5sum] = "04d379292e023df0b0266825cb0dbde5"
+SRC_URI[archive.sha256sum] = "a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2"
+SRC_URI[demos.md5sum] = "22e03dc4038cd63f32c21eb60994892b"
+SRC_URI[demos.sha256sum] = "3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4"
recipes/mesa/mesa-7.6.inc new file +6 -0
new file mode 100644
index 0000000..76b41c6
@@ -0,0 +1,6 @@
+SRC_URI[archive.md5sum] = "8c75f90cd0303cfac9e4b6d54f6759ca"
+SRC_URI[archive.sha256sum] = "782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830"
+SRC_URI[demos.md5sum] = "0ede7adf217951acd90dbe4551210c07"
+SRC_URI[demos.sha256sum] = "2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0"
+
+EXTRA_OECONF += " --disable-gallium"
recipes/mesa/mesa-7.8.2.inc new file +13 -0
new file mode 100644
index 0000000..a20e290
@@ -0,0 +1,13 @@
+SRC_URI += " \ 
+            file://fix-progs-makefile.patch \
+            file://glamo.patch \
+           "
+
+SRC_URI[archive.md5sum] = "6be2d343a0089bfd395ce02aaf8adb57"
+SRC_URI[archive.sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d"
+SRC_URI[demos.md5sum] = "757d9e2e06f48b1a52848be9b0307ced"
+SRC_URI[demos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c"
+
+DEFAULT_PREFERENCE_shr = "2"
+
+EXTRA_OECONF += " --disable-gallium"
recipes/mesa/mesa-7.8.2/glamo.patch new file +2386 -0

2,386 lines not on this page · raw message

recipes/mesa/mesa-common.inc +15 -5
index 3884112..51f7873 100644
@@ -4,11 +4,17 @@ DESCRIPTION = "An open source implementation of the OpenGL spec"
 HOMEPAGE = "http://mesa3d.org"
 LICENSE = "MIT"
 
-INC_PR = "r7"
+INC_PR = "r8"
 PE = "2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2;name=archive \
-           ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2;name=demos "
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
+           ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \
+          "
 S = "${WORKDIR}/Mesa-${PV}"
 
 PROVIDES = "virtual/libgl"
@@ -25,8 +31,10 @@ inherit glx-use-tls
 # Package contents vary according to ${MACHINE_DRI_MODULES}.
 PACKAGE_ARCH = "${MACHINE}"
 
-PACKAGES =+ "libegl libegl-dev libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
-FILES_libegl = "${libdir}/libEGL.so.*"
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev ${PN}-xprogs"
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
 FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
 FILES_libosmesa = "${libdir}/libOSMesa.so.*"
@@ -36,6 +44,8 @@ FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
 FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
 FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
 
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
 
 do_stage() {
         autotools_stage_all
recipes/mesa/mesa-dri-7.8.2/fix-progs-makefile.patch deleted +0 -82

82 lines not on this page · raw message

recipes/mesa/mesa-dri-7.8.2/glamo.patch deleted +0 -2386

454 lines not on this page · raw message

recipes/mesa/mesa-dri.inc new file +8 -0
new file mode 100644
index 0000000..33258c5

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-dri_7.2.bb +3 -26
index da402c3..26b56e4 100644

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-dri_7.6.bb +3 -31
index 33f4069..26b56e4 100644

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-dri_7.8.2.bb +4 -36
index 356c284..8c4cef6 100644

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-dri_git.bb +3 -16
index 5f72641..61fb199 100644

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-xlib-7.8.2/fix-progs-makefile.patch deleted +0 -81

81 lines not on this page · raw message

recipes/mesa/mesa-xlib.inc new file +2 -0
new file mode 100644
index 0000000..cabe6e5

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-xlib_7.2.bb +3 -23
index dfc0d7c..93bb8cd 100644

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-xlib_7.6.bb +3 -18
index e81c585..93bb8cd 100644

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa-xlib_7.8.2.bb +3 -19
index 6c0e7ea..93bb8cd 100644

Lines of this file are not shown. View the raw message.

recipes/mesa/mesa/fix-progs-makefile.patch new file +82 -0

82 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.0.2

Part of the diff is not shown here. View the raw message.

#16 lore raw

PATCH 8/9 htcdream: don't set PREFERRED_PROVIDER_virtual/libgl to mesa-dri

In reply to Martin Jansa

* there was --disable-egl in mesa-dri recipes (there are mesa recipes for this)

---
 conf/machine/htcdream.conf |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
conf/machine/htcdream.conf +0 -2
index 89604d5..a10edb8 100644
@@ -19,5 +19,3 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-leviathan"
-
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
Signature · 1 line
1.7.0.2
#17 lore raw

PATCH 9/9 mesa: switch to new staging

In reply to Martin Jansa
---
 recipes/mesa/mesa-common.inc |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
recipes/mesa/mesa-common.inc +4 -7
index 51f7873..dd66410 100644
@@ -4,7 +4,7 @@ DESCRIPTION = "An open source implementation of the OpenGL spec"
 HOMEPAGE = "http://mesa3d.org"
 LICENSE = "MIT"
 
-INC_PR = "r8"
+INC_PR = "r9"
 PE = "2"
 
 PROTO_DEPS = "xf86driproto glproto"
@@ -47,15 +47,12 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_libegl-dbg += "${libdir}/egl/.debug/*"
 
-do_stage() {
-        autotools_stage_all
-		install -d ${STAGING_INCDIR}/GL/	
-		cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/
-}
-
+NATIVE_INSTALL_WORKS = "1"
 do_install_append () {
     install -d ${D}/${bindir}
     for i in glxdemo glxgears glxheads glxinfo; do 
         install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir}
     done
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
 }
Signature · 1 line
1.7.0.2
#18 lore raw
In reply to Martin Jansa
Quoted 8 lines · On Fri, 25 Jun 2010 14:19:34 +0200 Martin Jansa <[email protected]> wrote:

Hi,

i know the rules about removing old versions, but in this dir there were versions really old and I'm pretty sure they cant be even built with current OE (I tried in few cases and then refused to spend whole day just to confirm that some 6.0 version still builds after converting to new staging and cleanups..).

Quoted 6 lines

Please review/test.

FYI: all those patches are often rebased on top of oe.dev also here
http://gitorious.org/~jama/angstrom/jama-shr-experimental
if cherry-picking is more effective way for you to test

Looks good to me, there is no problem with removing broken recipes. Whole series

G

#19 lore raw
Quoted 5 lines
Quoted 2 lines · On Fri, 25 Jun 2010 14:19:34 +0200 Martin Jansa <[email protected]> wrote:

Hi,

Quoted 8 lines
Quoted 8 lines

i know the rules about removing old versions, but in this dir there were versions really old and I'm pretty sure they cant be even built with current OE (I tried in few cases and then refused to spend whole day just to confirm that some 6.0 version still builds after converting to new staging and cleanups..).

Please review/test.

Bye Henning