Date: Tue, 21 Nov 2006 23:23:20 +0100 (CET) From: Jean-Yves Lefort <jylefort@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rrghphar@bigpond.net.au, yinjieh@csie.nctu.edu.tw, lawrance@FreeBSD.org Subject: ports/105729: Update devel/openthreads, graphics/openproducer and graphics/osg Message-ID: <20061121222321.074042E@jsite.lefort.net> Resent-Message-ID: <200611212230.kALMUElj070984@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105729 >Category: ports >Synopsis: Update devel/openthreads, graphics/openproducer and graphics/osg >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Nov 21 22:30:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jean-Yves Lefort >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD jsite.lefort.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Tue Oct 24 19:03:08 CEST 2006 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386 >Description: - Update to what is shipped in the osg 1.2 zipfile: - openthreads 1.5 - openproducer 1.1 - osg 1.2 - Move openproducer and osg to LOCALBASE - Consolidate the common bits into bsd.osg.mk - Take maintainerships (these three ports are closely related and should be maintained by the same person, it'd make my future work easier if that person could be me) >How-To-Repeat: >Fix: diff -ruN /usr/ports/devel/openthreads/Makefile openthreads/Makefile --- /usr/ports/devel/openthreads/Makefile Tue Oct 31 23:23:27 2006 +++ openthreads/Makefile Tue Nov 21 03:31:38 2006 @@ -6,31 +6,13 @@ # PORTNAME= openthreads -PORTVERSION= 1.4.2 +PORTVERSION= 1.5 CATEGORIES= devel -MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/ -# -# the following master distribution contains the version of OpenThreads -# as described above by PORTVERSION and PORTREVISION. -DISTNAME= OSG_OP_OT-1.0 -MAINTAINER= yinjieh@csie.nctu.edu.tw -COMMENT= A library which provides OO thread interface for C++ programmers +MAINTAINER= jylefort@FreeBSD.org +COMMENT= A library which provides a C++ object-oriented thread interface -USE_ZIP= yes -USE_GMAKE= yes -USE_LDCONFIG= yes - -MAKEFILE= GNUmakefile WRKSRC= ${WRKDIR}/${DISTNAME}/OpenThreads -MAKE_ENV+= FREEBSD_ARCH="${ARCH}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - -# Optimisation/Debug flags: -# opt = optimised ($OPTF added) -# debug = debug ($DBGF added) -# opt is default -# -ALL_TARGET= opt +.include "${.CURDIR}/../../graphics/osg/bsd.osg.mk" .include <bsd.port.mk> diff -ruN /usr/ports/devel/openthreads/distinfo openthreads/distinfo --- /usr/ports/devel/openthreads/distinfo Tue Oct 31 23:23:27 2006 +++ openthreads/distinfo Thu Jan 1 01:00:00 1970 @@ -1,3 +0,0 @@ -MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f -SHA256 (OSG_OP_OT-1.0.zip) = c39572c72d9ed7b7a34a36779bcf56180ba2917926f6f658b5af1824eeb3b6a6 -SIZE (OSG_OP_OT-1.0.zip) = 5036053 diff -ruN /usr/ports/devel/openthreads/files/patch-Make::makedefs openthreads/files/patch-Make::makedefs --- /usr/ports/devel/openthreads/files/patch-Make::makedefs Tue Oct 31 23:23:27 2006 +++ openthreads/files/patch-Make::makedefs Thu Jan 1 01:00:00 1970 @@ -1,29 +0,0 @@ ---- Make/makedefs.orig Sat Dec 10 09:49:24 2005 -+++ Make/makedefs Wed Sep 27 19:05:17 2006 -@@ -264,15 +264,22 @@ - CXX = g++ - endif - DEPARG = -MM -- INC += -I/usr/local/include -I/usr/X11R6/include -- DEF += -W -Wall -+ INC += -I${LOCALBASE}/include -I${X11BASE}/include -+ DEF += -W -Wall ${PTHREAD_CFLAGS} - OPTF = -O2 - DBGF = -g - SHARED = -shared - ARCH = 32 - ARCHARGS = -- INST_LOCATION = /usr/local -- INST_SHARE = /usr/share/OpenThreads -+ INST_SYS_PREFIX = $(PREFIX) -+ INST_SHARE_PREFIX = $(DATADIR) -+ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib ${PTHREAD_LIBS} -+ INST_LOCATION = $(INST_SYS_PREFIX) -+ INST_SHARE = $(INST_SHARE_PREFIX) -+ INST_DEMOS = $(EXAMPLESDIR)/bin -+ INST_SRC = $(EXAMPLESDIR)/src -+ INST_DOC = $(DOCSDIR) -+ INST_DATA = $(DATADIR) - endif - - #### MacOS X specific definitions diff -ruN /usr/ports/devel/openthreads/files/patch-Make::makerules openthreads/files/patch-Make::makerules --- /usr/ports/devel/openthreads/files/patch-Make::makerules Thu Nov 6 14:15:01 2003 +++ openthreads/files/patch-Make::makerules Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- Make/makerules.orig Thu Oct 16 19:39:35 2003 -+++ Make/makerules Thu Oct 16 19:40:50 2003 -@@ -89,7 +89,7 @@ - $(EXEC:=.opt) : - @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) - @cd $(OPTDIR); \ -- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ -+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(EXEC) - @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link -@@ -98,7 +98,7 @@ - $(LIB:=.opt) : - @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) - @cd $(OPTDIR);\ -- $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \ -+ $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(LIB) - @$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB).$(LIB_EXT) __link diff -ruN /usr/ports/devel/openthreads/files/patch-Make_instrules openthreads/files/patch-Make_instrules --- /usr/ports/devel/openthreads/files/patch-Make_instrules Tue Oct 31 23:23:27 2006 +++ openthreads/files/patch-Make_instrules Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- Make/instrules.orig Thu Dec 8 22:28:18 2005 -+++ Make/instrules Mon Sep 25 19:17:55 2006 -@@ -28,13 +28,13 @@ - - __inst_headers: - @[ -d $(INST_INCLUDE)/OpenThreads ] || mkdir -p $(INST_INCLUDE)/OpenThreads -- for f in include/OpenThreads/* ; do\ -- if [ ! -d $$f ];\ -- then\ -+ for f in include/OpenThreads/* ; do \ -+ if [ ! -d $$f ]; \ -+ then \ - [ "`head -1 $$f | cut -c 1-12`" = "/* -*-c++-*-" ] && \ - echo $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \ - $(INSTRCMD) $$f $(INST_INCLUDE)/OpenThreads; \ -- fi;\ -+ fi; \ - done - - diff -ruN /usr/ports/devel/openthreads/pkg-descr openthreads/pkg-descr --- /usr/ports/devel/openthreads/pkg-descr Mon Jan 24 22:58:55 2005 +++ openthreads/pkg-descr Tue Nov 21 02:58:11 2006 @@ -5,5 +5,3 @@ a shared object library. WWW: http://openthreads.sourceforge.net/ - -Maintainer: "Ying-Chieh Chen" <yinjieh@csie.nctu.edu.tw> diff -ruN /usr/ports/graphics/openproducer/Makefile openproducer/Makefile --- /usr/ports/graphics/openproducer/Makefile Wed Nov 1 09:06:27 2006 +++ openproducer/Makefile Tue Nov 21 04:03:42 2006 @@ -6,34 +6,17 @@ # PORTNAME= openproducer -PORTVERSION= 1.0.1 +PORTVERSION= 1.1 CATEGORIES= graphics -MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/ -# -# the following master distribution contains the version of OpenProducer -# as described above by PORTVERSION and PORTREVISION. -DISTNAME= OSG_OP_OT-1.0 -MAINTAINER= lawrance@FreeBSD.org +MAINTAINER= jylefort@FreeBSD.org COMMENT= A cross-platform C++/OpenGL library focused on camera control BUILD_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads +RUN_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads -USE_ZIP= yes -USE_X_PREFIX= yes USE_GL= yes -USE_GMAKE= yes -USE_LDCONFIG= yes - WRKSRC= ${WRKDIR}/${DISTNAME}/Producer -MAKEFILE= GNUmakefile -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} - -# Optimisation/Debug flags: -# opt = optimized ($OPTF added) -# debug = debug ($DBGF added) -# opt is default -# -ALL_TARGET= opt +.include "${.CURDIR}/../../graphics/osg/bsd.osg.mk" .include <bsd.port.mk> diff -ruN /usr/ports/graphics/openproducer/distinfo openproducer/distinfo --- /usr/ports/graphics/openproducer/distinfo Wed Nov 1 09:06:27 2006 +++ openproducer/distinfo Thu Jan 1 01:00:00 1970 @@ -1,3 +0,0 @@ -MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f -SHA256 (OSG_OP_OT-1.0.zip) = c39572c72d9ed7b7a34a36779bcf56180ba2917926f6f658b5af1824eeb3b6a6 -SIZE (OSG_OP_OT-1.0.zip) = 5036053 diff -ruN /usr/ports/graphics/openproducer/files/patch-Make::makedefs openproducer/files/patch-Make::makedefs --- /usr/ports/graphics/openproducer/files/patch-Make::makedefs Sun Nov 19 19:37:16 2006 +++ openproducer/files/patch-Make::makedefs Thu Jan 1 01:00:00 1970 @@ -1,56 +0,0 @@ ---- Make/makedefs.orig Fri Dec 9 23:51:33 2005 -+++ Make/makedefs Sun Nov 19 19:33:13 2006 -@@ -55,7 +55,7 @@ - DEF = -DPRODUCER_VERSION=\"$(VERSION)\"\ - -DPRODUCER_VERSION_REVISION="$(VERSION_REVISION)" - --INC = -I$(TOPDIR)/include -+INC += -I${LOCALBASE}/include -I${X11BASE}/include - - CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) - LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) -@@ -64,20 +64,20 @@ - $(YACCFILES:.y=.o)\ - $(LEXFILES:.l=.o) - --DOF = $(OPTF) -+OPTF = ${CXXFLAGS} - DEBUGDIR = $(OS)$(ARCH).Debug - OPTDIR = $(OS)$(ARCH).Opt - BININST = bin - LIBINST = lib - --INST_LOCATION ?= /usr/local -+INST_LOCATION = $(PREFIX) - INST_LIBS = $(INST_LOCATION)/lib$(ARCH_EXT) - INST_INCLUDE = $(INST_LOCATION)/include - INST_SHARE = $(INST_LOCATION)/share/Producer --INST_DEMOS = $(INST_SHARE)/bin --INST_SRC = $(INST_SHARE)/src --INST_DOC = $(INST_SHARE)/doc --INST_DATA = $(INST_SHARE)/data -+INST_DEMOS = $(EXAMPLESDIR)/bin -+INST_SRC = $(EXAMPLESDIR)/src -+INST_DOC = $(DOCSDIR) -+INST_DATA = $(DATADIR) - INST_DEMO_SRC = $(INST_SRC)/demos - - LINK = ln -sf -@@ -294,7 +294,7 @@ - endif - DEPARG = -MM - INC += -I/usr/local/include -I/usr/X11R6/include -- DEF += -W -Wall -+ DEF += -fPIC -W -Wall - OPTF = -O2 - DBGF = -g - SHARED = -shared -@@ -305,7 +305,7 @@ - - GL_LIBS = -lGL - X_LIBS = -lXmu -lX11 -- OPEN_THREAD_LIB = -lOpenThreads -lpthread -+ OPEN_THREAD_LIB = -lOpenThreads $(PTHREAD_LIBS) - - endif - diff -ruN /usr/ports/graphics/openproducer/files/patch-Make::makerules openproducer/files/patch-Make::makerules --- /usr/ports/graphics/openproducer/files/patch-Make::makerules Sat Jan 29 15:05:00 2005 +++ openproducer/files/patch-Make::makerules Thu Jan 1 01:00:00 1970 @@ -1,21 +0,0 @@ -diff -urN ../Producer.orig/Make/makerules ./Make/makerules ---- ../Producer.orig/Make/makerules Wed Jul 28 04:02:15 2004 -+++ ./Make/makerules Tue Jan 25 21:36:58 2005 -@@ -83,7 +83,7 @@ - $(EXEC:=.opt) : - @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) - @cd $(OPTDIR); \ -- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ -+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(EXEC) - @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link -@@ -92,7 +92,7 @@ - $(LIB:=.opt) : - @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) - @cd $(OPTDIR);\ -- $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \ -+ $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(LIB) - @$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB).$(LIB_EXT) __link diff -ruN /usr/ports/graphics/openproducer/pkg-descr openproducer/pkg-descr --- /usr/ports/graphics/openproducer/pkg-descr Sat Jul 26 01:35:07 2003 +++ openproducer/pkg-descr Tue Nov 21 04:08:46 2006 @@ -13,5 +13,3 @@ systems. WWW: http://www.andesengineering.com/Producer/ - -Maintainer: "Ying-Chieh Chen" <yinjieh@csie.nctu.edu.tw> diff -ruN /usr/ports/graphics/openproducer/pkg-plist openproducer/pkg-plist --- /usr/ports/graphics/openproducer/pkg-plist Wed Nov 1 09:06:27 2006 +++ openproducer/pkg-plist Tue Nov 21 03:49:14 2006 @@ -9,12 +9,15 @@ include/Producer/Keyboard include/Producer/KeyboardMouse include/Producer/Math +include/Producer/PipeTimer include/Producer/RefOpenThreads include/Producer/Referenced include/Producer/RenderSurface +include/Producer/System include/Producer/Timer include/Producer/Trackball include/Producer/Types +include/Producer/Utils include/Producer/Version include/Producer/VisualChooser include/Producer/Window3D diff -ruN /usr/ports/graphics/osg/Makefile osg/Makefile --- /usr/ports/graphics/osg/Makefile Sat Sep 2 18:51:00 2006 +++ osg/Makefile Tue Nov 21 05:42:10 2006 @@ -6,72 +6,24 @@ # PORTNAME= osg -PORTVERSION= 0.9.8 +PORTVERSION= 1.2 CATEGORIES= graphics -MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/ -DISTNAME= OSG_OP_OT-${PORTVERSION}-2 -MAINTAINER= rrghphar@bigpond.net.au +MAINTAINER= jylefort@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering -BROKEN= fails to install -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2006-12-01 - BUILD_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \ - ${X11BASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer + ${LOCALBASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer RUN_DEPENDS= ${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads \ - ${X11BASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer + ${LOCALBASE}/lib/libProducer.so:${PORTSDIR}/graphics/openproducer LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ tiff.4:${PORTSDIR}/graphics/tiff \ - freetype.9:${PORTSDIR}/print/freetype2 \ - xml2.5:${PORTSDIR}/textproc/libxml2 + freetype.9:${PORTSDIR}/print/freetype2 -USE_ZIP= yes -USE_X_PREFIX= yes USE_GL= yes -INSTALLS_SHLIB= yes -USE_GMAKE= yes -MAKE_ENV= OSGHOME="${WRKSRC}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - EXAMPLESDIR="${EXAMPLESDIR}" \ - DOCSDIR="${DOCSDIR}" \ - DATADIR="${DATADIR}" \ - OPTF="${CXXFLAGS}" -MAKEFILE= GNUmakefile WRKSRC= ${WRKDIR}/${DISTNAME}/OpenSceneGraph -# opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default -ALL_TARGET= opt - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500035 -EXTRA_PATCHES= ${FILESDIR}/freebsd4-osg-patches -.endif - -.if !defined(NOPORTDOCS) - -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ - dot:${PORTSDIR}/graphics/graphviz -PORTDOCS= html - -pre-patch: - ${REINPLACE_CMD} -e 's,[[:cntrl:]]*$$,,' \ - ${WRKSRC}/examples/osgtesselate/osgtesselate.cpp - -post-build: - cd ${WRKSRC}/doc/Doxyfiles && OSGHOME=${WRKSRC} doxygen all_Doxyfile - -pre-install: - ${FIND} ${WRKSRC} -name '*.orig' -delete - -post-install: - @${MKDIR} ${DOCSDIR} - ${CP} -r ${WRKSRC}/doc/doxygen/ ${DOCSDIR} - -.endif - -.include <bsd.port.post.mk> +.include "${.CURDIR}/bsd.osg.mk" +.include <bsd.port.mk> diff -ruN /usr/ports/graphics/osg/bsd.osg.mk osg/bsd.osg.mk --- /usr/ports/graphics/osg/bsd.osg.mk Thu Jan 1 01:00:00 1970 +++ osg/bsd.osg.mk Tue Nov 21 05:36:33 2006 @@ -0,0 +1,33 @@ +# $Id$ + +MASTER_SITES= http://www.openscenegraph.org/downloads/snapshots/ +DISTNAME= OSG_OP_OT-1.2 + +MD5_FILE= ${.CURDIR}/../../graphics/osg/distinfo +USE_ZIP= yes +USE_GMAKE= yes +USE_LDCONFIG= yes + +MAKEFILE= GNUmakefile +MAKE_ARGS= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + CXX="${CXX}" \ + INST_LOCATION="${PREFIX}" \ + INST_EXAMPLES="${EXAMPLESDIR}/bin" \ + INST_SRC="${EXAMPLESDIR}/src" \ + INST_EXAMPLE_SRC="${EXAMPLESDIR}/src" \ + INSTBINCMD="${INSTALL_PROGRAM}" \ + INSTXCMD="${INSTALL_PROGRAM}" \ + INSTDEVCMD="${INSTALL_DATA}" \ + INSTRCMD="${INSTALL_DATA}" +ALL_TARGET= opt + +post-patch: osg-post-patch + +osg-post-patch: + @${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \ + s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \ + s|(-I\|-L\|-rpath )/usr/X11R6|\1${X11BASE}|' \ + ${WRKSRC}/Make/makedefs + @${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \ + ${WRKSRC}/Make/makerules diff -ruN /usr/ports/graphics/osg/distinfo osg/distinfo --- /usr/ports/graphics/osg/distinfo Sun Jan 22 13:35:02 2006 +++ osg/distinfo Tue Nov 21 02:45:56 2006 @@ -1,3 +1,3 @@ -MD5 (OSG_OP_OT-0.9.8-2.zip) = 4c3fe8b7701e5a5932a4268075b60cda -SHA256 (OSG_OP_OT-0.9.8-2.zip) = 72a13ad9ca473660eef155041892fd8ba3ca570beaa6220f3375746143bad5f1 -SIZE (OSG_OP_OT-0.9.8-2.zip) = 3805142 +MD5 (OSG_OP_OT-1.2.zip) = e08e0ef1f250dfc17122926ef00b1559 +SHA256 (OSG_OP_OT-1.2.zip) = 3ccd899c83140a542313f9a659698af36ea30bb7cfddcd8962e25cf0fe7e1fb5 +SIZE (OSG_OP_OT-1.2.zip) = 5286887 diff -ruN /usr/ports/graphics/osg/files/freebsd4-osg-patches osg/files/freebsd4-osg-patches --- /usr/ports/graphics/osg/files/freebsd4-osg-patches Wed Mar 2 19:50:47 2005 +++ osg/files/freebsd4-osg-patches Thu Jan 1 01:00:00 1970 @@ -1,688 +0,0 @@ -diff -urN ../OpenSceneGraph.orig/examples/osgtesselate/osgtesselate.cpp ./examples/osgtesselate/osgtesselate.cpp ---- ../OpenSceneGraph.orig/examples/osgtesselate/osgtesselate.cpp Sun Oct 24 20:03:59 2004 -+++ ./examples/osgtesselate/osgtesselate.cpp Tue Feb 8 01:28:23 2005 -@@ -562,7 +562,7 @@ - setTesselateVisitor():osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) { - } - virtual void apply(osg::Geode& geode) { -- if (geode.getName().compare(0,9,"tesselate")==0) { -+ if (geode.getName().compare("tesselate",0,9)==0) { - for(unsigned int i=0;i<geode.getNumDrawables();++i) - { - osg::Geometry* geom = dynamic_cast<osg::Geometry*>(geode.getDrawable(i)); -diff -urN ../OpenSceneGraph.orig/examples/osgunittests/osgunittests.cpp ./examples/osgunittests/osgunittests.cpp ---- ../OpenSceneGraph.orig/examples/osgunittests/osgunittests.cpp Wed Nov 10 21:28:06 2004 -+++ ./examples/osgunittests/osgunittests.cpp Tue Feb 8 01:28:23 2005 -@@ -113,9 +113,6 @@ - std::cout<<"sizeof(float)=="<<sizeof(float)<<std::endl; - std::cout<<"sizeof(double)=="<<sizeof(double)<<std::endl; - -- std::cout<<"sizeof(std::istream::pos_type)=="<<sizeof(std::istream::pos_type)<<std::endl; -- std::cout<<"sizeof(std::istream::off_type)=="<<sizeof(std::istream::off_type)<<std::endl; -- - } - - -diff -urN ../OpenSceneGraph.orig/include/osg/AnimationPath ./include/osg/AnimationPath ---- ../OpenSceneGraph.orig/include/osg/AnimationPath Wed Sep 1 08:34:49 2004 -+++ ./include/osg/AnimationPath Tue Feb 8 01:28:24 2005 -@@ -15,7 +15,7 @@ - #define OSG_ANIMATIONPATH 1 - - #include <map> --#include <istream> -+#include <istream.h> - #include <float.h> - - #include <osg/Matrixf> -diff -urN ../OpenSceneGraph.orig/include/osg/ApplicationUsage ./include/osg/ApplicationUsage ---- ../OpenSceneGraph.orig/include/osg/ApplicationUsage Mon Oct 25 19:16:56 2004 -+++ ./include/osg/ApplicationUsage Tue Feb 8 01:28:24 2005 -@@ -18,7 +18,7 @@ - - #include <map> - #include <string> --#include <ostream> -+#include <ostream.h> - - namespace osg { - -diff -urN ../OpenSceneGraph.orig/include/osg/ArgumentParser ./include/osg/ArgumentParser ---- ../OpenSceneGraph.orig/include/osg/ArgumentParser Tue Sep 28 09:14:03 2004 -+++ ./include/osg/ArgumentParser Tue Feb 8 01:28:24 2005 -@@ -18,7 +18,7 @@ - - #include <map> - #include <string> --#include <ostream> -+#include <ostream.h> - - namespace osg { - -diff -urN ../OpenSceneGraph.orig/include/osg/Matrixd ./include/osg/Matrixd ---- ../OpenSceneGraph.orig/include/osg/Matrixd Tue Aug 31 13:19:30 2004 -+++ ./include/osg/Matrixd Tue Feb 8 01:28:24 2005 -@@ -23,7 +23,7 @@ - - #include <string.h> - --#include <ostream> -+#include <ostream.h> - #include <algorithm> - - namespace osg { -diff -urN ../OpenSceneGraph.orig/include/osg/Matrixf ./include/osg/Matrixf ---- ../OpenSceneGraph.orig/include/osg/Matrixf Tue Aug 31 13:19:30 2004 -+++ ./include/osg/Matrixf Tue Feb 8 01:28:24 2005 -@@ -23,7 +23,7 @@ - - #include <string.h> - --#include <ostream> -+#include <ostream.h> - #include <algorithm> - - namespace osg { -diff -urN ../OpenSceneGraph.orig/include/osg/Notify ./include/osg/Notify ---- ../OpenSceneGraph.orig/include/osg/Notify Thu Sep 2 19:10:33 2004 -+++ ./include/osg/Notify Tue Feb 8 01:28:24 2005 -@@ -16,7 +16,7 @@ - - #include <osg/Export> - --#include <ostream> -+#include <ostream.h> - - namespace osg { - -diff -urN ../OpenSceneGraph.orig/include/osg/UByte4 ./include/osg/UByte4 ---- ../OpenSceneGraph.orig/include/osg/UByte4 Mon Sep 13 15:14:11 2004 -+++ ./include/osg/UByte4 Tue Feb 8 01:28:24 2005 -@@ -16,7 +16,7 @@ - - #include <osg/Vec3> - --#include <ostream> -+#include <ostream.h> - - namespace osg { - -diff -urN ../OpenSceneGraph.orig/include/osg/Vec2f ./include/osg/Vec2f ---- ../OpenSceneGraph.orig/include/osg/Vec2f Wed Sep 15 19:10:15 2004 -+++ ./include/osg/Vec2f Tue Feb 8 01:28:24 2005 -@@ -14,7 +14,7 @@ - #ifndef OSG_VEC2F - #define OSG_VEC2F 1 - --#include <ostream> -+#include <ostream.h> - - #include <osg/Math> - -diff -urN ../OpenSceneGraph.orig/include/osg/Vec3f ./include/osg/Vec3f ---- ../OpenSceneGraph.orig/include/osg/Vec3f Mon Oct 18 18:36:40 2004 -+++ ./include/osg/Vec3f Tue Feb 8 01:28:24 2005 -@@ -14,7 +14,7 @@ - #ifndef OSG_VEC3F - #define OSG_VEC3F 1 - --#include <ostream> -+#include <ostream.h> - - #include <osg/Vec2f> - #include <osg/Math> -diff -urN ../OpenSceneGraph.orig/include/osgDB/FieldReader ./include/osgDB/FieldReader ---- ../OpenSceneGraph.orig/include/osgDB/FieldReader Wed Mar 3 13:27:18 2004 -+++ ./include/osgDB/FieldReader Tue Feb 8 01:28:24 2005 -@@ -19,7 +19,7 @@ - #include <string.h> - #include <stdlib.h> - --#include <istream> -+#include <istream.h> - - namespace osgDB { - -diff -urN ../OpenSceneGraph.orig/include/osgSim/GeographicLocation ./include/osgSim/GeographicLocation ---- ../OpenSceneGraph.orig/include/osgSim/GeographicLocation Tue Mar 2 16:12:11 2004 -+++ ./include/osgSim/GeographicLocation Tue Feb 8 01:28:24 2005 -@@ -17,7 +17,7 @@ - #include <osg/Math> - #include <osg/Referenced> - --#include <ostream> -+#include <ostream.h> - - namespace osgSim { - -diff -urN ../OpenSceneGraph.orig/src/osgDB/Archive.cpp ./src/osgDB/Archive.cpp ---- ../OpenSceneGraph.orig/src/osgDB/Archive.cpp Thu Nov 25 15:09:56 2004 -+++ ./src/osgDB/Archive.cpp Tue Feb 8 01:28:24 2005 -@@ -18,7 +18,7 @@ - #include <osgDB/FileNameUtils> - #include <osgDB/Archive> - --#include <streambuf> -+#include <streambuf.h> - - using namespace osgDB; - -diff -urN ../OpenSceneGraph.orig/src/osgDB/FileNameUtils.cpp ./src/osgDB/FileNameUtils.cpp ---- ../OpenSceneGraph.orig/src/osgDB/FileNameUtils.cpp Wed Oct 6 13:11:04 2004 -+++ ./src/osgDB/FileNameUtils.cpp Tue Feb 8 01:28:23 2005 -@@ -16,8 +16,6 @@ - #include <ctype.h> - #elif defined(__GNUC__) || !defined(WIN32) || defined(__MWERKS__) - #include <cctype> -- using std::tolower; -- using std::strlen; - #endif - - using namespace std; -@@ -119,13 +117,13 @@ - { - // need to check for http:// - if (filename.size()<7) return false; -- if (filename.compare(0,7,"http://")==0) return true; -+ if (filename.compare("http://",0,7)==0) return true; - return false; - } - - std::string osgDB::getServerAddress(const std::string& filename) - { -- if (filename.size()>=7 && filename.compare(0,7,"http://")==0) -+ if (filename.size()>=7 && filename.compare("http://",0,7)==0) - { - std::string::size_type pos_slash = filename.find_first_of('/',7); - if (pos_slash!=std::string::npos) -@@ -142,7 +140,7 @@ - - std::string osgDB::getServerFileName(const std::string& filename) - { -- if (filename.size()>=7 && filename.compare(0,7,"http://")==0) -+ if (filename.size()>=7 && filename.compare("http://",0,7)==0) - { - std::string::size_type pos_slash = filename.find_first_of('/',7); - if (pos_slash!=std::string::npos) -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/ac3d/Geode.cpp ./src/osgPlugins/ac3d/Geode.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/ac3d/Geode.cpp Thu Nov 18 10:08:29 2004 -+++ ./src/osgPlugins/ac3d/Geode.cpp Tue Feb 8 01:28:23 2005 -@@ -12,7 +12,7 @@ - #include <osg/Texture2D> - #include <osg/Drawable> - #include <osg/Geometry> --#include <limits> -+#include <limits.h> - #include <iomanip> - - #include "Exception.h" -@@ -796,8 +796,8 @@ - if (NULL != pTexCoords) - { - // Find max min s coords -- float fMin = std::numeric_limits<float>::max(); -- float fMax = std::numeric_limits<float>::min(); -+ float fMin = FLT_MAX; -+ float fMax = FLT_MIN; - unsigned int iNumTexCoords = pGeometry->getTexCoordArray(0)->getNumElements(); - - for (j = 0; j < iNumTexCoords; j++) -@@ -809,8 +809,8 @@ - } - fRep_s = fMax - fMin; - fOffset_s = fMin; -- fMin = std::numeric_limits<float>::max(); -- fMax = std::numeric_limits<float>::min(); -+ fMin = FLT_MAX; -+ fMax = FLT_MIN; - for (j = 0; j < iNumTexCoords; j++) - { - if (pTexCoords[j][1] > fMax) -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/ac3d/ac3d.cpp ./src/osgPlugins/ac3d/ac3d.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/ac3d/ac3d.cpp Tue Nov 23 15:29:51 2004 -+++ ./src/osgPlugins/ac3d/ac3d.cpp Tue Feb 8 01:28:25 2005 -@@ -6,9 +6,9 @@ - - - #include <stdio.h> --// Where is malloc.h really needed? -+// Where is stdlib.h really needed? - #if !defined(__APPLE__) && !defined(macintosh) && !defined(__FreeBSD__) --#include <malloc.h> -+#include <stdlib.h> - #endif - #include <math.h> - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/flt/Input.cpp ./src/osgPlugins/flt/Input.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/flt/Input.cpp Mon Nov 22 23:54:44 2004 -+++ ./src/osgPlugins/flt/Input.cpp Tue Feb 8 01:28:25 2005 -@@ -1,7 +1,7 @@ - // Input.cpp - - #include <string> --// #include <malloc.h> -+// #include <stdlib.h> - #include <assert.h> - - #include <osg/Notify> -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/camera.cpp ./src/osgPlugins/lib3ds/camera.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/camera.cpp Fri Jan 24 15:12:52 2003 -+++ ./src/osgPlugins/lib3ds/camera.cpp Tue Feb 8 01:28:25 2005 -@@ -28,7 +28,7 @@ - #include <string.h> - #include "config.h" - #ifdef WITH_DMALLOC --#include <dmalloc.h> -+#include <dstdlib.h> - #endif - - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/file.cpp ./src/osgPlugins/lib3ds/file.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/file.cpp Fri Jan 24 15:12:53 2003 -+++ ./src/osgPlugins/lib3ds/file.cpp Tue Feb 8 01:28:25 2005 -@@ -34,7 +34,7 @@ - #include <math.h> - #include "config.h" - #ifdef WITH_DMALLOC --#include <dmalloc.h> -+#include <dstdlib.h> - #endif - - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/light.cpp ./src/osgPlugins/lib3ds/light.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/light.cpp Fri Jan 24 15:12:53 2003 -+++ ./src/osgPlugins/lib3ds/light.cpp Tue Feb 8 01:28:25 2005 -@@ -28,7 +28,7 @@ - #include <string.h> - #include "config.h" - #ifdef WITH_DMALLOC --#include <dmalloc.h> -+#include <dstdlib.h> - #endif - - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/material.cpp ./src/osgPlugins/lib3ds/material.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/material.cpp Fri Jan 24 15:12:53 2003 -+++ ./src/osgPlugins/lib3ds/material.cpp Tue Feb 8 01:28:25 2005 -@@ -28,7 +28,7 @@ - #include <string.h> - #include "config.h" - #ifdef WITH_DMALLOC --#include <dmalloc.h> -+#include <dstdlib.h> - #endif - - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/mesh.cpp ./src/osgPlugins/lib3ds/mesh.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/mesh.cpp Fri Jan 24 15:12:53 2003 -+++ ./src/osgPlugins/lib3ds/mesh.cpp Tue Feb 8 01:28:25 2005 -@@ -30,7 +30,7 @@ - #include <math.h> - #include "config.h" - #ifdef WITH_DMALLOC --#include <dmalloc.h> -+#include <dstdlib.h> - #endif - - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/node.cpp ./src/osgPlugins/lib3ds/node.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/node.cpp Fri Jan 24 15:12:54 2003 -+++ ./src/osgPlugins/lib3ds/node.cpp Tue Feb 8 01:28:25 2005 -@@ -30,7 +30,7 @@ - #include <math.h> - #include "config.h" - #ifdef WITH_DMALLOC --#include <dmalloc.h> -+#include <dstdlib.h> - #endif - - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/tracks.cpp ./src/osgPlugins/lib3ds/tracks.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lib3ds/tracks.cpp Thu Aug 5 13:41:52 2004 -+++ ./src/osgPlugins/lib3ds/tracks.cpp Tue Feb 8 01:28:25 2005 -@@ -31,7 +31,7 @@ - #include <math.h> - #include "config.h" - #ifdef WITH_DMALLOC --#include <dmalloc.h> -+#include <dstdlib.h> - #endif - - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Converter.cpp ./src/osgPlugins/lwo/Converter.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Converter.cpp Mon Nov 22 23:54:44 2004 -+++ ./src/osgPlugins/lwo/Converter.cpp Tue Feb 8 01:28:23 2005 -@@ -246,7 +246,7 @@ - std::string file = osgDB::findDataFile(filename, options); - if (file.empty()) return 0; - -- std::ifstream ifs(file.c_str(), std::ios_base::in | std::ios_base::binary); -+ std::ifstream ifs(file.c_str(), std::ios::in | std::ios::binary); - if (!ifs.is_open()) return 0; - - std::vector<char> buffer; -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Object.cpp ./src/osgPlugins/lwo/Object.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Object.cpp Mon Jun 28 14:18:48 2004 -+++ ./src/osgPlugins/lwo/Object.cpp Tue Feb 8 01:28:23 2005 -@@ -135,7 +135,7 @@ - } - VertexMap *new_map = current_layer.units().back().weight_maps()->getOrCreate(vmap->name); - for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) { -- (*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), 0, 0, 0); -+ (*new_map)[i->vert.index] = osg::Vec4(i->value[0], 0, 0, 0); - } - } - if (type == "MNVW") { -@@ -145,7 +145,7 @@ - } - VertexMap *new_map = current_layer.units().back().subpatch_weight_maps()->getOrCreate(vmap->name); - for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) { -- (*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), 0, 0, 0); -+ (*new_map)[i->vert.index] = osg::Vec4(i->value[0], 0, 0, 0); - } - } - if (type == "TXUV") { -@@ -155,7 +155,7 @@ - } - VertexMap *new_map = current_layer.units().back().texture_maps()->getOrCreate(vmap->name); - for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) { -- (*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), 0, 0); -+ (*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], 0, 0); - } - } - if (type == "RGB ") { -@@ -165,7 +165,7 @@ - } - VertexMap *new_map = current_layer.units().back().rgb_maps()->getOrCreate(vmap->name); - for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) { -- (*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), 1); -+ (*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], 1); - } - } - if (type == "RGBA") { -@@ -175,7 +175,7 @@ - } - VertexMap *new_map = current_layer.units().back().rgba_maps()->getOrCreate(vmap->name); - for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) { -- (*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), i->value.at(3)); -+ (*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], i->value[3]); - } - } - if (type == "MORF") { -@@ -185,7 +185,7 @@ - } - VertexMap *new_map = current_layer.units().back().displacement_maps()->getOrCreate(vmap->name); - for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) { -- (*new_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), 0); -+ (*new_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], 0); - } - } - if (type == "SPOT") { -@@ -195,7 +195,7 @@ - } - VertexMap *new_map = current_layer.units().back().spot_maps()->getOrCreate(vmap->name); - for (lwo2::FORM::VMAP::Mapping_list::const_iterator i=vmap->mapping.begin(); i!=vmap->mapping.end(); ++i) { -- (*new_map)[i->vert.index] = osg::Vec4(csf_->fix_point(osg::Vec3(i->value.at(0), i->value.at(1), i->value.at(2))), 0); -+ (*new_map)[i->vert.index] = osg::Vec4(csf_->fix_point(osg::Vec3(i->value[0], i->value[1], i->value[2])), 0); - } - } - } -@@ -223,15 +223,15 @@ - - if (must_invert_winding) { - for (unsigned j=0; j<i->numvert; ++j) { -- int index = i->vert.at((i->numvert-j)%i->numvert).index; -+ int index = i->vert[(i->numvert-j)%i->numvert].index; - polygon.indices().push_back(index); -- current_layer.units().back().shares().at(index).push_back(current_layer.units().back().polygons().size()); -+ current_layer.units().back().shares()[index].push_back(current_layer.units().back().polygons().size()); - } - } else { - for (unsigned j=0; j<i->numvert; ++j) { -- int index = i->vert.at(j).index; -+ int index = i->vert[j].index; - polygon.indices().push_back(index); -- current_layer.units().back().shares().at(index).push_back(current_layer.units().back().polygons().size()); -+ current_layer.units().back().shares()[index].push_back(current_layer.units().back().polygons().size()); - } - } - current_layer.units().back().polygons().push_back(polygon); -@@ -248,17 +248,17 @@ - std::string type(ptag->type.id, 4); - if (type == "SURF") { - for (lwo2::FORM::PTAG::Mapping_list::const_iterator i=ptag->mapping.begin(); i!=ptag->mapping.end(); ++i) { -- current_layer.units().back().polygons().at(i->poly.index).set_surface(&surfaces_[tag_strings.at(i->tag)]); -+ current_layer.units().back().polygons()[i->poly.index].set_surface(&surfaces_[tag_strings[i->tag]]); - } - } - if (type == "PART") { - for (lwo2::FORM::PTAG::Mapping_list::const_iterator i=ptag->mapping.begin(); i!=ptag->mapping.end(); ++i) { -- current_layer.units().back().polygons().at(i->poly.index).set_part_name(tag_strings.at(i->tag)); -+ current_layer.units().back().polygons()[i->poly.index].set_part_name(tag_strings[i->tag]); - } - } - if (type == "SMGP") { - for (lwo2::FORM::PTAG::Mapping_list::const_iterator i=ptag->mapping.begin(); i!=ptag->mapping.end(); ++i) { -- current_layer.units().back().polygons().at(i->poly.index).set_smoothing_group(tag_strings.at(i->tag)); -+ current_layer.units().back().polygons()[i->poly.index].set_smoothing_group(tag_strings[i->tag]); - } - } - } -@@ -272,8 +272,8 @@ - continue; - } - for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) { -- VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).weight_maps()->getOrCreate(vmad->name); -- (*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), 0, 0, 0); -+ VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].weight_maps()->getOrCreate(vmad->name); -+ (*this_map)[i->vert.index] = osg::Vec4(i->value[0], 0, 0, 0); - } - } - if (type == "TXUV") { -@@ -282,8 +282,8 @@ - continue; - } - for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) { -- VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).texture_maps()->getOrCreate(vmad->name); -- (*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), 0, 0); -+ VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].texture_maps()->getOrCreate(vmad->name); -+ (*this_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], 0, 0); - } - } - if (type == "RGB ") { -@@ -292,8 +292,8 @@ - continue; - } - for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) { -- VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).rgb_maps()->getOrCreate(vmad->name); -- (*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), 1); -+ VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].rgb_maps()->getOrCreate(vmad->name); -+ (*this_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], 1); - } - } - if (type == "RGBA") { -@@ -302,8 +302,8 @@ - continue; - } - for (lwo2::FORM::VMAD::Mapping_list::const_iterator i=vmad->mapping.begin(); i!=vmad->mapping.end(); ++i) { -- VertexMap *this_map = current_layer.units().back().polygons().at(i->poly.index).rgba_maps()->getOrCreate(vmad->name); -- (*this_map)[i->vert.index] = osg::Vec4(i->value.at(0), i->value.at(1), i->value.at(2), i->value.at(3)); -+ VertexMap *this_map = current_layer.units().back().polygons()[i->poly.index].rgba_maps()->getOrCreate(vmad->name); -+ (*this_map)[i->vert.index] = osg::Vec4(i->value[0], i->value[1], i->value[2], i->value[3]); - } - } - } -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Polygon.h ./src/osgPlugins/lwo/Polygon.h ---- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Polygon.h Sat Jan 3 15:20:32 2004 -+++ ./src/osgPlugins/lwo/Polygon.h Tue Feb 8 01:28:23 2005 -@@ -95,9 +95,9 @@ - if (last_used_points_ != points) { - normal_.set(0, 0, 0); - if (indices_.size() >= 3) { -- const osg::Vec3 &A = points->at(indices_.front()); -- const osg::Vec3 &B = points->at(indices_[1]); -- const osg::Vec3 &C = points->at(indices_.back()); -+ const osg::Vec3 &A = (*points)[indices_.front()]; -+ const osg::Vec3 &B = (*points)[indices_[1]]; -+ const osg::Vec3 &C = (*points)[indices_.back()]; - if (invert_normal_) { - normal_ = (C - A) ^ (B - A); - } else { -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/ReaderWriterLWO.cpp ./src/osgPlugins/lwo/ReaderWriterLWO.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lwo/ReaderWriterLWO.cpp Tue Nov 23 15:29:51 2004 -+++ ./src/osgPlugins/lwo/ReaderWriterLWO.cpp Tue Feb 8 01:28:23 2005 -@@ -18,6 +18,7 @@ - #include <string> - #include <sstream> - #include <algorithm> -+#include <memory> - - #include <osg/Notify> - #include <osg/Node> -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/Unit.cpp ./src/osgPlugins/lwo/Unit.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lwo/Unit.cpp Sat Jan 3 15:20:32 2004 -+++ ./src/osgPlugins/lwo/Unit.cpp Tue Feb 8 01:28:23 2005 -@@ -75,11 +75,11 @@ - osg::Vec4 N(poly.face_normal(points_.get()), 0); - unsigned num_smoothed = 1; - -- const Index_list &shared_polys = shares_.at(*j); -+ const Index_list &shared_polys = shares_[*j]; - - for (unsigned k=0; k<shared_polys.size(); ++k) { - if (shared_polys[k] != pn) { -- const Polygon &shared_poly = polygons_.at(shared_polys[k]); -+ const Polygon &shared_poly = polygons_[shared_polys[k]]; - float angle = angle_between_polygons(poly, shared_poly); - if (angle <= max_smoothing_angle && (poly.get_smoothing_group() == shared_poly.get_smoothing_group())) { - N += osg::Vec4(shared_poly.face_normal(points_.get()), 0); -@@ -157,7 +157,7 @@ - if (poly.dup_vertices()[j] == 0) { - - // duplicate point -- points_->push_back(points_->at(*i)); -+ points_->push_back((*points_)[*i]); - - int new_index = static_cast<int>(points_->size())-1; - -@@ -165,7 +165,7 @@ - (*normals_.get())[new_index] = (*normals_.get())[*i]; - - // duplicate share -- shares_.push_back(shares_.at(*i)); -+ shares_.push_back(shares_[*i]); - - VertexMap_map::iterator vm; - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/VertexMap.cpp ./src/osgPlugins/lwo/VertexMap.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/lwo/VertexMap.cpp Sat Jan 3 15:20:32 2004 -+++ ./src/osgPlugins/lwo/VertexMap.cpp Tue Feb 8 01:28:23 2005 -@@ -21,7 +21,7 @@ - value.y() *= modulator.y(); - value.z() *= modulator.z(); - value.w() *= modulator.w(); -- array->at(i->first) = value; -+ (*array)[i->first] = value; - } - return array.take(); - } -@@ -34,7 +34,7 @@ - osg::Vec4 value = i->second; - value.x() *= modulator.x(); - value.y() *= modulator.y(); -- array->at(i->first) = osg::Vec2(value.x(), value.y()); -+ (*array)[i->first] = osg::Vec2(value.x(), value.y()); - } - return array.take(); - } -@@ -48,7 +48,7 @@ - value.x() *= modulator.x(); - value.y() *= modulator.y(); - value.z() *= modulator.z(); -- array->at(i->first) = osg::Vec3(value.x(), value.y(), value.z()); -+ (*array)[i->first] = osg::Vec3(value.x(), value.y(), value.z()); - } - return array.take(); - } -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/lwo/iffparser.h ./src/osgPlugins/lwo/iffparser.h ---- ../OpenSceneGraph.orig/src/osgPlugins/lwo/iffparser.h Wed Jun 9 16:28:51 2004 -+++ ./src/osgPlugins/lwo/iffparser.h Tue Feb 8 01:28:23 2005 -@@ -10,6 +10,7 @@ - - #include <vector> - #include <iostream> -+#include <string> - - namespace iff - { -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.cpp ./src/osgPlugins/obj/obj.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.cpp Mon Nov 22 23:54:45 2004 -+++ ./src/osgPlugins/obj/obj.cpp Tue Feb 8 01:28:23 2005 -@@ -15,6 +15,8 @@ - - #include "obj.h" - -+#include <cstdio> -+ - #include <osg/Notify> - - #include <osgDB/FileUtils> -@@ -75,7 +77,7 @@ - // need to keep return; - skipNewline = true; - } -- else if (c!=std::ifstream::traits_type::eof()) // don't copy eof. -+ else if (c!=EOF) // don't copy eof. - { - skipNewline = false; - -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.h ./src/osgPlugins/obj/obj.h ---- ../OpenSceneGraph.orig/src/osgPlugins/obj/obj.h Mon Nov 22 23:54:45 2004 -+++ ./src/osgPlugins/obj/obj.h Tue Feb 8 01:28:24 2005 -@@ -17,7 +17,7 @@ - #include <string> - #include <vector> - #include <map> --#include <istream> -+#include <istream.h> - - #include <osg/ref_ptr> - #include <osg/Referenced> -diff -urN ../OpenSceneGraph.orig/src/osgPlugins/osga/OSGA_Archive.cpp ./src/osgPlugins/osga/OSGA_Archive.cpp ---- ../OpenSceneGraph.orig/src/osgPlugins/osga/OSGA_Archive.cpp Tue Nov 23 15:29:52 2004 -+++ ./src/osgPlugins/osga/OSGA_Archive.cpp Tue Feb 8 01:28:23 2005 -@@ -235,7 +235,7 @@ - if (status==READ) - { - _status = status; -- _input.open(filename.c_str(), std::ios_base::binary | std::ios_base::in); -+ _input.open(filename.c_str(), std::ios::binary | std::ios::in); - - return _open(_input); - } -@@ -246,7 +246,7 @@ - _input.close(); - _status = WRITE; - -- _output.open(filename.c_str(), std::ios_base::binary | std::ios_base::in | std::ios_base::out); -+ _output.open(filename.c_str(), std::ios::binary | std::ios::in | std::ios::out); - - osg::notify(osg::INFO)<<"File position after open = "<<(int)_output.tellp()<<" is_open "<<_output.is_open()<<std::endl; - -@@ -264,7 +264,7 @@ - osg::notify(osg::INFO)<<"OSGA_Archive::open("<<filename<<"), archive being created."<<std::endl; - - _status = WRITE; -- _output.open(filename.c_str(), std::ios_base::out | std::ios_base::binary | std::ios_base::trunc); -+ _output.open(filename.c_str(), std::ios::out | std::ios::binary | std::ios::trunc); - _output<<"osga"; - _output.write(reinterpret_cast<const char*>(&ENDIAN_TEST_NUMBER),4); - _output.write(reinterpret_cast<char*>(&s_currentSupportedVersion),sizeof(float)); -@@ -475,6 +475,7 @@ - class proxy_streambuf : public std::streambuf - { - public: -+ typedef int int_type; - - proxy_streambuf(std::streambuf* streambuf, unsigned int numChars): - _streambuf(streambuf), diff -ruN /usr/ports/graphics/osg/files/patch-Make::makedefs osg/files/patch-Make::makedefs --- /usr/ports/graphics/osg/files/patch-Make::makedefs Wed Mar 2 19:50:47 2005 +++ osg/files/patch-Make::makedefs Thu Jan 1 01:00:00 1970 @@ -1,43 +0,0 @@ ---- Make/makedefs.orig Sun Dec 5 11:03:43 2004 -+++ Make/makedefs Mon Feb 7 10:59:22 2005 -@@ -402,24 +402,35 @@ - - #### FreeBSD specific definitions - ifeq ($(OS),FreeBSD) -- C++ = g++ -+ C++ = ${CXX} - DEPARG = -MM -- INC += -I/usr/local/include -I/usr/X11R6/include -+ INC += -I${LOCALBASE}/include -I${X11BASE}/include - DEF += -W -Wall -- OPTF = -O2 -+ OPTF ?= -O2 - DBGF = -g -DOSG_COMPILE_UNIT_TESTS - SHARED = -shared - ARCH = - ARCHINST = - ARCHARGS = -- LINKARGS = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib -pthread -+ LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib -pthread - DYNAMICLIBRARYLIB = - OSG_LIBS = -losgGA -losgDB -losgUtil -losg - GL_LIBS = -lGLU -lGL - X_INC = -I/usr/X11R6/include - X_LIBS = -lXmu -lX11 - SOCKET_LIBS = -- OTHER_LIBS = -lOpenThreads -+ OTHER_LIBS = -lOpenThreads ${PTHREAD_LIBS} -+ # PREFIX, EXAMPLESDIR, DOCSDIR, and DATADIR are defined by the port -+ INST_LOCATION = ${PREFIX} -+ INST_SHARE = ${PREFIX}/share -+ INST_EXAMPLES = ${EXAMPLESDIR}/bin -+ INST_EXAMPLE_SRC = ${EXAMPLESDIR}/src -+ INST_DOC = ${DOCSDIR} -+ INST_SRC = ${EXAMPLESDIR}/src -+ INST_DATA = ${DATADIR} -+ INSTBINCMD = ${BSD_INSTALL_PROGRAM} -+ INSTDEVCMD = ${BSD_INSTALL_DATA} -+ LIBXML2_INCLUDE = -I${LOCALBASE}/include/libxml2 - PNG_LIBS = -lpng - JPEG_LIBS = -ljpeg - TIFF_LIB = -ltiff diff -ruN /usr/ports/graphics/osg/files/patch-Make::makedirdefs osg/files/patch-Make::makedirdefs --- /usr/ports/graphics/osg/files/patch-Make::makedirdefs Tue Jul 29 17:53:05 2003 +++ osg/files/patch-Make::makedirdefs Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- Make/makedirdefs.orig Tue Jul 22 21:12:55 2003 -+++ Make/makedirdefs Tue Jul 22 21:13:50 2003 -@@ -58,9 +58,11 @@ - ifneq ($(OS),Darwin) - ifneq ($(OS),SunOS) - ifneq ($(OS),IRIX) -+ifneq ($(OS),FreeBSD) - - PLUGIN_DIRS += geo - -+endif - endif - endif - endif diff -ruN /usr/ports/graphics/osg/files/patch-Make::makerules osg/files/patch-Make::makerules --- /usr/ports/graphics/osg/files/patch-Make::makerules Thu Nov 13 12:36:41 2003 +++ osg/files/patch-Make::makerules Thu Jan 1 01:00:00 1970 @@ -1,29 +0,0 @@ ---- Make/makerules.orig Fri Aug 8 22:41:37 2003 -+++ Make/makerules Sat Oct 18 01:42:58 2003 -@@ -110,7 +110,7 @@ - $(EXEC:=.opt) : - @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) - @cd $(OPTDIR); \ -- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ -+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(EXEC) - @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link -@@ -119,7 +119,7 @@ - $(LIB:=.opt) : - @[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR) - @cd $(OPTDIR);\ -- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ -+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(LIB) - @$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB) __link -@@ -127,7 +127,7 @@ - $(PLUGIN:=.opt) : - @[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR) - @cd $(OPTDIR); \ -- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ -+ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ - THISDIR=../$(THISDIR)\ - MAKEDEPEND=Makedepend $(PLUGIN) - @$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link diff -ruN /usr/ports/graphics/osg/files/patch-Make_makedefs osg/files/patch-Make_makedefs --- /usr/ports/graphics/osg/files/patch-Make_makedefs Thu Jan 1 01:00:00 1970 +++ osg/files/patch-Make_makedefs Tue Nov 21 17:03:17 2006 @@ -0,0 +1,11 @@ +--- Make/makedefs.orig Tue Sep 12 21:15:04 2006 ++++ Make/makedefs Tue Nov 21 17:02:38 2006 +@@ -459,7 +459,7 @@ + X_INC = -I/usr/X11R6/include + X_LIBS = -lXmu -lX11 + SOCKET_LIBS = +- OTHER_LIBS = -lOpenThreads ++ OTHER_LIBS = -lOpenThreads $(PTHREAD_LIBS) + PNG_LIBS = -lpng + JPEG_LIBS = -ljpeg + TIFF_LIB = -ltiff diff -ruN /usr/ports/graphics/osg/pkg-plist osg/pkg-plist --- /usr/ports/graphics/osg/pkg-plist Wed Mar 2 19:50:47 2005 +++ osg/pkg-plist Tue Nov 21 18:44:39 2006 @@ -6,10 +6,15 @@ include/osg/AutoTransform include/osg/Billboard include/osg/BlendColor +include/osg/BlendEquation include/osg/BlendFunc include/osg/BoundingBox include/osg/BoundingSphere include/osg/BoundsChecking +include/osg/BufferObject +include/osg/CameraNode +include/osg/CameraView +include/osg/ClampColor include/osg/ClearNode include/osg/ClipNode include/osg/ClipPlane @@ -33,18 +38,20 @@ include/osg/Export include/osg/Fog include/osg/FragmentProgram +include/osg/FrameBufferObject include/osg/FrameStamp include/osg/FrontFace include/osg/GL +include/osg/GL2Extensions include/osg/GLExtensions include/osg/GLU include/osg/Geode include/osg/Geometry +include/osg/GraphicsContext +include/osg/GraphicsThread include/osg/Group include/osg/Image include/osg/ImageStream -include/osg/Impostor -include/osg/ImpostorSprite include/osg/LOD include/osg/Light include/osg/LightModel @@ -52,6 +59,7 @@ include/osg/LineSegment include/osg/LineStipple include/osg/LineWidth +include/osg/LogicOp include/osg/Material include/osg/Math include/osg/Matrix @@ -61,6 +69,7 @@ include/osg/Multisample include/osg/Node include/osg/NodeCallback +include/osg/NodeTrackerCallback include/osg/NodeVisitor include/osg/Notify include/osg/Object @@ -75,12 +84,15 @@ include/osg/Polytope include/osg/PositionAttitudeTransform include/osg/PrimitiveSet +include/osg/Program include/osg/Projection +include/osg/ProxyNode include/osg/Quat -include/osg/RefNodePath include/osg/Referenced +include/osg/Scissor include/osg/Sequence include/osg/ShadeModel +include/osg/Shader include/osg/ShadowVolumeOccluder include/osg/Shape include/osg/ShapeDrawable @@ -105,22 +117,31 @@ include/osg/Transform include/osg/TriangleFunctor include/osg/TriangleIndexFunctor -include/osg/UByte4 +include/osg/Uniform include/osg/UnitTestFramework include/osg/Vec2 +include/osg/Vec2b include/osg/Vec2d include/osg/Vec2f +include/osg/Vec2s include/osg/Vec3 +include/osg/Vec3b include/osg/Vec3d include/osg/Vec3f +include/osg/Vec3s include/osg/Vec4 +include/osg/Vec4b include/osg/Vec4d include/osg/Vec4f +include/osg/Vec4s +include/osg/Vec4ub include/osg/Version include/osg/VertexProgram include/osg/Viewport include/osg/buffered_value include/osg/fast_back_stack +include/osg/io_utils +include/osg/observer_ptr include/osg/ref_ptr include/osgDB/Archive include/osgDB/DatabasePager @@ -148,6 +169,7 @@ include/osgFX/Cartoon include/osgFX/Effect include/osgFX/Export +include/osgFX/MultiTextureControl include/osgFX/Registry include/osgFX/Scribe include/osgFX/SpecularHighlights @@ -155,6 +177,8 @@ include/osgFX/Validator include/osgGA/AnimationPathManipulator include/osgGA/DriveManipulator +include/osgGA/EventQueue +include/osgGA/EventVisitor include/osgGA/Export include/osgGA/FlightManipulator include/osgGA/GUIActionAdapter @@ -168,21 +192,48 @@ include/osgGA/StateSetManipulator include/osgGA/TerrainManipulator include/osgGA/TrackballManipulator +include/osgGA/UFOManipulator include/osgGA/Version -include/osgGL2/Export -include/osgGL2/Extensions -include/osgGL2/ProgramObject -include/osgGL2/UniformValue -include/osgGL2/Version +include/osgIntrospection/Attributes +include/osgIntrospection/Comparator +include/osgIntrospection/ConstructorInfo +include/osgIntrospection/Converter +include/osgIntrospection/ConverterProxy +include/osgIntrospection/CustomAttribute +include/osgIntrospection/CustomAttributeProvider +include/osgIntrospection/Exceptions +include/osgIntrospection/Export +include/osgIntrospection/InstanceCreator +include/osgIntrospection/MethodInfo +include/osgIntrospection/ParameterInfo +include/osgIntrospection/PropertyInfo +include/osgIntrospection/PublicMemberAccessor +include/osgIntrospection/ReaderWriter +include/osgIntrospection/Reflection +include/osgIntrospection/ReflectionMacros +include/osgIntrospection/Reflector +include/osgIntrospection/StaticMethodInfo +include/osgIntrospection/Type +include/osgIntrospection/TypeNameAliasProxy +include/osgIntrospection/TypedConstructorInfo +include/osgIntrospection/TypedMethodInfo +include/osgIntrospection/Utility +include/osgIntrospection/Value +include/osgIntrospection/variant_cast include/osgParticle/AccelOperator include/osgParticle/AngularAccelOperator +include/osgParticle/BoxPlacer include/osgParticle/CenteredPlacer +include/osgParticle/ConnectedParticleSystem +include/osgParticle/ConstantRateCounter include/osgParticle/Counter include/osgParticle/Emitter +include/osgParticle/ExplosionDebrisEffect include/osgParticle/ExplosionEffect include/osgParticle/Export include/osgParticle/FireEffect include/osgParticle/FluidFrictionOperator +include/osgParticle/FluidProgram include/osgParticle/ForceOperator include/osgParticle/Interpolator include/osgParticle/LinearInterpolator @@ -197,6 +248,7 @@ include/osgParticle/ParticleSystemUpdater include/osgParticle/Placer include/osgParticle/PointPlacer +include/osgParticle/PrecipitationEffect include/osgParticle/Program include/osgParticle/RadialShooter include/osgParticle/RandomRateCounter @@ -204,11 +256,12 @@ include/osgParticle/SegmentPlacer include/osgParticle/Shooter include/osgParticle/SmokeEffect +include/osgParticle/SmokeTrailEffect include/osgParticle/VariableRateCounter include/osgParticle/Version include/osgParticle/range -include/osgProducer/EventAdapter include/osgProducer/Export +include/osgProducer/GraphicsContextImplementation include/osgProducer/KeyboardMouseCallback include/osgProducer/OsgCameraGroup include/osgProducer/OsgSceneHandler @@ -220,10 +273,15 @@ include/osgSim/DOFTransform include/osgSim/Export include/osgSim/GeographicLocation +include/osgSim/Impostor +include/osgSim/ImpostorSprite +include/osgSim/InsertImpostorsVisitor include/osgSim/LightPoint include/osgSim/LightPointNode include/osgSim/LightPointSystem include/osgSim/MultiSwitch +include/osgSim/OpenFlightOptimizer +include/osgSim/OverlayNode include/osgSim/ScalarBar include/osgSim/ScalarsToColors include/osgSim/Sector @@ -248,19 +306,17 @@ include/osgUtil/GLObjectsVisitor include/osgUtil/HalfWayMapGenerator include/osgUtil/HighlightMapGenerator -include/osgUtil/InsertImpostorsVisitor include/osgUtil/IntersectVisitor include/osgUtil/Optimizer +include/osgUtil/PositionalStateContainer include/osgUtil/ReflectionMapGenerator include/osgUtil/RenderBin -include/osgUtil/RenderGraph include/osgUtil/RenderLeaf include/osgUtil/RenderStage -include/osgUtil/RenderStageLighting -include/osgUtil/RenderToTextureStage include/osgUtil/SceneView include/osgUtil/Simplifier include/osgUtil/SmoothingVisitor +include/osgUtil/StateGraph include/osgUtil/Statistics include/osgUtil/TangentSpaceGenerator include/osgUtil/Tesselator @@ -273,7 +329,6 @@ lib/libosgDB.so lib/libosgFX.so lib/libosgGA.so -lib/libosgGL2.so lib/libosgParticle.so lib/libosgProducer.so lib/libosgSim.so @@ -281,13 +336,18 @@ lib/libosgUtil.so lib/osgPlugins/osgdb_3dc.so lib/osgPlugins/osgdb_3ds.so +lib/osgPlugins/osgdb_OpenFlight.so lib/osgPlugins/osgdb_ac.so lib/osgPlugins/osgdb_bmp.so +lib/osgPlugins/osgdb_bsp.so lib/osgPlugins/osgdb_dds.so lib/osgPlugins/osgdb_dw.so +lib/osgPlugins/osgdb_dxf.so lib/osgPlugins/osgdb_flt.so lib/osgPlugins/osgdb_freetype.so +lib/osgPlugins/osgdb_geo.so lib/osgPlugins/osgdb_gif.so +lib/osgPlugins/osgdb_hdr.so lib/osgPlugins/osgdb_ive.so lib/osgPlugins/osgdb_jpeg.so lib/osgPlugins/osgdb_logo.so @@ -295,6 +355,7 @@ lib/osgPlugins/osgdb_lws.so lib/osgPlugins/osgdb_md2.so lib/osgPlugins/osgdb_net.so +lib/osgPlugins/osgdb_normals.so lib/osgPlugins/osgdb_obj.so lib/osgPlugins/osgdb_osg.so lib/osgPlugins/osgdb_osgFX.so @@ -309,6 +370,7 @@ lib/osgPlugins/osgdb_rgb.so lib/osgPlugins/osgdb_rot.so lib/osgPlugins/osgdb_scale.so +lib/osgPlugins/osgdb_shp.so lib/osgPlugins/osgdb_stl.so lib/osgPlugins/osgdb_tga.so lib/osgPlugins/osgdb_tgz.so @@ -317,99 +379,36 @@ lib/osgPlugins/osgdb_txp.so lib/osgPlugins/osgdb_x.so lib/osgPlugins/osgdb_zip.so -@dirrm include/osg -@dirrm include/osgDB -@dirrm include/osgFX -@dirrm include/osgGA -@dirrm include/osgGL2 -@dirrm include/osgParticle -@dirrm include/osgProducer -@dirrm include/osgSim -@dirrm include/osgTerrain -@dirrm include/osgText -@dirrm include/osgUtil -@dirrm lib/osgPlugins -%%EXAMPLESDIR%%/bin/osganimate %%EXAMPLESDIR%%/bin/osgarchive -%%EXAMPLESDIR%%/bin/osgautotransform -%%EXAMPLESDIR%%/bin/osgbillboard -%%EXAMPLESDIR%%/bin/osgcallback -%%EXAMPLESDIR%%/bin/osgcameragroup -%%EXAMPLESDIR%%/bin/osgclip -%%EXAMPLESDIR%%/bin/osgcluster %%EXAMPLESDIR%%/bin/osgconv -%%EXAMPLESDIR%%/bin/osgcopy -%%EXAMPLESDIR%%/bin/osgcubemap -%%EXAMPLESDIR%%/bin/osgdepthshadow -%%EXAMPLESDIR%%/bin/osgdistortion -%%EXAMPLESDIR%%/bin/osgforest -%%EXAMPLESDIR%%/bin/osgfxbrowser -%%EXAMPLESDIR%%/bin/osggeodemo -%%EXAMPLESDIR%%/bin/osggeometry -%%EXAMPLESDIR%%/bin/osghangglide -%%EXAMPLESDIR%%/bin/osghud -%%EXAMPLESDIR%%/bin/osgimpostor -%%EXAMPLESDIR%%/bin/osgkeyboard -%%EXAMPLESDIR%%/bin/osgkeyboardmouse -%%EXAMPLESDIR%%/bin/osglauncher -%%EXAMPLESDIR%%/bin/osglight -%%EXAMPLESDIR%%/bin/osglightpoint -%%EXAMPLESDIR%%/bin/osglogo -%%EXAMPLESDIR%%/bin/osgmotionblur -%%EXAMPLESDIR%%/bin/osgmovie -%%EXAMPLESDIR%%/bin/osgmultitexture -%%EXAMPLESDIR%%/bin/osgoccluder -%%EXAMPLESDIR%%/bin/osgpagedlod -%%EXAMPLESDIR%%/bin/osgparticle -%%EXAMPLESDIR%%/bin/osgpick -%%EXAMPLESDIR%%/bin/osgplanets -%%EXAMPLESDIR%%/bin/osgpoints -%%EXAMPLESDIR%%/bin/osgpointsprite -%%EXAMPLESDIR%%/bin/osgprerender -%%EXAMPLESDIR%%/bin/osgprerendercubemap -%%EXAMPLESDIR%%/bin/osgreflect -%%EXAMPLESDIR%%/bin/osgscalarbar -%%EXAMPLESDIR%%/bin/osgscribe -%%EXAMPLESDIR%%/bin/osgsequence -%%EXAMPLESDIR%%/bin/osgshaders -%%EXAMPLESDIR%%/bin/osgshadowtexture -%%EXAMPLESDIR%%/bin/osgshape -%%EXAMPLESDIR%%/bin/osgsimple -%%EXAMPLESDIR%%/bin/osgsimplepager -%%EXAMPLESDIR%%/bin/osgsimplifier -%%EXAMPLESDIR%%/bin/osgspacewarp -%%EXAMPLESDIR%%/bin/osgspheresegment -%%EXAMPLESDIR%%/bin/osgspotlight -%%EXAMPLESDIR%%/bin/osgstereoimage -%%EXAMPLESDIR%%/bin/osgteapot -%%EXAMPLESDIR%%/bin/osgtesselate -%%EXAMPLESDIR%%/bin/osgtext -%%EXAMPLESDIR%%/bin/osgtexture1D -%%EXAMPLESDIR%%/bin/osgtexture2D -%%EXAMPLESDIR%%/bin/osgtexture3D -%%EXAMPLESDIR%%/bin/osgtexturerectangle -%%EXAMPLESDIR%%/bin/osgunittests %%EXAMPLESDIR%%/bin/osgversion -%%EXAMPLESDIR%%/bin/osgvertexprogram %%EXAMPLESDIR%%/bin/osgviewer -%%EXAMPLESDIR%%/bin/osgvolume -%%EXAMPLESDIR%%/bin/osgwindows %%EXAMPLESDIR%%/src/Make/makedefs %%EXAMPLESDIR%%/src/Make/makerules +%%EXAMPLESDIR%%/src/osgGLUTkeyboardmouse/GNUmakefile +%%EXAMPLESDIR%%/src/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp +%%EXAMPLESDIR%%/src/osgGLUTsimple/GNUmakefile +%%EXAMPLESDIR%%/src/osgGLUTsimple/osgGLUTsimple.cpp %%EXAMPLESDIR%%/src/osganimate/GNUmakefile %%EXAMPLESDIR%%/src/osganimate/osganimate.cpp -%%EXAMPLESDIR%%/src/osgarchive/GNUmakefile -%%EXAMPLESDIR%%/src/osgarchive/osgarchive.cpp %%EXAMPLESDIR%%/src/osgautotransform/GNUmakefile %%EXAMPLESDIR%%/src/osgautotransform/osgautotransform.cpp %%EXAMPLESDIR%%/src/osgbillboard/GNUmakefile %%EXAMPLESDIR%%/src/osgbillboard/osgbillboard.cpp +%%EXAMPLESDIR%%/src/osgblendequation/GNUmakefile +%%EXAMPLESDIR%%/src/osgblendequation/osgblendequation.cpp %%EXAMPLESDIR%%/src/osgbluemarble/GNUmakefile %%EXAMPLESDIR%%/src/osgbluemarble/osgbluemarble.cpp %%EXAMPLESDIR%%/src/osgcallback/GNUmakefile %%EXAMPLESDIR%%/src/osgcallback/osgcallback.cpp +%%EXAMPLESDIR%%/src/osgcamera/GNUmakefile +%%EXAMPLESDIR%%/src/osgcamera/osgcamera.cpp %%EXAMPLESDIR%%/src/osgcameragroup/GNUmakefile %%EXAMPLESDIR%%/src/osgcameragroup/osgcameragroup.cpp +%%EXAMPLESDIR%%/src/osgcatch/GNUmakefile +%%EXAMPLESDIR%%/src/osgcatch/osgcatch.cpp +%%EXAMPLESDIR%%/src/osgcegui/GNUmakefile +%%EXAMPLESDIR%%/src/osgcegui/osgcegui.cpp %%EXAMPLESDIR%%/src/osgclip/GNUmakefile %%EXAMPLESDIR%%/src/osgclip/osgclip.cpp %%EXAMPLESDIR%%/src/osgcluster/GNUmakefile @@ -418,20 +417,16 @@ %%EXAMPLESDIR%%/src/osgcluster/osgcluster.cpp %%EXAMPLESDIR%%/src/osgcluster/receiver.cpp %%EXAMPLESDIR%%/src/osgcluster/receiver.h -%%EXAMPLESDIR%%/src/osgconv/GNUmakefile -%%EXAMPLESDIR%%/src/osgconv/GeoSet.cpp -%%EXAMPLESDIR%%/src/osgconv/IO_GeoSet.cpp -%%EXAMPLESDIR%%/src/osgconv/OrientationConverter.cpp -%%EXAMPLESDIR%%/src/osgconv/OrientationConverter.h -%%EXAMPLESDIR%%/src/osgconv/osgconv.cpp %%EXAMPLESDIR%%/src/osgcopy/GNUmakefile %%EXAMPLESDIR%%/src/osgcopy/osgcopy.cpp %%EXAMPLESDIR%%/src/osgcubemap/GNUmakefile %%EXAMPLESDIR%%/src/osgcubemap/osgcubemap.cpp -%%EXAMPLESDIR%%/src/osgdem/GNUmakefile -%%EXAMPLESDIR%%/src/osgdem/osgdem.cpp -%%EXAMPLESDIR%%/src/osgdemeter/GNUmakefile -%%EXAMPLESDIR%%/src/osgdemeter/osgdemeter.cpp +%%EXAMPLESDIR%%/src/osgdelaunay/GNUmakefile +%%EXAMPLESDIR%%/src/osgdelaunay/osgdelaunay.cpp +%%EXAMPLESDIR%%/src/osgdepthpartition/DepthPartitionNode.cpp +%%EXAMPLESDIR%%/src/osgdepthpartition/DistanceAccumulator.cpp +%%EXAMPLESDIR%%/src/osgdepthpartition/GNUmakefile +%%EXAMPLESDIR%%/src/osgdepthpartition/osgdepthpartition.cpp %%EXAMPLESDIR%%/src/osgdepthshadow/GNUmakefile %%EXAMPLESDIR%%/src/osgdepthshadow/osgdepthshadow.cpp %%EXAMPLESDIR%%/src/osgdistortion/GNUmakefile @@ -464,6 +459,8 @@ %%EXAMPLESDIR%%/src/osgimpostor/GNUmakefile %%EXAMPLESDIR%%/src/osgimpostor/TestManipulator.cpp %%EXAMPLESDIR%%/src/osgimpostor/osgimpostor.cpp +%%EXAMPLESDIR%%/src/osgintrospection/GNUmakefile +%%EXAMPLESDIR%%/src/osgintrospection/osgintrospection.cpp %%EXAMPLESDIR%%/src/osgkeyboard/GNUmakefile %%EXAMPLESDIR%%/src/osgkeyboard/osgkeyboard.cpp %%EXAMPLESDIR%%/src/osgkeyboardmouse/GNUmakefile @@ -474,20 +471,28 @@ %%EXAMPLESDIR%%/src/osglight/osglight.cpp %%EXAMPLESDIR%%/src/osglightpoint/GNUmakefile %%EXAMPLESDIR%%/src/osglightpoint/osglightpoint.cpp +%%EXAMPLESDIR%%/src/osglogicop/GNUmakefile +%%EXAMPLESDIR%%/src/osglogicop/osglogicop.cpp %%EXAMPLESDIR%%/src/osglogo/GNUmakefile %%EXAMPLESDIR%%/src/osglogo/osglogo.cpp %%EXAMPLESDIR%%/src/osgmotionblur/GNUmakefile %%EXAMPLESDIR%%/src/osgmotionblur/osgmotionblur.cpp %%EXAMPLESDIR%%/src/osgmovie/GNUmakefile %%EXAMPLESDIR%%/src/osgmovie/osgmovie.cpp +%%EXAMPLESDIR%%/src/osgmultiplecameras/GNUmakefile +%%EXAMPLESDIR%%/src/osgmultiplecameras/osgmultiplecameras.cpp %%EXAMPLESDIR%%/src/osgmultitexture/GNUmakefile %%EXAMPLESDIR%%/src/osgmultitexture/osgmultitexture.cpp %%EXAMPLESDIR%%/src/osgoccluder/GNUmakefile %%EXAMPLESDIR%%/src/osgoccluder/osgoccluder.cpp %%EXAMPLESDIR%%/src/osgpagedlod/GNUmakefile %%EXAMPLESDIR%%/src/osgpagedlod/osgpagedlod.cpp +%%EXAMPLESDIR%%/src/osgparametric/GNUmakefile +%%EXAMPLESDIR%%/src/osgparametric/osgparametric.cpp %%EXAMPLESDIR%%/src/osgparticle/GNUmakefile %%EXAMPLESDIR%%/src/osgparticle/osgparticle.cpp +%%EXAMPLESDIR%%/src/osgparticleeffects/GNUmakefile +%%EXAMPLESDIR%%/src/osgparticleeffects/osgparticleeffects.cpp %%EXAMPLESDIR%%/src/osgphotoalbum/GNUmakefile %%EXAMPLESDIR%%/src/osgphotoalbum/ImageReaderWriter.cpp %%EXAMPLESDIR%%/src/osgphotoalbum/PhotoArchive.cpp @@ -500,6 +505,8 @@ %%EXAMPLESDIR%%/src/osgpoints/osgpoints.cpp %%EXAMPLESDIR%%/src/osgpointsprite/GNUmakefile %%EXAMPLESDIR%%/src/osgpointsprite/osgpointsprite.cpp +%%EXAMPLESDIR%%/src/osgprecipitation/GNUmakefile +%%EXAMPLESDIR%%/src/osgprecipitation/osgprecipitation.cpp %%EXAMPLESDIR%%/src/osgprerender/GNUmakefile %%EXAMPLESDIR%%/src/osgprerender/osgprerender.cpp %%EXAMPLESDIR%%/src/osgprerendercubemap/GNUmakefile @@ -516,6 +523,8 @@ %%EXAMPLESDIR%%/src/osgshaders/GNUmakefile %%EXAMPLESDIR%%/src/osgshaders/Noise.cpp %%EXAMPLESDIR%%/src/osgshaders/osgshaders.cpp +%%EXAMPLESDIR%%/src/osgshaderterrain/GNUmakefile +%%EXAMPLESDIR%%/src/osgshaderterrain/osgshaderterrain.cpp %%EXAMPLESDIR%%/src/osgshadowtexture/CreateShadowedScene.cpp %%EXAMPLESDIR%%/src/osgshadowtexture/GNUmakefile %%EXAMPLESDIR%%/src/osgshadowtexture/osgshadowtexture.cpp @@ -529,6 +538,8 @@ %%EXAMPLESDIR%%/src/osgsimplifier/osgsimplifier.cpp %%EXAMPLESDIR%%/src/osgsimulation/GNUmakefile %%EXAMPLESDIR%%/src/osgsimulation/osgsimulation.cpp +%%EXAMPLESDIR%%/src/osgslice/GNUmakefile +%%EXAMPLESDIR%%/src/osgslice/osgslice.cpp %%EXAMPLESDIR%%/src/osgspacewarp/GNUmakefile %%EXAMPLESDIR%%/src/osgspacewarp/osgspacewarp.cpp %%EXAMPLESDIR%%/src/osgspheresegment/GNUmakefile @@ -553,32 +564,33 @@ %%EXAMPLESDIR%%/src/osgtexturerectangle/osgtexturerectangle.cpp %%EXAMPLESDIR%%/src/osgunittests/GNUmakefile %%EXAMPLESDIR%%/src/osgunittests/osgunittests.cpp -%%EXAMPLESDIR%%/src/osgversion/GNUmakefile -%%EXAMPLESDIR%%/src/osgversion/osgversion.cpp +%%EXAMPLESDIR%%/src/osgunittests/performance.cpp %%EXAMPLESDIR%%/src/osgvertexprogram/GNUmakefile %%EXAMPLESDIR%%/src/osgvertexprogram/osgvertexprogram.cpp -%%EXAMPLESDIR%%/src/osgviewer/GNUmakefile -%%EXAMPLESDIR%%/src/osgviewer/osgviewer.cpp %%EXAMPLESDIR%%/src/osgvolume/GNUmakefile %%EXAMPLESDIR%%/src/osgvolume/osgvolume.cpp %%EXAMPLESDIR%%/src/osgwindows/GNUmakefile %%EXAMPLESDIR%%/src/osgwindows/osgwindows.cpp @dirrm %%EXAMPLESDIR%%/bin @dirrm %%EXAMPLESDIR%%/src/Make +@dirrm %%EXAMPLESDIR%%/src/osgGLUTkeyboardmouse +@dirrm %%EXAMPLESDIR%%/src/osgGLUTsimple @dirrm %%EXAMPLESDIR%%/src/osganimate -@dirrm %%EXAMPLESDIR%%/src/osgarchive @dirrm %%EXAMPLESDIR%%/src/osgautotransform @dirrm %%EXAMPLESDIR%%/src/osgbillboard +@dirrm %%EXAMPLESDIR%%/src/osgblendequation @dirrm %%EXAMPLESDIR%%/src/osgbluemarble @dirrm %%EXAMPLESDIR%%/src/osgcallback +@dirrm %%EXAMPLESDIR%%/src/osgcamera @dirrm %%EXAMPLESDIR%%/src/osgcameragroup +@dirrm %%EXAMPLESDIR%%/src/osgcatch +@dirrm %%EXAMPLESDIR%%/src/osgcegui @dirrm %%EXAMPLESDIR%%/src/osgclip @dirrm %%EXAMPLESDIR%%/src/osgcluster -@dirrm %%EXAMPLESDIR%%/src/osgconv @dirrm %%EXAMPLESDIR%%/src/osgcopy @dirrm %%EXAMPLESDIR%%/src/osgcubemap -@dirrm %%EXAMPLESDIR%%/src/osgdem -@dirrm %%EXAMPLESDIR%%/src/osgdemeter +@dirrm %%EXAMPLESDIR%%/src/osgdelaunay +@dirrm %%EXAMPLESDIR%%/src/osgdepthpartition @dirrm %%EXAMPLESDIR%%/src/osgdepthshadow @dirrm %%EXAMPLESDIR%%/src/osgdistortion @dirrm %%EXAMPLESDIR%%/src/osgforest @@ -588,24 +600,29 @@ @dirrm %%EXAMPLESDIR%%/src/osghangglide @dirrm %%EXAMPLESDIR%%/src/osghud @dirrm %%EXAMPLESDIR%%/src/osgimpostor +@dirrm %%EXAMPLESDIR%%/src/osgintrospection @dirrm %%EXAMPLESDIR%%/src/osgkeyboard @dirrm %%EXAMPLESDIR%%/src/osgkeyboardmouse @dirrm %%EXAMPLESDIR%%/src/osglauncher @dirrm %%EXAMPLESDIR%%/src/osglight @dirrm %%EXAMPLESDIR%%/src/osglightpoint +@dirrm %%EXAMPLESDIR%%/src/osglogicop @dirrm %%EXAMPLESDIR%%/src/osglogo @dirrm %%EXAMPLESDIR%%/src/osgmotionblur @dirrm %%EXAMPLESDIR%%/src/osgmovie +@dirrm %%EXAMPLESDIR%%/src/osgmultiplecameras @dirrm %%EXAMPLESDIR%%/src/osgmultitexture @dirrm %%EXAMPLESDIR%%/src/osgoccluder @dirrm %%EXAMPLESDIR%%/src/osgpagedlod +@dirrm %%EXAMPLESDIR%%/src/osgparametric @dirrm %%EXAMPLESDIR%%/src/osgparticle -@dirrm %%EXAMPLESDIR%%/src/osgpbuffer +@dirrm %%EXAMPLESDIR%%/src/osgparticleeffects @dirrm %%EXAMPLESDIR%%/src/osgphotoalbum @dirrm %%EXAMPLESDIR%%/src/osgpick @dirrm %%EXAMPLESDIR%%/src/osgplanets @dirrm %%EXAMPLESDIR%%/src/osgpoints @dirrm %%EXAMPLESDIR%%/src/osgpointsprite +@dirrm %%EXAMPLESDIR%%/src/osgprecipitation @dirrm %%EXAMPLESDIR%%/src/osgprerender @dirrm %%EXAMPLESDIR%%/src/osgprerendercubemap @dirrm %%EXAMPLESDIR%%/src/osgreflect @@ -613,12 +630,14 @@ @dirrm %%EXAMPLESDIR%%/src/osgscribe @dirrm %%EXAMPLESDIR%%/src/osgsequence @dirrm %%EXAMPLESDIR%%/src/osgshaders +@dirrm %%EXAMPLESDIR%%/src/osgshaderterrain @dirrm %%EXAMPLESDIR%%/src/osgshadowtexture @dirrm %%EXAMPLESDIR%%/src/osgshape @dirrm %%EXAMPLESDIR%%/src/osgsimple @dirrm %%EXAMPLESDIR%%/src/osgsimplepager @dirrm %%EXAMPLESDIR%%/src/osgsimplifier @dirrm %%EXAMPLESDIR%%/src/osgsimulation +@dirrm %%EXAMPLESDIR%%/src/osgslice @dirrm %%EXAMPLESDIR%%/src/osgspacewarp @dirrm %%EXAMPLESDIR%%/src/osgspheresegment @dirrm %%EXAMPLESDIR%%/src/osgspotlight @@ -631,10 +650,20 @@ @dirrm %%EXAMPLESDIR%%/src/osgtexture3D @dirrm %%EXAMPLESDIR%%/src/osgtexturerectangle @dirrm %%EXAMPLESDIR%%/src/osgunittests -@dirrm %%EXAMPLESDIR%%/src/osgversion @dirrm %%EXAMPLESDIR%%/src/osgvertexprogram -@dirrm %%EXAMPLESDIR%%/src/osgviewer @dirrm %%EXAMPLESDIR%%/src/osgvolume @dirrm %%EXAMPLESDIR%%/src/osgwindows @dirrm %%EXAMPLESDIR%%/src @dirrm %%EXAMPLESDIR%% +@dirrm lib/osgPlugins +@dirrm include/osg +@dirrm include/osgDB +@dirrm include/osgFX +@dirrm include/osgGA +@dirrm include/osgIntrospection +@dirrm include/osgParticle +@dirrm include/osgProducer +@dirrm include/osgSim +@dirrm include/osgTerrain +@dirrm include/osgText +@dirrm include/osgUtil >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061121222321.074042E>