update Mesa to 3.4.2

Bug fixes:
        - deleting the currently bound texture could cause bad problems
        - using fog could result in random vertex alpha values
         - AA triangle rendering could touch pixels outside right window bound
        - fixed byteswapping problem in clear_32bit_ximage() function
        - fixed bugs in wglUseFontBitmapsA(), by Frank Warmerdam
        - fixed memory leak in glXUseXFont()
        - fragment sampling in AA triangle function was off by 1/2 pixel
        - Windows: reading pixels from framebuffer didn't always work
        - glConvolutionFilter2D could segfault or cause FP exception
        - fixed segfaults in FX and X drivers when using tex unit 1 but not 0
        - GL_NAND logicop didn't work right in RGBA mode
        - fixed a memory corruption bug in vertex buffer reset code
        - clearing the softwara alpha buffer with scissoring was broken
        - fixed a few color index mode fog bugs
        - fixed some bad assertions in color index mode
        - fixed FX line 'stipple' bug #420091
Changes:
        - optimized writing mono-colored pixel spans to X pixmaps
        - increased max viewport size to 2048 x 2048

7 files changed, 60 insertions, 24 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index ca63800941d..6b9ba965677 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1 +1 @@
-MESA_VERSION=		3.4.1
+MESA_VERSION=		3.4.2
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 324d4de19cf..f70109d89fb 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/12 20:38:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/30 07:53:02 drochner Exp $
 #
 
 .include "../Mesa/Makefile.common"
@@ -21,7 +21,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--enable-static
+CONFIGURE_ARGS=		--enable-static --without-glut
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index e920d324836..2ccb3a56c1e 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:07 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/30 07:53:03 drochner Exp $
 
-SHA1 (MesaLib-3.4.1.tar.bz2) = d239335f11e5322d98a98aa699afb4fc5b995197
-Size (MesaLib-3.4.1.tar.bz2) = 1379494 bytes
+SHA1 (MesaLib-3.4.2.tar.bz2) = 0beefac5ecf9e65c3738ac935abd158987cce346
+Size (MesaLib-3.4.2.tar.bz2) = 1381342 bytes
 SHA1 (patch-aa) = f8e311944bbd80bf3939196dbbe993f78b2f8c50
-SHA1 (patch-ab) = 36ad59ccff1f99f9352c0fc6c9d8754f4ee01a5f
+SHA1 (patch-ab) = 8cf672d645f9681b0987e94d3692903a5314173e
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
index f03b60ec973..f21d9b7e039 100644
--- a/graphics/MesaLib/patches/patch-ab
+++ b/graphics/MesaLib/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2001/03/23 12:36:54 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2001/05/30 07:53:03 drochner Exp $
 
---- configure.orig	Thu Feb  8 00:27:38 2001
-+++ configure	Mon Mar 12 16:13:43 2001
+--- configure.orig	Thu May 17 00:28:58 2001
++++ configure	Fri May 18 14:16:44 2001
 @@ -823,8 +823,8 @@
  MESA_MAJOR=3
  MESA_MINOR=4
- MESA_TINY=1
+ MESA_TINY=2
 -LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
 -LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
 +LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
@@ -13,3 +13,21 @@ $NetBSD: patch-ab,v 1.3 2001/03/23 12:36:54 drochner Exp $
  LIBGLUT_VERSION=3:7:0
  
  
+@@ -4635,7 +4635,7 @@
+ if test -d $srcdir/src-glut; then
+   have_glut_source=yes
+ else
+-  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; exit 1; }
++  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; }
+ fi
+ echo "$ac_t""$have_glut_source" 1>&6
+ need_glut=no
+@@ -4673,7 +4673,7 @@
+ done
+ echo "$ac_t""$have_demo_source" 1>&6
+ if test "x$have_demo_source" != xyes; then
+-  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; exit 1; }
++  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; }
+ fi
+ 
+ 
diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo
index c484533973f..e0f01aaeb1f 100644
--- a/graphics/glu/distinfo
+++ b/graphics/glu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:14 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/30 07:53:03 drochner Exp $
 
-SHA1 (MesaLib-3.4.1.tar.bz2) = d239335f11e5322d98a98aa699afb4fc5b995197
-Size (MesaLib-3.4.1.tar.bz2) = 1379494 bytes
-SHA1 (patch-aa) = 36ad59ccff1f99f9352c0fc6c9d8754f4ee01a5f
+SHA1 (MesaLib-3.4.2.tar.bz2) = 0beefac5ecf9e65c3738ac935abd158987cce346
+Size (MesaLib-3.4.2.tar.bz2) = 1381342 bytes
+SHA1 (patch-aa) = 8cf672d645f9681b0987e94d3692903a5314173e
diff --git a/graphics/glu/patches/patch-aa b/graphics/glu/patches/patch-aa
index 180f4d09488..83fca963c29 100644
--- a/graphics/glu/patches/patch-aa
+++ b/graphics/glu/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2001/03/23 12:36:55 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/30 07:53:04 drochner Exp $
 
---- configure.orig	Thu Feb  8 00:27:38 2001
-+++ configure	Mon Mar 12 16:13:43 2001
+--- configure.orig	Thu May 17 00:28:58 2001
++++ configure	Fri May 18 14:16:44 2001
 @@ -823,8 +823,8 @@
  MESA_MAJOR=3
  MESA_MINOR=4
- MESA_TINY=1
+ MESA_TINY=2
 -LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
 -LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY}
 +LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:${MESA_TINY}
@@ -13,3 +13,21 @@ $NetBSD: patch-aa,v 1.3 2001/03/23 12:36:55 drochner Exp $
  LIBGLUT_VERSION=3:7:0
  
  
+@@ -4635,7 +4635,7 @@
+ if test -d $srcdir/src-glut; then
+   have_glut_source=yes
+ else
+-  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; exit 1; }
++  { echo "configure: error: GLUT sources missing; that is not supported at this point." 1>&2; }
+ fi
+ echo "$ac_t""$have_glut_source" 1>&6
+ need_glut=no
+@@ -4673,7 +4673,7 @@
+ done
+ echo "$ac_t""$have_demo_source" 1>&6
+ if test "x$have_demo_source" != xyes; then
+-  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; exit 1; }
++  { echo "configure: error: Demo sources missing; that is not supported at this point." 1>&2; }
+ fi
+ 
+ 
diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo
index ca67e386f00..59ee1902f41 100644
--- a/graphics/glut/distinfo
+++ b/graphics/glut/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:14 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/30 07:53:04 drochner Exp $
 
-SHA1 (MesaLib-3.4.1.tar.bz2) = d239335f11e5322d98a98aa699afb4fc5b995197
-Size (MesaLib-3.4.1.tar.bz2) = 1379494 bytes
-SHA1 (MesaDemos-3.4.1.tar.bz2) = 2298901e36e887c0979e7d5e08fcb1f63784d97b
-Size (MesaDemos-3.4.1.tar.bz2) = 855311 bytes
+SHA1 (MesaLib-3.4.2.tar.bz2) = 0beefac5ecf9e65c3738ac935abd158987cce346
+Size (MesaLib-3.4.2.tar.bz2) = 1381342 bytes
+SHA1 (MesaDemos-3.4.2.tar.bz2) = b291eb70c07ad2e12122e53039bf6d36c061a914
+Size (MesaDemos-3.4.2.tar.bz2) = 854130 bytes