[src/netbsd-7]: src/external/mit/xorg/lib/libGLU Pull up following revision(s...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b12ad95bd418
branches:  netbsd-7
changeset: 798771:b12ad95bd418
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 02 20:41:51 2015 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #370):
        external/mit/xorg/lib/libGLU/Makefile: revision 1.16
switch over to the separate glu sources.

diffstat:

 external/mit/xorg/lib/libGLU/Makefile |  156 +++++++++++++++++++++++----------
 1 files changed, 109 insertions(+), 47 deletions(-)

diffs (195 lines):

diff -r f02527fe753c -r b12ad95bd418 external/mit/xorg/lib/libGLU/Makefile
--- a/external/mit/xorg/lib/libGLU/Makefile     Fri Jan 02 20:38:36 2015 +0000
+++ b/external/mit/xorg/lib/libGLU/Makefile     Fri Jan 02 20:41:51 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2014/07/14 00:22:46 riz Exp $
+#      $NetBSD: Makefile,v 1.15.2.1 2015/01/02 20:41:51 martin Exp $
 
 NOLINT=                1       # XTODO: tess.ln SIGSEGVs lint :(
 
@@ -7,67 +7,127 @@
 LIB=           GLU
 LIBISCXX=      yes
 
-GLUDIR=                ${X11SRCDIR.MesaLib}/src/glu/sgi
+GLUDIR=                ${X11SRCDIR.glu}/src
 
-SRCS.libutil=  error.c glue.c mipmap.c project.c quad.c registry.c
+SRCS.libutil=  \
+       error.c \
+       glue.c \
+       mipmap.c \
+       project.c \
+       quad.c \
+       registry.c
 .PATH:         ${GLUDIR}/libutil
 
-SRCS.libtess=  dict.c geom.c memalloc.c mesh.c normal.c priorityq.c \
-               render.c sweep.c tess.c tessmono.c
+SRCS.libtess=  \
+       dict.c \
+       geom.c \
+       memalloc.c \
+       mesh.c \
+       normal.c \
+       priorityq.c \
+       render.c \
+       sweep.c \
+       tess.c \
+       tessmono.c 
 .PATH:         ${GLUDIR}/libtess
 
-SRCS.interface=        bezierEval.cc bezierPatch.cc bezierPatchMesh.cc \
-               glcurveval.cc glinterface.cc glrenderer.cc \
-               glsurfeval.cc incurveeval.cc insurfeval.cc
+SRCS.interface=        \
+       bezierEval.cc \
+       bezierPatch.cc \
+       bezierPatchMesh.cc \
+       glcurveval.cc \
+       glinterface.cc \
+       glrenderer.cc \
+       glsurfeval.cc \
+       incurveeval.cc \
+       insurfeval.cc
 .PATH:         ${GLUDIR}/libnurbs/interface
-.for fn in ${SRCS.interface}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
-               -I${GLUDIR}/libnurbs/nurbtess \
-               -DLIBRARYBUILD
+
+SRCS.internals=        \
+       arc.cc \
+       arcsorter.cc \
+       arctess.cc \
+       backend.cc \
+       basiccrveval.cc \
+       basicsurfeval.cc \
+       bin.cc \
+       bufpool.cc \
+       cachingeval.cc \
+       ccw.cc \
+       coveandtiler.cc \
+       curve.cc \
+       curvelist.cc \
+       curvesub.cc \
+       dataTransform.cc \
+       displaylist.cc \
+       flist.cc \
+       flistsorter.cc \
+       hull.cc \
+       intersect.cc \
+       knotvector.cc \
+       mapdesc.cc \
+       mapdescv.cc \
+       maplist.cc \
+       mesher.cc \
+       monoTriangulationBackend.cc \
+       monotonizer.cc \
+       mycode.cc \
+       nurbsinterfac.cc \
+       nurbstess.cc \
+       patch.cc \
+       patchlist.cc \
+       quilt.cc \
+       reader.cc \
+       renderhints.cc \
+       slicer.cc \
+       sorter.cc \
+       splitarcs.cc \
+       subdivider.cc \
+       tobezier.cc \
+       trimline.cc \
+       trimregion.cc \
+       trimvertpool.cc \
+       uarray.cc \
+       varray.cc
+.PATH:         ${GLUDIR}/libnurbs/internals
+.for fn in ${SRCS.internals}
+CPPFLAGS.${fn}+= -D_EXTENSIONS_
 .endfor
 
-SRCS.internals=        arc.cc arcsorter.cc arctess.cc backend.cc \
-               basiccrveval.cc basicsurfeval.cc bin.cc bufpool.cc \
-               cachingeval.cc ccw.cc coveandtiler.cc curve.cc \
-               curvelist.cc curvesub.cc dataTransform.cc displaylist.cc \
-               flist.cc flistsorter.cc hull.cc intersect.cc \
-               knotvector.cc mapdesc.cc mapdescv.cc maplist.cc \
-               mesher.cc monoTriangulationBackend.cc monotonizer.cc \
-               mycode.cc nurbsinterfac.cc nurbstess.cc patch.cc \
-               patchlist.cc quilt.cc reader.cc renderhints.cc \
-               slicer.cc sorter.cc splitarcs.cc subdivider.cc \
-               tobezier.cc trimline.cc trimregion.cc trimvertpool.cc \
-               uarray.cc varray.cc
-.PATH:         ${GLUDIR}/libnurbs/internals
-.for fn in ${SRCS.internals}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
-               -I${GLUDIR}/libnurbs/nurbtess \
-               -I${GLUDIR}/libutil \
-               -DLIBRARYBUILD -D_EXTENSIONS_
-.endfor
+SRCS.nurbtess= \
+       directedLine.cc \
+       gridWrap.cc \
+       monoChain.cc \
+       monoPolyPart.cc \
+       monoTriangulation.cc \
+       partitionX.cc \
+       partitionY.cc \
+       polyDBG.cc \
+       polyUtil.cc \
+       primitiveStream.cc \
+       quicksort.cc \
+       rectBlock.cc \
+       sampleComp.cc \
+       sampleCompBot.cc \
+       sampleCompRight.cc \
+       sampleCompTop.cc \
+       sampleMonoPoly.cc \
+       sampledLine.cc \
+       searchTree.cc
+.PATH:         ${GLUDIR}/libnurbs/nurbtess
 
-SRCS.nurbtess= directedLine.cc gridWrap.cc monoChain.cc monoPolyPart.cc \
-               monoTriangulation.cc partitionX.cc partitionY.cc \
-               polyDBG.cc polyUtil.cc primitiveStream.cc quicksort.cc \
-               rectBlock.cc sampleComp.cc sampleCompBot.cc \
-               sampleCompRight.cc sampleCompTop.cc sampleMonoPoly.cc \
-               sampledLine.cc searchTree.cc
-.PATH:         ${GLUDIR}/libnurbs/nurbtess
-.for fn in ${SRCS.nurbtess}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
-               -I${GLUDIR}/libnurbs/nurbtess \
-               -DLIBRARYBUILD
-.endfor
-
-CPPFLAGS+=     -I${GLUDIR}/include
 CPPFLAGS+=     -DPTHREADS -DUSE_XSHM -DHZ=100 -DNDEBUG -DLIBRARYBUILD
+CPPFLAGS+=     -I${GLUDIR}/include \
+               -I${GLUDIR}/libnurbs/internals \
+               -I${GLUDIR}/libnurbs/interface \
+               -I${GLUDIR}/libnurbs/nurbtess
 
 SRCS=          ${SRCS.libutil} ${SRCS.libtess} \
                ${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
 
 CFLAGS+=       -fno-strict-aliasing -fvisibility=hidden -pthread
 
-.PATH:         ${X11SRCDIR.MesaLib}/include/GL
+.PATH:         ${X11SRCDIR.glu}/include/GL
 INCS=  glu.h glu_mangle.h
 INCSDIR=${X11INCDIR}/GL
 
@@ -81,9 +141,11 @@
                m       ${NETBSDSRCDIR}/lib/libm
 
 PKGCONFIG=     glu
-PKGDIST.glu=   ${X11SRCDIR.MesaLib}/src/glu
+PKGDIST.glu=   ${X11SRCDIR.glu}
 .include "${.CURDIR}/../libGL/mesa-ver.mk"
 PKGCONFIG_VERSION.glu= ${MESA_VER}
+PKGCONFIG_SED_FLAGS= \
+       -e "s,@GLU_REQUIRES@,gl,"
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>