Changes 6.4:

    New:
	- Added a fast XOR line drawing function in Xlib driver
	- Added support for GL_ARB_texture_mirrored_repeat to savage
	  driver (supported only on Savage4 hardware).
    Changes:
	- Mesa now packaged in three parts: Library, Demos and GLUT
    Bug fixes:
	- GLX_X_RENDERABLE token wasn't accepted by glXChooseFBConfig
	- Some files were present multiple times in the 6.3.2 tarballs
	- r200_vtxtmp_x86.S file was missing from 6.3.2 tarball (bug 4207)
	- glxgears_fbconfig demo didn't work (bug 4237)
	- fixed bug when bilinear sampling 2d textures with borders
	- glXCreatePbuffer() could segfault instead of returning 0 (bug 4235)
	- fixed undefined frexp and rand in X.org libGLcore.a (bug 4242)
	- fixed a few problems with proxy color tables (bug 4270)
	- fixed precision problem in Z clearing (bug 4395)
	- glBitmap, glDraw/CopyPixels mistakenly generated selection hits
	- fixed potential segfault caused by reading pixels outside
	  of renderbuffer bounds
	- glGetTexLevelParameter didn't accept GL_TEXTURE_DEPTH_SIZE_ARB
	- fixed memory corruption bug involving software alpha buffers
	- glReadPixels clipped by window bounds was sometimes broken
	- glDraw/CopyPixels of stencil data ignored the stencil write mask
	- glReadPixels from a texture bound to a framebuffer object didn't work
	- glIsRender/FramebufferEXT weren't totally correct
	- fixed a number of point size attenuation/fade bugs
	- fixed glFogCoord bug 4729
	- GLX encoding for transpose matrix functions was broken
	- fixed broken fragment program KIL and SWZ instructions
	- fragment programs that wrote result.depth.z didn't work

Changes 6.4.1:
    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 files changed, 39 insertions, 80 deletions

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index c80533863b8..bda11da2457 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/01/12 12:59:15 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/19 12:53:17 adam Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
 COMMENT=	OpenGL examples and Demos
@@ -9,6 +9,7 @@ DISTINFO_FILE=		${.CURDIR}/distinfo
 .include "../../graphics/Mesa/Makefile.common"
 
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
 MAKE_FLAGS+=		LIB_DEP=""
 
 pre-build:
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 3bc401037b7..99772df5f63 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,51 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2004/10/26 13:57:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/01/19 12:53:17 adam Exp $
 share/examples/${PKGNAME}/beos/GLInfo.cpp
 share/examples/${PKGNAME}/beos/demo.cpp
 share/examples/${PKGNAME}/beos/sample.cpp
 share/examples/${PKGNAME}/demos/README
-share/examples/${PKGNAME}/demos/Windows/all.dsp
-share/examples/${PKGNAME}/demos/Windows/bounce.dsp
-share/examples/${PKGNAME}/demos/Windows/clearspd.dsp
-share/examples/${PKGNAME}/demos/Windows/cubemap.dsp
-share/examples/${PKGNAME}/demos/Windows/demos.dsw
-share/examples/${PKGNAME}/demos/Windows/drawpix.dsp
-share/examples/${PKGNAME}/demos/Windows/fire.dsp
-share/examples/${PKGNAME}/demos/Windows/gears.dsp
-share/examples/${PKGNAME}/demos/Windows/geartrain.dsp
-share/examples/${PKGNAME}/demos/Windows/glinfo.dsp
-share/examples/${PKGNAME}/demos/Windows/gloss.dsp
-share/examples/${PKGNAME}/demos/Windows/gltestperf.dsp
-share/examples/${PKGNAME}/demos/Windows/glutfx.dsp
-share/examples/${PKGNAME}/demos/Windows/ipers.dsp
-share/examples/${PKGNAME}/demos/Windows/isosurf.dsp
-share/examples/${PKGNAME}/demos/Windows/loadbias.dsp
-share/examples/${PKGNAME}/demos/Windows/morph3d.dsp
-share/examples/${PKGNAME}/demos/Windows/multiarb.dsp
-share/examples/${PKGNAME}/demos/Windows/occlude.dsp
-share/examples/${PKGNAME}/demos/Windows/osdemo.dsp
-share/examples/${PKGNAME}/demos/Windows/paltex.dsp
-share/examples/${PKGNAME}/demos/Windows/pixeltex.dsp
-share/examples/${PKGNAME}/demos/Windows/pointblast.dsp
-share/examples/${PKGNAME}/demos/Windows/rain.dsp
-share/examples/${PKGNAME}/demos/Windows/ray.dsp
-share/examples/${PKGNAME}/demos/Windows/readpix.dsp
-share/examples/${PKGNAME}/demos/Windows/reflect.dsp
-share/examples/${PKGNAME}/demos/Windows/renormal.dsp
-share/examples/${PKGNAME}/demos/Windows/shadowtex.dsp
-share/examples/${PKGNAME}/demos/Windows/spectex.dsp
-share/examples/${PKGNAME}/demos/Windows/spriteblast.dsp
-share/examples/${PKGNAME}/demos/Windows/stex3d.dsp
-share/examples/${PKGNAME}/demos/Windows/teapot.dsp
-share/examples/${PKGNAME}/demos/Windows/terrain.dsp
-share/examples/${PKGNAME}/demos/Windows/tessdemo.dsp
-share/examples/${PKGNAME}/demos/Windows/texcyl.dsp
-share/examples/${PKGNAME}/demos/Windows/texdown.dsp
-share/examples/${PKGNAME}/demos/Windows/texenv.dsp
-share/examples/${PKGNAME}/demos/Windows/texobj.dsp
-share/examples/${PKGNAME}/demos/Windows/trispd.dsp
-share/examples/${PKGNAME}/demos/Windows/tunnel.dsp
-share/examples/${PKGNAME}/demos/Windows/tunnel2.dsp
-share/examples/${PKGNAME}/demos/Windows/winpos.dsp
 share/examples/${PKGNAME}/demos/arbfplight
 share/examples/${PKGNAME}/demos/arbfplight.c
 share/examples/${PKGNAME}/demos/arbocclude
@@ -93,10 +50,6 @@ share/examples/${PKGNAME}/demos/multiarb
 share/examples/${PKGNAME}/demos/multiarb.c
 share/examples/${PKGNAME}/demos/occlude
 share/examples/${PKGNAME}/demos/occlude.c
-share/examples/${PKGNAME}/demos/osdemo
-share/examples/${PKGNAME}/demos/osdemo.c
-share/examples/${PKGNAME}/demos/osdemo16.c
-share/examples/${PKGNAME}/demos/osdemo32.c
 share/examples/${PKGNAME}/demos/paltex
 share/examples/${PKGNAME}/demos/paltex.c
 share/examples/${PKGNAME}/demos/particles.cxx
@@ -118,6 +71,8 @@ share/examples/${PKGNAME}/demos/renormal
 share/examples/${PKGNAME}/demos/renormal.c
 share/examples/${PKGNAME}/demos/shadowtex
 share/examples/${PKGNAME}/demos/shadowtex.c
+share/examples/${PKGNAME}/demos/showbuffer.c
+share/examples/${PKGNAME}/demos/showbuffer.h
 share/examples/${PKGNAME}/demos/spectex
 share/examples/${PKGNAME}/demos/spectex.c
 share/examples/${PKGNAME}/demos/spriteblast
@@ -153,12 +108,16 @@ share/examples/${PKGNAME}/ggi/gears.c
 share/examples/${PKGNAME}/ggi/gears2.c
 share/examples/${PKGNAME}/images/bw.rgb
 share/examples/${PKGNAME}/images/girl.rgb
+share/examples/${PKGNAME}/images/girl2.rgb
 share/examples/${PKGNAME}/images/reflect.rgb
 share/examples/${PKGNAME}/images/s128.rgb
 share/examples/${PKGNAME}/images/tile.rgb
 share/examples/${PKGNAME}/images/tree2.rgba
 share/examples/${PKGNAME}/images/tree3.rgb
 share/examples/${PKGNAME}/images/wrs_logo.rgb
+share/examples/${PKGNAME}/osdemos/osdemo.c
+share/examples/${PKGNAME}/osdemos/osdemo16.c
+share/examples/${PKGNAME}/osdemos/osdemo32.c
 share/examples/${PKGNAME}/redbook/README
 share/examples/${PKGNAME}/redbook/aaindex
 share/examples/${PKGNAME}/redbook/aaindex.c
@@ -328,6 +287,8 @@ share/examples/${PKGNAME}/samples/prim
 share/examples/${PKGNAME}/samples/prim.c
 share/examples/${PKGNAME}/samples/quad
 share/examples/${PKGNAME}/samples/quad.c
+share/examples/${PKGNAME}/samples/readtex.c
+share/examples/${PKGNAME}/samples/readtex.h
 share/examples/${PKGNAME}/samples/rgbtoppm.c
 share/examples/${PKGNAME}/samples/select
 share/examples/${PKGNAME}/samples/select.c
@@ -383,10 +344,14 @@ share/examples/${PKGNAME}/windml/wrs_logo.bmp
 share/examples/${PKGNAME}/xdemos/descrip.mms
 share/examples/${PKGNAME}/xdemos/glthreads
 share/examples/${PKGNAME}/xdemos/glthreads.c
+share/examples/${PKGNAME}/xdemos/glwdemo.c
+share/examples/${PKGNAME}/xdemos/glxcontexts
+share/examples/${PKGNAME}/xdemos/glxcontexts.c
 share/examples/${PKGNAME}/xdemos/glxdemo
 share/examples/${PKGNAME}/xdemos/glxdemo.c
 share/examples/${PKGNAME}/xdemos/glxgears
 share/examples/${PKGNAME}/xdemos/glxgears.c
+share/examples/${PKGNAME}/xdemos/glxgears_fbconfig
 share/examples/${PKGNAME}/xdemos/glxgears_fbconfig.c
 share/examples/${PKGNAME}/xdemos/glxheads
 share/examples/${PKGNAME}/xdemos/glxheads.c
@@ -403,6 +368,8 @@ share/examples/${PKGNAME}/xdemos/manywin.c
 share/examples/${PKGNAME}/xdemos/offset
 share/examples/${PKGNAME}/xdemos/offset.c
 share/examples/${PKGNAME}/xdemos/opencloseopen.c
+share/examples/${PKGNAME}/xdemos/overlay
+share/examples/${PKGNAME}/xdemos/overlay.c
 share/examples/${PKGNAME}/xdemos/pbdemo
 share/examples/${PKGNAME}/xdemos/pbdemo.c
 share/examples/${PKGNAME}/xdemos/pbinfo
@@ -423,14 +390,16 @@ share/examples/${PKGNAME}/xdemos/xrotfontdemo
 share/examples/${PKGNAME}/xdemos/xrotfontdemo.c
 share/examples/${PKGNAME}/xdemos/xuserotfont.c
 share/examples/${PKGNAME}/xdemos/xuserotfont.h
+share/examples/${PKGNAME}/xdemos/yuvrect_client
+share/examples/${PKGNAME}/xdemos/yuvrect_client.c
 @dirrm share/examples/${PKGNAME}/xdemos
 @dirrm share/examples/${PKGNAME}/windml
 @dirrm share/examples/${PKGNAME}/util
 @dirrm share/examples/${PKGNAME}/samples
 @dirrm share/examples/${PKGNAME}/redbook
+@dirrm share/examples/${PKGNAME}/osdemos
 @dirrm share/examples/${PKGNAME}/images
 @dirrm share/examples/${PKGNAME}/ggi
-@dirrm share/examples/${PKGNAME}/demos/Windows
 @dirrm share/examples/${PKGNAME}/demos
 @dirrm share/examples/${PKGNAME}/beos
 @dirrm share/examples/${PKGNAME}
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 91c9760729a..4a7d702a6c0 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 08:45:02 agc Exp $
+$NetBSD: distinfo,v 1.14 2006/01/19 12:53:17 adam Exp $
 
-SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189
-RMD160 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = cfc5e8db61289c017ff20dd6b4c6db5c7b66855b
-Size (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 1627520 bytes
-SHA1 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = f8da791e365eec633a70c4b5a76d96d27838e20b
-RMD160 (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 62b3ebc47e822c4704b69c9888e74bae12a1391b
-Size (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 1004511 bytes
+SHA1 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = efb70276ccd9cd13dbd7d5e581213a5ca3e4ef25
+RMD160 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = e3a54d6442fa5d6e446bb0b6704bd22c31fb4927
+Size (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = 2913887 bytes
+SHA1 (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = b28f0dcee182604646e0e7d6aaaea25d816bacce
+RMD160 (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = a09583b05c551852f5b4bc9688bca8a713c5f3bc
+Size (Mesa-6.4.1/MesaGLUT-6.4.1.tar.bz2) = 270793 bytes
+SHA1 (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = ae7a13ed55dfac9dde13464df0c4ac98ac6f7669
+RMD160 (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = 3cff02a195e2aa558d3b5dbbfe15e03ee280df62
+Size (Mesa-6.4.1/MesaDemos-6.4.1.tar.bz2) = 819391 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4
-SHA1 (patch-ac) = 3640b405d9402b6a8e96a257813f116f5502740b
-SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
+SHA1 (patch-ac) = ebaaf755d35bd7f82fe93cff9bb98abee6bbf415
 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1
-SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
+SHA1 (patch-ah) = 02f1c4ac8a41999454cbebe5d91167fafc7f554e
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
index 2398fa02405..d22115836b3 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.8 2005/01/04 15:50:08 adam Exp $
+$NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $
 
---- Makefile.orig	2004-12-05 18:25:19.000000000 +0000
+--- Makefile.orig	2005-11-29 23:38:49.000000000 +0100
 +++ Makefile
 @@ -2,7 +2,7 @@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2005/01/04 15:50:08 adam Exp $
  
  
  default: $(TOP)/configs/current
-@@ -100,6 +100,7 @@ linux-x86-64-static \
+@@ -117,6 +117,7 @@ linux-x86-xcb \
  linux-x86-glide \
  linux-x86-static \
  netbsd \
diff --git a/graphics/MesaDemos/patches/patch-ad b/graphics/MesaDemos/patches/patch-ad
deleted file mode 100644
index 92db20ec87b..00000000000
--- a/graphics/MesaDemos/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/01/20 02:48:33 jschauma Exp $
-
---- progs/demos/osdemo.c.orig	2004-01-19 20:07:26.000000000 -0500
-+++ progs/demos/osdemo.c	2004-01-19 20:08:09.000000000 -0500
-@@ -301,7 +301,7 @@
- 
-    if (filename != NULL) {
- #ifdef SAVE_TARGA
--      write_targa(filename, buffer, WIDTH, HEIGHT);
-+      write_targa(filename, (const GLubyte*)buffer, WIDTH, HEIGHT);
- #else
-       write_ppm(filename, buffer, WIDTH, HEIGHT);
- #endif
diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah
index f922e0fb9ad..fabbcd5ca9d 100644
--- a/graphics/MesaDemos/patches/patch-ah
+++ b/graphics/MesaDemos/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2004/10/26 13:57:47 adam Exp $
+$NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $
 
---- configs/default.orig	2004-10-25 17:21:49.000000000 +0000
+--- configs/default.orig	2005-10-25 01:35:14.000000000 +0200
 +++ configs/default
-@@ -14,10 +14,6 @@ MESA_TINY=0
+@@ -14,10 +14,6 @@ MESA_TINY=1
  DRM_SOURCE_PATH=$(TOP)/../drm
  
  # Compiler and flags
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.2 2004/10/26 13:57:47 adam Exp $
  GLU_CFLAGS = 
  
  # Misc tools and flags
-@@ -52,7 +48,7 @@ GLW_SOURCES = GLwDrawA.c
+@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c
  
  # Directories
  LIB_DIR = $(TOP)/lib