diff options
author | jschauma <jschauma@pkgsrc.org> | 2004-01-20 02:48:33 +0000 |
---|---|---|
committer | jschauma <jschauma@pkgsrc.org> | 2004-01-20 02:48:33 +0000 |
commit | cffc45e2f083e42578ce3a67a01ba36b2f997681 (patch) | |
tree | 53511c5e43e4fb10658a8b773e2d73f4ae4bf3d3 /graphics/MesaDemos | |
parent | 886fcca3ce6b88771c1f83f47b0353dc9395fa95 (diff) | |
download | pkgsrc-cffc45e2f083e42578ce3a67a01ba36b2f997681.tar.gz |
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 (limited to 'graphics/MesaDemos')
-rw-r--r-- | graphics/MesaDemos/Makefile | 22 | ||||
-rw-r--r-- | graphics/MesaDemos/PLIST | 398 | ||||
-rw-r--r-- | graphics/MesaDemos/distinfo | 24 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-aa | 25 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-ab | 50 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-ac | 34 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-ad | 24 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-ae | 44 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-af | 13 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-ag | 53 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-ah | 22 | ||||
-rw-r--r-- | graphics/MesaDemos/patches/patch-ai | 27 |
12 files changed, 503 insertions, 233 deletions
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index 6f876b2a6be..7116065dcbc 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -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 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 + +MAKE_FLAGS+= LIB_DEP="" -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} +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 --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST index 5d7f1321ff1..388cf09b53c 100644 --- a/graphics/MesaDemos/PLIST +++ b/graphics/MesaDemos/PLIST @@ -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 +share/examples/${PKGNAME}/demos/Windows/CVS/Entries +share/examples/${PKGNAME}/demos/Windows/CVS/Repository +share/examples/${PKGNAME}/demos/Windows/CVS/Root +share/examples/${PKGNAME}/demos/Windows/CVS/Template +share/examples/${PKGNAME}/demos/Windows/all.dsp +share/examples/${PKGNAME}/demos/Windows/bounce.dsp +share/examples/${PKGNAME}/demos/Windows/clearspd.dsp +share/examples/${PKGNAME}/demos/Windows/cubemap.dsp +share/examples/${PKGNAME}/demos/Windows/demos.dsw +share/examples/${PKGNAME}/demos/Windows/drawpix.dsp +share/examples/${PKGNAME}/demos/Windows/fire.dsp +share/examples/${PKGNAME}/demos/Windows/gears.dsp +share/examples/${PKGNAME}/demos/Windows/geartrain.dsp +share/examples/${PKGNAME}/demos/Windows/glinfo.dsp +share/examples/${PKGNAME}/demos/Windows/gloss.dsp +share/examples/${PKGNAME}/demos/Windows/gltestperf.dsp +share/examples/${PKGNAME}/demos/Windows/glutfx.dsp +share/examples/${PKGNAME}/demos/Windows/ipers.dsp +share/examples/${PKGNAME}/demos/Windows/isosurf.dsp +share/examples/${PKGNAME}/demos/Windows/loadbias.dsp +share/examples/${PKGNAME}/demos/Windows/morph3d.dsp +share/examples/${PKGNAME}/demos/Windows/multiarb.dsp +share/examples/${PKGNAME}/demos/Windows/occlude.dsp +share/examples/${PKGNAME}/demos/Windows/osdemo.dsp +share/examples/${PKGNAME}/demos/Windows/paltex.dsp +share/examples/${PKGNAME}/demos/Windows/pixeltex.dsp +share/examples/${PKGNAME}/demos/Windows/pointblast.dsp +share/examples/${PKGNAME}/demos/Windows/rain.dsp +share/examples/${PKGNAME}/demos/Windows/ray.dsp +share/examples/${PKGNAME}/demos/Windows/readpix.dsp +share/examples/${PKGNAME}/demos/Windows/reflect.dsp +share/examples/${PKGNAME}/demos/Windows/renormal.dsp +share/examples/${PKGNAME}/demos/Windows/shadowtex.dsp +share/examples/${PKGNAME}/demos/Windows/spectex.dsp +share/examples/${PKGNAME}/demos/Windows/spriteblast.dsp +share/examples/${PKGNAME}/demos/Windows/stex3d.dsp +share/examples/${PKGNAME}/demos/Windows/teapot.dsp +share/examples/${PKGNAME}/demos/Windows/terrain.dsp +share/examples/${PKGNAME}/demos/Windows/tessdemo.dsp +share/examples/${PKGNAME}/demos/Windows/texcyl.dsp +share/examples/${PKGNAME}/demos/Windows/texdown.dsp +share/examples/${PKGNAME}/demos/Windows/texenv.dsp +share/examples/${PKGNAME}/demos/Windows/texobj.dsp +share/examples/${PKGNAME}/demos/Windows/trispd.dsp +share/examples/${PKGNAME}/demos/Windows/tunnel.dsp +share/examples/${PKGNAME}/demos/Windows/tunnel2.dsp +share/examples/${PKGNAME}/demos/Windows/winpos.dsp +share/examples/${PKGNAME}/demos/arbfplight +share/examples/${PKGNAME}/demos/arbfplight.c +share/examples/${PKGNAME}/demos/arbocclude +share/examples/${PKGNAME}/demos/arbocclude.c share/examples/${PKGNAME}/demos/bounce share/examples/${PKGNAME}/demos/bounce.c share/examples/${PKGNAME}/demos/clearspd @@ -137,9 +60,10 @@ share/examples/${PKGNAME}/demos/cubemap.c share/examples/${PKGNAME}/demos/descrip.mms share/examples/${PKGNAME}/demos/drawpix share/examples/${PKGNAME}/demos/drawpix.c -share/examples/${PKGNAME}/demos/example.c share/examples/${PKGNAME}/demos/fire share/examples/${PKGNAME}/demos/fire.c +share/examples/${PKGNAME}/demos/fplight +share/examples/${PKGNAME}/demos/fplight.c share/examples/${PKGNAME}/demos/gamma share/examples/${PKGNAME}/demos/gamma.c share/examples/${PKGNAME}/demos/gears @@ -170,7 +94,6 @@ 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 share/examples/${PKGNAME}/demos/particles.cxx share/examples/${PKGNAME}/demos/particles.h @@ -193,6 +116,8 @@ share/examples/${PKGNAME}/demos/shadowtex share/examples/${PKGNAME}/demos/shadowtex.c share/examples/${PKGNAME}/demos/spectex share/examples/${PKGNAME}/demos/spectex.c +share/examples/${PKGNAME}/demos/spriteblast +share/examples/${PKGNAME}/demos/spriteblast.c share/examples/${PKGNAME}/demos/stex3d share/examples/${PKGNAME}/demos/stex3d.c share/examples/${PKGNAME}/demos/teapot @@ -219,6 +144,13 @@ share/examples/${PKGNAME}/demos/tunnel2.c share/examples/${PKGNAME}/demos/tunneldat.h share/examples/${PKGNAME}/demos/winpos share/examples/${PKGNAME}/demos/winpos.c +share/examples/${PKGNAME}/ggi/asc-view.c +share/examples/${PKGNAME}/ggi/gears.c +share/examples/${PKGNAME}/ggi/gears2.c +share/examples/${PKGNAME}/images/CVS/Entries +share/examples/${PKGNAME}/images/CVS/Repository +share/examples/${PKGNAME}/images/CVS/Root +share/examples/${PKGNAME}/images/CVS/Template share/examples/${PKGNAME}/images/bw.rgb share/examples/${PKGNAME}/images/girl.rgb share/examples/${PKGNAME}/images/reflect.rgb @@ -227,6 +159,134 @@ share/examples/${PKGNAME}/images/tile.rgb share/examples/${PKGNAME}/images/tree2.rgba share/examples/${PKGNAME}/images/tree3.rgb share/examples/${PKGNAME}/images/wrs_logo.rgb +share/examples/${PKGNAME}/redbook/README +share/examples/${PKGNAME}/redbook/aaindex +share/examples/${PKGNAME}/redbook/aaindex.c +share/examples/${PKGNAME}/redbook/aapoly +share/examples/${PKGNAME}/redbook/aapoly.c +share/examples/${PKGNAME}/redbook/aargb +share/examples/${PKGNAME}/redbook/aargb.c +share/examples/${PKGNAME}/redbook/accanti +share/examples/${PKGNAME}/redbook/accanti.c +share/examples/${PKGNAME}/redbook/accpersp +share/examples/${PKGNAME}/redbook/accpersp.c +share/examples/${PKGNAME}/redbook/alpha +share/examples/${PKGNAME}/redbook/alpha.c +share/examples/${PKGNAME}/redbook/alpha3D +share/examples/${PKGNAME}/redbook/alpha3D.c +share/examples/${PKGNAME}/redbook/anti +share/examples/${PKGNAME}/redbook/anti.c +share/examples/${PKGNAME}/redbook/bezcurve +share/examples/${PKGNAME}/redbook/bezcurve.c +share/examples/${PKGNAME}/redbook/bezmesh +share/examples/${PKGNAME}/redbook/bezmesh.c +share/examples/${PKGNAME}/redbook/checker +share/examples/${PKGNAME}/redbook/checker.c +share/examples/${PKGNAME}/redbook/clip +share/examples/${PKGNAME}/redbook/clip.c +share/examples/${PKGNAME}/redbook/colormat +share/examples/${PKGNAME}/redbook/colormat.c +share/examples/${PKGNAME}/redbook/cube +share/examples/${PKGNAME}/redbook/cube.c +share/examples/${PKGNAME}/redbook/depthcue +share/examples/${PKGNAME}/redbook/depthcue.c +share/examples/${PKGNAME}/redbook/dof +share/examples/${PKGNAME}/redbook/dof.c +share/examples/${PKGNAME}/redbook/double +share/examples/${PKGNAME}/redbook/double.c +share/examples/${PKGNAME}/redbook/drawf +share/examples/${PKGNAME}/redbook/drawf.c +share/examples/${PKGNAME}/redbook/feedback +share/examples/${PKGNAME}/redbook/feedback.c +share/examples/${PKGNAME}/redbook/fog +share/examples/${PKGNAME}/redbook/fog.c +share/examples/${PKGNAME}/redbook/fogindex +share/examples/${PKGNAME}/redbook/fogindex.c +share/examples/${PKGNAME}/redbook/font +share/examples/${PKGNAME}/redbook/font.c +share/examples/${PKGNAME}/redbook/hello +share/examples/${PKGNAME}/redbook/hello.c +share/examples/${PKGNAME}/redbook/image +share/examples/${PKGNAME}/redbook/image.c +share/examples/${PKGNAME}/redbook/jitter.h +share/examples/${PKGNAME}/redbook/light +share/examples/${PKGNAME}/redbook/light.c +share/examples/${PKGNAME}/redbook/lines +share/examples/${PKGNAME}/redbook/lines.c +share/examples/${PKGNAME}/redbook/list +share/examples/${PKGNAME}/redbook/list.c +share/examples/${PKGNAME}/redbook/material +share/examples/${PKGNAME}/redbook/material.c +share/examples/${PKGNAME}/redbook/mipmap +share/examples/${PKGNAME}/redbook/mipmap.c +share/examples/${PKGNAME}/redbook/model +share/examples/${PKGNAME}/redbook/model.c +share/examples/${PKGNAME}/redbook/movelight +share/examples/${PKGNAME}/redbook/movelight.c +share/examples/${PKGNAME}/redbook/nurbs +share/examples/${PKGNAME}/redbook/nurbs.c +share/examples/${PKGNAME}/redbook/pickdepth +share/examples/${PKGNAME}/redbook/pickdepth.c +share/examples/${PKGNAME}/redbook/picksquare +share/examples/${PKGNAME}/redbook/picksquare.c +share/examples/${PKGNAME}/redbook/plane +share/examples/${PKGNAME}/redbook/plane.c +share/examples/${PKGNAME}/redbook/planet +share/examples/${PKGNAME}/redbook/planet.c +share/examples/${PKGNAME}/redbook/polyoff +share/examples/${PKGNAME}/redbook/polyoff.c +share/examples/${PKGNAME}/redbook/polys +share/examples/${PKGNAME}/redbook/polys.c +share/examples/${PKGNAME}/redbook/quadric +share/examples/${PKGNAME}/redbook/quadric.c +share/examples/${PKGNAME}/redbook/robot +share/examples/${PKGNAME}/redbook/robot.c +share/examples/${PKGNAME}/redbook/sccolorlight +share/examples/${PKGNAME}/redbook/sccolorlight.c +share/examples/${PKGNAME}/redbook/scene +share/examples/${PKGNAME}/redbook/scene.c +share/examples/${PKGNAME}/redbook/scenebamb +share/examples/${PKGNAME}/redbook/scenebamb.c +share/examples/${PKGNAME}/redbook/sceneflat +share/examples/${PKGNAME}/redbook/sceneflat.c +share/examples/${PKGNAME}/redbook/select +share/examples/${PKGNAME}/redbook/select.c +share/examples/${PKGNAME}/redbook/smooth +share/examples/${PKGNAME}/redbook/smooth.c +share/examples/${PKGNAME}/redbook/stencil +share/examples/${PKGNAME}/redbook/stencil.c +share/examples/${PKGNAME}/redbook/stroke +share/examples/${PKGNAME}/redbook/stroke.c +share/examples/${PKGNAME}/redbook/surface +share/examples/${PKGNAME}/redbook/surface.c +share/examples/${PKGNAME}/redbook/teaambient +share/examples/${PKGNAME}/redbook/teaambient.c +share/examples/${PKGNAME}/redbook/teapots +share/examples/${PKGNAME}/redbook/teapots.c +share/examples/${PKGNAME}/redbook/tess +share/examples/${PKGNAME}/redbook/tess.c +share/examples/${PKGNAME}/redbook/tesswind +share/examples/${PKGNAME}/redbook/tesswind.c +share/examples/${PKGNAME}/redbook/texbind +share/examples/${PKGNAME}/redbook/texbind.c +share/examples/${PKGNAME}/redbook/texgen +share/examples/${PKGNAME}/redbook/texgen.c +share/examples/${PKGNAME}/redbook/texprox +share/examples/${PKGNAME}/redbook/texprox.c +share/examples/${PKGNAME}/redbook/texsub +share/examples/${PKGNAME}/redbook/texsub.c +share/examples/${PKGNAME}/redbook/texturesurf +share/examples/${PKGNAME}/redbook/texturesurf.c +share/examples/${PKGNAME}/redbook/torus +share/examples/${PKGNAME}/redbook/torus.c +share/examples/${PKGNAME}/redbook/trim +share/examples/${PKGNAME}/redbook/trim.c +share/examples/${PKGNAME}/redbook/unproject +share/examples/${PKGNAME}/redbook/unproject.c +share/examples/${PKGNAME}/redbook/varray +share/examples/${PKGNAME}/redbook/varray.c +share/examples/${PKGNAME}/redbook/wrap +share/examples/${PKGNAME}/redbook/wrap.c share/examples/${PKGNAME}/samples/README share/examples/${PKGNAME}/samples/accum share/examples/${PKGNAME}/samples/accum.c @@ -236,7 +296,6 @@ share/examples/${PKGNAME}/samples/bitmap2 share/examples/${PKGNAME}/samples/bitmap2.c share/examples/${PKGNAME}/samples/blendeq share/examples/${PKGNAME}/samples/blendeq.c -share/examples/${PKGNAME}/samples/blendxor share/examples/${PKGNAME}/samples/blendxor.c share/examples/${PKGNAME}/samples/copy share/examples/${PKGNAME}/samples/copy.c @@ -250,9 +309,9 @@ share/examples/${PKGNAME}/samples/fog share/examples/${PKGNAME}/samples/fog.c share/examples/${PKGNAME}/samples/font share/examples/${PKGNAME}/samples/font.c -share/examples/${PKGNAME}/samples/loadppm.c share/examples/${PKGNAME}/samples/line share/examples/${PKGNAME}/samples/line.c +share/examples/${PKGNAME}/samples/loadppm.c share/examples/${PKGNAME}/samples/logo share/examples/${PKGNAME}/samples/logo.c share/examples/${PKGNAME}/samples/nurb @@ -289,8 +348,79 @@ share/examples/${PKGNAME}/samples/tri share/examples/${PKGNAME}/samples/tri.c share/examples/${PKGNAME}/samples/wave share/examples/${PKGNAME}/samples/wave.c +share/examples/${PKGNAME}/util/README +share/examples/${PKGNAME}/util/dumpstate.c +share/examples/${PKGNAME}/util/errcheck.c +share/examples/${PKGNAME}/util/glstate.c +share/examples/${PKGNAME}/util/glstate.h +share/examples/${PKGNAME}/util/glutskel.c +share/examples/${PKGNAME}/util/idproj.c +share/examples/${PKGNAME}/util/imagesgi.h +share/examples/${PKGNAME}/util/mwmborder.c +share/examples/${PKGNAME}/util/readtex.c +share/examples/${PKGNAME}/util/readtex.h +share/examples/${PKGNAME}/util/showbuffer.c +share/examples/${PKGNAME}/util/showbuffer.h +share/examples/${PKGNAME}/util/winpos.c +share/examples/${PKGNAME}/windml/readtex.c +share/examples/${PKGNAME}/windml/uglaccum.c +share/examples/${PKGNAME}/windml/uglalldemos.c +share/examples/${PKGNAME}/windml/uglbounce.c +share/examples/${PKGNAME}/windml/uglcube.c +share/examples/${PKGNAME}/windml/ugldrawpix.c +share/examples/${PKGNAME}/windml/uglflip.c +share/examples/${PKGNAME}/windml/uglgears.c +share/examples/${PKGNAME}/windml/uglicotorus.c +share/examples/${PKGNAME}/windml/uglline.c +share/examples/${PKGNAME}/windml/uglolympic.c +share/examples/${PKGNAME}/windml/uglpoint.c +share/examples/${PKGNAME}/windml/uglstencil.c +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/descrip.mms +share/examples/${PKGNAME}/xdemos/glthreads +share/examples/${PKGNAME}/xdemos/glthreads.c +share/examples/${PKGNAME}/xdemos/glxdemo +share/examples/${PKGNAME}/xdemos/glxdemo.c +share/examples/${PKGNAME}/xdemos/glxgears +share/examples/${PKGNAME}/xdemos/glxgears.c +share/examples/${PKGNAME}/xdemos/glxheads +share/examples/${PKGNAME}/xdemos/glxheads.c +share/examples/${PKGNAME}/xdemos/glxinfo +share/examples/${PKGNAME}/xdemos/glxinfo.c +share/examples/${PKGNAME}/xdemos/glxpixmap +share/examples/${PKGNAME}/xdemos/glxpixmap.c +share/examples/${PKGNAME}/xdemos/glxswapcontrol +share/examples/${PKGNAME}/xdemos/glxswapcontrol.c +share/examples/${PKGNAME}/xdemos/manywin +share/examples/${PKGNAME}/xdemos/manywin.c +share/examples/${PKGNAME}/xdemos/offset +share/examples/${PKGNAME}/xdemos/offset.c +share/examples/${PKGNAME}/xdemos/pbdemo.c +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/vgears.c +share/examples/${PKGNAME}/xdemos/vindex.c +share/examples/${PKGNAME}/xdemos/vtest.c +share/examples/${PKGNAME}/xdemos/wincopy +share/examples/${PKGNAME}/xdemos/wincopy.c +share/examples/${PKGNAME}/xdemos/xdemo +share/examples/${PKGNAME}/xdemos/xdemo.c +share/examples/${PKGNAME}/xdemos/xfont +share/examples/${PKGNAME}/xdemos/xfont.c +@dirrm share/examples/${PKGNAME}/xdemos +@dirrm share/examples/${PKGNAME}/windml +@dirrm share/examples/${PKGNAME}/util @dirrm share/examples/${PKGNAME}/samples +@dirrm share/examples/${PKGNAME}/redbook +@dirrm share/examples/${PKGNAME}/images/CVS @dirrm share/examples/${PKGNAME}/images +@dirrm share/examples/${PKGNAME}/ggi +@dirrm share/examples/${PKGNAME}/demos/Windows/CVS +@dirrm share/examples/${PKGNAME}/demos/Windows @dirrm share/examples/${PKGNAME}/demos -@dirrm share/examples/${PKGNAME}/book @dirrm share/examples/${PKGNAME} diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo index bf2f9e90f29..8762ae1f9f8 100644 --- a/graphics/MesaDemos/distinfo +++ b/graphics/MesaDemos/distinfo @@ -1,11 +1,15 @@ -$NetBSD: distinfo,v 1.6 2003/11/28 18:41:03 jschauma Exp $ +$NetBSD: distinfo,v 1.7 2004/01/20 02:48:33 jschauma Exp $ -SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = a49234ad74d6c67b2727c1dd8a8c8e1ed7f63192 -Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = 1719544 bytes -SHA1 (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 3c6f948023f5f41b8d5bd308076e9d8cfd194115 -Size (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 901632 bytes -SHA1 (patch-aa) = 9e278446701ef6cd2b056b3c8f020f0d8befaf7a -SHA1 (patch-ab) = 8750d7a8c476c85823c0c56bb9b6f8323019a1f0 -SHA1 (patch-ac) = 38da6ec05805eab6c93431e7e977e38b33f83860 -SHA1 (patch-ad) = 807b07b1505735f23dd4148c8c838df08af6333e -SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100 +SHA1 (Mesa-6.0/MesaLib-6.0.tar.bz2) = 00f0ac27fbc3eddfdbc84de482f16b64b904d60c +Size (Mesa-6.0/MesaLib-6.0.tar.bz2) = 1487379 bytes +SHA1 (Mesa-6.0/MesaDemos-6.0.tar.bz2) = f57a76d0b9b4f70197860eda15f5241a02017a91 +Size (Mesa-6.0/MesaDemos-6.0.tar.bz2) = 915060 bytes +SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0 +SHA1 (patch-ab) = 0426be52c00f40b9a631813d3cbdf2cee47c39cb +SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4 +SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b +SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b +SHA1 (patch-af) = a66af6ebab7569d85693a9fa58b2d8f9b35149c1 +SHA1 (patch-ag) = 1aae03d6dfe080efacd306ac157231e2c72c13ea +SHA1 (patch-ah) = b1c39f3b5e739dd14340b8b6c680a891e61c54e1 +SHA1 (patch-ai) = 9331e8e9a7f9dd044b10b62319f5eaaaddfe63d0 diff --git a/graphics/MesaDemos/patches/patch-aa b/graphics/MesaDemos/patches/patch-aa index af8b520242b..c30c973cb4c 100644 --- a/graphics/MesaDemos/patches/patch-aa +++ b/graphics/MesaDemos/patches/patch-aa @@ -1,14 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2003/11/28 18:41:03 jschauma Exp $ +$NetBSD: patch-aa,v 1.5 2004/01/20 02:48:33 jschauma Exp $ ---- book/Makefile.am.orig 2003-11-07 09:32:07.000000000 -0500 -+++ book/Makefile.am 2003-11-28 12:47:45.000000000 -0500 -@@ -15,8 +15,7 @@ - - EXTRA_DIST = jitter.h - --LDADD = $(GLUT_LIBS) $(top_builddir)/$(GLU_DIR)/libGLU.la \ -- $(top_builddir)/src/libGL.la -lm -+LDADD = $(GLUT_LIBS) -lGLU -lGL -lm - #LDFLAGS = -no-install - - # execute all programs +--- progs/demos/lodbias.c.orig 2004-01-19 20:06:16.000000000 -0500 ++++ progs/demos/lodbias.c 2004-01-19 20:06:28.000000000 -0500 +@@ -212,7 +212,7 @@ + } + /* resize to 256 x 256 */ + if (width != 256 || height != 256) { +- GLubyte *newImage = malloc(256 * 256 * 4); ++ GLubyte *newImage = (GLubyte *)malloc(256 * 256 * 4); + gluScaleImage(format, width, height, GL_UNSIGNED_BYTE, image, + 256, 256, GL_UNSIGNED_BYTE, newImage); + free(image); diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab index dd50836e88e..f6735d9230a 100644 --- a/graphics/MesaDemos/patches/patch-ab +++ b/graphics/MesaDemos/patches/patch-ab @@ -1,30 +1,26 @@ -$NetBSD: patch-ab,v 1.5 2003/11/18 16:10:55 jschauma Exp $ +$NetBSD: patch-ab,v 1.6 2004/01/20 02:48:33 jschauma Exp $ ---- demos/Makefile.am.orig 2003-11-07 10:57:52.000000000 -0600 -+++ demos/Makefile.am 2003-11-17 21:26:50.000000000 -0600 -@@ -22,6 +22,7 @@ - morph3d \ - multiarb \ - occlude \ -+ osdemo \ - paltex \ - pixeltex \ - pointblast \ -@@ -47,14 +48,14 @@ +--- Make-config.orig 2004-01-15 09:23:54.000000000 -0500 ++++ Make-config 2004-01-19 18:29:14.000000000 -0500 +@@ -778,19 +778,14 @@ + "GLUT_CFLAGS = -fexceptions" \ + "APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm" - CLEANFILES = test.ppm - --LDADD = $(GLUT_LIBS) \ -- $(top_builddir)/$(GLU_DIR)/libGLU.la \ -- $(top_builddir)/src/libGL.la -lm -+LDADD = $(GLUT_LIBS) -lGLU -lGL -lm - - #LDFLAGS = -no-install - - EXTRA_DIST = isosurf.dat particles.cxx particles.h tunneldat.h - -+osdemo_LDADD = $(LDADD) -lOSMesa -+ - # use double buffering if possible - BUFFER = -db +-netbsd: ++pkgsrc: + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ + "GL_LIB = libGL.so" \ + "GLU_LIB = libGLU.so" \ + "GLUT_LIB = libglut.so" \ + "GLW_LIB = libGLw.so" \ + "OSMESA_LIB = libOSMesa.so" \ +- "CC = gcc" \ +- "CXX = g++" \ +- "CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100" \ +- "CXXFLAGS = -O2 -fPIC" \ +- "GLUT_CFLAGS = -fexceptions" \ +- "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" ++ "APP_LIB_DEPS = -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm" + openbsd: + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ diff --git a/graphics/MesaDemos/patches/patch-ac b/graphics/MesaDemos/patches/patch-ac index e68d5551e88..c512585aa9a 100644 --- a/graphics/MesaDemos/patches/patch-ac +++ b/graphics/MesaDemos/patches/patch-ac @@ -1,14 +1,22 @@ -$NetBSD: patch-ac,v 1.4 2003/11/18 16:10:55 jschauma Exp $ +$NetBSD: patch-ac,v 1.5 2004/01/20 02:48:33 jschauma Exp $ ---- samples/Makefile.am.orig 2003-11-07 08:32:08.000000000 -0600 -+++ samples/Makefile.am 2003-11-17 20:51:29.000000000 -0600 -@@ -12,8 +12,7 @@ - - EXTRA_DIST = tkmap.c loadppm.c - --LDADD = $(GLUT_LIBS) $(top_builddir)/$(GLU_DIR)/libGLU.la \ -- $(top_builddir)/src/libGL.la -lm -+LDADD = $(GLUT_LIBS) -lGLU -lGL -lm - #LDFLAGS = -no-install - - # default image +--- Makefile.orig 2004-01-19 18:31:20.000000000 -0500 ++++ Makefile 2004-01-19 18:31:54.000000000 -0500 +@@ -79,7 +79,7 @@ + @echo " make linux-icc for Linux with the Intel C/C++ compiler" + @echo " make lynxos for LynxOS systems with GCC" + @echo " make mklinux for Linux on Power Macintosh" +- @echo " make netbsd for NetBSD 1.0 systems with GCC" ++ @echo " make pkgsrc for pkgsrc systems" + @echo " make openbsd for OpenBSD systems" + @echo " make openstep for OpenStep/MacOSX Server systems" + @echo " make osf1 for DEC Alpha systems with OSF/1" +@@ -115,7 +115,7 @@ + linux-alpha-static linux-alpha \ + linux-ppc-static linux-ppc \ + linux-sparc linux-sparc5 linux-sparc-ultra \ +-mklinux netbsd osf1 openbsd qnx \ ++mklinux pkgsrc osf1 openbsd qnx \ + solaris-x86 solaris-x86-gcc \ + sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \ + sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \ diff --git a/graphics/MesaDemos/patches/patch-ad b/graphics/MesaDemos/patches/patch-ad index 41d0161d4c5..92db20ec87b 100644 --- a/graphics/MesaDemos/patches/patch-ad +++ b/graphics/MesaDemos/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.1 2003/11/18 16:10:55 jschauma Exp $ +$NetBSD: patch-ad,v 1.2 2004/01/20 02:48:33 jschauma Exp $ ---- configure.orig 2003-11-08 19:10:36.000000000 -0500 -+++ configure 2003-11-08 19:10:53.000000000 -0500 -@@ -7121,7 +7121,7 @@ - if test "x$enable_optim" = xyes; then - if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then - if test "x$GCC" = xyes; then -- CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing" -+ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing" - case "$host" in - i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";; - esac +--- progs/demos/osdemo.c.orig 2004-01-19 20:07:26.000000000 -0500 ++++ progs/demos/osdemo.c 2004-01-19 20:08:09.000000000 -0500 +@@ -301,7 +301,7 @@ + + if (filename != NULL) { + #ifdef SAVE_TARGA +- write_targa(filename, buffer, WIDTH, HEIGHT); ++ write_targa(filename, (const GLubyte*)buffer, WIDTH, HEIGHT); + #else + write_ppm(filename, buffer, WIDTH, HEIGHT); + #endif diff --git a/graphics/MesaDemos/patches/patch-ae b/graphics/MesaDemos/patches/patch-ae index db53c3b642d..41328f9db82 100644 --- a/graphics/MesaDemos/patches/patch-ae +++ b/graphics/MesaDemos/patches/patch-ae @@ -1,17 +1,35 @@ -$NetBSD: patch-ae,v 1.1 2003/11/18 16:10:55 jschauma Exp $ +$NetBSD: patch-ae,v 1.2 2004/01/20 02:48:33 jschauma Exp $ ---- src/GGI/Makefile.am.orig 2003-11-13 21:47:55.000000000 -0500 -+++ src/GGI/Makefile.am 2003-11-13 21:48:04.000000000 -0500 -@@ -7,10 +7,10 @@ - ggimesaconfdatadir = ${sysconfdir}/ggi - ggimesaconfdata_DATA = ggimesa.conf +--- progs/demos/Makefile.X11.orig 2003-10-03 10:03:15.000000000 -0400 ++++ progs/demos/Makefile.X11 2004-01-19 20:47:16.000000000 -0500 +@@ -7,7 +7,7 @@ + INCDIR = $(TOP)/include + LIBDIR = $(TOP)/lib --INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \ -+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \ - -I$(top_srcdir)/src $(GGI_CFLAGS) +-LIBS = -L$(LIBDIR) $(APP_LIB_DEPS) ++LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut --DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\" -+DEFS = -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\" + OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) - if HAVE_GGI - # Build a libtool convenience library. +@@ -36,7 +36,6 @@ + multiarb \ + occlude \ + osdemo \ +- paltex \ + pixeltex \ + pointblast \ + ray \ +@@ -68,11 +67,11 @@ + + # make executable from .c file: + .c: $(LIB_DEP) +- $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ ++ $(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ + + # special case: need the -lOSMesa library: + osdemo: osdemo.c +- $(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@ ++ $(CXX) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@ + + + ##### TARGETS ##### diff --git a/graphics/MesaDemos/patches/patch-af b/graphics/MesaDemos/patches/patch-af new file mode 100644 index 00000000000..ef9ae663b9c --- /dev/null +++ b/graphics/MesaDemos/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2004/01/20 02:48:33 jschauma Exp $ + +--- progs/xdemos/glxswapcontrol.c.orig 2004-01-19 20:16:07.000000000 -0500 ++++ progs/xdemos/glxswapcontrol.c 2004-01-19 20:16:26.000000000 -0500 +@@ -645,7 +645,7 @@ + * other in the string. + */ + +- string_tab[ idx ] = malloc( sizeof( char ) * (i + 1) ); ++ string_tab[ idx ] = (char *)malloc( sizeof( char ) * (i + 1) ); + if ( string_tab[ idx ] == NULL ) { + return; + } diff --git a/graphics/MesaDemos/patches/patch-ag b/graphics/MesaDemos/patches/patch-ag new file mode 100644 index 00000000000..9a057842f88 --- /dev/null +++ b/graphics/MesaDemos/patches/patch-ag @@ -0,0 +1,53 @@ +$NetBSD: patch-ag,v 1.1 2004/01/20 02:48:33 jschauma Exp $ + +--- progs/xdemos/Makefile.X11.orig 2003-10-03 10:03:16.000000000 -0400 ++++ progs/xdemos/Makefile.X11 2004-01-19 20:48:04.000000000 -0500 +@@ -7,7 +7,7 @@ + INCDIR = $(TOP)/include + LIBDIR = $(TOP)/lib + +-LIBS = -L$(LIBDIR) $(APP_LIB_DEPS) ++LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut + + LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) + +@@ -20,8 +20,6 @@ + glxswapcontrol \ + manywin \ + offset \ +- pbinfo \ +- pbdemo \ + wincopy \ + xdemo \ + xfont +@@ -34,24 +32,24 @@ + .SUFFIXES: .c + + .c: $(LIB_DEP) +- $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ ++ $(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ + + + # special cases + pbinfo: pbinfo.o pbutil.o +- $(CC) pbinfo.o pbutil.o $(LIBS) -o $@ ++ $(CXX) pbinfo.o pbutil.o $(LIBS) -o $@ + + pbdemo: pbdemo.o pbutil.o +- $(CC) pbdemo.o pbutil.o $(LIBS) -o $@ ++ $(CXX) pbdemo.o pbutil.o $(LIBS) -o $@ + + pbinfo.o: pbinfo.c pbutil.h +- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c ++ $(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c + + pbdemo.o: pbdemo.c pbutil.h +- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c ++ $(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c + + pbutil.o: pbutil.c pbutil.h +- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c ++ $(CXX) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c + + + diff --git a/graphics/MesaDemos/patches/patch-ah b/graphics/MesaDemos/patches/patch-ah new file mode 100644 index 00000000000..4aad2cfc173 --- /dev/null +++ b/graphics/MesaDemos/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.1 2004/01/20 02:48:33 jschauma Exp $ + +--- progs/redbook/Makefile.X11.orig 2003-10-03 10:03:15.000000000 -0400 ++++ progs/redbook/Makefile.X11 2004-01-19 20:47:35.000000000 -0500 +@@ -7,7 +7,7 @@ + INCDIR = $(TOP)/include + LIBDIR = $(TOP)/lib + +-LIBS = -L$(LIBDIR) $(APP_LIB_DEPS) ++LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut + + LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) + +@@ -28,7 +28,7 @@ + .SUFFIXES: .c + + .c: $(LIB_DEP) +- $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ ++ $(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ + + + diff --git a/graphics/MesaDemos/patches/patch-ai b/graphics/MesaDemos/patches/patch-ai new file mode 100644 index 00000000000..905e45727c9 --- /dev/null +++ b/graphics/MesaDemos/patches/patch-ai @@ -0,0 +1,27 @@ +$NetBSD: patch-ai,v 1.1 2004/01/20 02:48:33 jschauma Exp $ + +--- progs/samples/Makefile.X11.orig 2003-10-03 10:03:16.000000000 -0400 ++++ progs/samples/Makefile.X11 2004-01-19 20:53:56.000000000 -0500 +@@ -7,11 +7,11 @@ + INCDIR = $(TOP)/include + LIBDIR = $(TOP)/lib + +-LIBS = -L$(LIBDIR) $(APP_LIB_DEPS) ++LIBS+= -L$(LIBDIR) $(APP_LIB_DEPS) -lGL -lGLU -lglut + + LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) + +-PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ ++PROGS = accum bitmap1 bitmap2 blendeq copy cursor depth eval fog \ + font line logo nurb oglinfo olympic overlay point prim quad select \ + shape sphere star stencil stretch texture tri wave + +@@ -22,7 +22,7 @@ + .SUFFIXES: .c + + .c: $(LIB_DEP) +- $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ ++ $(CXX) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ + + + |