Mesa 6.3.1 merge

[Brian Paul]

Keith Whitwell wrote:
> Mike A. Harris wrote:
> 
>> Brian Paul wrote:
>>
>>>>>> src/glu/mesa/
>>>>>> src/glut/
>>>>>> src/glw/boilerplate.c
>>>>>> src/mesa/drivers/allegro/
>>>>>> src/mesa/drivers/directfb/
>>>>>> src/mesa/drivers/ggi/
>>>>>> src/mesa/drivers/svga/
>>>>>> src/mesa/drivers/windows/
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> That's a significant change in policy, since GLU and glut have been 
>>>>> part of the install set for X since Mesa was first imported into 
>>>>> XFree86 (iirc).
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> AFAIK the GLU shipped with X was always from the SGI SI,
>>>
>>>
>>>
>>>
>>> Right.  I want to omit the old Mesa GLU 1.1 code, not the GLU 1.3 
>>> code from SGI.
>>>
>>>
>>>> and I don't remember GLUT ever shipping with X.
>>>
>>>
>>>
>>>
>>> Right.  The distros have been avoiding using Mark Kilgard's GLUT 
>>> because of its lack of a real license.  And the dos, ggi and mini 
>>> subdirectories in there have GPL code.
>>
>>
>>
>> Due to legal concerns about Mark Kilgard's GLUT, legal counsel had us
>> remove GLUT from our OS, which we later replaced with freeglut once
>> freeglut became stable and useable.
>>
>> Does the Mesa source still contain Mark's GLUT source?  If so, is there
>> any chance of having it removed from the Mesa tarball and put in a
>> separate tarball to avoid having code with legal issues in the Mesa
>> source?
>>
>> We'll be using the stock Mesa official tarballs in Fedora Core 5
>> and later OS releases that ship X11R7, but we'll have to remove
>> the GLUT source manually and ship modified Mesa tarballs in our
>> upcoming OS releases if GLUT is present.  I'd like to avoid that
>> if it's at all possible.
>>
>> Perhaps Mesa could replace GLUT with freeglut, or even just a
>> pointer to freeglut?
> 
> 
> Freeglut is pretty broken.  I'd prefer not to lose glut from the 
> standard mesa builds.

Like Keith said, freeglut isn't quite up to the level that the 
original GLUT is, so I'm not going to dump it just yet.

Currently the GLUT sources are in the MesaDemos tarball.  I guess I 
could make a 3rd tarball with just the GLUT bits.


Mike, Is the normal Mesa release included in Fedora Core?  The only 
Mesa-related RPMs I see in FC4 are:

xorg-x11-Mesa-libGL-6.8.2-31.i386.rpm
xorg-x11-Mesa-libGLU-6.8.2-31.i386.rpm

The first just has libGL.so and the second has libGLU.so.

-Brian