[PATCH] add -DIN_DRI_DRIVER to xorg-6.9 build [was Re: problem found with new xorg-6.9RC2 on savage with DRI enabled]

[Sergio Monteiro Basto]

Hi, 
I remade the patch, and I attach to bug #1709, because resolved the
issue there. and I marked the bug has verified.
The patch looks to me, obvious but don't know for sure.
Its based on this result:
http://sergiomb.no-ip.org/xorg/xorgRC2/SOURCES/list

thanks, 

On Mon, 2005-11-21 at 19:15 +0100, Roland Scheidegger wrote:
> Sergio Monteiro Basto wrote:
> > After analyze how build Mesa from CVS with "make linux-x86-dri" and 
> > how xorg built same Mesa source with "make World".
> > 
> > Ian Romanick has point that Mesa code should have IN_DRI_DRIVER 
> > Define. So, I found on xc/lib/GL/mesa all subdirs: shader swrast tnl
> >  x86 main math and tnl_dd have missing at least -DIN_DRI_DRIVER
> I think this should be blocker on the 6.9 (I guess 7.0 isn't affected?)
> release, though I'm not really sure on the exact consequences.
> 
> > Xorg build also misses -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
> > -DHAVE_ALIAS Ian, and those ones are needed ?
> Can't comment on the others (though usually care must be taken with the
> threading stuff!), but not having -DUSE_EXTERNAL_DXTN_LIB=1 will
> obviously cause it to not support s3tc with the external library (I had
> already filed a bug about this,
> https://bugs.freedesktop.org/show_bug.cgi?id=5057).
> 
> > As side note I haven't the minimum idea, what side effect this could 
> > cause on non Linux or BSD systems.
> Since the code in question is only built on systems which support dri,
> there shouldn't be any problems I suspect. The glx server code is built
> elsewhere (and as a side note, it can't use -DUSE_EXTERNAL_DXTN_LIB=1,
> at least last time I tried it was not possible to use the dl functions
> directly).
> 
> > --- xc/lib/GL/mesa/Imakefile.orig       2005-11-17 23:46:56.000000000
> >  +0000 +++ xc/lib/GL/mesa/Imakefile    2005-11-17 23:04:00.000000000
> >  +0000 @@ -50,7 +50,7 @@ MATH_DEFINES = -DCCPML #endif
> > 
> > -      DEFINES = $(ALLOC_DEFINES) GlxDefines \ +      DEFINES = 
> > $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER \ $(MESA_ASM_DEFINES) 
> > $(MATH_DEFINES) INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) 
> > -I$(EXTINCSRC) \ -I$(GLXLIBSRC)/dri \
> I'm not sure if that's the best place to put it, it looks like usually 
> the -Ddefinewhatever are all in the Imakefile.inc files, maybe that 
> would be nicer.
> 
> Roland
-- 
Sérgio M.B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 2166 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20051121/2b8aeffa/attachment.bin>