thanks, with sharedObjects_xorg.diff (send in attach) fix the compile problem. With compilesavage.diff, I delete unicrome, i810 and radeon dri drives because they have compile problems.
So I can compile Xorg cvs with last Mesa cvs source with no problem. Btw: last update on savage today resolve the unresolved symbols < (==) Log file: "/var/log/Xorg.0.log", Time: Sun Oct 31 20:08:33 2004 --- > (==) Log file: "/var/log/Xorg.0.log", Time: Sun Oct 31 20:51:05 2004 799,801d798 < Symbol SavageInitStreamsOld from module /usr/X11R6/lib/modules/drivers/savage_drv.o is unresolved! < Symbol SavageInitStreams2000 from module /usr/X11R6/lib/modules/drivers/savage_drv.o is unresolved! < Symbol SavageInitStreamsNew from module /usr/X11R6/lib/modules/drivers/savage_drv.o is unresolved! 857,858d853 < (II) SAVAGE(0): [drm] removed 1 reserved context for kernel < (II) SAVAGE(0): [drm] unmapping 8192 bytes of SAREA 0xce9f2000 at 0x4000c000 thanks, On Sat, 2004-10-30 at 21:17, Dieter Nützel wrote: > Am Samstag, 30. Oktober 2004 19:01 schrieb Brian Paul: > > To fix this, somebody just has to add mesa/src/shaders/shaderobjects.c > > to the Makefiles. > > > Sérgio Monteiro Basto wrote: > > > Sorry I have to correct this information but > > > with last Mesa CVS this is not correct and I can't compile Mesa anymore. > > > > > > I get this error that can't workaround > > > > > > GL/mesa/GLcore/libGLcore.a(state.o)(.text+0xf7c): In function > > > > > > `_mesa_init_exec_table': > > > : undefined reference to `_mesa_DeleteObjectARB' -- 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/config/cf/xorg.cf.orig 2004-10-30 03:26:27.000000000 +0100 +++ xc/config/cf/xorg.cf 2004-10-30 06:17:56.000000000 +0100 @@ -406,16 +406,16 @@ # endif # ifndef DevelDRIDrivers -# define DevelDRIDrivers ffb mach64 savage unichrome +# define DevelDRIDrivers ffb mach64 savage # endif # ifndef DriDrivers # ifndef ia64Architecture -# define i386DRIDrivers i810 i915 +# define i386DRIDrivers i915 # else # define i386DRIDrivers /**/ # endif -# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 \ +# define DriDrivers gamma i386DRIDrivers mga r128 r200 \ sis tdfx # endif #endif
