bring in changes from 6.4 branch

5 files changed, 190 insertions, 1 deletions

diff --git a/docs/RELNOTES-6.4.1 b/docs/RELNOTES-6.4.1
new file mode 100644
index 00000000000..4a867e77825
--- /dev/null
+++ b/docs/RELNOTES-6.4.1
@@ -0,0 +1,47 @@
+
+		        Mesa 6.4.1 Release Notes
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.3) designate new developmental releases.
+Even numbered versions (such as 6.4) designate stable releases.
+
+
+6.4.1 is a bug-fix release.  See the VERSIONS file for details.
+
+
+
+GLUT tarball
+------------
+
+Starting with 6.4, the GLUT library sources are distributed in a separate
+tarball.  This was done at the request of Linux distro vendors who prefer
+to use freeglut.
+
+
+
+
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa (Xlib)		implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Windows/Win32		implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)  requires updates	
+SVGA			requires updates
+DJGPP			requires updates
+GGI			requires updates
+BeOS			requires updates
+Allegro			requires updates
+D3D			requires updates
+
+The drivers which require updates mostly need to be updated to work
+with the new gl_renderbuffer / gl_framebuffer infrastructure introduced
+in Mesa 6.3.
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-6.4.1,v 3.1 2006/02/03 17:21:54 brianp Exp $
diff --git a/docs/RELNOTES-6.4.2 b/docs/RELNOTES-6.4.2
new file mode 100644
index 00000000000..f9312157b1a
--- /dev/null
+++ b/docs/RELNOTES-6.4.2
@@ -0,0 +1,47 @@
+
+		        Mesa 6.4.2 Release Notes
+
+
+Introduction
+------------
+
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.3) designate new developmental releases.
+Even numbered versions (such as 6.4) designate stable releases.
+
+
+6.4.2 is a minor bug-fix release.  See the VERSIONS file for details.
+
+
+
+GLUT tarball
+------------
+
+Starting with 6.4, the GLUT library sources are distributed in a separate
+tarball.  This was done at the request of Linux distro vendors who prefer
+to use freeglut.
+
+
+
+
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa (Xlib)		implements OpenGL 1.5
+OSMesa (off-screen)	implements OpenGL 1.5
+Windows/Win32		implements OpenGL 1.5
+Glide (3dfx Voodoo1/2)  requires updates	
+SVGA			requires updates
+DJGPP			requires updates
+GGI			requires updates
+BeOS			requires updates
+Allegro			requires updates
+D3D			requires updates
+
+The drivers which require updates mostly need to be updated to work
+with the new gl_renderbuffer / gl_framebuffer infrastructure introduced
+in Mesa 6.3.
+
+
+----------------------------------------------------------------------
+$Id: RELNOTES-6.4.2,v 3.1 2006/02/03 17:21:54 brianp Exp $
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 6cf48e68d35..55e05f6ec7a 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1407,6 +1407,33 @@ Mesa Version History
 	- fragment programs that wrote result.depth.z didn't work
 
 
+6.4.1  November 30, 2005
+    Bug fixes:
+	- redefining a vertex program string didn't take effect in TNL module
+	- fixed occasional segfault upon vertex/fragment parsing error
+	- vertex program LIT instruction didn't handle 0^0=1 correctly
+	- fragment program fog option didn't work with glDrawPixels, glBitmap
+	- USE_MGL_NAMESPACE didn't work for x86-64
+	- OSMesa demos were missing from previous release tarballs
+	- fixed problem with float->ushort conversion in glClear (bug 4992)
+	- popping of GL_EYE_PLANE texgen state was broken (bug 4996)
+	- popping of GL_SPOT_DIRECTION light state was broken (bug 5005)
+	- fixed occasional triangle color interpolation problem on VMS
+	- work around invalid free() call (bug 5131)
+	- fixed BSD X server compilation problem by including stdint.h
+
+
+6.4.2  February 2, 2006
+    New:
+	- added OSMesaColorClamp() function/feature
+	- added wglGetExtensionStringARB() function
+    Bug fixes:
+	- fixed some problems when building on Windows
+	- GLw header files weren't installed by installmesa script (bug 5396)
+	- GL/glfbdev.h file was missing from tarballs
+	- fixed TNL initialization bug which could lead to crash (bug 5791)
+
+
 6.5  month, day, 2005
     New:
 	- GL_EXT_packed_depth_stencil extension
diff --git a/docs/news.html b/docs/news.html
index b756d26578f..b55ca5ccfe6 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,72 @@
 <H1>News</H1>
 
 
+<h2>February 2, 2006</h2>
+<p>
+Mesa 6.4.2 has been released.  This is primarily a bug-fix release.
+</p>
+<pre>
+    New items:
+	- added OSMesaColorClamp() function/feature
+	- added wglGetExtensionStringARB() function
+    Bug fixes:
+	- fixed some problems when building on Windows
+	- GLw header files weren't installed by installmesa script (bug 5396)
+	- GL/glfbdev.h file was missing from tarballs
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+cb0d745d520fa7c2bb9178058b763544  MesaLib-6.4.2.tar.gz
+7674d2c603b5834259e4e5a820cefd5b  MesaLib-6.4.2.tar.bz2
+d224e1325b33ff71a0f3893fc6b4d594  MesaLib-6.4.2.zip
+d4b345d4588fc750cd3d34f3ac26673e  MesaDemos-6.4.2.tar.gz
+9cae1ab874af533ce356bd7dfe2e0bb0  MesaDemos-6.4.2.tar.bz2
+2da6e1d1245e441d27813595c6ba50de  MesaDemos-6.4.2.zip
+84427d18c3453f0ea52388eeba7169b5  MesaGLUT-6.4.2.tar.gz
+b157ba8ad1ea63260cf5339132e7aac6  MesaGLUT-6.4.2.tar.bz2
+fe1523744fc05edc3811dfc6a1bf4181  MesaGLUT-6.4.2.zip
+</pre>
+
+
+<h2>November 29, 2005</h2>
+<p>
+Mesa 6.4.1 has been released.  This is a stable, bug-fix release.
+</p>
+<pre>
+    Bug fixes:
+	- redefining a vertex program string didn't take effect in TNL module
+	- fixed occasional segfault upon vertex/fragment parsing error
+	- vertex program LIT instruction didn't handle 0^0=1 correctly
+	- fragment program fog option didn't work with glDrawPixels, glBitmap
+	- USE_MGL_NAMESPACE didn't work for x86-64
+	- OSMesa demos were missing from previous release tarballs
+	- fixed problem with float->ushort conversion in glClear (bug 4992)
+	- popping of GL_EYE_PLANE texgen state was broken (bug 4996)
+	- popping of GL_SPOT_DIRECTION light state was broken (bug 5005)
+	- fixed occasional triangle color interpolation problem on VMS
+	- work around invalid free() call (bug 5131)
+	- fixed BSD X server compilation problem by including stdint.h
+</pre>
+<p>
+The MD5 checksums are:
+</p>
+<pre>
+698ceb574cf882b0226761f5913c0da9  MesaLib-6.4.1.tar.gz
+ea148c828ec6f645526451db1b8556f1  MesaLib-6.4.1.tar.bz2
+42e93279468975ed2bf3111b8721e5d9  MesaLib-6.4.1.zip
+e3b0d50807fd2bdcd1a95aaddd786f13  MesaDemos-6.4.1.tar.gz
+99df1fdcb98d391666b476ca6f1dda8a  MesaDemos-6.4.1.tar.bz2
+b999d2c6d92fb4b7740a3dbd889348e3  MesaDemos-6.4.1.zip
+eadfe01fe5ddfb1eb8227dd567b31635  MesaGLUT-6.4.1.tar.gz
+bd003bb4f981a4f91dee4c38644d4f3f  MesaGLUT-6.4.1.tar.bz2
+71c401c037088bf688a88afdaeb3420f  MesaGLUT-6.4.1.zip
+</pre>
+
+
+
+
 <h2>October 24, 2005</h2>
 <p>
 Mesa 6.4 has been released.  This is a stable, bug-fix release.
@@ -1102,6 +1168,6 @@ source code</a>.</p>
 
 
 <hr>
-$Id: news.html,v 3.25 2005/10/24 23:33:27 brianp Exp $
+$Id: news.html,v 3.26 2006/02/03 17:21:54 brianp Exp $
 </body>
 </html>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 36083a1fbce..270567d1821 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,6 +13,8 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
+<LI><A HREF="RELNOTES-6.4.2">RELNOTES-6.4.2</A>
+<LI><A HREF="RELNOTES-6.4.1">RELNOTES-6.4.1</A>
 <LI><A HREF="RELNOTES-6.4">RELNOTES-6.4</A>
 <LI><A HREF="RELNOTES-6.3.2">RELNOTES-6.3.2</A>
 <LI><A HREF="RELNOTES-6.3">RELNOTES-6.3</A>