Mesa 6.3.1 merge

[Brian Paul]

Mike A. Harris wrote:
> Brian Paul wrote:
> 
>>> 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.
> 
> 
> That's fair enough.  We've been shipping freeglut for several OS
> releases now, and I think I've only gotten 1 or two bug reports.
> That isn't indicative of its reliabiltiy/stability though.  People
> could be filing reports upstream instead of in our bugzilla (which
> is much preferred anyway), or they could just silently be downloading
> GLUT and replacing our supplied freeglut with it perhaps. ;)
> 
> 
>> Currently the GLUT sources are in the MesaDemos tarball.  I guess I 
>> could make a 3rd tarball with just the GLUT bits.
> 
> 
> That would be great, as we could then ship the stock upstream
> Mesa tarballs in FC5 without having to modify locally.  We
> strongly prefer to use unmodified upstream tarballs whenever
> possible, so that'd be a big plus.
> 
> 
>> 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.
> 
> 
> We have shipped the Mesa included with XFree86 and Xorg since
> XFree86 4.2.0 through 4.3.0, and all X.Org releases, as it was
> easier to maintain this way.  Prior to that we had to extract
> XFree86 code from the main XFree86 tarball to build the
> external Mesa source, and there were build loops between our
> XFree86 and Mesa rpms.  It caused a lot of development maintenance
> overhead, so we started using the Mesa included with X for
> simplicity.
> 
> With the modular tree however, we've been looking forward to
> shipping the standalone Mesa once again in FC5, as the build
> process seems to have improved dramatically in the latest
> releases which basically eliminates the build-loop problem
> we had before.
> 
> I haven't started rpm packaging of Mesa yet, but I was planning
> on shipping Mesa in Fedora Core, and Mesa-demos perhaps in
> Fedora Extras.  Me or Kristian will probably do that sometime
> this week.
> 
> GLUT and it's legal issues are the only problem that I see so far
> for us, but it looks like that's workable if you can split it out
> into a separate tarball.  Alternatively we could cut it out, but
> things are much easier, and more authentic (users seem to care
> a lot about this) if we can use the upstream tarballs unmodified.

Mike,

The next Mesa release (6.4) will put the GLUT sources into a separate 
tarball.  So we'll have:

MesaLib-6.4.tar.gz
MesaDemos-6.4.tar.gz
MesaGLUT-6.4.tar.gz

I can make the Mesa 6.4 release anytime.  This will have bug fixes 
since the 6.3.2 release (nothing major yet, but a bunch of little 
items).  The even minor version number (4) indicates a stable release.

Whoever's doing the Mesa import into X.org should probably coordinate 
with me.

-Brian