pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Update Mesa and friends to latest version 5.0.2:
details: https://anonhg.NetBSD.org/pkgsrc/rev/82c9004ac297
branches: trunk
changeset: 462279:82c9004ac297
user: jschauma <jschauma%pkgsrc.org@localhost>
date: Mon Sep 29 21:30:28 2003 +0000
description:
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.
diffstat:
graphics/Mesa/Makefile | 4 ++-
graphics/Mesa/Makefile.common | 11 ++++++-
graphics/Mesa/version.mk | 4 ++-
graphics/MesaDemos/PLIST | 5 ++-
graphics/MesaDemos/distinfo | 12 +++----
graphics/MesaDemos/patches/patch-ab | 54 -------------------------------------
graphics/MesaDemos/patches/patch-ac | 24 ----------------
graphics/MesaLib/Makefile | 5 ++-
graphics/MesaLib/PLIST | 6 ++--
graphics/MesaLib/buildlink2.mk | 5 ++-
graphics/MesaLib/distinfo | 8 ++--
graphics/MesaLib/patches/patch-ac | 10 +++---
graphics/glu/distinfo | 6 ++--
graphics/glut/distinfo | 10 +++---
14 files changed, 51 insertions(+), 113 deletions(-)
diffs (truncated from 329 to 300 lines):
diff -r fb0c8e567aba -r 82c9004ac297 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/Mesa/Makefile Mon Sep 29 21:30:28 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/08/26 01:43:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.52 2003/09/29 21:30:28 jschauma Exp $
#
PKGNAME= Mesa-${MESA_VERSION}
@@ -10,6 +10,8 @@
CONFLICTS= Mesa-glx-[0-9]*
+pre-patch: # empty
+
.include "Makefile.common"
USE_BUILDLINK2= yes
diff -r fb0c8e567aba -r 82c9004ac297 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/Mesa/Makefile.common Mon Sep 29 21:30:28 2003 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.18 2003/08/26 01:43:51 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.19 2003/09/29 21:30:28 jschauma Exp $
-MESA_VERSION= 5.0.1
DISTNAME?= MesaLib-${MESA_VERSION}
CATEGORIES?= graphics
MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
@@ -9,6 +8,7 @@
MAINTAINER?= tech-pkg%NetBSD.org@localhost
HOMEPAGE?= http://www.mesa3d.org/
+AUTOMAKE_REQD= 1.4
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -16,4 +16,11 @@
GNU_CONFIGURE?= yes
CONFIGURE_ARGS+= --enable-static
+.if !target(pre-patch)
+pre-patch:
+ cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE}
+.endif
+
+.include "../../graphics/Mesa/version.mk"
+.include "../../mk/automake.mk"
.include "../../mk/bsd.prefs.mk"
diff -r fb0c8e567aba -r 82c9004ac297 graphics/Mesa/version.mk
--- a/graphics/Mesa/version.mk Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/Mesa/version.mk Mon Sep 29 21:30:28 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2002/11/20 22:13:21 jlam Exp $
+# $NetBSD: version.mk,v 1.2 2003/09/29 21:30:28 jschauma Exp $
#
# This file computes the version number of the Mesa distributed with
# XFree86 and stores it in ${_MESA_VERSION}.
@@ -8,6 +8,8 @@
.if !defined(MESA_VERSION_MK)
MESA_VERSION_MK= # defined
+MESA_VERSION= 5.0.2
+
.include "../../mk/bsd.prefs.mk"
_GL_GLEXT_H= ${X11BASE}/include/GL/glext.h
diff -r fb0c8e567aba -r 82c9004ac297 graphics/MesaDemos/PLIST
--- a/graphics/MesaDemos/PLIST Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/MesaDemos/PLIST Mon Sep 29 21:30:28 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/05 15:20:22 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/29 21:30:28 jschauma Exp $
share/examples/${PKGNAME}/book/README
share/examples/${PKGNAME}/book/aaindex
share/examples/${PKGNAME}/book/aaindex.c
@@ -165,6 +165,7 @@
share/examples/${PKGNAME}/demos/multiarb.c
share/examples/${PKGNAME}/demos/occlude
share/examples/${PKGNAME}/demos/occlude.c
+share/examples/${PKGNAME}/demos/osdemo
share/examples/${PKGNAME}/demos/osdemo.c
share/examples/${PKGNAME}/demos/paltex
share/examples/${PKGNAME}/demos/paltex.c
@@ -185,6 +186,7 @@
share/examples/${PKGNAME}/demos/reflect.c
share/examples/${PKGNAME}/demos/renormal
share/examples/${PKGNAME}/demos/renormal.c
+share/examples/${PKGNAME}/demos/shadowtex
share/examples/${PKGNAME}/demos/shadowtex.c
share/examples/${PKGNAME}/demos/spectex
share/examples/${PKGNAME}/demos/spectex.c
@@ -252,6 +254,7 @@
share/examples/${PKGNAME}/samples/logo.c
share/examples/${PKGNAME}/samples/nurb
share/examples/${PKGNAME}/samples/nurb.c
+share/examples/${PKGNAME}/samples/oglinfo
share/examples/${PKGNAME}/samples/oglinfo.c
share/examples/${PKGNAME}/samples/olympic
share/examples/${PKGNAME}/samples/olympic.c
diff -r fb0c8e567aba -r 82c9004ac297 graphics/MesaDemos/distinfo
--- a/graphics/MesaDemos/distinfo Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/MesaDemos/distinfo Mon Sep 29 21:30:28 2003 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/05/10 16:37:11 drochner Exp $
+$NetBSD: distinfo,v 1.4 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 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938
-Size (MesaDemos-5.0.1.tar.bz2) = 889575 bytes
+SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
+Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
+SHA1 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
+Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes
SHA1 (patch-aa) = 97abd719eb38d141af1c7a12c22fe24f98a1fdf7
-SHA1 (patch-ab) = 9b11eb413720f6a0863a15951dc23449ec25de2d
-SHA1 (patch-ac) = 79166ebd1f425ba592d9a62bccd47533c89f9807
diff -r fb0c8e567aba -r 82c9004ac297 graphics/MesaDemos/patches/patch-ab
--- a/graphics/MesaDemos/patches/patch-ab Mon Sep 29 21:24:18 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/05/10 16:37:12 drochner Exp $
-
---- 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 #####
-
--INCDIR = ../include
--LIBDIR = ../lib
-+INCDIR = ${X11PREFIX}/include
-+LIBDIR = ${X11PREFIX}/lib
-
- GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-
-@@ -36,7 +36,6 @@
- morph3d \
- multiarb \
- occlude \
-- osdemo \
- paltex \
- pixeltex \
- pointblast \
-@@ -44,7 +43,6 @@
- readpix \
- reflect \
- renormal \
-- shadowtex \
- spectex \
- stex3d \
- teapot \
-@@ -68,11 +66,11 @@
-
- # make executable from .c file:
- .c: $(LIB_DEP)
-- $(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
-+ $(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} $< $(GL_LIBS) -o $@
-
- # special case: need the -lOSMesa library:
- osdemo: osdemo.c
-- $(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
-+ $(CC) -I$(INCDIR) $(CFLAGS) ${LDFLAGS} osdemo.c $(OSMESA_LIBS) -o $@
-
-
- ##### TARGETS #####
-@@ -95,7 +93,7 @@
- cp ../util/readtex.c .
-
- readtex.h:
-- cp ../util/readtex.c .
-+ cp ../util/readtex.h .
-
-
- # execute all programs
diff -r fb0c8e567aba -r 82c9004ac297 graphics/MesaDemos/patches/patch-ac
--- a/graphics/MesaDemos/patches/patch-ac Mon Sep 29 21:24:18 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/03/09 19:04:53 jschauma Exp $
-
---- samples/Makefile.X11.orig Tue Feb 15 20:09:06 2000
-+++ samples/Makefile.X11 Sat Mar 8 19:00:44 2003
-@@ -9,15 +9,15 @@
-
- ##### MACROS #####
-
--INCDIR = ../include
--LIBDIR = ../lib
-+INCDIR = ${X11PREFIX}/include
-+LIBDIR = ${X11PREFIX}/lib
-
--GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-+GL_LIBS = ${LDFLAGS} -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
-
- PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-- font line logo nurb oglinfo olympic overlay point prim quad select \
-+ font line logo nurb olympic overlay point prim quad select \
- shape sphere star stencil stretch texture tri wave
-
-
diff -r fb0c8e567aba -r 82c9004ac297 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/MesaLib/Makefile Mon Sep 29 21:30:28 2003 +0000
@@ -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 @@
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 -r fb0c8e567aba -r 82c9004ac297 graphics/MesaLib/PLIST
--- a/graphics/MesaLib/PLIST Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/MesaLib/PLIST Mon Sep 29 21:30:28 2003 +0000
@@ -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.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 -r fb0c8e567aba -r 82c9004ac297 graphics/MesaLib/buildlink2.mk
--- a/graphics/MesaLib/buildlink2.mk Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/MesaLib/buildlink2.mk Mon Sep 29 21:30:28 2003 +0000
@@ -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_x.h
BUILDLINK_FILES.MesaLib+= include/GL/xmesa_xf86.h
BUILDLINK_FILES.MesaLib+= lib/libGL.*
+BUILDLINK_FILES.MesaLib+= lib/libOSMesa.*
USE_X11= # defined
diff -r fb0c8e567aba -r 82c9004ac297 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/MesaLib/distinfo Mon Sep 29 21:30:28 2003 +0000
@@ -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 -r fb0c8e567aba -r 82c9004ac297 graphics/MesaLib/patches/patch-ac
--- a/graphics/MesaLib/patches/patch-ac Mon Sep 29 21:24:18 2003 +0000
+++ b/graphics/MesaLib/patches/patch-ac Mon Sep 29 21:30:28 2003 +0000
@@ -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@
Home |
Main Index |
Thread Index |
Old Index