Hi ,
and I still can compile unichrome and lately radeon so I use xorg2.diff
to workaround
thanks,
--
Sérgio M.B.
--- xc/lib/GL/mesa/shader/Imakefile.inc.orig 2004-06-16 10:27:56.000000000 +0100
+++ xc/lib/GL/mesa/shader/Imakefile.inc 2004-10-31 18:48:35.000000000 +0000
@@ -15,7 +15,8 @@
$(MESASHADERBUILDDIR)nvfragparse.c \
$(MESASHADERBUILDDIR)nvvertexec.c \
$(MESASHADERBUILDDIR)nvvertparse.c \
- $(MESASHADERBUILDDIR)program.c
+ $(MESASHADERBUILDDIR)program.c \
+ $(MESASHADERBUILDDIR)shaderobjects.c
#ifdef NeedToLinkMesaSrc
LinkSourceFile(arbprogparse.c, $(MESASRCDIR)/src/mesa/shader)
@@ -44,6 +45,8 @@
LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader)
LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/shader)
LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects.h, $(MESASRCDIR)/src/mesa/shader)
#endif
MESA_SHADER_OBJS = $(MESASHADERBUILDDIR)arbprogparse.o \
@@ -55,7 +58,8 @@
$(MESASHADERBUILDDIR)nvfragparse.o \
$(MESASHADERBUILDDIR)nvvertexec.o \
$(MESASHADERBUILDDIR)nvvertparse.o \
- $(MESASHADERBUILDDIR)program.o
+ $(MESASHADERBUILDDIR)program.o \
+ $(MESASHADERBUILDDIR)shaderobjects.o
#if defined(DoSharedLib) && DoSharedLib
MESA_SHADER_UOBJS = $(MESASHADERBUILDDIR)unshared/arbprogparse.o \
@@ -67,7 +71,8 @@
$(MESASHADERBUILDDIR)unshared/nvfragparse.o \
$(MESASHADERBUILDDIR)unshared/nvvertexec.o \
$(MESASHADERBUILDDIR)unshared/nvvertparse.o \
- $(MESASHADERBUILDDIR)unshared/program.o
+ $(MESASHADERBUILDDIR)unshared/program.o \
+ $(MESASHADERBUILDDIR)unshared/shaderobjects.o
#else
MESA_SHADER_UOBJS = $(MESA_SHADER_OBJS)
#endif
@@ -81,7 +86,8 @@
$(MESASHADERBUILDDIR)debugger/nvfragparse.o \
$(MESASHADERBUILDDIR)debugger/nvvertexec.o \
$(MESASHADERBUILDDIR)debugger/nvvertparse.o \
- $(MESASHADERBUILDDIR)debugger/program.o
+ $(MESASHADERBUILDDIR)debugger/program.o \
+ $(MESASHADERBUILDDIR)debugger/shaderobjects.o
MESA_SHADER_POBJS = $(MESASHADERBUILDDIR)profiled/arbprogparse.o \
$(MESASHADERBUILDDIR)profiled/arbprogram.o \
@@ -92,4 +98,5 @@
$(MESASHADERBUILDDIR)profiled/nvfragparse.o \
$(MESASHADERBUILDDIR)profiled/nvvertexec.o \
$(MESASHADERBUILDDIR)profiled/nvvertparse.o \
- $(MESASHADERBUILDDIR)profiled/program.o
+ $(MESASHADERBUILDDIR)profiled/program.o \
+ $(MESASHADERBUILDDIR)profiled/shaderobjects.o
--- xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc.orig 2004-11-13 19:07:21.000000000 +0000
+++ xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc 2004-10-21 20:29:16.000000000 +0100
@@ -48,8 +48,7 @@
$(MESADRVR128BUILDDIR)r128_tex.c \
$(MESADRVR128BUILDDIR)r128_texmem.c \
$(MESADRVR128BUILDDIR)r128_texstate.c \
- $(MESADRVR128BUILDDIR)r128_tris.c \
- $(MESADRVR128BUILDDIR)r128_vb.c
+ $(MESADRVR128BUILDDIR)r128_tris.c
R128OBJS = $(MESADRVR128BUILDDIR)r128_context.o \
$(MESADRVR128BUILDDIR)r128_dd.o \
@@ -61,8 +60,7 @@
$(MESADRVR128BUILDDIR)r128_tex.o \
$(MESADRVR128BUILDDIR)r128_texmem.o \
$(MESADRVR128BUILDDIR)r128_texstate.o \
- $(MESADRVR128BUILDDIR)r128_tris.o \
- $(MESADRVR128BUILDDIR)r128_vb.o
+ $(MESADRVR128BUILDDIR)r128_tris.o
R128UOBJS = $(MESADRVR128BUILDDIR)unshared/r128_context.o \
$(MESADRVR128BUILDDIR)unshared/r128_dd.o \
@@ -74,8 +72,7 @@
$(MESADRVR128BUILDDIR)unshared/r128_tex.o \
$(MESADRVR128BUILDDIR)unshared/r128_texmem.o \
$(MESADRVR128BUILDDIR)unshared/r128_texstate.o \
- $(MESADRVR128BUILDDIR)unshared/r128_tris.o \
- $(MESADRVR128BUILDDIR)unshared/r128_vb.o
+ $(MESADRVR128BUILDDIR)unshared/r128_tris.o
R128DOBJS = $(MESADRVR128BUILDDIR)debugger/r128_context.o \
$(MESADRVR128BUILDDIR)debugger/r128_dd.o \
@@ -87,8 +84,7 @@
$(MESADRVR128BUILDDIR)debugger/r128_tex.o \
$(MESADRVR128BUILDDIR)debugger/r128_texmem.o \
$(MESADRVR128BUILDDIR)debugger/r128_texstate.o \
- $(MESADRVR128BUILDDIR)debugger/r128_tris.o \
- $(MESADRVR128BUILDDIR)debugger/r128_vb.o
+ $(MESADRVR128BUILDDIR)debugger/r128_tris.o
R128POBJS = $(MESADRVR128BUILDDIR)profiled/r128_context.o \
$(MESADRVR128BUILDDIR)profiled/r128_dd.o \
@@ -100,8 +96,7 @@
$(MESADRVR128BUILDDIR)profiled/r128_tex.o \
$(MESADRVR128BUILDDIR)profiled/r128_texmem.o \
$(MESADRVR128BUILDDIR)profiled/r128_texstate.o \
- $(MESADRVR128BUILDDIR)profiled/r128_tris.o \
- $(MESADRVR128BUILDDIR)profiled/r128_vb.o
+ $(MESADRVR128BUILDDIR)profiled/r128_tris.o
#ifdef NeedToLinkMesaSrc
LinkSourceFile(r128_context.c, $(MESADRVSRCDIR)/r128)
@@ -125,6 +120,4 @@
LinkSourceFile(r128_texstate.c, $(MESADRVSRCDIR)/r128)
LinkSourceFile(r128_tris.c, $(MESADRVSRCDIR)/r128)
LinkSourceFile(r128_tris.h, $(MESADRVSRCDIR)/r128)
-LinkSourceFile(r128_vb.c, $(MESADRVSRCDIR)/r128)
-LinkSourceFile(r128_vb.h, $(MESADRVSRCDIR)/r128)
#endif
--- xc/config/cf/xorg.cf.orig 2004-12-12 02:45:45.000000000 +0000
+++ xc/config/cf/xorg.cf 2004-12-12 12:06:24.000000000 +0000
@@ -406,7 +406,7 @@
# endif
# ifndef DevelDRIDrivers
-# define DevelDRIDrivers ffb mach64 savage unichrome
+# define DevelDRIDrivers ffb mach64 savage
# endif
# ifndef DriDrivers
@@ -415,7 +415,7 @@
# else
# define i386DRIDrivers /**/
# endif
-# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 \
+# define DriDrivers gamma i386DRIDrivers mga r128 r200 \
sis tdfx
# endif
#endif
