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 version 6.0:
details: https://anonhg.NetBSD.org/pkgsrc/rev/f83e92043bd9
branches: trunk
changeset: 466513:f83e92043bd9
user: jschauma <jschauma%pkgsrc.org@localhost>
date: Tue Jan 20 02:48:33 2004 +0000
description:
Update Mesa and friends to version 6.0:
Changes since 5.2:
New:
- full OpenGL 1.5 support
- updated GL/glext.h file to version 21
Changes:
- changed max framebuffer size to 4Kx4K (MAX_WIDTH/HEIGHT in config.h)
Bug fixes:
- fixed bug in UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color
clamping issue
- updated suno5-gcc configs
- glColor3 functions sometimes resulted in undefined alpha values
- fixed FP divide by zero error seen on VMS with xlockmore, others
- fixed vertex/fragment program debug problem (bug 873011)
- building on AIX with gcc works now
- glDeleteProgramsARB failed for ARB fragment programs (bug 876160)
- glDrawRangeElements tried to modify potentially read-only storage
- updated files for building on Windows
Changes since 5.0.2:
New features:
- reorganized directory tree
- GL_ARB_vertex/fragment_program extensions (Michal Krol & Karl Rasche)
- GL_ATI_texture_env_combine3 extension (Ian Romanick)
- GL_SGI_texture_color_table extension (Eric Plante)
- GL_NV_fragment_program extension
- GL_NV_light_max_exponent extension
- GL_EXT_texture_rectangle (identical to GL_NV_texture_rectangle)
- GL_ARB_occlusion_query extension
- GL_ARB_point_sprite extension
- GL_ARB_texture_non_power_of_two extension
- GL_IBM_multimode_draw_arrays extension
- GL_EXT_texture_mirror_clamp extension (Ian Romanick)
- GL_ARB_vertex_buffer_object extension
- new X86 feature detection code (Petr Sebor)
- less memory used for display lists and vertex buffers
- demo of per-pixel lighting with a fragment program (demos/fplight.c)
- new version (18) of glext.h header
- new spriteblast.c demo of GL_ARB_point_sprite
- faster glDrawPixels in X11 driver in some cases (see RELNOTES-5.1)
- faster glCopyPixels in X11 driver in some cases (see RELNOTES-5.1)
Bug fixes:
- really enable OpenGL 1.4 features in DOS driver.
- fixed issues in glDrawPixels and glCopyPixels for very wide images
- glPixelMapf/ui/usv()'s size parameter is GLsizei, not GLint
- fixed some texgen bugs reported by Daniel Borca
- fixed wglMakeCurrent(NULL, NULL) bug (#835861)
- fixed glTexSubImage3D z-offset bug (Cedric Gautier)
- fixed RGBA blend enable bug (Ville Syrjala)
- glAccum is supposed to be a no-op in selection/feedback mode
- fixed texgen bug #597589 (John Popplewell)
Changes:
- dropped API trace feature (src/Trace/)
- documentation overhaul. merged with website content. more html.
- glxgears.c demo updated to use GLX swap rate extensions
- glTexImage1/2/3D now allows width/height/depth = 0
- disable SPARC asm code on Linux (bug 852204)
diffstat:
graphics/Mesa/Makefile | 11 +-
graphics/Mesa/Makefile.common | 24 +-
graphics/Mesa/version.mk | 13 +-
graphics/MesaDemos/Makefile | 22 +-
graphics/MesaDemos/PLIST | 398 +++++++++++++++++++++++------------
graphics/MesaDemos/distinfo | 24 +-
graphics/MesaDemos/patches/patch-aa | 25 +-
graphics/MesaDemos/patches/patch-ab | 50 ++--
graphics/MesaDemos/patches/patch-ac | 34 +-
graphics/MesaDemos/patches/patch-ad | 24 +-
graphics/MesaDemos/patches/patch-ae | 44 ++-
graphics/MesaDemos/patches/patch-af | 13 +
graphics/MesaDemos/patches/patch-ag | 53 ++++
graphics/MesaDemos/patches/patch-ah | 22 +
graphics/MesaDemos/patches/patch-ai | 27 ++
graphics/MesaLib/Makefile | 19 +-
graphics/MesaLib/PLIST | 20 +-
graphics/MesaLib/distinfo | 13 +-
graphics/MesaLib/patches/patch-aa | 8 +-
graphics/MesaLib/patches/patch-ab | 26 ++
graphics/MesaLib/patches/patch-ac | 33 +-
graphics/MesaLib/patches/patch-ad | 13 -
graphics/MesaLib/patches/patch-ae | 17 -
graphics/glu/Makefile | 10 +-
graphics/glu/PLIST | 9 +-
graphics/glu/buildlink2.mk | 4 +-
graphics/glu/distinfo | 6 -
graphics/glut/Makefile | 12 +-
graphics/glut/PLIST | 9 +-
graphics/glut/distinfo | 10 -
30 files changed, 631 insertions(+), 362 deletions(-)
diffs (truncated from 1351 to 300 lines):
diff -r c4657df0b5b1 -r f83e92043bd9 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile Tue Jan 20 02:18:50 2004 +0000
+++ b/graphics/Mesa/Makefile Tue Jan 20 02:48:33 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2003/11/30 22:58:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.55 2004/01/20 02:48:33 jschauma Exp $
#
PKGNAME= Mesa-${MESA_VERSION}
-PKGREVISION= 1
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,17 +10,17 @@
CONFLICTS= Mesa-glx-[0-9]*
-pre-patch: # empty
-
USE_BUILDLINK2= yes
-USE_X11BASE= yes
+USE_X11= yes
NO_CHECKSUM= yes
NO_CONFIGURE= yes
NO_BUILD= yes
+NO_PATCH= yes
EXTRACT_ONLY= # empty
-post-patch: # empty
+do-patch: # empty
+do-buildlink: # empty
do-install: # empty
.include "Makefile.common"
diff -r c4657df0b5b1 -r f83e92043bd9 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common Tue Jan 20 02:18:50 2004 +0000
+++ b/graphics/Mesa/Makefile.common Tue Jan 20 02:48:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2003/11/18 16:10:55 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/01/20 02:48:33 jschauma Exp $
DISTNAME?= MesaLib-${MESA_VERSION}
CATEGORIES?= graphics
@@ -8,20 +8,24 @@
MAINTAINER?= tech-pkg%NetBSD.org@localhost
HOMEPAGE?= http://www.mesa3d.org/
-AUTOMAKE_REQD= 1.7
-USE_GMAKE= yes
+ALL_TARGET= pkgsrc
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-GNU_CONFIGURE?= yes
-CONFIGURE_ARGS+= --enable-static
+NO_CONFIGURE?= yes
DIST_SUBDIR= Mesa-${MESA_VERSION}
+PATCHDIR?= ${.CURDIR}/../../graphics/MesaLib/patches
+DISTINFO_FILE?= ${.CURDIR}/../../graphics/MesaLib/distinfo
-.if !target(post-patch)
-post-patch:
- cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE}
-.endif
+pre-install:
+ for lib in ${INSTLIBS}; do \
+ ${INSTALL_DATA} ${WRKSRC}/lib/$${lib} ${PREFIX}/lib/; \
+ cd ${PREFIX}/lib && ${LN} -s $${lib} $${lib%%.[0-9]}; \
+ cd ${PREFIX}/lib && ${LN} -s $${lib%%.[0-9]} \
+ $${lib%%.[0-9].[0-9]}; \
+ ${INSTALL_DATA} ${WRKSRC}/lib/$${lib%%.*}_pic.a \
+ ${PREFIX}/lib/; \
+ done;
.include "../../graphics/Mesa/version.mk"
-.include "../../mk/automake.mk"
.include "../../mk/bsd.prefs.mk"
diff -r c4657df0b5b1 -r f83e92043bd9 graphics/Mesa/version.mk
--- a/graphics/Mesa/version.mk Tue Jan 20 02:18:50 2004 +0000
+++ b/graphics/Mesa/version.mk Tue Jan 20 02:48:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.5 2004/01/05 06:32:40 jlam Exp $
+# $NetBSD: version.mk,v 1.6 2004/01/20 02:48:33 jschauma Exp $
#
# This file computes the version number of the Mesa distributed with
# XFree86 and stores it in ${_MESA_VERSION}.
@@ -8,12 +8,12 @@
.if !defined(MESA_VERSION_MK)
MESA_VERSION_MK= # defined
-MESA_VERSION= 5.0.2
+MESA_VERSION= 6.0
.include "../../mk/bsd.prefs.mk"
_GL_GL_H= ${X11BASE}/include/GL/gl.h
-_MESA_GL_VERSIONS= 1.2 1.3 1.4
+_MESA_GL_VERSIONS= 1.2 1.3 1.4 1.5
.for _glvers_ in ${_MESA_GL_VERSIONS}
. if !exists(${_GL_GL_H})
_MESA_GL_VERSION_${_glvers_}= NO
@@ -29,11 +29,14 @@
#
# According to the Mesa documentation, for stable releases:
#
+# Mesa-5.0 implements OpenGL 1.5,
# Mesa-5.0 implements OpenGL 1.4,
-# Mesa-4.0.4 implements OpenGL 1.3
+# Mesa-4.0.4 implements OpenGL 1.3,
# Mesa-3.4.2 implements OpenGL 1.2.
#
-.if ${_MESA_GL_VERSION_1.4} == "YES"
+.if ${_MESA_GL_VERSION_1.5} == "YES"
+_MESA_VERSION?= 6.0
+.elif ${_MESA_GL_VERSION_1.4} == "YES"
_MESA_VERSION?= 5.0
.elif ${_MESA_GL_VERSION_1.3} == "YES"
_MESA_VERSION?= 4.0.4
diff -r c4657df0b5b1 -r f83e92043bd9 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile Tue Jan 20 02:18:50 2004 +0000
+++ b/graphics/MesaDemos/Makefile Tue Jan 20 02:48:33 2004 +0000
@@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.10 2003/11/28 18:41:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 02:48:33 jschauma Exp $
PKGNAME= MesaDemos-${MESA_VERSION}
-PKGREVISION= 2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
MAINTAINER= jschauma%NetBSD.org@localhost
COMMENT= OpenGL examples and Demos
+PATCHDIR= ${.CURDIR}/patches
+DISTINFO_FILE= ${.CURDIR}/distinfo
+
.include "../Mesa/Makefile.common"
USE_BUILDLINK2= yes
-USE_X11BASE= yes
+USE_X11= yes
-BUILD_DIRS= ${WRKSRC}/book ${WRKSRC}/demos ${WRKSRC}/samples
-ALL_TARGET= check
-CONFIGURE_ARGS+= --with-glut=${X11PREFIX}
-CONFIGURE_ENV+= ac_cv_lib_glut_main=yes
-MAKE_ENV+= X11PREFIX=${X11PREFIX}
+MAKE_FLAGS+= LIB_DEP=""
+
+pre-build:
+ ${RM} -fr ${WRKSRC}/src
do-install:
-.for dir in book demos images samples
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
- cd ${WRKSRC}/${dir} && ${PAX} -s ,^./.*Makefile.*,, -s ,^./CVS.*,, \
+ cd ${WRKSRC}/progs && ${PAX} -s ,^./.*Makefile.*,, -s ,^./CVS.*,, \
-s ,^./.*\\.o$$,, -s ,^./\\.libs.*,, -s ,^./\\.deps.*,, \
+ -s ,^./.*\\.orig$$,, \
-rw . ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-.endfor
${CHMOD} -R a+rX ${PREFIX}/share/examples/${PKGNAME_NOREV}
.include "../../graphics/Mesa/buildlink2.mk"
diff -r c4657df0b5b1 -r f83e92043bd9 graphics/MesaDemos/PLIST
--- a/graphics/MesaDemos/PLIST Tue Jan 20 02:18:50 2004 +0000
+++ b/graphics/MesaDemos/PLIST Tue Jan 20 02:48:33 2004 +0000
@@ -1,133 +1,56 @@
-@comment $NetBSD: PLIST,v 1.4 2003/11/28 18:41:03 jschauma Exp $
-share/examples/${PKGNAME}/book/README
-share/examples/${PKGNAME}/book/aaindex
-share/examples/${PKGNAME}/book/aaindex.c
-share/examples/${PKGNAME}/book/aapoly
-share/examples/${PKGNAME}/book/aapoly.c
-share/examples/${PKGNAME}/book/aargb
-share/examples/${PKGNAME}/book/aargb.c
-share/examples/${PKGNAME}/book/accanti
-share/examples/${PKGNAME}/book/accanti.c
-share/examples/${PKGNAME}/book/accpersp
-share/examples/${PKGNAME}/book/accpersp.c
-share/examples/${PKGNAME}/book/alpha
-share/examples/${PKGNAME}/book/alpha.c
-share/examples/${PKGNAME}/book/alpha3D
-share/examples/${PKGNAME}/book/alpha3D.c
-share/examples/${PKGNAME}/book/anti
-share/examples/${PKGNAME}/book/anti.c
-share/examples/${PKGNAME}/book/bezcurve
-share/examples/${PKGNAME}/book/bezcurve.c
-share/examples/${PKGNAME}/book/bezmesh
-share/examples/${PKGNAME}/book/bezmesh.c
-share/examples/${PKGNAME}/book/checker
-share/examples/${PKGNAME}/book/checker.c
-share/examples/${PKGNAME}/book/clip
-share/examples/${PKGNAME}/book/clip.c
-share/examples/${PKGNAME}/book/colormat
-share/examples/${PKGNAME}/book/colormat.c
-share/examples/${PKGNAME}/book/cube
-share/examples/${PKGNAME}/book/cube.c
-share/examples/${PKGNAME}/book/depthcue
-share/examples/${PKGNAME}/book/depthcue.c
-share/examples/${PKGNAME}/book/dof
-share/examples/${PKGNAME}/book/dof.c
-share/examples/${PKGNAME}/book/double
-share/examples/${PKGNAME}/book/double.c
-share/examples/${PKGNAME}/book/drawf
-share/examples/${PKGNAME}/book/drawf.c
-share/examples/${PKGNAME}/book/feedback
-share/examples/${PKGNAME}/book/feedback.c
-share/examples/${PKGNAME}/book/fog
-share/examples/${PKGNAME}/book/fog.c
-share/examples/${PKGNAME}/book/fogindex
-share/examples/${PKGNAME}/book/fogindex.c
-share/examples/${PKGNAME}/book/font
-share/examples/${PKGNAME}/book/font.c
-share/examples/${PKGNAME}/book/hello
-share/examples/${PKGNAME}/book/hello.c
-share/examples/${PKGNAME}/book/image
-share/examples/${PKGNAME}/book/image.c
-share/examples/${PKGNAME}/book/jitter.h
-share/examples/${PKGNAME}/book/light
-share/examples/${PKGNAME}/book/light.c
-share/examples/${PKGNAME}/book/lines
-share/examples/${PKGNAME}/book/lines.c
-share/examples/${PKGNAME}/book/list
-share/examples/${PKGNAME}/book/list.c
-share/examples/${PKGNAME}/book/material
-share/examples/${PKGNAME}/book/material.c
-share/examples/${PKGNAME}/book/mipmap
-share/examples/${PKGNAME}/book/mipmap.c
-share/examples/${PKGNAME}/book/model
-share/examples/${PKGNAME}/book/model.c
-share/examples/${PKGNAME}/book/movelight
-share/examples/${PKGNAME}/book/movelight.c
-share/examples/${PKGNAME}/book/nurbs
-share/examples/${PKGNAME}/book/nurbs.c
-share/examples/${PKGNAME}/book/pickdepth
-share/examples/${PKGNAME}/book/pickdepth.c
-share/examples/${PKGNAME}/book/picksquare
-share/examples/${PKGNAME}/book/picksquare.c
-share/examples/${PKGNAME}/book/plane
-share/examples/${PKGNAME}/book/plane.c
-share/examples/${PKGNAME}/book/planet
-share/examples/${PKGNAME}/book/planet.c
-share/examples/${PKGNAME}/book/polyoff
-share/examples/${PKGNAME}/book/polyoff.c
-share/examples/${PKGNAME}/book/polys
-share/examples/${PKGNAME}/book/polys.c
-share/examples/${PKGNAME}/book/quadric
-share/examples/${PKGNAME}/book/quadric.c
-share/examples/${PKGNAME}/book/robot
-share/examples/${PKGNAME}/book/robot.c
-share/examples/${PKGNAME}/book/sccolorlight
-share/examples/${PKGNAME}/book/sccolorlight.c
-share/examples/${PKGNAME}/book/scene
-share/examples/${PKGNAME}/book/scene.c
-share/examples/${PKGNAME}/book/scenebamb
-share/examples/${PKGNAME}/book/scenebamb.c
-share/examples/${PKGNAME}/book/sceneflat
-share/examples/${PKGNAME}/book/sceneflat.c
-share/examples/${PKGNAME}/book/select
-share/examples/${PKGNAME}/book/select.c
-share/examples/${PKGNAME}/book/smooth
-share/examples/${PKGNAME}/book/smooth.c
-share/examples/${PKGNAME}/book/stencil
-share/examples/${PKGNAME}/book/stencil.c
-share/examples/${PKGNAME}/book/stroke
-share/examples/${PKGNAME}/book/stroke.c
-share/examples/${PKGNAME}/book/surface
-share/examples/${PKGNAME}/book/surface.c
-share/examples/${PKGNAME}/book/teaambient
-share/examples/${PKGNAME}/book/teaambient.c
-share/examples/${PKGNAME}/book/teapots
-share/examples/${PKGNAME}/book/teapots.c
-share/examples/${PKGNAME}/book/tess
-share/examples/${PKGNAME}/book/tess.c
-share/examples/${PKGNAME}/book/tesswind
-share/examples/${PKGNAME}/book/tesswind.c
-share/examples/${PKGNAME}/book/texbind
-share/examples/${PKGNAME}/book/texbind.c
-share/examples/${PKGNAME}/book/texgen
-share/examples/${PKGNAME}/book/texgen.c
-share/examples/${PKGNAME}/book/texprox
-share/examples/${PKGNAME}/book/texprox.c
-share/examples/${PKGNAME}/book/texsub
-share/examples/${PKGNAME}/book/texsub.c
-share/examples/${PKGNAME}/book/texturesurf
-share/examples/${PKGNAME}/book/texturesurf.c
-share/examples/${PKGNAME}/book/torus
-share/examples/${PKGNAME}/book/torus.c
-share/examples/${PKGNAME}/book/trim
-share/examples/${PKGNAME}/book/trim.c
-share/examples/${PKGNAME}/book/unproject
-share/examples/${PKGNAME}/book/unproject.c
-share/examples/${PKGNAME}/book/varray
-share/examples/${PKGNAME}/book/varray.c
-share/examples/${PKGNAME}/book/wrap
-share/examples/${PKGNAME}/book/wrap.c
+@comment $NetBSD: PLIST,v 1.5 2004/01/20 02:48:33 jschauma Exp $
share/examples/${PKGNAME}/demos/README
Home |
Main Index |
Thread Index |
Old Index