From c7db3af44bf1eaea1387dbfc469c605aab9431d5 Mon Sep 17 00:00:00 2001 From: drochner Date: Sat, 10 May 2003 16:37:11 +0000 Subject: update to 5.0.1 mostly a bugfix release other changes: - updated GL/gl_mangle.h file - use glPolygonOffset in gloss demo to avoid z-fighting artifacts - updated winpos and pointblast demos to use ARB extensions - disable SPARC normal transformation code --- graphics/Mesa/Makefile.common | 8 ++++---- graphics/MesaDemos/Makefile | 4 ++-- graphics/MesaDemos/distinfo | 12 ++++++------ graphics/MesaDemos/patches/patch-ab | 15 ++++++++++++--- graphics/MesaLib/Makefile | 3 +-- graphics/MesaLib/PLIST | 6 +++--- graphics/MesaLib/distinfo | 9 +++------ graphics/MesaLib/patches/patch-ab | 13 ------------- graphics/glu/PLIST | 4 ++-- graphics/glu/distinfo | 9 +++------ graphics/glu/patches/patch-aa | 12 ------------ graphics/glut/Makefile | 4 ++-- graphics/glut/distinfo | 14 +++++--------- 13 files changed, 43 insertions(+), 70 deletions(-) delete mode 100644 graphics/MesaLib/patches/patch-ab delete mode 100644 graphics/glu/patches/patch-aa diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index b7c3d843494..32e6a9c62eb 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.11 2003/04/30 04:05:49 atatat Exp $ +# $NetBSD: Makefile.common,v 1.12 2003/05/10 16:37:11 drochner Exp $ -# Latest is: 5.0 -# Default is: 5.0 -MESA_REQD?= 5.0 +# Latest is: 5.0.1 +# Default is: 5.0.1 +MESA_REQD?= 5.0.1 MESA_VERSION= ${MESA_REQD} DISTNAME?= MesaLib-${MESA_VERSION} diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index 1bb0b454d59..d5d2fd9d94c 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/04/14 03:46:51 jschauma Exp $ +# $NetBSD: Makefile,v 1.6 2003/05/10 16:37:11 drochner Exp $ PKGNAME= MesaDemos-${MESA_VERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -7,7 +7,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} MAINTAINER= jschauma@netbsd.org COMMENT= OpenGL examples and Demos -MESA_REQD= 5.0 +MESA_REQD= 5.0.1 .include "../Mesa/Makefile.common" diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo index af254a9077f..6c8eb7ae286 100644 --- a/graphics/MesaDemos/distinfo +++ b/graphics/MesaDemos/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2003/03/09 19:04:53 jschauma Exp $ +$NetBSD: distinfo,v 1.3 2003/05/10 16:37:11 drochner Exp $ -SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d -Size (MesaLib-5.0.tar.bz2) = 1645037 bytes -SHA1 (MesaDemos-5.0.tar.bz2) = b487c94daa2d19060c40b0ae46869c28c883b6e8 -Size (MesaDemos-5.0.tar.bz2) = 894069 bytes +SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 +Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes +SHA1 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938 +Size (MesaDemos-5.0.1.tar.bz2) = 889575 bytes SHA1 (patch-aa) = 97abd719eb38d141af1c7a12c22fe24f98a1fdf7 -SHA1 (patch-ab) = 5e0c15740eeedc173d70f166354f31c278af36c8 +SHA1 (patch-ab) = 9b11eb413720f6a0863a15951dc23449ec25de2d SHA1 (patch-ac) = 79166ebd1f425ba592d9a62bccd47533c89f9807 diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab index 9305ef26465..f22e7d333c6 100644 --- a/graphics/MesaDemos/patches/patch-ab +++ b/graphics/MesaDemos/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2003/03/09 19:04:53 jschauma Exp $ +$NetBSD: patch-ab,v 1.3 2003/05/10 16:37:12 drochner Exp $ ---- demos/Makefile.X11.orig Tue Aug 21 01:42:11 2001 -+++ demos/Makefile.X11 Thu Nov 21 14:42:39 2002 +--- demos/Makefile.X11.orig 2001-08-21 07:42:11.000000000 +0200 ++++ demos/Makefile.X11 2003-05-10 18:23:01.000000000 +0200 @@ -9,8 +9,8 @@ ##### MACROS ##### @@ -43,3 +43,12 @@ $NetBSD: patch-ab,v 1.2 2003/03/09 19:04:53 jschauma Exp $ ##### TARGETS ##### +@@ -95,7 +93,7 @@ + cp ../util/readtex.c . + + readtex.h: +- cp ../util/readtex.c . ++ cp ../util/readtex.h . + + + # execute all programs diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 7c8fd0f5854..6c0bc4fe337 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2003/04/17 22:15:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2003/05/10 16:37:12 drochner Exp $ PKGNAME= MesaLib-${MESA_VERSION} -PKGREVISION= 2 WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} MAINTAINER= rh@netbsd.org COMMENT= Graphics library similar to SGI's OpenGL diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index 75f018cffe0..49b78317e9e 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2003/04/17 22:15:45 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.9 2003/05/10 16:37:12 drochner Exp $ include/GL/gl.h include/GL/gl_mangle.h include/GL/glext.h @@ -13,12 +13,12 @@ lib/libGL.a lib/libGL.la lib/libGL.so lib/libGL.so.5 -lib/libGL.so.5.500 +lib/libGL.so.5.501 lib/libOSMesa.a lib/libOSMesa.la lib/libOSMesa.so lib/libOSMesa.so.4 -lib/libOSMesa.so.4.500 +lib/libOSMesa.so.4.501 share/examples/MesaLib/mesa.conf @dirrm share/examples/MesaLib @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 5aa1eb4b8c6..b95db7007df 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.9 2003/04/17 22:15:45 jmmv Exp $ +$NetBSD: distinfo,v 1.10 2003/05/10 16:37:12 drochner Exp $ -SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37 -Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes -SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d -Size (MesaLib-5.0.tar.bz2) = 1645037 bytes +SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 +Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33 -SHA1 (patch-ab) = 17d8f0508710fc03a75e736a3298ede72b953af7 SHA1 (patch-ac) = e4222d4a2f1cf6092cace568a2eff1aea7da581e diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab deleted file mode 100644 index 1234ebf718e..00000000000 --- a/graphics/MesaLib/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2003/03/09 19:04:53 jschauma Exp $ - ---- configure.orig Wed Nov 13 22:18:19 2002 -+++ configure Tue Nov 19 15:52:05 2002 -@@ -1532,7 +1532,7 @@ - fi - MAINT=$MAINTAINER_MODE_TRUE - --ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile ggi/demos/Makefile ggi/ggiglut/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile" -+ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile" - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST index bbe94c3d55f..80e5478474f 100644 --- a/graphics/glu/PLIST +++ b/graphics/glu/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.6 2003/03/09 19:04:54 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/05/10 16:37:12 drochner Exp $ include/GL/glu.h include/GL/glu_mangle.h lib/libGLU.so lib/libGLU.so.2 -lib/libGLU.so.2.500 +lib/libGLU.so.2.501 lib/libGLU.a lib/libGLU.la @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo index 0645140aefd..073e1ce2cee 100644 --- a/graphics/glu/distinfo +++ b/graphics/glu/distinfo @@ -1,7 +1,4 @@ -$NetBSD: distinfo,v 1.8 2003/03/24 18:23:26 jschauma Exp $ +$NetBSD: distinfo,v 1.9 2003/05/10 16:37:12 drochner Exp $ -SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37 -Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes -SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d -Size (MesaLib-5.0.tar.bz2) = 1645037 bytes -SHA1 (patch-aa) = 3006b3f1fece24ded6edc046d7bff439f181cd47 +SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 +Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes diff --git a/graphics/glu/patches/patch-aa b/graphics/glu/patches/patch-aa deleted file mode 100644 index 607831ecde1..00000000000 --- a/graphics/glu/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2003/04/21 20:26:35 cjep Exp $ ---- configure.orig Wed Nov 20 17:45:32 2002 -+++ configure Wed Nov 20 17:45:43 2002 -@@ -1532,7 +1532,7 @@ - fi - MAINT=$MAINTAINER_MODE_TRUE - --ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile ggi/demos/Makefile ggi/ggiglut/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile" -+ac_config_files="$ac_config_files Makefile include/Makefile include/GL/Makefile src/Makefile src/array_cache/Makefile src/math/Makefile src/swrast/Makefile src/swrast_setup/Makefile src/tnl/Makefile src/Trace/Makefile src/FX/Makefile src/FX/X86/Makefile src/GGI/Makefile src/GGI/include/Makefile src/GGI/include/ggi/Makefile src/GGI/include/ggi/mesa/Makefile src/GGI/ggimesa.conf src/GGI/default/Makefile src/GGI/default/genkgi.conf src/GGI/display/Makefile src/GGI/display/fbdev.conf src/OSmesa/Makefile src/SVGA/Makefile src/X/Makefile src/X86/Makefile src/SPARC/Makefile util/Makefile src-glu/Makefile si-glu/Makefile si-glu/include/Makefile si-glu/libnurbs/Makefile si-glu/libnurbs/interface/Makefile si-glu/libnurbs/internals/Makefile si-glu/libnurbs/nurbtess/Makefile si-glu/libtess/Makefile si-glu/libutil/Makefile" - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index fea1f694986..82025aef3f0 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/03/30 08:54:39 jmc Exp $ +# $NetBSD: Makefile,v 1.17 2003/05/10 16:37:13 drochner Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -31,7 +31,7 @@ post-install: .if (${MESA_REQD} == 3.4.2) SO_SUFFIX=3 SO_VERS=3.7 -.elif (${MESA_REQD} == 5.0) +.elif (${MESA_REQD} == 5.0.1) SO_SUFFIX=10 SO_VERS=10.1 .else diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo index fcadca60726..dd08fc61441 100644 --- a/graphics/glut/distinfo +++ b/graphics/glut/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.8 2003/03/24 18:23:26 jschauma Exp $ +$NetBSD: distinfo,v 1.9 2003/05/10 16:37:13 drochner Exp $ -SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37 -Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes -SHA1 (MesaDemos-3.4.2.tar.bz2) = b291eb70c07ad2e12122e53039bf6d36c061a914 -Size (MesaDemos-3.4.2.tar.bz2) = 854130 bytes -SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d -Size (MesaLib-5.0.tar.bz2) = 1645037 bytes -SHA1 (MesaDemos-5.0.tar.bz2) = b487c94daa2d19060c40b0ae46869c28c883b6e8 -Size (MesaDemos-5.0.tar.bz2) = 894069 bytes +SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 +Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes +SHA1 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938 +Size (MesaDemos-5.0.1.tar.bz2) = 889575 bytes -- cgit v1.2.3