Update Mesa and friends to 7.4.2.

Update provided by Hasso Tepper on pkgsrc-users.

Changes:
7.4.2:
Bug fixes

   * Fixed segfault when rendering to front buffer with DRI 1.
   * Fixed swrast texture rectangle bug when wrap mode = GL_CLAMP_TO_BORDER and filter mode = GL_LINEAR. (bug
     21461)
   * Fixed texture object mem leak during context destruction.
   * Fixed a state validation bug in glCopyTex[Sub]Image()
   * Fixed some i965 GLSL bugs.
   * Fixed an R300 driver texture object bad memory reference.

7.4.1:
Bug fixes

   * Fixed a two-sided lighting bug in fixed-function-to-GPU code generation
   * Fixed some Darwin issues (Jeremy Huddleston)
   * Indexing the GLSL gl_EyePlane[] or gl_ObjectPlane[] arrays with a variable was broken, bug 20986
   * Fixed incorrect texture unit bias in TXB instruction
   * glTexParameter settings weren't always propogated to drivers
   * Assorted vertex/fragment program bug fixes
   * Fixed point rendering in software rasterizer
   * Fixed potential deadlock in object hash functions
   * Fix a couple bugs surrounding front-buffer rendering with DRI2, but this is not quite complete.
   * Fixed glPopAttrib() bug when restoring user clip planes

7.4:
New features

   * Added MESA_GLX_FORCE_DIRECT env var for Xlib/software driver
   * GLSL version 1.20 is returnd by the GL_SHADING_LANGUAGE_VERSION query

Bug fixes

   * glGetActiveUniform() returned wrong size for some array types
   * Fixed some error checking in glUniform()
   * Fixed a potential glTexImage('proxy target') segfault
   * Fixed bad reference counting for 1D/2D texture arrays
   * Fixed VBO + glPush/PopClientAttrib() bug #19835
   * Assorted i965 driver bug fixes
   * Fixed a Windows compilation failure in s_triangle.c
   * Fixed a GLSL array indexing bug
   * Fixes for building on Haiku

Changes

   * Updated GL/glxext.h to version 48
   * Assorted updates for building on Solaris

7.3:
New features

   * Support for GLSL 1.20
   * Intel DRI drivers now use GEM and DRI2

Bug fixes

   * Assorted GLSL bug fixes
   * Assorted i965 driver fixes
   * Fix for wglCreateLayerContext() in WGL/Windows driver
   * Build fixes for OpenBSD and gcc 2.95
   * GLSL preprocessor handles #pragma now
   * Fix incorrect transformation of GL_SPOT_DIRECTION
   * Fixed several bugs (#18367 and #19625) in glXMakeContextCurrent()
   * Assorted Windows build fixes

Changes

   * Deprecated the "XMesa" interface (include/GL/xmesa*.h files)
   * Deprecated the "FXMesa" interface (include/GL/fxmesa.h file)
   * Deprecated the "Allegro" interface (include/GL/amesa.h file)
   * Removed include/GL/uglmesa.h header
   * Removed include/GLView.h header for BeOS

7.2:
New features

   * i965 driver: added support for G41 chipset (Intel)

Bug fixes

   * Fixed display list bug involving primitives split across lists (bug 17564)
   * Fixed some issues with glBindAttribLocation()
   * Fixed crash in _tnl_InvalidateState() found with Amira (bug 15834)
   * Assorted bug fixes for Ming build
   * Fixed some vertex/pixel buffer object reference counting bugs
   * Fixed depth/stencil bug in i915/945 driver
   * Fixed some shader flow control bugs in i965 driver
   * Fixed a few tdfx driver bugs which prevented driver from working
   * Fixed multisample enable/disable bug

Changes

   * Updated SGI header files with new license terms.

7.1:
New features

   * autoconf-based configuration (and clean-up of Makefiles)
   * Assorted DRI driver enhancements
   * Reduced dependencies between X server and Mesa
   * GL_EXT_texture_from_pixmap extension for Xlib driver
   * Support for the GL shading language with i965 driver (implemented by Intel)
   * ATI R500 series support (Radeon X1300-X1950) in r300 DRI driver

Bug fixes

   * Numerous GLSL fixes
   * Fixed some error code/detection bugs in the GLSL-related API functions
   * Lots of DRI driver fixes.

2 files changed, 69 insertions, 16 deletions

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 751c7f551ff..31e7d2d8fc2 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2008/10/01 22:25:53 bjs Exp $
+# $NetBSD: Makefile,v 1.35 2009/06/05 11:10:35 wiz Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
-PKGREVISION=	1
 COMMENT=	OpenGL examples and Demos
 
 
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index a21cdcaca28..0f96d4b3523 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/10/01 22:25:53 bjs Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/05 11:10:35 wiz Exp $
 share/examples/${PKGNAME}/beos/GLInfo.cpp
 share/examples/${PKGNAME}/beos/demo.cpp
 share/examples/${PKGNAME}/beos/sample.cpp
@@ -13,6 +13,8 @@ share/examples/${PKGNAME}/demos/bounce
 share/examples/${PKGNAME}/demos/bounce.c
 share/examples/${PKGNAME}/demos/clearspd
 share/examples/${PKGNAME}/demos/clearspd.c
+share/examples/${PKGNAME}/demos/copypix
+share/examples/${PKGNAME}/demos/copypix.c
 share/examples/${PKGNAME}/demos/cubemap
 share/examples/${PKGNAME}/demos/cubemap.c
 share/examples/${PKGNAME}/demos/descrip.mms
@@ -21,6 +23,8 @@ share/examples/${PKGNAME}/demos/drawpix.c
 share/examples/${PKGNAME}/demos/engine
 share/examples/${PKGNAME}/demos/engine.c
 share/examples/${PKGNAME}/demos/extfuncs.h
+share/examples/${PKGNAME}/demos/fbo_firecube
+share/examples/${PKGNAME}/demos/fbo_firecube.c
 share/examples/${PKGNAME}/demos/fire
 share/examples/${PKGNAME}/demos/fire.c
 share/examples/${PKGNAME}/demos/fogcoord
@@ -66,6 +70,7 @@ share/examples/${PKGNAME}/demos/particles.cxx
 share/examples/${PKGNAME}/demos/particles.h
 share/examples/${PKGNAME}/demos/pointblast
 share/examples/${PKGNAME}/demos/pointblast.c
+share/examples/${PKGNAME}/demos/rain
 share/examples/${PKGNAME}/demos/rain.cxx
 share/examples/${PKGNAME}/demos/ray
 share/examples/${PKGNAME}/demos/ray.c
@@ -123,35 +128,69 @@ share/examples/${PKGNAME}/fbdev/glfbdevtest.c
 share/examples/${PKGNAME}/ggi/asc-view.c
 share/examples/${PKGNAME}/ggi/gears.c
 share/examples/${PKGNAME}/ggi/gears2.c
-share/examples/${PKGNAME}/glsl/CH06-brick.frag.txt
-share/examples/${PKGNAME}/glsl/CH06-brick.vert.txt
-share/examples/${PKGNAME}/glsl/CH11-bumpmap.frag.txt
-share/examples/${PKGNAME}/glsl/CH11-bumpmap.vert.txt
-share/examples/${PKGNAME}/glsl/CH11-toyball.frag.txt
-share/examples/${PKGNAME}/glsl/CH11-toyball.vert.txt
-share/examples/${PKGNAME}/glsl/CH18-mandel.frag.txt
-share/examples/${PKGNAME}/glsl/CH18-mandel.vert.txt
+share/examples/${PKGNAME}/glsl/CH06-brick.frag
+share/examples/${PKGNAME}/glsl/CH06-brick.vert
+share/examples/${PKGNAME}/glsl/CH11-bumpmap.frag
+share/examples/${PKGNAME}/glsl/CH11-bumpmap.vert
+share/examples/${PKGNAME}/glsl/CH11-toyball.frag
+share/examples/${PKGNAME}/glsl/CH11-toyball.vert
+share/examples/${PKGNAME}/glsl/CH18-mandel.frag
+share/examples/${PKGNAME}/glsl/CH18-mandel.vert
+share/examples/${PKGNAME}/glsl/bitmap
+share/examples/${PKGNAME}/glsl/bitmap.c
 share/examples/${PKGNAME}/glsl/brick
 share/examples/${PKGNAME}/glsl/brick.c
 share/examples/${PKGNAME}/glsl/bump
 share/examples/${PKGNAME}/glsl/bump.c
-share/examples/${PKGNAME}/glsl/cubemap.frag.txt
+share/examples/${PKGNAME}/glsl/convolution.frag
+share/examples/${PKGNAME}/glsl/convolution.vert
+share/examples/${PKGNAME}/glsl/convolutions
+share/examples/${PKGNAME}/glsl/convolutions.c
+share/examples/${PKGNAME}/glsl/cubemap.frag
 share/examples/${PKGNAME}/glsl/deriv
 share/examples/${PKGNAME}/glsl/deriv.c
 share/examples/${PKGNAME}/glsl/extfuncs.h
+share/examples/${PKGNAME}/glsl/fragcoord
+share/examples/${PKGNAME}/glsl/fragcoord.c
 share/examples/${PKGNAME}/glsl/mandelbrot
 share/examples/${PKGNAME}/glsl/mandelbrot.c
+share/examples/${PKGNAME}/glsl/multinoise
+share/examples/${PKGNAME}/glsl/multinoise.c
+share/examples/${PKGNAME}/glsl/multitex
+share/examples/${PKGNAME}/glsl/multitex.c
+share/examples/${PKGNAME}/glsl/multitex.frag
+share/examples/${PKGNAME}/glsl/multitex.vert
 share/examples/${PKGNAME}/glsl/noise
 share/examples/${PKGNAME}/glsl/noise.c
+share/examples/${PKGNAME}/glsl/pointcoord
+share/examples/${PKGNAME}/glsl/pointcoord.c
+share/examples/${PKGNAME}/glsl/points
+share/examples/${PKGNAME}/glsl/points.c
 share/examples/${PKGNAME}/glsl/readtex.c
 share/examples/${PKGNAME}/glsl/readtex.h
-share/examples/${PKGNAME}/glsl/reflect.vert.txt
-share/examples/${PKGNAME}/glsl/shadowtex.frag.txt
-share/examples/${PKGNAME}/glsl/simple.vert.txt
+share/examples/${PKGNAME}/glsl/reflect.vert
+share/examples/${PKGNAME}/glsl/samplers
+share/examples/${PKGNAME}/glsl/samplers.c
+share/examples/${PKGNAME}/glsl/shaderutil.c
+share/examples/${PKGNAME}/glsl/shaderutil.h
+share/examples/${PKGNAME}/glsl/shadowtex.frag
+share/examples/${PKGNAME}/glsl/simple.vert
+share/examples/${PKGNAME}/glsl/skinning
+share/examples/${PKGNAME}/glsl/skinning.c
+share/examples/${PKGNAME}/glsl/skinning.frag
+share/examples/${PKGNAME}/glsl/skinning.vert
 share/examples/${PKGNAME}/glsl/texdemo1
 share/examples/${PKGNAME}/glsl/texdemo1.c
 share/examples/${PKGNAME}/glsl/toyball
 share/examples/${PKGNAME}/glsl/toyball.c
+share/examples/${PKGNAME}/glsl/trirast
+share/examples/${PKGNAME}/glsl/trirast.c
+share/examples/${PKGNAME}/glsl/twoside
+share/examples/${PKGNAME}/glsl/twoside.c
+share/examples/${PKGNAME}/glsl/vert-or-frag-only
+share/examples/${PKGNAME}/glsl/vert-or-frag-only.c
+share/examples/${PKGNAME}/glsl/vert-tex
+share/examples/${PKGNAME}/glsl/vert-tex.c
 share/examples/${PKGNAME}/images/arch.rgb
 share/examples/${PKGNAME}/images/bw.rgb
 share/examples/${PKGNAME}/images/girl.rgb
@@ -166,7 +205,6 @@ share/examples/${PKGNAME}/osdemos/osdemo.c
 share/examples/${PKGNAME}/osdemos/osdemo16.c
 share/examples/${PKGNAME}/osdemos/osdemo32.c
 share/examples/${PKGNAME}/osdemos/ostest1.c
-share/examples/${PKGNAME}/osdemos/readtex.c
 share/examples/${PKGNAME}/redbook/README
 share/examples/${PKGNAME}/redbook/aaindex
 share/examples/${PKGNAME}/redbook/aaindex.c
@@ -371,6 +409,8 @@ share/examples/${PKGNAME}/util/matrix.c
 share/examples/${PKGNAME}/util/mwmborder.c
 share/examples/${PKGNAME}/util/readtex.c
 share/examples/${PKGNAME}/util/readtex.h
+share/examples/${PKGNAME}/util/shaderutil.c
+share/examples/${PKGNAME}/util/shaderutil.h
 share/examples/${PKGNAME}/util/showbuffer.c
 share/examples/${PKGNAME}/util/showbuffer.h
 share/examples/${PKGNAME}/util/trackball.c
@@ -393,7 +433,11 @@ share/examples/${PKGNAME}/windml/uglteapot.c
 share/examples/${PKGNAME}/windml/ugltexcube.c
 share/examples/${PKGNAME}/windml/ugltexcyl.c
 share/examples/${PKGNAME}/windml/wrs_logo.bmp
+share/examples/${PKGNAME}/xdemos/corender
+share/examples/${PKGNAME}/xdemos/corender.c
 share/examples/${PKGNAME}/xdemos/descrip.mms
+share/examples/${PKGNAME}/xdemos/glsync
+share/examples/${PKGNAME}/xdemos/glsync.c
 share/examples/${PKGNAME}/xdemos/glthreads
 share/examples/${PKGNAME}/xdemos/glthreads.c
 share/examples/${PKGNAME}/xdemos/glxcontexts
@@ -404,6 +448,8 @@ share/examples/${PKGNAME}/xdemos/glxgears
 share/examples/${PKGNAME}/xdemos/glxgears.c
 share/examples/${PKGNAME}/xdemos/glxgears_fbconfig
 share/examples/${PKGNAME}/xdemos/glxgears_fbconfig.c
+share/examples/${PKGNAME}/xdemos/glxgears_pixmap
+share/examples/${PKGNAME}/xdemos/glxgears_pixmap.c
 share/examples/${PKGNAME}/xdemos/glxheads
 share/examples/${PKGNAME}/xdemos/glxheads.c
 share/examples/${PKGNAME}/xdemos/glxinfo
@@ -412,8 +458,12 @@ 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/glxsnoop
+share/examples/${PKGNAME}/xdemos/glxsnoop.c
 share/examples/${PKGNAME}/xdemos/glxswapcontrol
 share/examples/${PKGNAME}/xdemos/glxswapcontrol.c
+share/examples/${PKGNAME}/xdemos/ipc.c
+share/examples/${PKGNAME}/xdemos/ipc.h
 share/examples/${PKGNAME}/xdemos/manywin
 share/examples/${PKGNAME}/xdemos/manywin.c
 share/examples/${PKGNAME}/xdemos/offset
@@ -428,6 +478,10 @@ 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/sharedtex
+share/examples/${PKGNAME}/xdemos/sharedtex.c
+share/examples/${PKGNAME}/xdemos/texture_from_pixmap
+share/examples/${PKGNAME}/xdemos/texture_from_pixmap.c
 share/examples/${PKGNAME}/xdemos/vgears.c
 share/examples/${PKGNAME}/xdemos/vindex.c
 share/examples/${PKGNAME}/xdemos/vtest.c