From 7b8629ea0013502b1943b19b12c8bef298dd7bb8 Mon Sep 17 00:00:00 2001 From: jschauma Date: Mon, 29 Sep 2003 21:30:28 +0000 Subject: Update Mesa and friends to latest version 5.0.2: - fixed texgen problem causing texcoord's Q to be zero (stex3d) - default GL_TEXTURE_COMPARE_MODE_ARB was wrong - GL_CURRENT_MATRIX_NV query was wrong - GL_CURRENT_MATRIX_STACK_DEPTH_NV query was off by one - GL_LIST_MODE query wasn't correct - GL_FOG_COORDINATE_SOURCE_EXT query wasn't supported - GL_SECONDARY_COLOR_ARRAY_SIZE_EXT query returned wrong value - blended, wide lines didn't always work correctly - glVertexAttrib4svNV w component was always 1 - fixed bug in GL_IBM_rasterpos_clip (missing return) - GL_DEPTH_TEXTURE_MODE = GL_ALPHA didn't work correctly - a few Solaris compilation fixes - fixed glClear() problem for DRI drivers (non-existant stencil, etc) - fixed int/REAL mixup in GLU NURBS curve evaluator (Eric Cazeaux) - fixed delete [] bug in SI GLU (bug 721765) (Diego Santa Cruz) - glFog() didn't clamp fog colors - fixed bad float/int conversion for GL_TEXTURE_PRIORITY in the gl[Get]TexParameteri[v] functions - fixed invalid memory references in glTexGen functions (bug 781602) - integer-valued color arrays weren't handled correctly - glDrawPixels(GL_DEPTH_COMPONENT) with glPixelZoom didn't work - GL_EXT_texture_lod_bias is part of 1.4, overlooked in 5.0.1 - build GLUT with -fexceptions so C++ apps propogate exceptions While here, fix PR pkg/23003 by moving the version number to version.mk and including that in the buildlink. --- graphics/MesaLib/Makefile | 5 ++++- graphics/MesaLib/PLIST | 6 +++--- graphics/MesaLib/buildlink2.mk | 5 +++-- graphics/MesaLib/distinfo | 8 ++++---- graphics/MesaLib/patches/patch-ac | 10 +++++----- 5 files changed, 19 insertions(+), 15 deletions(-) (limited to 'graphics/MesaLib') diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 4a0e768b9ff..3c779e09b36 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2003/09/18 16:25:08 jmmv Exp $ +# $NetBSD: Makefile,v 1.24 2003/09/29 21:30:28 jschauma Exp $ PKGNAME= MesaLib-${MESA_VERSION} WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} @@ -9,8 +9,11 @@ COMMENT= Graphics library similar to SGI's OpenGL USE_BUILDLINK2= yes USE_X11BASE= yes +USE_PKGINSTALL= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --without-glut +CONF_FILES= ${PREFIX}/share/examples/mesa/mesa.conf \ + ${PKG_SYSCONFDIR}/mesa.conf BUILD_DIRS= ${WRKSRC}/src .include "../../mk/bsd.prefs.mk" diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index 49b78317e9e..40f6889394f 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2003/05/10 16:37:12 drochner Exp $ +@comment $NetBSD: PLIST,v 1.10 2003/09/29 21:30:28 jschauma Exp $ include/GL/gl.h include/GL/gl_mangle.h include/GL/glext.h @@ -19,6 +19,6 @@ lib/libOSMesa.la lib/libOSMesa.so lib/libOSMesa.so.4 lib/libOSMesa.so.4.501 -share/examples/MesaLib/mesa.conf -@dirrm share/examples/MesaLib +share/examples/mesa/mesa.conf +@dirrm share/examples/mesa @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk index 602edcf1e79..51956ec1e90 100644 --- a/graphics/MesaLib/buildlink2.mk +++ b/graphics/MesaLib/buildlink2.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink2.mk,v 1.15 2003/08/26 01:43:52 jschauma Exp $ +# $NetBSD: buildlink2.mk,v 1.16 2003/09/29 21:30:28 jschauma Exp $ .if !defined(MESALIB_BUILDLINK2_MK) MESALIB_BUILDLINK2_MK= # defined -.include "../../mk/bsd.prefs.mk" +.include "../../graphics/Mesa/version.mk" BUILDLINK_DEPENDS.MesaLib?= MesaLib>=${MESA_VERSION} BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib @@ -25,6 +25,7 @@ BUILDLINK_FILES.MesaLib+= include/GL/xmesa.h BUILDLINK_FILES.MesaLib+= include/GL/xmesa_x.h BUILDLINK_FILES.MesaLib+= include/GL/xmesa_xf86.h BUILDLINK_FILES.MesaLib+= lib/libGL.* +BUILDLINK_FILES.MesaLib+= lib/libOSMesa.* USE_X11= # defined diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 3bd4010f9da..ddb0997973f 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2003/08/26 01:43:52 jschauma Exp $ +$NetBSD: distinfo,v 1.13 2003/09/29 21:30:28 jschauma Exp $ -SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 -Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes +SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc +Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33 -SHA1 (patch-ac) = e4222d4a2f1cf6092cace568a2eff1aea7da581e +SHA1 (patch-ac) = 30d3f08c2d9bbfe648a2ed2cbfade6c30a7413fe diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac index 83d07ecc54e..f17516d0e53 100644 --- a/graphics/MesaLib/patches/patch-ac +++ b/graphics/MesaLib/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1 2003/04/17 22:15:45 jmmv Exp $ +$NetBSD: patch-ac,v 1.2 2003/09/29 21:30:28 jschauma Exp $ ---- src/Makefile.in.orig 2002-11-14 04:18:13.000000000 +0100 -+++ src/Makefile.in -@@ -25,7 +25,7 @@ bindir = @bindir@ +--- src/Makefile.in.orig 2003-09-29 13:14:27.000000000 -0400 ++++ src/Makefile.in 2003-09-29 13:14:55.000000000 -0400 +@@ -25,7 +25,7 @@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ -sysconfdir = @sysconfdir@ -+sysconfdir = @datadir@/examples/MesaLib ++sysconfdir = @datadir@/examples/mesa sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ -- cgit v1.2.3