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)

10 files changed, 27 insertions, 120 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 841c36c2c8b..1a3f8080870 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.65 2006/02/09 12:27:42 adam Exp $
 
 PKGNAME=	Mesa-${MESA_VERSION}
-PKGREVISION=	1
 MASTER_SITES= 	# empty
 DISTFILES=	# empty
 
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index c795eae31c8..26cc376c5da 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2006/01/19 12:53:17 adam Exp $
+# $NetBSD: Makefile.common,v 1.46 2006/02/09 12:27:42 adam Exp $
 
 DISTNAME=	MesaLib-${MESA_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -9,7 +9,7 @@ CATEGORIES=	graphics
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
 EXTRACT_SUFX=	.tar.bz2
 
-MESA_VERSION=	6.4.1
+MESA_VERSION=	6.4.2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.mesa3d.org/
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 92802bddba9..78712c8031a 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/09 12:27:42 adam Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
-PKGREVISION=	1
 COMMENT=	OpenGL examples and Demos
 
 PATCHDIR=		${.CURDIR}/patches
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 4a7d702a6c0..07da0108762 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.14 2006/01/19 12:53:17 adam Exp $
+$NetBSD: distinfo,v 1.15 2006/02/09 12:27:42 adam Exp $
 
-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 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640
+RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509
+Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes
+SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771
+RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e
+Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes
+SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
+RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a
+Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4
 SHA1 (patch-ac) = ebaaf755d35bd7f82fe93cff9bb98abee6bbf415
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index ee1e3ffd199..bcd87b17b5b 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/02/09 12:27:42 adam Exp $
 
 PKGNAME=	MesaLib-${MESA_VERSION}
-PKGREVISION=	1
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 .include "../../graphics/Mesa/Makefile.common"
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index bc4983dc87d..09337050089 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.36 2006/01/31 21:44:31 kristerw Exp $
+$NetBSD: distinfo,v 1.37 2006/02/09 12:27:42 adam Exp $
 
-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 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640
+RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509
+Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes
+SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771
+RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e
+Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes
+SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
+RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a
+Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes
 SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606
 SHA1 (patch-ab) = c257a57d4570576f160e9a4c029384718402c1bd
 SHA1 (patch-ac) = a12c3538907aaa63184371037c0f70924861fbe4
@@ -19,6 +19,4 @@ SHA1 (patch-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac
 SHA1 (patch-ah) = b9ee33c497b8abe2af004a4f13219a19f413f30e
 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558
 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a
-SHA1 (patch-ak) = 3cce21b97f828895e73aa75469ce75de4f84be83
 SHA1 (patch-al) = 8ccbc370bc52882ee72ba76b72a99f163f7b89a7
-SHA1 (patch-am) = 7a96e7b4afaba76c8b86e2ee9c5c0c6a4f51a717
diff --git a/graphics/MesaLib/patches/patch-ak b/graphics/MesaLib/patches/patch-ak
deleted file mode 100644
index b63e40f309c..00000000000
--- a/graphics/MesaLib/patches/patch-ak
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/01/30 08:54:55 rillig Exp $
-
-Declarations inside of macros are evil. Even more if they are not preceded
-by an additional opening brace.
-
---- src/mesa/swrast/s_triangle.c.orig	2005-06-30 15:42:10.000000000 +0200
-+++ src/mesa/swrast/s_triangle.c	2006-01-30 09:53:24.000000000 +0100
-@@ -163,6 +163,7 @@ _swrast_culltriangle( GLcontext *ctx,
-    }
- 
- #define RENDER_SPAN( span  )						\
-+{									\
-    GLuint i;								\
-    span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\
-    span.intTex[1] -= FIXED_HALF;					\
-@@ -177,7 +178,8 @@ _swrast_culltriangle( GLcontext *ctx,
-       span.intTex[0] += span.intTexStep[0];				\
-       span.intTex[1] += span.intTexStep[1];				\
-    }									\
--   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL);
-+   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); \
-+}
- 
- #include "s_tritemp.h"
- 
-@@ -214,6 +216,7 @@ _swrast_culltriangle( GLcontext *ctx,
-    }
- 
- #define RENDER_SPAN( span )						\
-+{									\
-    GLuint i;				    				\
-    span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\
-    span.intTex[1] -= FIXED_HALF;					\
-@@ -238,7 +241,8 @@ _swrast_culltriangle( GLcontext *ctx,
-       span.z += span.zStep;						\
-    }									\
-    rb->PutRowRGB(ctx, rb, span.end, span.x, span.y,			\
--                 span.array->rgb, span.array->mask);
-+                 span.array->rgb, span.array->mask);			\
-+}
- 
- #include "s_tritemp.h"
- 
diff --git a/graphics/MesaLib/patches/patch-am b/graphics/MesaLib/patches/patch-am
deleted file mode 100644
index 774bc73a96c..00000000000
--- a/graphics/MesaLib/patches/patch-am
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/01/31 21:44:31 kristerw Exp $
-
-Declarations inside of macros are evil. Even more if they are not preceded
-by an additional opening brace.
-
---- src/mesa/drivers/osmesa/osmesa.c.orig	Tue Jan 31 22:33:21 2006
-+++ src/mesa/drivers/osmesa/osmesa.c	Tue Jan 31 22:34:10 2006
-@@ -471,7 +471,7 @@
- #define INTERP_ALPHA 1
- #define SETUP_CODE \
-    const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
--#define RENDER_SPAN( span )					\
-+#define RENDER_SPAN( span ) {					\
-    GLuint i;							\
-    GLchan *img = PIXELADDR4(span.x, span.y); 			\
-    for (i = 0; i < span.end; i++, img += 4) {			\
-@@ -487,7 +487,7 @@
-       span.blue += span.blueStep;				\
-       span.alpha += span.alphaStep;				\
-       span.z += span.zStep;					\
--   }
-+   } }
- #ifdef WIN32
- #include "..\swrast\s_tritemp.h"
- #else
-@@ -508,7 +508,7 @@
-    PACK_RGBA((GLchan *) &pixel, v2->color[0], v2->color[1],	\
-                                 v2->color[2], v2->color[3]);
- 
--#define RENDER_SPAN( span )				\
-+#define RENDER_SPAN( span ) {				\
-    GLuint i;						\
-    GLuint *img = (GLuint *) PIXELADDR4(span.x, span.y);	\
-    for (i = 0; i < span.end; i++) {			\
-@@ -518,7 +518,7 @@
-          zRow[i] = z;					\
-       }							\
-       span.z += span.zStep;				\
--   }
-+   } }
- #ifdef WIN32
- #include "..\swrast\s_tritemp.h"
- #else
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 4f677614581..1c07706c81f 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/02/09 12:27:42 adam Exp $
 
 PKGNAME=	${DISTNAME:C/MesaLib/glu/}
-PKGREVISION=	1
 COMMENT=	GLU polygon tessellation facility for Mesa
 
 CONFLICTS+=	Mesa-glx-[0-9]*
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index b6928abab47..a068e665a94 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/02/09 12:27:42 adam Exp $
 
 PKGNAME=	${DISTNAME:S/MesaLib/glut/}
-PKGREVISION=	1
 COMMENT=	GLUT Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=	Mesa-glx-[0-9]*