Mesa 6.3.1 merge

[Brian Paul]

Michel Dänzer wrote:
> On Wed, 2005-08-24 at 16:57 -0400, Adam Jackson wrote:
> 
>>On Tuesday 23 August 2005 10:49, Brian Paul wrote:
>>
>>>Whenever the 6.3.2 code is brought in, the following directories and
>>>files should be removed as they contain GPL code:
>>>
>>>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.

-Brian