From b95d598323540ecb6dbbdcf00bbb5cf3fb22a78c Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 23 Aug 2012 16:39:20 -0700 Subject: [PATCH] Remove libGLU It's been moved to its own repository, found at http://cgit.freedesktop.org/mesa/glu/ Acked-by: Kenneth Graunke --- configs/default | 2 +- configure.ac | 67 - docs/autoconf.html | 10 - docs/contents.html | 1 - docs/download.html | 18 +- docs/faq.html | 4 - docs/glu.html | 46 - docs/install.html | 5 - docs/license.html | 2 - docs/relnotes-9.0.html | 4 + docs/sourcetree.html | 5 - include/GL/glu.h | 353 - include/GL/glu_mangle.h | 86 - src/SConscript | 2 - src/glu/.gitignore | 1 - src/glu/Makefile | 40 - src/glu/glu.pc.in | 13 - src/glu/sgi/.gitignore | 1 - src/glu/sgi/Makefile | 144 - src/glu/sgi/SConscript | 143 - src/glu/sgi/dummy.cc | 4 - src/glu/sgi/glu.def | 88 - src/glu/sgi/glu.exports | 118 - src/glu/sgi/glu.exports.darwin | 59 - src/glu/sgi/include/gluos.h | 86 - src/glu/sgi/libnurbs/interface/bezierEval.cc | 260 - src/glu/sgi/libnurbs/interface/bezierEval.h | 48 - src/glu/sgi/libnurbs/interface/bezierPatch.cc | 206 - src/glu/sgi/libnurbs/interface/bezierPatch.h | 104 - .../sgi/libnurbs/interface/bezierPatchMesh.cc | 610 -- .../sgi/libnurbs/interface/bezierPatchMesh.h | 121 - src/glu/sgi/libnurbs/interface/glcurveval.cc | 402 - src/glu/sgi/libnurbs/interface/glcurveval.h | 157 - src/glu/sgi/libnurbs/interface/glimports.h | 42 - src/glu/sgi/libnurbs/interface/glinterface.cc | 469 - src/glu/sgi/libnurbs/interface/glrenderer.cc | 301 - src/glu/sgi/libnurbs/interface/glrenderer.h | 146 - src/glu/sgi/libnurbs/interface/glsurfeval.cc | 1293 --- src/glu/sgi/libnurbs/interface/glsurfeval.h | 404 - src/glu/sgi/libnurbs/interface/incurveeval.cc | 206 - src/glu/sgi/libnurbs/interface/insurfeval.cc | 2064 ---- src/glu/sgi/libnurbs/interface/mystdio.h | 60 - src/glu/sgi/libnurbs/interface/mystdlib.h | 57 - src/glu/sgi/libnurbs/internals/arc.cc | 346 - src/glu/sgi/libnurbs/internals/arc.h | 139 - src/glu/sgi/libnurbs/internals/arcsorter.cc | 172 - src/glu/sgi/libnurbs/internals/arcsorter.h | 72 - src/glu/sgi/libnurbs/internals/arctess.cc | 611 -- src/glu/sgi/libnurbs/internals/arctess.h | 66 - src/glu/sgi/libnurbs/internals/backend.cc | 588 -- src/glu/sgi/libnurbs/internals/backend.h | 113 - .../sgi/libnurbs/internals/basiccrveval.cc | 138 - src/glu/sgi/libnurbs/internals/basiccrveval.h | 62 - .../sgi/libnurbs/internals/basicsurfeval.cc | 232 - .../sgi/libnurbs/internals/basicsurfeval.h | 90 - src/glu/sgi/libnurbs/internals/bezierarc.h | 51 - src/glu/sgi/libnurbs/internals/bin.cc | 167 - src/glu/sgi/libnurbs/internals/bin.h | 121 - src/glu/sgi/libnurbs/internals/bufpool.cc | 113 - src/glu/sgi/libnurbs/internals/bufpool.h | 141 - src/glu/sgi/libnurbs/internals/cachingeval.cc | 78 - src/glu/sgi/libnurbs/internals/cachingeval.h | 51 - src/glu/sgi/libnurbs/internals/ccw.cc | 565 -- .../sgi/libnurbs/internals/coveandtiler.cc | 440 - src/glu/sgi/libnurbs/internals/coveandtiler.h | 72 - src/glu/sgi/libnurbs/internals/curve.cc | 204 - src/glu/sgi/libnurbs/internals/curve.h | 70 - src/glu/sgi/libnurbs/internals/curvelist.cc | 112 - src/glu/sgi/libnurbs/internals/curvelist.h | 62 - src/glu/sgi/libnurbs/internals/curvesub.cc | 102 - .../sgi/libnurbs/internals/dataTransform.cc | 209 - .../sgi/libnurbs/internals/dataTransform.h | 59 - src/glu/sgi/libnurbs/internals/defines.h | 50 - src/glu/sgi/libnurbs/internals/displaylist.cc | 82 - src/glu/sgi/libnurbs/internals/displaylist.h | 79 - src/glu/sgi/libnurbs/internals/displaymode.h | 40 - src/glu/sgi/libnurbs/internals/flist.cc | 118 - src/glu/sgi/libnurbs/internals/flist.h | 59 - src/glu/sgi/libnurbs/internals/flistsorter.cc | 81 - src/glu/sgi/libnurbs/internals/flistsorter.h | 53 - src/glu/sgi/libnurbs/internals/gridline.h | 46 - .../sgi/libnurbs/internals/gridtrimvertex.h | 89 - src/glu/sgi/libnurbs/internals/gridvertex.h | 48 - src/glu/sgi/libnurbs/internals/hull.cc | 165 - src/glu/sgi/libnurbs/internals/hull.h | 69 - src/glu/sgi/libnurbs/internals/intersect.cc | 665 -- src/glu/sgi/libnurbs/internals/jarcloc.h | 87 - src/glu/sgi/libnurbs/internals/knotvector.cc | 142 - src/glu/sgi/libnurbs/internals/knotvector.h | 62 - src/glu/sgi/libnurbs/internals/mapdesc.cc | 841 -- src/glu/sgi/libnurbs/internals/mapdesc.h | 271 - src/glu/sgi/libnurbs/internals/mapdescv.cc | 243 - src/glu/sgi/libnurbs/internals/maplist.cc | 116 - src/glu/sgi/libnurbs/internals/maplist.h | 81 - src/glu/sgi/libnurbs/internals/mesher.cc | 489 - src/glu/sgi/libnurbs/internals/mesher.h | 83 - .../internals/monoTriangulationBackend.cc | 397 - src/glu/sgi/libnurbs/internals/monotonizer.cc | 260 - src/glu/sgi/libnurbs/internals/monotonizer.h | 64 - src/glu/sgi/libnurbs/internals/myassert.h | 51 - src/glu/sgi/libnurbs/internals/mycode.cc | 67 - src/glu/sgi/libnurbs/internals/mymath.h | 68 - src/glu/sgi/libnurbs/internals/mysetjmp.h | 85 - src/glu/sgi/libnurbs/internals/mystring.h | 56 - src/glu/sgi/libnurbs/internals/nurbsconsts.h | 120 - .../sgi/libnurbs/internals/nurbsinterfac.cc | 537 - src/glu/sgi/libnurbs/internals/nurbstess.cc | 691 -- src/glu/sgi/libnurbs/internals/nurbstess.h | 172 - src/glu/sgi/libnurbs/internals/patch.cc | 504 - src/glu/sgi/libnurbs/internals/patch.h | 94 - src/glu/sgi/libnurbs/internals/patchlist.cc | 169 - src/glu/sgi/libnurbs/internals/patchlist.h | 92 - src/glu/sgi/libnurbs/internals/pwlarc.h | 78 - src/glu/sgi/libnurbs/internals/quilt.cc | 274 - src/glu/sgi/libnurbs/internals/quilt.h | 92 - src/glu/sgi/libnurbs/internals/reader.cc | 148 - src/glu/sgi/libnurbs/internals/reader.h | 132 - src/glu/sgi/libnurbs/internals/renderhints.cc | 136 - src/glu/sgi/libnurbs/internals/renderhints.h | 60 - src/glu/sgi/libnurbs/internals/simplemath.h | 52 - src/glu/sgi/libnurbs/internals/slicer.cc | 1304 --- src/glu/sgi/libnurbs/internals/slicer.h | 84 - src/glu/sgi/libnurbs/internals/sorter.cc | 139 - src/glu/sgi/libnurbs/internals/sorter.h | 51 - src/glu/sgi/libnurbs/internals/splitarcs.cc | 293 - src/glu/sgi/libnurbs/internals/subdivider.cc | 912 -- src/glu/sgi/libnurbs/internals/subdivider.h | 200 - src/glu/sgi/libnurbs/internals/tobezier.cc | 687 -- src/glu/sgi/libnurbs/internals/trimline.cc | 223 - src/glu/sgi/libnurbs/internals/trimline.h | 103 - src/glu/sgi/libnurbs/internals/trimregion.cc | 113 - src/glu/sgi/libnurbs/internals/trimregion.h | 84 - src/glu/sgi/libnurbs/internals/trimvertex.h | 63 - .../sgi/libnurbs/internals/trimvertpool.cc | 119 - src/glu/sgi/libnurbs/internals/trimvertpool.h | 57 - src/glu/sgi/libnurbs/internals/types.h | 47 - src/glu/sgi/libnurbs/internals/uarray.cc | 73 - src/glu/sgi/libnurbs/internals/uarray.h | 55 - src/glu/sgi/libnurbs/internals/varray.cc | 152 - src/glu/sgi/libnurbs/internals/varray.h | 68 - src/glu/sgi/libnurbs/nurbtess/definitions.h | 40 - src/glu/sgi/libnurbs/nurbtess/directedLine.cc | 860 -- src/glu/sgi/libnurbs/nurbtess/directedLine.h | 171 - src/glu/sgi/libnurbs/nurbtess/glimports.h | 42 - src/glu/sgi/libnurbs/nurbtess/gridWrap.cc | 293 - src/glu/sgi/libnurbs/nurbtess/gridWrap.h | 137 - src/glu/sgi/libnurbs/nurbtess/monoChain.cc | 936 -- src/glu/sgi/libnurbs/nurbtess/monoChain.h | 103 - src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc | 299 - src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h | 41 - .../libnurbs/nurbtess/monoTriangulation.cc | 1482 --- .../sgi/libnurbs/nurbtess/monoTriangulation.h | 184 - src/glu/sgi/libnurbs/nurbtess/mystdio.h | 60 - src/glu/sgi/libnurbs/nurbtess/mystdlib.h | 57 - src/glu/sgi/libnurbs/nurbtess/partitionX.cc | 162 - src/glu/sgi/libnurbs/nurbtess/partitionX.h | 54 - src/glu/sgi/libnurbs/nurbtess/partitionY.cc | 836 -- src/glu/sgi/libnurbs/nurbtess/partitionY.h | 97 - src/glu/sgi/libnurbs/nurbtess/polyDBG.cc | 734 -- src/glu/sgi/libnurbs/nurbtess/polyDBG.h | 68 - src/glu/sgi/libnurbs/nurbtess/polyUtil.cc | 90 - src/glu/sgi/libnurbs/nurbtess/polyUtil.h | 47 - .../sgi/libnurbs/nurbtess/primitiveStream.cc | 192 - .../sgi/libnurbs/nurbtess/primitiveStream.h | 109 - src/glu/sgi/libnurbs/nurbtess/quicksort.cc | 77 - src/glu/sgi/libnurbs/nurbtess/quicksort.h | 42 - src/glu/sgi/libnurbs/nurbtess/rectBlock.cc | 196 - src/glu/sgi/libnurbs/nurbtess/rectBlock.h | 82 - src/glu/sgi/libnurbs/nurbtess/sampleComp.cc | 371 - src/glu/sgi/libnurbs/nurbtess/sampleComp.h | 86 - .../sgi/libnurbs/nurbtess/sampleCompBot.cc | 844 -- src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h | 138 - .../sgi/libnurbs/nurbtess/sampleCompRight.cc | 644 -- .../sgi/libnurbs/nurbtess/sampleCompRight.h | 117 - .../sgi/libnurbs/nurbtess/sampleCompTop.cc | 1030 -- src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h | 67 - .../sgi/libnurbs/nurbtess/sampleMonoPoly.cc | 2427 ----- .../sgi/libnurbs/nurbtess/sampleMonoPoly.h | 184 - src/glu/sgi/libnurbs/nurbtess/sampledLine.cc | 182 - src/glu/sgi/libnurbs/nurbtess/sampledLine.h | 71 - src/glu/sgi/libnurbs/nurbtess/searchTree.cc | 282 - src/glu/sgi/libnurbs/nurbtess/searchTree.h | 61 - src/glu/sgi/libnurbs/nurbtess/zlassert.h | 34 - src/glu/sgi/libtess/README | 446 - src/glu/sgi/libtess/alg-outline | 228 - src/glu/sgi/libtess/dict-list.h | 100 - src/glu/sgi/libtess/dict.c | 111 - src/glu/sgi/libtess/dict.h | 100 - src/glu/sgi/libtess/geom.c | 264 - src/glu/sgi/libtess/geom.h | 84 - src/glu/sgi/libtess/memalloc.c | 55 - src/glu/sgi/libtess/memalloc.h | 54 - src/glu/sgi/libtess/mesh.c | 798 -- src/glu/sgi/libtess/mesh.h | 266 - src/glu/sgi/libtess/normal.c | 257 - src/glu/sgi/libtess/normal.h | 45 - src/glu/sgi/libtess/priorityq-heap.c | 256 - src/glu/sgi/libtess/priorityq-heap.h | 107 - src/glu/sgi/libtess/priorityq-sort.h | 117 - src/glu/sgi/libtess/priorityq.c | 260 - src/glu/sgi/libtess/priorityq.h | 117 - src/glu/sgi/libtess/render.c | 502 - src/glu/sgi/libtess/render.h | 52 - src/glu/sgi/libtess/sweep.c | 1361 --- src/glu/sgi/libtess/sweep.h | 77 - src/glu/sgi/libtess/tess.c | 632 -- src/glu/sgi/libtess/tess.h | 165 - src/glu/sgi/libtess/tessmono.c | 201 - src/glu/sgi/libtess/tessmono.h | 71 - src/glu/sgi/libutil/error.c | 81 - src/glu/sgi/libutil/glue.c | 93 - src/glu/sgi/libutil/gluint.h | 48 - src/glu/sgi/libutil/mipmap.c | 8940 ----------------- src/glu/sgi/libutil/project.c | 359 - src/glu/sgi/libutil/quad.c | 1155 --- src/glu/sgi/libutil/registry.c | 91 - src/glu/sgi/mesaglu.opt | 67 - 217 files changed, 18 insertions(+), 58354 deletions(-) delete mode 100644 docs/glu.html delete mode 100644 include/GL/glu.h delete mode 100644 include/GL/glu_mangle.h delete mode 100644 src/glu/.gitignore delete mode 100644 src/glu/Makefile delete mode 100644 src/glu/glu.pc.in delete mode 100644 src/glu/sgi/.gitignore delete mode 100644 src/glu/sgi/Makefile delete mode 100644 src/glu/sgi/SConscript delete mode 100644 src/glu/sgi/dummy.cc delete mode 100644 src/glu/sgi/glu.def delete mode 100644 src/glu/sgi/glu.exports delete mode 100644 src/glu/sgi/glu.exports.darwin delete mode 100644 src/glu/sgi/include/gluos.h delete mode 100644 src/glu/sgi/libnurbs/interface/bezierEval.cc delete mode 100644 src/glu/sgi/libnurbs/interface/bezierEval.h delete mode 100644 src/glu/sgi/libnurbs/interface/bezierPatch.cc delete mode 100644 src/glu/sgi/libnurbs/interface/bezierPatch.h delete mode 100644 src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc delete mode 100644 src/glu/sgi/libnurbs/interface/bezierPatchMesh.h delete mode 100644 src/glu/sgi/libnurbs/interface/glcurveval.cc delete mode 100644 src/glu/sgi/libnurbs/interface/glcurveval.h delete mode 100644 src/glu/sgi/libnurbs/interface/glimports.h delete mode 100644 src/glu/sgi/libnurbs/interface/glinterface.cc delete mode 100644 src/glu/sgi/libnurbs/interface/glrenderer.cc delete mode 100644 src/glu/sgi/libnurbs/interface/glrenderer.h delete mode 100644 src/glu/sgi/libnurbs/interface/glsurfeval.cc delete mode 100644 src/glu/sgi/libnurbs/interface/glsurfeval.h delete mode 100644 src/glu/sgi/libnurbs/interface/incurveeval.cc delete mode 100644 src/glu/sgi/libnurbs/interface/insurfeval.cc delete mode 100644 src/glu/sgi/libnurbs/interface/mystdio.h delete mode 100644 src/glu/sgi/libnurbs/interface/mystdlib.h delete mode 100644 src/glu/sgi/libnurbs/internals/arc.cc delete mode 100644 src/glu/sgi/libnurbs/internals/arc.h delete mode 100644 src/glu/sgi/libnurbs/internals/arcsorter.cc delete mode 100644 src/glu/sgi/libnurbs/internals/arcsorter.h delete mode 100644 src/glu/sgi/libnurbs/internals/arctess.cc delete mode 100644 src/glu/sgi/libnurbs/internals/arctess.h delete mode 100644 src/glu/sgi/libnurbs/internals/backend.cc delete mode 100644 src/glu/sgi/libnurbs/internals/backend.h delete mode 100644 src/glu/sgi/libnurbs/internals/basiccrveval.cc delete mode 100644 src/glu/sgi/libnurbs/internals/basiccrveval.h delete mode 100644 src/glu/sgi/libnurbs/internals/basicsurfeval.cc delete mode 100644 src/glu/sgi/libnurbs/internals/basicsurfeval.h delete mode 100644 src/glu/sgi/libnurbs/internals/bezierarc.h delete mode 100644 src/glu/sgi/libnurbs/internals/bin.cc delete mode 100644 src/glu/sgi/libnurbs/internals/bin.h delete mode 100644 src/glu/sgi/libnurbs/internals/bufpool.cc delete mode 100644 src/glu/sgi/libnurbs/internals/bufpool.h delete mode 100644 src/glu/sgi/libnurbs/internals/cachingeval.cc delete mode 100644 src/glu/sgi/libnurbs/internals/cachingeval.h delete mode 100644 src/glu/sgi/libnurbs/internals/ccw.cc delete mode 100644 src/glu/sgi/libnurbs/internals/coveandtiler.cc delete mode 100644 src/glu/sgi/libnurbs/internals/coveandtiler.h delete mode 100644 src/glu/sgi/libnurbs/internals/curve.cc delete mode 100644 src/glu/sgi/libnurbs/internals/curve.h delete mode 100644 src/glu/sgi/libnurbs/internals/curvelist.cc delete mode 100644 src/glu/sgi/libnurbs/internals/curvelist.h delete mode 100644 src/glu/sgi/libnurbs/internals/curvesub.cc delete mode 100644 src/glu/sgi/libnurbs/internals/dataTransform.cc delete mode 100644 src/glu/sgi/libnurbs/internals/dataTransform.h delete mode 100644 src/glu/sgi/libnurbs/internals/defines.h delete mode 100644 src/glu/sgi/libnurbs/internals/displaylist.cc delete mode 100644 src/glu/sgi/libnurbs/internals/displaylist.h delete mode 100644 src/glu/sgi/libnurbs/internals/displaymode.h delete mode 100644 src/glu/sgi/libnurbs/internals/flist.cc delete mode 100644 src/glu/sgi/libnurbs/internals/flist.h delete mode 100644 src/glu/sgi/libnurbs/internals/flistsorter.cc delete mode 100644 src/glu/sgi/libnurbs/internals/flistsorter.h delete mode 100644 src/glu/sgi/libnurbs/internals/gridline.h delete mode 100644 src/glu/sgi/libnurbs/internals/gridtrimvertex.h delete mode 100644 src/glu/sgi/libnurbs/internals/gridvertex.h delete mode 100644 src/glu/sgi/libnurbs/internals/hull.cc delete mode 100644 src/glu/sgi/libnurbs/internals/hull.h delete mode 100644 src/glu/sgi/libnurbs/internals/intersect.cc delete mode 100644 src/glu/sgi/libnurbs/internals/jarcloc.h delete mode 100644 src/glu/sgi/libnurbs/internals/knotvector.cc delete mode 100644 src/glu/sgi/libnurbs/internals/knotvector.h delete mode 100644 src/glu/sgi/libnurbs/internals/mapdesc.cc delete mode 100644 src/glu/sgi/libnurbs/internals/mapdesc.h delete mode 100644 src/glu/sgi/libnurbs/internals/mapdescv.cc delete mode 100644 src/glu/sgi/libnurbs/internals/maplist.cc delete mode 100644 src/glu/sgi/libnurbs/internals/maplist.h delete mode 100644 src/glu/sgi/libnurbs/internals/mesher.cc delete mode 100644 src/glu/sgi/libnurbs/internals/mesher.h delete mode 100644 src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc delete mode 100644 src/glu/sgi/libnurbs/internals/monotonizer.cc delete mode 100644 src/glu/sgi/libnurbs/internals/monotonizer.h delete mode 100644 src/glu/sgi/libnurbs/internals/myassert.h delete mode 100644 src/glu/sgi/libnurbs/internals/mycode.cc delete mode 100644 src/glu/sgi/libnurbs/internals/mymath.h delete mode 100644 src/glu/sgi/libnurbs/internals/mysetjmp.h delete mode 100644 src/glu/sgi/libnurbs/internals/mystring.h delete mode 100644 src/glu/sgi/libnurbs/internals/nurbsconsts.h delete mode 100644 src/glu/sgi/libnurbs/internals/nurbsinterfac.cc delete mode 100644 src/glu/sgi/libnurbs/internals/nurbstess.cc delete mode 100644 src/glu/sgi/libnurbs/internals/nurbstess.h delete mode 100644 src/glu/sgi/libnurbs/internals/patch.cc delete mode 100644 src/glu/sgi/libnurbs/internals/patch.h delete mode 100644 src/glu/sgi/libnurbs/internals/patchlist.cc delete mode 100644 src/glu/sgi/libnurbs/internals/patchlist.h delete mode 100644 src/glu/sgi/libnurbs/internals/pwlarc.h delete mode 100644 src/glu/sgi/libnurbs/internals/quilt.cc delete mode 100644 src/glu/sgi/libnurbs/internals/quilt.h delete mode 100644 src/glu/sgi/libnurbs/internals/reader.cc delete mode 100644 src/glu/sgi/libnurbs/internals/reader.h delete mode 100644 src/glu/sgi/libnurbs/internals/renderhints.cc delete mode 100644 src/glu/sgi/libnurbs/internals/renderhints.h delete mode 100644 src/glu/sgi/libnurbs/internals/simplemath.h delete mode 100644 src/glu/sgi/libnurbs/internals/slicer.cc delete mode 100644 src/glu/sgi/libnurbs/internals/slicer.h delete mode 100644 src/glu/sgi/libnurbs/internals/sorter.cc delete mode 100644 src/glu/sgi/libnurbs/internals/sorter.h delete mode 100644 src/glu/sgi/libnurbs/internals/splitarcs.cc delete mode 100644 src/glu/sgi/libnurbs/internals/subdivider.cc delete mode 100644 src/glu/sgi/libnurbs/internals/subdivider.h delete mode 100644 src/glu/sgi/libnurbs/internals/tobezier.cc delete mode 100644 src/glu/sgi/libnurbs/internals/trimline.cc delete mode 100644 src/glu/sgi/libnurbs/internals/trimline.h delete mode 100644 src/glu/sgi/libnurbs/internals/trimregion.cc delete mode 100644 src/glu/sgi/libnurbs/internals/trimregion.h delete mode 100644 src/glu/sgi/libnurbs/internals/trimvertex.h delete mode 100644 src/glu/sgi/libnurbs/internals/trimvertpool.cc delete mode 100644 src/glu/sgi/libnurbs/internals/trimvertpool.h delete mode 100644 src/glu/sgi/libnurbs/internals/types.h delete mode 100644 src/glu/sgi/libnurbs/internals/uarray.cc delete mode 100644 src/glu/sgi/libnurbs/internals/uarray.h delete mode 100644 src/glu/sgi/libnurbs/internals/varray.cc delete mode 100644 src/glu/sgi/libnurbs/internals/varray.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/definitions.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/directedLine.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/directedLine.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/glimports.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/gridWrap.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/gridWrap.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/monoChain.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/monoChain.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/mystdio.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/mystdlib.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/partitionX.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/partitionX.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/partitionY.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/partitionY.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/polyDBG.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/polyDBG.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/polyUtil.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/polyUtil.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/primitiveStream.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/quicksort.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/quicksort.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/rectBlock.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/rectBlock.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleComp.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleComp.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampledLine.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/sampledLine.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/searchTree.cc delete mode 100644 src/glu/sgi/libnurbs/nurbtess/searchTree.h delete mode 100644 src/glu/sgi/libnurbs/nurbtess/zlassert.h delete mode 100644 src/glu/sgi/libtess/README delete mode 100644 src/glu/sgi/libtess/alg-outline delete mode 100644 src/glu/sgi/libtess/dict-list.h delete mode 100644 src/glu/sgi/libtess/dict.c delete mode 100644 src/glu/sgi/libtess/dict.h delete mode 100644 src/glu/sgi/libtess/geom.c delete mode 100644 src/glu/sgi/libtess/geom.h delete mode 100644 src/glu/sgi/libtess/memalloc.c delete mode 100644 src/glu/sgi/libtess/memalloc.h delete mode 100644 src/glu/sgi/libtess/mesh.c delete mode 100644 src/glu/sgi/libtess/mesh.h delete mode 100644 src/glu/sgi/libtess/normal.c delete mode 100644 src/glu/sgi/libtess/normal.h delete mode 100644 src/glu/sgi/libtess/priorityq-heap.c delete mode 100644 src/glu/sgi/libtess/priorityq-heap.h delete mode 100644 src/glu/sgi/libtess/priorityq-sort.h delete mode 100644 src/glu/sgi/libtess/priorityq.c delete mode 100644 src/glu/sgi/libtess/priorityq.h delete mode 100644 src/glu/sgi/libtess/render.c delete mode 100644 src/glu/sgi/libtess/render.h delete mode 100644 src/glu/sgi/libtess/sweep.c delete mode 100644 src/glu/sgi/libtess/sweep.h delete mode 100644 src/glu/sgi/libtess/tess.c delete mode 100644 src/glu/sgi/libtess/tess.h delete mode 100644 src/glu/sgi/libtess/tessmono.c delete mode 100644 src/glu/sgi/libtess/tessmono.h delete mode 100644 src/glu/sgi/libutil/error.c delete mode 100644 src/glu/sgi/libutil/glue.c delete mode 100644 src/glu/sgi/libutil/gluint.h delete mode 100644 src/glu/sgi/libutil/mipmap.c delete mode 100644 src/glu/sgi/libutil/project.c delete mode 100644 src/glu/sgi/libutil/quad.c delete mode 100644 src/glu/sgi/libutil/registry.c delete mode 100644 src/glu/sgi/mesaglu.opt diff --git a/configs/default b/configs/default index 85a863f3081..5e4cc56785d 100644 --- a/configs/default +++ b/configs/default @@ -94,7 +94,7 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2 # Directories to build LIB_DIR = lib SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ - gallium egl gallium/winsys gallium/targets glu + gallium egl gallium/winsys gallium/targets DRIVER_DIRS = x11 osmesa # Gallium directories and diff --git a/configure.ac b/configure.ac index 12a9a74c594..a80ccbfa568 100644 --- a/configure.ac +++ b/configure.ac @@ -340,18 +340,12 @@ AC_ARG_WITH([gl-lib-name], [specify GL library name @<:@default=GL@:>@])], [GL_LIB=$withval], [GL_LIB=GL]) -AC_ARG_WITH([glu-lib-name], - [AS_HELP_STRING([--with-glu-lib-name@<:@=NAME@:>@], - [specify GLU library name @<:@default=GLU@:>@])], - [GLU_LIB=$withval], - [GLU_LIB=GLU]) AC_ARG_WITH([osmesa-lib-name], [AS_HELP_STRING([--with-osmesa-lib-name@<:@=NAME@:>@], [specify OSMesa library name @<:@default=OSMesa@:>@])], [OSMESA_LIB=$withval], [OSMESA_LIB=OSMesa]) AS_IF([test "x$GL_LIB" = xyes], [GL_LIB=GL]) -AS_IF([test "x$GLU_LIB" = xyes], [GLU_LIB=GLU]) AS_IF([test "x$OSMESA_LIB" = xyes], [OSMESA_LIB=OSMesa]) dnl @@ -366,11 +360,9 @@ AC_ARG_ENABLE([mangling], if test "x${enable_mangling}" = "xyes" ; then DEFINES="${DEFINES} -DUSE_MGL_NAMESPACE" GL_LIB="Mangled${GL_LIB}" - GLU_LIB="Mangled${GLU_LIB}" OSMESA_LIB="Mangled${OSMESA_LIB}" fi AC_SUBST([GL_LIB]) -AC_SUBST([GLU_LIB]) AC_SUBST([OSMESA_LIB]) dnl @@ -389,7 +381,6 @@ if test "x$enable_texture_float" = xyes; then fi GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION} -GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION} OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION} EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION} GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION} @@ -398,7 +389,6 @@ VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION} GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION} GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' -GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' @@ -407,7 +397,6 @@ VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENS GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' AC_SUBST([GL_LIB_NAME]) -AC_SUBST([GLU_LIB_NAME]) AC_SUBST([OSMESA_LIB_NAME]) AC_SUBST([EGL_LIB_NAME]) AC_SUBST([GLESv1_CM_LIB_NAME]) @@ -416,7 +405,6 @@ AC_SUBST([VG_LIB_NAME]) AC_SUBST([GLAPI_LIB_NAME]) AC_SUBST([GL_LIB_GLOB]) -AC_SUBST([GLU_LIB_GLOB]) AC_SUBST([EGL_LIB_GLOB]) AC_SUBST([GLESv1_CM_LIB_GLOB]) AC_SUBST([GLESv2_LIB_GLOB]) @@ -1465,60 +1453,6 @@ if test "x$enable_opencl" = xyes; then enable_gallium_loader=yes fi -dnl -dnl GLU configuration -dnl -AC_ARG_ENABLE([glu], - [AS_HELP_STRING([--disable-glu], - [enable OpenGL Utility library @<:@default=enabled@:>@])], - [enable_glu="$enableval"], - [enable_glu=yes]) - -if test "x$enable_glu" = xyes; then - if test "x$enable_glx" = xno -a "x$enable_osmesa" = xno; then - AC_MSG_NOTICE([Disabling GLU since there is no OpenGL driver]) - enable_glu=no - fi -fi - -if test "x$enable_glu" = xyes; then - SRC_DIRS="$SRC_DIRS glu" - - if test "x$enable_glx" = xno; then - # Link libGLU to libOSMesa instead of libGL - GLU_LIB_DEPS="" - GLU_PC_REQ="osmesa" - if test "$enable_static" = no; then - GLU_MESA_DEPS='-l$(OSMESA_LIB)' - else - GLU_MESA_DEPS="" - fi - else - # If static, empty GLU_LIB_DEPS and add libs for programs to link - GLU_PC_REQ="gl" - GLU_PC_LIB_PRIV="-lm" - if test "$enable_static" = no; then - GLU_LIB_DEPS="-lm" - GLU_MESA_DEPS='-l$(GL_LIB)' - else - GLU_LIB_DEPS="" - GLU_MESA_DEPS="" - fi - fi -fi -if test "$enable_static" = no; then - GLU_LIB_DEPS="$GLU_LIB_DEPS $OS_CPLUSPLUS_LIBS" -fi -GLU_PC_LIB_PRIV="$GLU_PC_LIB_PRIV $OS_CPLUSPLUS_LIBS" -AC_SUBST([GLU_LIB_DEPS]) -AC_SUBST([GLU_MESA_DEPS]) -AC_SUBST([GLU_PC_REQ]) -AC_SUBST([GLU_PC_REQ_PRIV]) -AC_SUBST([GLU_PC_LIB_PRIV]) -AC_SUBST([GLU_PC_CFLAGS]) - -AC_SUBST([PROGRAM_DIRS]) - dnl dnl Gallium configuration dnl @@ -2116,7 +2050,6 @@ xyesno) esac echo "" -echo " GLU: $enable_glu" dnl EGL echo "" diff --git a/docs/autoconf.html b/docs/autoconf.html index 4fa96c3c672..fa902872ccc 100644 --- a/docs/autoconf.html +++ b/docs/autoconf.html @@ -17,10 +17,6 @@
  • DRI Driver Options
  • OSMesa Driver Options
    • -

  • Library Options -

  • Demo Program Options @@ -219,12 +215,6 @@ libraries that will be built. More details on the specific GL libraries can be found in the basic installation instructions. -

    -
    GLU

    The libGLU library will be built by default -on all drivers. This can be disable with the option ---disable-glu. -

    -

    4. Demo Program Options

    diff --git a/docs/contents.html b/docs/contents.html index e7a23a6bcaf..efd75191935 100644 --- a/docs/contents.html +++ b/docs/contents.html @@ -74,7 +74,6 @@
  • SourceForge homepage
  • Source Code Repository
  • Source Code Tree -
  • SGI's GLU
  • Utilities
  • Help Wanted
  • Development Notes diff --git a/docs/download.html b/docs/download.html index 3d543281f4b..a1a1baa28ff 100644 --- a/docs/download.html +++ b/docs/download.html @@ -69,7 +69,6 @@ docs/ - documentation src/ - source code for libraries src/mesa - sources for the main Mesa library and device drivers src/gallium - sources for Gallium and Gallium drivers -src/glu - libGLU source code src/glx - sources for building libGL with full GLX and DRI support @@ -80,7 +79,12 @@ instructions.

    -

    Demos and GLUT

    +

    Demos, GLUT, and GLU

    + +

    +A package of SGI's GLU library is available +here +

    A package of Mark Kilgard's GLUT library is available @@ -93,9 +97,13 @@ The Mesa demos collection is available

    -In the past, GLUT and the Mesa demos were released in conjunction with -Mesa releases. But since GLUT and the demos change infrequently, they -were split off some time ago. +In the past, GLUT, GLU and the Mesa demos were released in conjunction with +Mesa releases. But since GLUT, GLU and the demos change infrequently, they +were split off into their own git repositories: + +GLUT, +GLU and +Demos,

    diff --git a/docs/faq.html b/docs/faq.html index fa90d5bfe81..80f4a71dc43 100644 --- a/docs/faq.html +++ b/docs/faq.html @@ -226,10 +226,6 @@ Basically you'll want the following:
  • /usr/lib/libGL.so.1 - a symlink to libGL.so.1.xyz
  • /usr/lib/libGL.so.xyz - the actual OpenGL/Mesa library. xyz denotes the Mesa version number. -
  • /usr/lib/libGLU.so - a symlink to libGLU.so.1 -
  • /usr/lib/libGLU.so.1 - a symlink to libGLU.so.1.3.xyz -
  • /usr/lib/libGLU.so.xyz - the OpenGL Utility library. xyz denotes the Mesa -version number.

    • After installing XFree86/X.org and the DRI drivers, some of these files diff --git a/docs/glu.html b/docs/glu.html deleted file mode 100644 index 3d7cbe50a5e..00000000000 --- a/docs/glu.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - SGI GLU - - - - -

    SGI SI GLU

    - -(Silicon Graphics, Inc. Sample Implementation of the OpenGL Utility library) - -

    -SGI open-sourced their OpenGL Sample Implementation (SI) in January, 2000. -This includes the GLU library. -

    - -

    -The SI GLU library implements GLU version 1.3 whereas the original -Mesa GLU library only implemented version 1.2. -We recommend using the SI GLU library instead of Mesa's GLU library -since it's more up-to-date, complete and reliable. -We're no longer developing the original Mesa GLU library. -

    - -

    -The SI GLU library code is included in the Mesa distribution. -You don't have to download it separately. -

    - - -

    -Olivier Michel has made Linux RPMs of GLU for i386 and PowerPC. -You can download them from the -download area under Miscellaneous. -

    - -

    -Visit the -OpenGL Sample Implementation home page for more information about the SI. -

    - - - diff --git a/docs/install.html b/docs/install.html index 948d147f19e..c756c2fcd61 100644 --- a/docs/install.html +++ b/docs/install.html @@ -151,9 +151,6 @@ You'll see a set of library files similar to this: lrwxrwxrwx 1 brian users 10 Mar 26 07:53 libGL.so -> libGL.so.1* lrwxrwxrwx 1 brian users 19 Mar 26 07:53 libGL.so.1 -> libGL.so.1.5.060100* -rwxr-xr-x 1 brian users 3375861 Mar 26 07:53 libGL.so.1.5.060100* -lrwxrwxrwx 1 brian users 11 Mar 26 07:53 libGLU.so -> libGLU.so.1* -lrwxrwxrwx 1 brian users 20 Mar 26 07:53 libGLU.so.1 -> libGLU.so.1.3.060100* --rwxr-xr-x 1 brian users 549269 Mar 26 07:53 libGLU.so.1.3.060100* lrwxrwxrwx 1 brian users 14 Mar 26 07:53 libOSMesa.so -> libOSMesa.so.6* lrwxrwxrwx 1 brian users 23 Mar 26 07:53 libOSMesa.so.6 -> libOSMesa.so.6.1.060100* -rwxr-xr-x 1 brian users 23871 Mar 26 07:53 libOSMesa.so.6.1.060100* @@ -162,8 +159,6 @@ lrwxrwxrwx 1 brian users 23 Mar 26 07:53 libOSMesa.so.6 -> libOSM

    libGL is the main OpenGL library (i.e. Mesa).
    -libGLU is the OpenGL Utility library. -
    libOSMesa is the OSMesa (Off-Screen) interface library.

    diff --git a/docs/license.html b/docs/license.html index f0ac28ccfe8..d69c673ceda 100644 --- a/docs/license.html +++ b/docs/license.html @@ -95,8 +95,6 @@ Device drivers src/mesa/drivers/* MIT, generally Ext headers include/GL/glext.h Khronos include/GL/glxext.h - -SGI GLU library src/glu/sgi/ SGI Free B

    diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html index 1e3a11b6445..ccc0dd587bf 100644 --- a/docs/relnotes-9.0.html +++ b/docs/relnotes-9.0.html @@ -82,6 +82,10 @@ The two supported build methods are now autoconf/automake and SCons.

  • Removed Gallium3D - nvfx driver (use nv30 instead)
    • +

    +libGLU has been moved into its own repository, found at http://cgit.freedesktop.org/mesa/glu/ +

    + diff --git a/docs/sourcetree.html b/docs/sourcetree.html index 42675d9bb5d..6a1f0398368 100644 --- a/docs/sourcetree.html +++ b/docs/sourcetree.html @@ -146,11 +146,6 @@ each directory.