Changes 6.2:

New:
- enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)
- updated Doxygen support (Jose Fonseca)
Changes:
- some GGI driver updates (Christoph Egger, bug 1025977)
Bug fixes:
- Omit GL_ARB_texture_non_power_of_two from list of OpenGL 1.5 features
- fixed a few compilation issues on IRIX
- fixed a matrix classification bug (reported by Wes Bethel)
- we weren't reseting the vertex/fragment program error state
  before parsing (Dave Reveman)
- adjust texcoords for sampling texture rectangles (Dave Reveman)
- glGet*(GL_MAX_VERTEX_ATTRIBS_ARB) wasn't implemented
- repeated calls to glDeleteTexture(t) could lead to a crash
- fixed potential ref count bugs in VBOs and vertex/fragment programs
- spriteblast demo didn't handle window size changes correctly
- glTexSubImage didn't handle pixels=NULL correctly for PBOs
- fixed color index mode glDrawPixels bug (Karl Schultz)

Changes 6.1:
New:
- Revamped Makefile system
- glXUseRotatedXFont() utility (see xdemos/xuserotfont.c)
- internal driver interface changes related to texture object
  allocation, vertex/fragment programs, BlendEquationSeparate, etc.
- option to walk triangle edges with double-precision floats
  (Justin Novosad of Discreet) (see config.h file)
- support for AUX buffers in software GLX driver
- updated glext.h to version 24 and glxext.h to version 6
- new MESA_GLX_FORCE_ALPHA and MESA_GLX_DEPTH_BITS env vars
- updated BeOS support (Philippe Houdoin)
Changes:
- fragment fog interpolation is perspective corrected now
- new glTexImage code, much cleaner, may be a bit faster
Bug fixes:
- glArrayElement in display lists didn't handle generic vertex attribs
- glFogCoord didn't always work properly
- ARB_fragment_program fog options didn't work
- frag prog TEX instruction no longer incorrectly divides s,t,r by q
- ARB frag prog TEX and TEXP instructions now use LOD=0
- glTexEnviv in display lists didn't work
- glRasterPos didn't do texgen or apply texture matrix
- GL_DOUBLE-valued vertex arrays were broken in some cases
- fixed texture rectangle edge/border sampling bugs
- sampling an incomplete texture in a fragment program would segfault
- glTexImage was missing a few error checks
- fixed some minor glGetTexParameter glitches
- GL_INTENSITY was mistakenly accepted as a  to glTexImage
- fragment program writes to RC/HC register were broken
- fixed a few glitches in GL_HP_occlusion_test extension
- glBeginQueryARB and glEndQueryARB didn't work inside display lists
- vertex program state references were broken
- fixed triangle color interpolation bug on AIX (Shane Blackett)
- fixed a number of minor memory leaks (bug #1002030)

8 files changed, 83 insertions, 159 deletions

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index c4d87ccea0d..a0793061af8 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2004/10/13 18:00:08 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/10/26 13:57:47 adam Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
-PKGREVISION=	2
 COMMENT=	OpenGL examples and Demos
 
 PATCHDIR=		${.CURDIR}/patches
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 87951832395..3bc401037b7 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/09 13:08:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/10/26 13:57:47 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
@@ -58,6 +61,8 @@ share/examples/${PKGNAME}/demos/drawpix
 share/examples/${PKGNAME}/demos/drawpix.c
 share/examples/${PKGNAME}/demos/fire
 share/examples/${PKGNAME}/demos/fire.c
+share/examples/${PKGNAME}/demos/fogcoord
+share/examples/${PKGNAME}/demos/fogcoord.c
 share/examples/${PKGNAME}/demos/fplight
 share/examples/${PKGNAME}/demos/fplight.c
 share/examples/${PKGNAME}/demos/gamma
@@ -90,6 +95,9 @@ 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
 share/examples/${PKGNAME}/demos/particles.h
@@ -288,6 +296,7 @@ share/examples/${PKGNAME}/samples/bitmap2
 share/examples/${PKGNAME}/samples/bitmap2.c
 share/examples/${PKGNAME}/samples/blendeq
 share/examples/${PKGNAME}/samples/blendeq.c
+share/examples/${PKGNAME}/samples/blendxor
 share/examples/${PKGNAME}/samples/blendxor.c
 share/examples/${PKGNAME}/samples/copy
 share/examples/${PKGNAME}/samples/copy.c
@@ -308,7 +317,6 @@ share/examples/${PKGNAME}/samples/logo
 share/examples/${PKGNAME}/samples/logo.c
 share/examples/${PKGNAME}/samples/nurb
 share/examples/${PKGNAME}/samples/nurb.c
-share/examples/${PKGNAME}/samples/oglinfo
 share/examples/${PKGNAME}/samples/oglinfo.c
 share/examples/${PKGNAME}/samples/olympic
 share/examples/${PKGNAME}/samples/olympic.c
@@ -348,6 +356,7 @@ share/examples/${PKGNAME}/util/glstate.h
 share/examples/${PKGNAME}/util/glutskel.c
 share/examples/${PKGNAME}/util/idproj.c
 share/examples/${PKGNAME}/util/imagesgi.h
+share/examples/${PKGNAME}/util/matrix.c
 share/examples/${PKGNAME}/util/mwmborder.c
 share/examples/${PKGNAME}/util/readtex.c
 share/examples/${PKGNAME}/util/readtex.h
@@ -378,10 +387,13 @@ 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.c
 share/examples/${PKGNAME}/xdemos/glxheads
 share/examples/${PKGNAME}/xdemos/glxheads.c
 share/examples/${PKGNAME}/xdemos/glxinfo
 share/examples/${PKGNAME}/xdemos/glxinfo.c
+share/examples/${PKGNAME}/xdemos/glxpbdemo
+share/examples/${PKGNAME}/xdemos/glxpbdemo.c
 share/examples/${PKGNAME}/xdemos/glxpixmap
 share/examples/${PKGNAME}/xdemos/glxpixmap.c
 share/examples/${PKGNAME}/xdemos/glxswapcontrol
@@ -390,12 +402,14 @@ share/examples/${PKGNAME}/xdemos/manywin
 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/pbdemo
 share/examples/${PKGNAME}/xdemos/pbdemo.c
+share/examples/${PKGNAME}/xdemos/pbinfo
 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
@@ -405,6 +419,10 @@ share/examples/${PKGNAME}/xdemos/xdemo
 share/examples/${PKGNAME}/xdemos/xdemo.c
 share/examples/${PKGNAME}/xdemos/xfont
 share/examples/${PKGNAME}/xdemos/xfont.c
+share/examples/${PKGNAME}/xdemos/xrotfontdemo
+share/examples/${PKGNAME}/xdemos/xrotfontdemo.c
+share/examples/${PKGNAME}/xdemos/xuserotfont.c
+share/examples/${PKGNAME}/xdemos/xuserotfont.h
 @dirrm share/examples/${PKGNAME}/xdemos
 @dirrm share/examples/${PKGNAME}/windml
 @dirrm share/examples/${PKGNAME}/util
@@ -414,4 +432,5 @@ share/examples/${PKGNAME}/xdemos/xfont.c
 @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 a1689391dc6..688ea5e5bf6 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.10 2004/04/09 13:08:20 adam Exp $
+$NetBSD: distinfo,v 1.11 2004/10/26 13:57:47 adam Exp $
 
-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 (Mesa-6.2/MesaLib-6.2.tar.bz2) = dc8cc87138729ab6b5002c91e02f8c41a9dbdd35
+Size (Mesa-6.2/MesaLib-6.2.tar.bz2) = 1615788 bytes
+SHA1 (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 10a3303093be1b69243e639377ecee299e34d98c
+Size (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 1005757 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
-SHA1 (patch-ab) = 15687f90c7727d8167ca829ffb185e457e87e5d7
-SHA1 (patch-ac) = 9c780cee963a99801b3a29176c00942fc5ef938f
+SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4
+SHA1 (patch-ac) = fb27a96d6932b8d3e3b2c57539c995322e7196c0
 SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
-SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b
 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1
-SHA1 (patch-ag) = 1aae03d6dfe080efacd306ac157231e2c72c13ea
-SHA1 (patch-ah) = b1c39f3b5e739dd14340b8b6c680a891e61c54e1
-SHA1 (patch-ai) = 9331e8e9a7f9dd044b10b62319f5eaaaddfe63d0
+SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
index f885ef8608c..c985bdf1a5a 100644
--- a/graphics/MesaDemos/patches/patch-ab
+++ b/graphics/MesaDemos/patches/patch-ab
@@ -1,26 +1,14 @@
-$NetBSD: patch-ab,v 1.9 2004/04/09 13:08:20 adam Exp $
+$NetBSD: patch-ab,v 1.10 2004/10/26 13:57:47 adam Exp $
 
---- 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"
- 
--netbsd:
-+pkgsrc:
- 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
- 	"GL_LIB = libGL.so" \
- 	"GLU_LIB = libGLU.so" \
- 	"GLUT_LIB = libglut.so" \
- 	"GLW_LIB = libGLw.so" \
- 	"OSMESA_LIB = libOSMesa.so" \
--	"CC = gcc" \
--	"CXX = g++" \
--	"CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100"  \
--	"CXXFLAGS = -O2 -fPIC"  \
--	"GLUT_CFLAGS = -fexceptions" \
--	"APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
-+	"APP_LIB_DEPS = ${LDFLAGS} -lXext -lXmu -lXi -lX11 -lm"
- 
- openbsd:
- 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+--- /dev/null	2004-10-25 16:57:21.000000000 +0000
++++ configs/pkgsrc
+@@ -0,0 +1,9 @@
++# Configuration for NetBSD
++
++include $(TOP)/configs/default
++
++CONFIG_NAME = pkgsrc
++
++# Compiler and flags
++APP_LIB_DEPS = ${LDFLAGS} -lXext -lXmu -lXi -lX11 -lm -lGL -lGLU -lglut -lOSMesa
++
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
index 7e8986b0141..670e951acff 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,22 +1,21 @@
-$NetBSD: patch-ac,v 1.6 2004/04/09 13:08:20 adam Exp $
+$NetBSD: patch-ac,v 1.7 2004/10/26 13:57:47 adam Exp $
 
---- Makefile.orig	2004-04-02 23:29:33.000000000 +0000
+--- Makefile.orig	2004-10-01 21:34:29.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"
-+	@echo "  make pkgsrc                for pkgsrc systems"
- 	@echo "  make openbsd               for OpenBSD systems"
- 	@echo "  make openstep              for OpenStep/MacOSX Server systems"
- 	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
-@@ -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 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 \
+@@ -2,7 +2,7 @@
+ 
+ TOP = .
+ 
+-SUBDIRS = src progs
++SUBDIRS = progs
+ 
+ 
+ default: $(TOP)/configs/current
+@@ -98,6 +98,7 @@ linux-x86-64-static \
+ linux-x86-glide \
+ linux-x86-static \
+ netbsd \
++pkgsrc \
+ openbsd \
+ osf1 \
+ solaris-x86 \
diff --git a/graphics/MesaDemos/patches/patch-ag b/graphics/MesaDemos/patches/patch-ag
deleted file mode 100644
index 9a057842f88..00000000000
--- a/graphics/MesaDemos/patches/patch-ag
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/01/20 02:48:33 jschauma Exp $
-
---- progs/xdemos/Makefile.X11.orig	2003-10-03 10:03:16.000000000 -0400
-+++ progs/xdemos/Makefile.X11	2004-01-19 20:48:04.000000000 -0500
-@@ -7,7 +7,7 @@
- INCDIR = $(TOP)/include
- LIBDIR = $(TOP)/lib
- 
--LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
-+LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS)  -lGL -lGLU -lglut
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB)
- 
-@@ -20,8 +20,6 @@
- 	glxswapcontrol \
- 	manywin \
- 	offset \
--	pbinfo \
--	pbdemo \
- 	wincopy \
- 	xdemo \
- 	xfont
-@@ -34,24 +32,24 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
- 
- 
- # special cases
- pbinfo: pbinfo.o pbutil.o
--	$(CC) pbinfo.o pbutil.o $(LIBS) -o $@
-+	$(CXX) pbinfo.o pbutil.o $(LIBS) -o $@
- 
- pbdemo: pbdemo.o pbutil.o
--	$(CC) pbdemo.o pbutil.o $(LIBS) -o $@
-+	$(CXX) pbdemo.o pbutil.o $(LIBS) -o $@
- 
- pbinfo.o: pbinfo.c pbutil.h
--	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
-+	$(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
- 
- pbdemo.o: pbdemo.c pbutil.h
--	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
-+	$(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
- 
- pbutil.o: pbutil.c pbutil.h
--	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
-+	$(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
- 
- 
- 
diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah
index 4aad2cfc173..f922e0fb9ad 100644
--- a/graphics/MesaDemos/patches/patch-ah
+++ b/graphics/MesaDemos/patches/patch-ah
@@ -1,22 +1,24 @@
-$NetBSD: patch-ah,v 1.1 2004/01/20 02:48:33 jschauma Exp $
+$NetBSD: patch-ah,v 1.2 2004/10/26 13:57:47 adam Exp $
 
---- progs/redbook/Makefile.X11.orig	2003-10-03 10:03:15.000000000 -0400
-+++ progs/redbook/Makefile.X11	2004-01-19 20:47:35.000000000 -0500
-@@ -7,7 +7,7 @@
- INCDIR = $(TOP)/include
- LIBDIR = $(TOP)/lib
- 
--LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
-+LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
- 
-@@ -28,7 +28,7 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
+--- configs/default.orig	2004-10-25 17:21:49.000000000 +0000
++++ configs/default
+@@ -14,10 +14,6 @@ MESA_TINY=0
+ DRM_SOURCE_PATH=$(TOP)/../drm
  
+ # Compiler and flags
+-CC = cc
+-CXX = CC
+-CFLAGS = -O
+-CXXFLAGS = -O
+ GLU_CFLAGS = 
  
+ # Misc tools and flags
+@@ -52,7 +48,7 @@ GLW_SOURCES = GLwDrawA.c
  
+ # Directories
+ LIB_DIR = $(TOP)/lib
+-INSTALL_PREFIX = /usr/local
++INSTALL_PREFIX = ${PREFIX}
+ SRC_DIRS = mesa glu glut/glx glw
+ GLU_DIRS = sgi
+ DRIVER_DIRS = x11 osmesa
diff --git a/graphics/MesaDemos/patches/patch-ai b/graphics/MesaDemos/patches/patch-ai
deleted file mode 100644
index 905e45727c9..00000000000
--- a/graphics/MesaDemos/patches/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/01/20 02:48:33 jschauma Exp $
-
---- progs/samples/Makefile.X11.orig	2003-10-03 10:03:16.000000000 -0400
-+++ progs/samples/Makefile.X11	2004-01-19 20:53:56.000000000 -0500
-@@ -7,11 +7,11 @@
- INCDIR = $(TOP)/include
- LIBDIR = $(TOP)/lib
- 
--LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
-+LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
- 
--PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-+PROGS = accum bitmap1 bitmap2 blendeq copy cursor depth eval fog \
- 	font line logo nurb oglinfo olympic overlay point prim quad select \
- 	shape sphere star stencil stretch texture tri wave
- 
-@@ -22,7 +22,7 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
- 
- 
-