Changes 6.2.1:

Bug fixes:
- don't apply regular fog or color sum when using a fragment program
- glProgramEnvParameter4fARB always generated an error on
  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
- fixed width/height mix-up in glSeparableFilter2D()
- fixed regression in glCopyPixels + convolution
- glReadPixels from a clipped front color buffer didn't always work
- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
- Attempting queries/accesses of VBO 0 weren't detected as errors
- paletted textures failed if the palette had fewer that 256 entries
Changes:
- fixed a bunch of compiler warnings found with gcc 3.4
- bug reports should to go bugzilla.freedesktop.org

6 files changed, 25 insertions, 25 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index f89cdbb5872..5fe5c488d20 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2004/12/03 15:14:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.37 2005/01/04 15:49:49 adam Exp $
 
 DISTNAME=	MesaLib-${MESA_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -8,7 +8,7 @@ CATEGORIES=	graphics
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
 EXTRACT_SUFX=	.tar.bz2
 
-MESA_VERSION=	6.2
+MESA_VERSION=	6.2.1
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.mesa3d.org/
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index 688ea5e5bf6..e7821616743 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2004/10/26 13:57:47 adam Exp $
+$NetBSD: distinfo,v 1.12 2005/01/04 15:50:08 adam Exp $
 
-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 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189
+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
+Size (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 1004511 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4
-SHA1 (patch-ac) = fb27a96d6932b8d3e3b2c57539c995322e7196c0
+SHA1 (patch-ac) = 3640b405d9402b6a8e96a257813f116f5502740b
 SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
 SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1
 SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac
index 670e951acff..2398fa02405 100644
--- a/graphics/MesaDemos/patches/patch-ac
+++ b/graphics/MesaDemos/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2004/10/26 13:57:47 adam Exp $
+$NetBSD: patch-ac,v 1.8 2005/01/04 15:50:08 adam Exp $
 
---- Makefile.orig	2004-10-01 21:34:29.000000000 +0000
+--- Makefile.orig	2004-12-05 18:25:19.000000000 +0000
 +++ Makefile
 @@ -2,7 +2,7 @@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2004/10/26 13:57:47 adam Exp $
  
  
  default: $(TOP)/configs/current
-@@ -98,6 +98,7 @@ linux-x86-64-static \
+@@ -100,6 +100,7 @@ linux-x86-64-static \
  linux-x86-glide \
  linux-x86-static \
  netbsd \
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 40cee1af764..1725fe16f5c 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.21 2004/10/27 19:20:33 drochner Exp $
+$NetBSD: distinfo,v 1.22 2005/01/04 15:49:24 adam Exp $
 
-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 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189
+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
+Size (Mesa-6.2.1/MesaDemos-6.2.1.tar.bz2) = 1004511 bytes
 SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606
 SHA1 (patch-ab) = 8de78b793e384578d8821a4ef487bb2b39ebfcb6
-SHA1 (patch-ac) = b1ce4c041d07894817cf473f06b7caab5bb70cb2
+SHA1 (patch-ac) = 9a0717105fef41e84b5faebaa8bd91d1c0964b86
 SHA1 (patch-ad) = 0d8bee8806d2c5c23acf2bf4744f64efc1c73d7d
 SHA1 (patch-ae) = b7fd3c2af1e40536f9e5a2b0409342aaee7fef1f
 SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8
-SHA1 (patch-ag) = 4026f44a2f0135e4d1800c689bf5805bc3a0fd48
+SHA1 (patch-ag) = 05673cd2240f1b03139a5a4c57938d58a952b730
 SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
index efe3ce9fbac..45d033b3fe4 100644
--- a/graphics/MesaLib/patches/patch-ac
+++ b/graphics/MesaLib/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2004/10/26 13:55:37 adam Exp $
+$NetBSD: patch-ac,v 1.7 2005/01/04 15:49:24 adam Exp $
 
---- Makefile.orig	2004-10-01 21:34:29.000000000 +0000
+--- Makefile.orig	2004-12-05 18:25:19.000000000 +0000
 +++ Makefile
 @@ -2,7 +2,7 @@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2004/10/26 13:55:37 adam Exp $
  
  
  default: $(TOP)/configs/current
-@@ -98,6 +98,7 @@ linux-x86-64-static \
+@@ -100,6 +100,7 @@ linux-x86-64-static \
  linux-x86-glide \
  linux-x86-static \
  netbsd \
diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag
index f9b2ba0c78e..9b5a63ab2dd 100644
--- a/graphics/MesaLib/patches/patch-ag
+++ b/graphics/MesaLib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2004/10/26 13:55:37 adam Exp $
+$NetBSD: patch-ag,v 1.4 2005/01/04 15:49:24 adam Exp $
 
---- src/glut/glx/Makefile.orig	2004-06-25 22:51:39.000000000 +0000
+--- src/glut/glx/Makefile.orig	2004-12-05 18:00:20.000000000 +0000
 +++ src/glut/glx/Makefile
-@@ -80,6 +80,7 @@ OBJECTS = $(SOURCES:.c=.o)
+@@ -79,6 +79,7 @@ OBJECTS = $(SOURCES:.c=.o)
  ##### RULES #####
  
  .c.o:
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.3 2004/10/26 13:55:37 adam Exp $
  	$(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $<
  
  
-@@ -91,10 +92,8 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
+@@ -90,10 +91,8 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
  
  # Make the library
  $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)