Mesa 6.3.1 merge

[Alan Coopersmith]

 > 6.3.1 merged.  Please build and test.

I needed the attached patches to build successfully on Solaris x86 with
Sun compilers.   (Building with gcc 3.4.3 on Solaris gives a strange ld
error I haven't figured out yet "ld: fatal: relocation error: R_386_GOTOFF:
file ../../../lib/GL/glx/indirect_init.o: symbol __indirect_glNewList:
relocation must bind locally")

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering
-------------- next part --------------
Index: glx/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/glx/Imakefile,v
retrieving revision 1.10
diff -u -r1.10 Imakefile
--- glx/Imakefile	31 Jul 2005 17:19:19 -0000	1.10
+++ glx/Imakefile	31 Jul 2005 22:40:38 -0000
@@ -44,6 +44,7 @@
 LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi)
 LinkSourceFile(glcontextmodes.c, $(MESASRCDIR)/src/mesa/drivers/dri/common)
 LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common)
+LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main)
 
 #ifdef i386Architecture
 LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86)
@@ -98,6 +99,7 @@
      GLX_SRCS = \
 		clientattrib.c \
 		compsize.c \
+		dispatch.c \
 		eval.c \
 		glapi.c \
 		glthread.c \
@@ -128,6 +130,7 @@
 		clientattrib.o \
 		compsize.o \
 		eval.o \
+		dispatch.o \
 		glapi.o \
 		glthread.o \
                 glx_pbuffer.o \
Index: mesa/drivers/osmesa/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/drivers/osmesa/Imakefile,v
retrieving revision 1.4
diff -u -r1.4 Imakefile
--- mesa/drivers/osmesa/Imakefile	2 Feb 2005 03:49:09 -0000	1.4
+++ mesa/drivers/osmesa/Imakefile	31 Jul 2005 22:40:38 -0000
@@ -17,6 +17,8 @@
 #include "../../math/Imakefile.inc"
 #include "../../main/Imakefile.inc"
 #include "../../shader/Imakefile.inc"
+#include "../../shader/grammar/Imakefile.inc"
+#include "../../shader/slang/Imakefile.inc"
 #include "../../swrast/Imakefile.inc"
 #include "../../swrast_setup/Imakefile.inc"
 #include "../../tnl/Imakefile.inc"
@@ -67,7 +69,11 @@
 #endif
 
 #if !GlxUseBuiltInDRIDriver
+# ifdef SharedOSMesaReqs
+ REQUIREDLIBS = SharedOSMesaReqs
+# else
  REQUIREDLIBS = MathLibrary $(LDPRELIB) $(XLIB) $(GLXLIB)
+# endif
 #endif
 
 #include <Library.tmpl>