- xaa/composite fix from modular tree

[packages/X11.git] / XFree86-GLcore-strip-a-workaround.patch

diff --git a/XFree86-GLcore-strip-a-workaround.patch b/XFree86-GLcore-strip-a-workaround.patch
index 0ef68cd9e4fe2bda7645dcd0e02c58173a36c09e..17bdfaefcb374563aecc4391b16a2d6b49f97f15 100644 (file)
--- a/XFree86-GLcore-strip-a-workaround.patch
+++ b/XFree86-GLcore-strip-a-workaround.patch
@@ -1,18 +1,47 @@
---- XFree86-4.2.1/xc/lib/GL/mesa/src/Imakefile.inc.orig        Tue Apr  3 00:15:47 2001
-+++ XFree86-4.2.1/xc/lib/GL/mesa/src/Imakefile.inc     Wed Sep 18 16:11:39 2002
-@@ -197,7 +197,6 @@
-               $(MESABUILDDIR)context.o \
-               $(MESABUILDDIR)copypix.o \
-               $(MESABUILDDIR)cva.o \
--              $(MESABUILDDIR)debug_xform.o \
-               $(MESABUILDDIR)depth.o \
-               $(MESABUILDDIR)dlist.o \
-               $(DISPATCHOBJS) \
-@@ -282,7 +281,6 @@
-               $(MESABUILDDIR)unshared/context.o \
-               $(MESABUILDDIR)unshared/copypix.o \
-               $(MESABUILDDIR)unshared/cva.o \
--              $(MESABUILDDIR)unshared/debug_xform.o \
-               $(MESABUILDDIR)unshared/depth.o \
-               $(DISPATCHUOBJS) \
-               $(MESABUILDDIR)unshared/dlist.o \
+--- XFree86-4.3.99.14/xc/lib/GL/mesa/src/math/Imakefile.inc.orig       2003-10-10 13:02:44.000000000 +0200
++++ XFree86-4.3.99.14/xc/lib/GL/mesa/src/math/Imakefile.inc    2003-10-12 14:33:09.000000000 +0200
+@@ -26,20 +23,14 @@
+ LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math)
+ #endif
+ 
+-  MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \
+-                 $(MESAMATHBUILDDIR)m_debug_norm.o \
+-                 $(MESAMATHBUILDDIR)m_debug_xform.o \
+-                 $(MESAMATHBUILDDIR)m_eval.o \
++  MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_eval.o \
+                  $(MESAMATHBUILDDIR)m_matrix.o \
+                  $(MESAMATHBUILDDIR)m_translate.o \
+                  $(MESAMATHBUILDDIR)m_vector.o \
+                  $(MESAMATHBUILDDIR)m_xform.o
+ 
+ #if defined(DoSharedLib) && DoSharedLib
+- MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
+-                 $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
+-                 $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \
+-                 $(MESAMATHBUILDDIR)unshared/m_eval.o \
++ MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_eval.o \
+                  $(MESAMATHBUILDDIR)unshared/m_matrix.o \
+                  $(MESAMATHBUILDDIR)unshared/m_translate.o \
+                  $(MESAMATHBUILDDIR)unshared/m_vector.o \
+@@ -48,19 +39,13 @@
+  MATH_MESA_UOBJS = $(MESA_MATH_OBJS)
+ #endif
+ 
+- MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \
+-                 $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \
+-                 $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \
+-                 $(MESAMATHBUILDDIR)debugger/m_eval.o \
++ MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_eval.o \
+                  $(MESAMATHBUILDDIR)debugger/m_matrix.o \
+                  $(MESAMATHBUILDDIR)debugger/m_translate.o \
+                  $(MESAMATHBUILDDIR)debugger/m_vector.o \
+                  $(MESAMATHBUILDDIR)debugger/m_xform.o
+ 
+- MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \
+-                 $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \
+-                 $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \
+-                 $(MESAMATHBUILDDIR)profiled/m_eval.o \
++ MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_eval.o \
+                  $(MESAMATHBUILDDIR)profiled/m_matrix.o \
+                  $(MESAMATHBUILDDIR)profiled/m_translate.o \
+                  $(MESAMATHBUILDDIR)profiled/m_vector.o \