Index: lib/GL/mesa/drivers/dri/common/Imakefile.inc
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc,v
retrieving revision 1.5
diff -u -d -r1.5 Imakefile.inc
--- lib/GL/mesa/drivers/dri/common/Imakefile.inc	12 Aug 2005 16:30:58 -0000	1.5
+++ lib/GL/mesa/drivers/dri/common/Imakefile.inc	21 Oct 2005 21:46:32 -0000
@@ -40,8 +40,7 @@
 		-I$(MESASRCDIR)/include
    COMMON_X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
 
-    COMMONSRCS = $(MESADRVCOMMONBUILDDIR)mm.c \
-                 $(MESADRVCOMMONBUILDDIR)utils.c \
+    COMMONSRCS = $(MESADRVCOMMONBUILDDIR)utils.c \
                  $(MESADRVCOMMONBUILDDIR)vblank.c \
                  $(MESADRVCOMMONBUILDDIR)texmem.c \
                  $(MESADRVCOMMONBUILDDIR)xmlconfig.c \
@@ -50,8 +49,7 @@
                  $(MESADRVCOMMONBUILDDIR)glcontextmodes.c \
                  $(MESADRVCOMMONBUILDDIR)drirenderbuffer.c
 
-    COMMONOBJS = $(MESADRVCOMMONBUILDDIR)mm.o \
-                 $(MESADRVCOMMONBUILDDIR)utils.o \
+    COMMONOBJS = $(MESADRVCOMMONBUILDDIR)utils.o \
                  $(MESADRVCOMMONBUILDDIR)vblank.o \
                  $(MESADRVCOMMONBUILDDIR)texmem.o \
                  $(MESADRVCOMMONBUILDDIR)xmlconfig.o \
@@ -60,8 +58,7 @@
                  $(MESADRVCOMMONBUILDDIR)glcontextmodes.o \
                  $(MESADRVCOMMONBUILDDIR)drirenderbuffer.o
 
-    COMMONUOBJS = $(MESADRVCOMMONBUILDDIR)unshared/mm.o \
-                 $(MESADRVCOMMONBUILDDIR)unshared/utils.o \
+    COMMONUOBJS = $(MESADRVCOMMONBUILDDIR)unshared/utils.o \
                  $(MESADRVCOMMONBUILDDIR)unshared/vblank.o \
                  $(MESADRVCOMMONBUILDDIR)unshared/texmem.o \
                  $(MESADRVCOMMONBUILDDIR)unshared/xmlconfig.o \
@@ -70,8 +67,7 @@
                  $(MESADRVCOMMONBUILDDIR)unshared/glcontextmodes.o \
                  $(MESADRVCOMMONBUILDDIR)unshared/drirenderbuffer.o
 
-    COMMONDOBJS = $(MESADRVCOMMONBUILDDIR)debugger/mm.o \
-                 $(MESADRVCOMMONBUILDDIR)debugger/utils.o \
+    COMMONDOBJS = $(MESADRVCOMMONBUILDDIR)debugger/utils.o \
                  $(MESADRVCOMMONBUILDDIR)debugger/vblank.o \
                  $(MESADRVCOMMONBUILDDIR)debugger/texmem.o \
                  $(MESADRVCOMMONBUILDDIR)debugger/xmlconfig.o \
@@ -80,8 +76,7 @@
                  $(MESADRVCOMMONBUILDDIR)debugger/glcontextmodes.o \
                  $(MESADRVCOMMONBUILDDIR)debugger/drirenderbuffer.o
 
-    COMMONPOBJS = $(MESADRVCOMMONBUILDDIR)profiled/mm.o \
-                 $(MESADRVCOMMONBUILDDIR)profiled/utils.o \
+    COMMONPOBJS = $(MESADRVCOMMONBUILDDIR)profiled/utils.o \
                  $(MESADRVCOMMONBUILDDIR)profiled/vblank.o \
                  $(MESADRVCOMMONBUILDDIR)profiled/texmem.o \
                  $(MESADRVCOMMONBUILDDIR)profiled/xmlconfig.o \
@@ -91,8 +86,6 @@
                  $(MESADRVCOMMONBUILDDIR)profiled/drirenderbuffer.o
 
 #ifdef NeedToLinkMesaSrc
-LinkSourceFile(mm.c, $(MESADRVSRCDIR)/common)
-LinkSourceFile(mm.h, $(MESADRVSRCDIR)/common)
 LinkSourceFile(texmem.c, $(MESADRVSRCDIR)/common)
 LinkSourceFile(texmem.h, $(MESADRVSRCDIR)/common)
 LinkSourceFile(utils.c, $(MESADRVSRCDIR)/common)
Index: lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc,v
retrieving revision 1.4
diff -u -d -r1.4 Imakefile.inc
--- lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc	12 Aug 2005 16:31:00 -0000	1.4
+++ lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc	21 Oct 2005 21:46:32 -0000
@@ -104,7 +104,6 @@
 LinkSourceFile(via_common.h, $(MESADRVSRCDIR)/unichrome)
 LinkSourceFile(via_context.c, $(MESADRVSRCDIR)/unichrome)
 LinkSourceFile(via_context.h, $(MESADRVSRCDIR)/unichrome)
-LinkSourceFile(via_dri.h, $(MESADRVSRCDIR)/unichrome)
 LinkSourceFile(via_fb.c, $(MESADRVSRCDIR)/unichrome)
 LinkSourceFile(via_fb.h, $(MESADRVSRCDIR)/unichrome)
 LinkSourceFile(via_ioctl.c, $(MESADRVSRCDIR)/unichrome)
Index: lib/GL/mesa/main/Imakefile.inc
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/main/Imakefile.inc,v
retrieving revision 1.2
diff -u -d -r1.2 Imakefile.inc
--- lib/GL/mesa/main/Imakefile.inc	31 Jul 2005 17:19:23 -0000	1.2
+++ lib/GL/mesa/main/Imakefile.inc	21 Oct 2005 21:46:32 -0000
@@ -38,6 +38,7 @@
 		$(MESABUILDDIR)enable.c \
 		$(MESABUILDDIR)enums.c \
 		$(MESABUILDDIR)eval.c \
+		$(MESABUILDDIR)execmem.c \
 		$(MESABUILDDIR)extensions.c \
 		$(MESABUILDDIR)feedback.c \
                 $(MESABUILDDIR)fbobject.c \
@@ -122,6 +123,7 @@
 LinkSourceFile(enums.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(eval.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(eval.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(execmem.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(extensions.c, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(extensions.h, $(MESASRCDIR)/src/mesa/main)
 LinkSourceFile(fbobject.c, $(MESASRCDIR)/src/mesa/main)
@@ -232,6 +234,7 @@
 		$(MESABUILDDIR)enable.o \
 		$(MESABUILDDIR)enums.o \
 		$(MESABUILDDIR)eval.o \
+		$(MESABUILDDIR)execmem.o \
 		$(MESABUILDDIR)extensions.o \
                 $(MESABUILDDIR)fbobject.o \
 		$(MESABUILDDIR)feedback.o \
@@ -299,6 +302,7 @@
 		$(MESABUILDDIR)unshared/enable.o \
 		$(MESABUILDDIR)unshared/enums.o \
 		$(MESABUILDDIR)unshared/eval.o \
+		$(MESABUILDDIR)unshared/execmem.o \
 		$(MESABUILDDIR)unshared/extensions.o \
                 $(MESABUILDDIR)unshared/fbobject.o \
 		$(MESABUILDDIR)unshared/feedback.o \
@@ -368,6 +372,7 @@
 		$(MESABUILDDIR)debugger/enable.o \
 		$(MESABUILDDIR)debugger/enums.o \
 		$(MESABUILDDIR)debugger/eval.o \
+		$(MESABUILDDIR)debugger/execmem.o \
 		$(MESABUILDDIR)debugger/extensions.o \
                 $(MESABUILDDIR)debugger/fbobject.o \
 		$(MESABUILDDIR)debugger/feedback.o \
@@ -434,6 +439,7 @@
 		$(MESABUILDDIR)profiled/enable.o \
 		$(MESABUILDDIR)profiled/enums.o \
 		$(MESABUILDDIR)profiled/eval.o \
+		$(MESABUILDDIR)profiled/execmem.o \
 		$(MESABUILDDIR)profiled/extensions.o \
                 $(MESABUILDDIR)profiled/fbobject.o \
 		$(MESABUILDDIR)profiled/feedback.o \
Index: programs/Xserver/GL/glx/render2.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/glx/render2.c,v
retrieving revision 1.5
diff -u -d -r1.5 render2.c
--- programs/Xserver/GL/glx/render2.c	28 Sep 2005 03:37:22 -0000	1.5
+++ programs/Xserver/GL/glx/render2.c	21 Oct 2005 21:46:32 -0000
@@ -43,6 +43,7 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "g_disptab_EXT.h"
+/*#include "indirect_size.h"*/
 
 
 void __glXDisp_Map1f(GLbyte *pc)