Re: [Dri-devel] Mesa 4.1 branch

[Brian P. <br...@tu...>]

Michel D=E4nzer wrote:
> On Don, 2002-10-10 at 00:42, Brian Paul wrote:
>=20
>>Brian Paul wrote:
>>
>>>I've created a new DRI branch: mesa-4-1-branch
>>>
>>>I'm in the process of porting all the DRI drivers to the new Mesa 4.1 =
code.
>>>I'll be checking in changes soon, but don't expect anything to run or =
even
>>>compile.  I'll post again when I think it's usable.
>>
>>OK, it's compiling and the r200 driver seems to be working (though I
>>only ran a few Mesa demos so far).
>>
>>If you want to try the branch you'll need to check out a Mesa CVS trunk
>>tree and the DRI mesa-4-1-branch branch.  Edit xc/config/cf/host.def to
>>set the MesaSrcDir to point into the Mesa tree.
>>
>>Disclaimer: you're on your own if you try it and have trouble.  I've go=
t
>>a lot of testing to do yet to iron out any obvious problems.
>=20
>=20
> I hope you don't mind feedback though; it fails to build here:
>=20
> make[1]: Entering directory
> `/home/michdaen/src/dri-cvs/xc-mesa-4-1/lib/GL/glx'
> rm -f dispatch.o
> gcc -c -O2 -mcpu=3D7450  -ansi -Wall -Wpointer-arith -Wstrict-prototype=
s
> -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -pipe=20
> -I../../../exports/include 		-I../../../exports/include/X11
> 		-I../../../include/extensions 		-I../../../exports/include/GL
> 		-I../../../lib/GL/glx 	=09
> -I/home/michdaen/src/mesa-cvs/Mesa/src
> 		-I/home/michdaen/src/mesa-cvs/Mesa/src/X
> 		-I/home/michdaen/src/mesa-cvs/Mesa/src/
> 		-I/home/michdaen/src/mesa-cvs/Mesa/include 		-I../../../lib/GL/includ=
e
> 		-I../../../lib/GL/dri  -I../../.. -I../../../exports/include
> -I/usr/local/X11R6-DRI.reinit/include  -Dlinux -D__powerpc__
> -D_POSIX_C_SOURCE=3D199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOUR=
CE
> -D_SVID_SOURCE  -D_GNU_SOURCE   -DFUNCPROTO=3D15 -DNARROWPROTO -DXTHREA=
DS=20
> -D_REENTRANT -DXUSE_MTSAFE_API    -DGLXEXT -DXF86DRI
> -DGLX_DIRECT_RENDERING -DGLX_USE_DLOPEN -DGLX_USE_MESA       -fPIC
> dispatch.c
> In file included from dispatch.c:67:
> /home/michdaen/src/mesa-cvs/Mesa/src/glapitemp.h:1907: conflicting type=
s
> for `glTexImage3D'
> ../../../exports/include/GL/gl.h:1696: previous declaration of
> `glTexImage3D'
>=20
>=20
> Anything I'm doing wrong? Anything special I'm supposed to do with the
> Mesa tree?

I missed one check-in.  The gl.h file needed updating.  Try again.

-Brian