Changes 6.0.1:

New:
- upgraded glext.h to version 22
- new build targets (Dan Schikore)
- new linux-x86-opteron build target (Heath Feather)
Bug fixes:
- glBindProgramARB didn't update all necessary state
- fixed build problems on OpenBSD
- omit CVS directories from tarballs
- glGetTexImage(GL_COLOR_INDEX) was broken
- fixed an infinite loop in t&l module
- silenced some valgrind warnings about using unitialized memory
- fixed some compilation/link glitches on IRIX (Mike Stephens)
- glBindProgram wasn't getting compiled into display lists
- GLX_FBCONFIG_ID wasn't recognized in glXChooseFBConfig() (bug 888079)
- two-sided lighting and vertex program didn't work (bug 887330)
- stores to program parameter registers in vertex state programs
  didn't work.
- fixed glOrtho bug found with gcc 3.2.2 (RH9)
- glXCreateWindow() wasn't fully implemented (bug 890894)
- generic vertex attribute arrays didn't work in display lists
- vertex buffer objects' default usage and access fields were wrong
- glDrawArrays with start!=0 was broken
- fragment program PK2H, UP2H, UP4B and UP4UB instructions were broken
- linux-osmesa16-static config didn't work
- fixed a few color index rendering problems (bug 910687)
- glInterleavedArrays didn't respect GL_CLIENT_ACTIVE_TEXTURE
- OSMesa RGB and BGR modes were broken
- glProgramStringARB mistakenly required a null-terminated string
- fragment program XPD instruction was incorrect
- glGetMaterial() didn't work reliably

5 files changed, 22 insertions, 32 deletions

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 51f76f7f68b..fb5261da894 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2004/03/15 18:04:34 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/09 13:08:20 adam Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
-PKGREVISION=	1
 COMMENT=	OpenGL examples and Demos
 
 PATCHDIR=		${.CURDIR}/patches
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 388cf09b53c..87951832395 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/20 02:48:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/09 13:08:20 adam Exp $
 share/examples/${PKGNAME}/demos/README
-share/examples/${PKGNAME}/demos/Windows/CVS/Entries
-share/examples/${PKGNAME}/demos/Windows/CVS/Repository
-share/examples/${PKGNAME}/demos/Windows/CVS/Root
-share/examples/${PKGNAME}/demos/Windows/CVS/Template
 share/examples/${PKGNAME}/demos/Windows/all.dsp
 share/examples/${PKGNAME}/demos/Windows/bounce.dsp
 share/examples/${PKGNAME}/demos/Windows/clearspd.dsp
@@ -147,10 +143,6 @@ share/examples/${PKGNAME}/demos/winpos.c
 share/examples/${PKGNAME}/ggi/asc-view.c
 share/examples/${PKGNAME}/ggi/gears.c
 share/examples/${PKGNAME}/ggi/gears2.c
-share/examples/${PKGNAME}/images/CVS/Entries
-share/examples/${PKGNAME}/images/CVS/Repository
-share/examples/${PKGNAME}/images/CVS/Root
-share/examples/${PKGNAME}/images/CVS/Template
 share/examples/${PKGNAME}/images/bw.rgb
 share/examples/${PKGNAME}/images/girl.rgb
 share/examples/${PKGNAME}/images/reflect.rgb
@@ -403,6 +395,7 @@ share/examples/${PKGNAME}/xdemos/pbinfo.c
 share/examples/${PKGNAME}/xdemos/pbutil.c
 share/examples/${PKGNAME}/xdemos/pbutil.h
 share/examples/${PKGNAME}/xdemos/shape.c
+share/examples/${PKGNAME}/xdemos/testgl5.c
 share/examples/${PKGNAME}/xdemos/vgears.c
 share/examples/${PKGNAME}/xdemos/vindex.c
 share/examples/${PKGNAME}/xdemos/vtest.c
@@ -417,10 +410,8 @@ share/examples/${PKGNAME}/xdemos/xfont.c
 @dirrm share/examples/${PKGNAME}/util
 @dirrm share/examples/${PKGNAME}/samples
 @dirrm share/examples/${PKGNAME}/redbook
-@dirrm share/examples/${PKGNAME}/images/CVS
 @dirrm share/examples/${PKGNAME}/images
 @dirrm share/examples/${PKGNAME}/ggi
-@dirrm share/examples/${PKGNAME}/demos/Windows/CVS
 @dirrm share/examples/${PKGNAME}/demos/Windows
 @dirrm share/examples/${PKGNAME}/demos
 @dirrm share/examples/${PKGNAME}
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 30855b4ef90..a1689391dc6 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2004/03/15 18:04:34 jlam Exp $
+$NetBSD: distinfo,v 1.10 2004/04/09 13:08:20 adam Exp $
 
-SHA1 (Mesa-6.0/MesaLib-6.0.tar.bz2) = 00f0ac27fbc3eddfdbc84de482f16b64b904d60c
-Size (Mesa-6.0/MesaLib-6.0.tar.bz2) = 1487379 bytes
-SHA1 (Mesa-6.0/MesaDemos-6.0.tar.bz2) = f57a76d0b9b4f70197860eda15f5241a02017a91
-Size (Mesa-6.0/MesaDemos-6.0.tar.bz2) = 915060 bytes
+SHA1 (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = e396e28d693cd7abfe8e3d4d726dfc28b3b335a2
+Size (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = 1496291 bytes
+SHA1 (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 8831d9af0a1afbdee29838460d5340f4612d7cd6
+Size (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 915558 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
-SHA1 (patch-ab) = 3d53af4d2036259bb23979ad0b411af63eacbbd1
-SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4
+SHA1 (patch-ab) = 15687f90c7727d8167ca829ffb185e457e87e5d7
+SHA1 (patch-ac) = 9c780cee963a99801b3a29176c00942fc5ef938f
 SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
 SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b
 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
index 9b79706c0ba..f885ef8608c 100644
--- a/graphics/MesaDemos/patches/patch-ab
+++ b/graphics/MesaDemos/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2004/03/15 18:04:34 jlam Exp $
+$NetBSD: patch-ab,v 1.9 2004/04/09 13:08:20 adam Exp $
 
---- Make-config.orig	2004-01-15 09:23:54.000000000 -0500
-+++ Make-config	2004-01-19 18:29:14.000000000 -0500
-@@ -778,19 +778,14 @@
+--- Make-config.orig	2004-03-30 14:47:13.000000000 +0000
++++ Make-config
+@@ -1172,19 +1172,14 @@ mklinux:
  	"GLUT_CFLAGS = -fexceptions" \
  	"APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
  
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
index c512585aa9a..7e8986b0141 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.5 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-ac,v 1.6 2004/04/09 13:08:20 adam Exp $
 
---- Makefile.orig	2004-01-19 18:31:20.000000000 -0500
-+++ Makefile	2004-01-19 18:31:54.000000000 -0500
-@@ -79,7 +79,7 @@
- 	@echo "  make linux-icc             for Linux with the Intel C/C++ compiler"
+--- Makefile.orig	2004-04-02 23:29:33.000000000 +0000
++++ Makefile
+@@ -104,7 +104,7 @@ default:
+ 	@echo "  make linux-ia64-ecc-static-nothreads  for Linux IA64 with the Intel C/C++ compiler, static, no threads"
  	@echo "  make lynxos                for LynxOS systems with GCC"
  	@echo "  make mklinux               for Linux on Power Macintosh"
 -	@echo "  make netbsd                for NetBSD 1.0 systems with GCC"
@@ -11,12 +11,12 @@ $NetBSD: patch-ac,v 1.5 2004/01/20 02:48:33 jschauma Exp $
  	@echo "  make openbsd               for OpenBSD systems"
  	@echo "  make openstep              for OpenStep/MacOSX Server systems"
  	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
-@@ -115,7 +115,7 @@
+@@ -152,7 +152,7 @@ linux-glide linux-x86-glide linux-glide-
  linux-alpha-static linux-alpha \
  linux-ppc-static linux-ppc \
  linux-sparc linux-sparc5 linux-sparc-ultra \
--mklinux netbsd osf1 openbsd qnx \
-+mklinux pkgsrc osf1 openbsd qnx \
+-mklinux netbsd osf1 osf1-nothreads openbsd qnx \
++mklinux pkgsrc osf1 osf1-nothreads openbsd qnx \
  solaris-x86 solaris-x86-gcc \
  sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
  sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \