git: 186ece74371a - main - graphics/osgearth: Update to 3.2

From: Loïc Bartoletti <lbartoletti_at_FreeBSD.org>
Date: Tue, 29 Mar 2022 16:14:48 UTC
The branch main has been updated by lbartoletti:

URL: https://cgit.FreeBSD.org/ports/commit/?id=186ece74371ad0b3fa025bbc282d58aa662696ce

commit 186ece74371ad0b3fa025bbc282d58aa662696ce
Author:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2022-03-29 16:11:40 +0000
Commit:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2022-03-29 16:14:43 +0000

    graphics/osgearth: Update to 3.2
    
    - remove patchs, fixed upstream
    - remove rocksdb LIB_DEPENDS
    
    Release notes:
      - https://docs.osgearth.org/en/3.2/releasenotes.html
    
    PR:             262405
    Reported by:    sunpoet
---
 graphics/osgearth/Makefile                         |   8 +-
 graphics/osgearth/distinfo                         |   6 +-
 .../files/patch-src-osgEarthSymbology-GEOS.cpp     |  70 ---
 .../patch-src_osgEarthDrivers_fastdxt_libdxt.cpp   |  18 -
 .../files/patch-src_osgEarthDrivers_fastdxt_util.h |  11 -
 graphics/osgearth/pkg-plist                        | 582 +++++++++------------
 6 files changed, 249 insertions(+), 446 deletions(-)

diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 2123b3bc089e..57685ebabadc 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -1,9 +1,8 @@
 # Created by: lbartoletti <lbartoletti@FreeBSD.org>
 
 PORTNAME=	osgearth
-PORTVERSION=	2.10.1
+PORTVERSION=	3.2
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	13
 CATEGORIES=	graphics geography
 
 MAINTAINER=	lbartoletti@FreeBSD.org
@@ -12,14 +11,13 @@ COMMENT=	C++ terrain rendering toolkit for OpenSceneGraph
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libosg.so:graphics/osg34 \
+LIB_DEPENDS=	libosg.so:graphics/osg \
 		libgdal.so:graphics/gdal \
 		libcurl.so:ftp/curl \
 		libgeos.so:graphics/geos \
 		libleveldb.so:databases/leveldb \
 		libPocoUtil.so:devel/poco \
-		libprotoc.so:devel/protobuf \
-		librocksdb.so:databases/rocksdb
+		libprotoc.so:devel/protobuf
 
 USES=		cmake gl pkgconfig sqlite
 
diff --git a/graphics/osgearth/distinfo b/graphics/osgearth/distinfo
index 572fc3753660..52485837ad55 100644
--- a/graphics/osgearth/distinfo
+++ b/graphics/osgearth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556665448
-SHA256 (gwaldron-osgearth-osgearth-2.10.1_GH0.tar.gz) = aec8e2d86e700c45aac5e12d352ab7e4011b40c34533c998da7abe18d297af4f
-SIZE (gwaldron-osgearth-osgearth-2.10.1_GH0.tar.gz) = 90448456
+TIMESTAMP = 1648530145
+SHA256 (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 7e1dd643b1f3b8d1ba9561b899c18176af988342b86c42d89a70be924cb747f6
+SIZE (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 121772329
diff --git a/graphics/osgearth/files/patch-src-osgEarthSymbology-GEOS.cpp b/graphics/osgearth/files/patch-src-osgEarthSymbology-GEOS.cpp
deleted file mode 100644
index 90d36828da70..000000000000
--- a/graphics/osgearth/files/patch-src-osgEarthSymbology-GEOS.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-Obtained from:	https://git.slackbuilds.org/slackbuilds/tree/gis/osgEarth/geos-3_8-support.patch
-
---- src/osgEarthSymbology/GEOS.cpp.orig	2019-04-19 16:45:18 UTC
-+++ src/osgEarthSymbology/GEOS.cpp
-@@ -49,7 +49,7 @@ using namespace geos::operation;
- 
- namespace
- {
--    geom::CoordinateSequence*
-+    std::unique_ptr<geom::CoordinateSequence>
-     vec3dArray2CoordSeq( const Symbology::Geometry* input, bool close, const geom::CoordinateSequenceFactory* factory )
-     {   
-         bool needToClose = close && input->size() > 2 && input->front() != input->back();
-@@ -64,7 +64,7 @@ namespace
-         {
-             coords->push_back( coords->front() );
-         }
--        geom::CoordinateSequence* seq = factory->create( coords );
-+	std::unique_ptr<geom::CoordinateSequence> seq = factory->create( coords );
- 
-         return seq;
-     }
-@@ -108,7 +108,8 @@ namespace
-         else
-         {
-             // any other type will at least contain points:
--            geom::CoordinateSequence* seq = 0L;
-+	    std::unique_ptr<geom::CoordinateSequence> seq = 0L;
-+
-             try
-             {
-                 switch( input->getType() )
-@@ -119,24 +120,24 @@ namespace
- 
-                 case Symbology::Geometry::TYPE_POINTSET:
-                     seq = vec3dArray2CoordSeq( input, false, f->getCoordinateSequenceFactory() );
--                    if ( seq ) output = f->createPoint( seq );
-+                    if ( seq ) output = f->createPoint( *seq );
-                     break;
- 
-                 case Symbology::Geometry::TYPE_LINESTRING:
-                     seq = vec3dArray2CoordSeq( input, false, f->getCoordinateSequenceFactory() );
--                    if ( seq ) output = f->createLineString( seq );
-+                    if ( seq ) output = f->createLineString( *seq );
-                     break;
- 
-                 case Symbology::Geometry::TYPE_RING:
-                     seq = vec3dArray2CoordSeq( input, true, f->getCoordinateSequenceFactory() );
--                    if ( seq ) output = f->createLinearRing( seq );
-+                    if ( seq ) output = f->createLinearRing( *seq );
-                     break;
- 
-                 case Symbology::Geometry::TYPE_POLYGON:
-                     seq = vec3dArray2CoordSeq( input, true, f->getCoordinateSequenceFactory() );
-                     geom::LinearRing* shell = 0L;
-                     if ( seq )
--                        shell = f->createLinearRing( seq );
-+                        shell = f->createLinearRing( *seq );
- 
-                     if ( shell )
-                     {
-@@ -155,7 +156,7 @@ namespace
-                                 holes = 0L;
-                             }
-                         }
--                        output = f->createPolygon( shell, holes );
-+                        output = f->createPolygon( shell, (std::vector<geom::LinearRing * >*)holes );
-                     }
-                 
-                     break;
diff --git a/graphics/osgearth/files/patch-src_osgEarthDrivers_fastdxt_libdxt.cpp b/graphics/osgearth/files/patch-src_osgEarthDrivers_fastdxt_libdxt.cpp
deleted file mode 100644
index ea978ceb7e0b..000000000000
--- a/graphics/osgearth/files/patch-src_osgEarthDrivers_fastdxt_libdxt.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/osgEarthDrivers/fastdxt/libdxt.cpp.orig	2018-11-12 18:17:36 UTC
-+++ src/osgEarthDrivers/fastdxt/libdxt.cpp
-@@ -24,7 +24,7 @@
- 
- #include "libdxt.h"
- 
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || (__FreeBSD__)
- #define memalign(x,y) malloc((y))
- #else
- #include <malloc.h>
-@@ -92,4 +92,4 @@ int CompressDXT(const byte *in, byte *ou
-   // Join all the threads
-   nbbytes = job.nbb;
-   return nbbytes;
--}
-\ No newline at end of file
-+}
diff --git a/graphics/osgearth/files/patch-src_osgEarthDrivers_fastdxt_util.h b/graphics/osgearth/files/patch-src_osgEarthDrivers_fastdxt_util.h
deleted file mode 100644
index 4c51babc9b43..000000000000
--- a/graphics/osgearth/files/patch-src_osgEarthDrivers_fastdxt_util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osgEarthDrivers/fastdxt/util.h.orig	2018-11-18 08:00:00 UTC
-+++ src/osgEarthDrivers/fastdxt/util.h
-@@ -64,7 +64,7 @@ void aFree(void* const p);
- float drand48(void);
- #endif
- 
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- #define memalign(x,y) malloc((y))
- #else
- #include <malloc.h>
diff --git a/graphics/osgearth/pkg-plist b/graphics/osgearth/pkg-plist
index 266e02666c6d..26841690225c 100644
--- a/graphics/osgearth/pkg-plist
+++ b/graphics/osgearth/pkg-plist
@@ -2,29 +2,27 @@ bin/osgEarth_tests
 bin/osgearth_3pv
 bin/osgearth_annotation
 bin/osgearth_atlas
+bin/osgearth_bindless
 bin/osgearth_boundarygen
-bin/osgearth_cache
 bin/osgearth_city
+bin/osgearth_clamp
 bin/osgearth_cluster
-bin/osgearth_colorfilter
 bin/osgearth_computerangecallback
 bin/osgearth_controls
 bin/osgearth_conv
-bin/osgearth_datetime
+bin/osgearth_createtile
+bin/osgearth_decal
 bin/osgearth_drawables
 bin/osgearth_eci
 bin/osgearth_elevation
 bin/osgearth_ephemeris
 bin/osgearth_featurefilter
-bin/osgearth_featureinfo
 bin/osgearth_featurequery
 bin/osgearth_features
 bin/osgearth_geodetic_graticule
 bin/osgearth_graticule
+bin/osgearth_heatmap
 bin/osgearth_horizon
-bin/osgearth_htm
-bin/osgearth_http
-bin/osgearth_imageoverlay
 bin/osgearth_infinitescroll
 bin/osgearth_lights
 bin/osgearth_los
@@ -34,23 +32,16 @@ bin/osgearth_map
 bin/osgearth_measure
 bin/osgearth_minimap
 bin/osgearth_mrt
-bin/osgearth_noisegen
+bin/osgearth_mvtindex
 bin/osgearth_occlusionculling
 bin/osgearth_overlayviewer
-bin/osgearth_package
-bin/osgearth_pick
 bin/osgearth_scenegraphcallbacks
 bin/osgearth_sequencecontrol
-bin/osgearth_server
 bin/osgearth_shadercomp
 bin/osgearth_shadergen
 bin/osgearth_skyview
-bin/osgearth_splat
-bin/osgearth_srstest
 bin/osgearth_terrainprofile
 bin/osgearth_tfs
-bin/osgearth_tileindex
-bin/osgearth_tilesource
 bin/osgearth_toc
 bin/osgearth_tracks
 bin/osgearth_transform
@@ -58,209 +49,357 @@ bin/osgearth_version
 bin/osgearth_video
 bin/osgearth_viewer
 bin/osgearth_wfs
-bin/osgearth_windows
-include/osgEarth/Async
+include/osgEarth/AGG.h
+include/osgEarth/ActivityMonitorTool
+include/osgEarth/AltitudeFilter
+include/osgEarth/AltitudeSymbol
+include/osgEarth/AnnotationData
+include/osgEarth/AnnotationLayer
+include/osgEarth/AnnotationNode
+include/osgEarth/AnnotationRegistry
+include/osgEarth/AnnotationSettings
+include/osgEarth/AnnotationUtils
+include/osgEarth/ArcGISServer
+include/osgEarth/ArcGISTilePackage
+include/osgEarth/AtlasBuilder
+include/osgEarth/AttributesFilter
+include/osgEarth/AutoClipPlaneHandler
+include/osgEarth/AutoScaleCallback
+include/osgEarth/BBoxSymbol
+include/osgEarth/BboxDrawable
+include/osgEarth/BillboardResource
+include/osgEarth/BillboardSymbol
+include/osgEarth/Bing
 include/osgEarth/Bounds
+include/osgEarth/BufferFilter
+include/osgEarth/BuildConfig.h
+include/osgEarth/BuildGeometryFilter
+include/osgEarth/BuildTextFilter
 include/osgEarth/Cache
 include/osgEarth/CacheBin
 include/osgEarth/CacheEstimator
 include/osgEarth/CachePolicy
 include/osgEarth/CacheSeed
+include/osgEarth/Callouts
+include/osgEarth/CameraUtils
 include/osgEarth/Capabilities
 include/osgEarth/CascadeDrapingDecorator
+include/osgEarth/CentroidFilter
+include/osgEarth/CesiumIon
+include/osgEarth/CircleNode
+include/osgEarth/ClampCallback
 include/osgEarth/ClampableNode
 include/osgEarth/Clamping
 include/osgEarth/ClampingTechnique
+include/osgEarth/ClipSpace
+include/osgEarth/ClusterNode
+include/osgEarth/Color
 include/osgEarth/ColorFilter
 include/osgEarth/Common
-include/osgEarth/CompositeTileSource
+include/osgEarth/Composite
 include/osgEarth/Config
 include/osgEarth/Containers
+include/osgEarth/ContourMap
+include/osgEarth/Controls
+include/osgEarth/ConvertTypeFilter
+include/osgEarth/CoverageSymbol
+include/osgEarth/CropFilter
+include/osgEarth/CssUtils
 include/osgEarth/Cube
 include/osgEarth/CullingUtils
 include/osgEarth/DateTime
 include/osgEarth/DateTimeRange
+include/osgEarth/DebugImageLayer
+include/osgEarth/DecalLayer
 include/osgEarth/DepthOffset
+include/osgEarth/Draggers
 include/osgEarth/DrapeableNode
 include/osgEarth/DrapingCullSet
 include/osgEarth/DrapingTechnique
 include/osgEarth/DrawInstanced
 include/osgEarth/ECEF
+include/osgEarth/EarthManipulator
+include/osgEarth/Elevation
 include/osgEarth/ElevationLOD
 include/osgEarth/ElevationLayer
 include/osgEarth/ElevationPool
 include/osgEarth/ElevationQuery
+include/osgEarth/ElevationRanges
+include/osgEarth/EllipseNode
+include/osgEarth/Ellipsoid
 include/osgEarth/EllipsoidIntersector
 include/osgEarth/Endian
+include/osgEarth/Ephemeris
+include/osgEarth/ExampleResources
 include/osgEarth/Export
+include/osgEarth/Expression
 include/osgEarth/Extension
+include/osgEarth/ExtrudeGeometryFilter
+include/osgEarth/ExtrusionSymbol
 include/osgEarth/FadeEffect
+include/osgEarth/Feature
+include/osgEarth/FeatureCursor
+include/osgEarth/FeatureDisplayLayout
+include/osgEarth/FeatureElevationLayer
+include/osgEarth/FeatureImageLayer
+include/osgEarth/FeatureIndex
+include/osgEarth/FeatureModelGraph
+include/osgEarth/FeatureModelLayer
+include/osgEarth/FeatureModelSource
+include/osgEarth/FeatureNode
+include/osgEarth/FeatureRasterizer
+include/osgEarth/FeatureSDFLayer
+include/osgEarth/FeatureSource
+include/osgEarth/FeatureSourceIndexNode
+include/osgEarth/FileGDBFeatureSource
 include/osgEarth/FileUtils
+include/osgEarth/Fill
+include/osgEarth/Filter
+include/osgEarth/FilterContext
+include/osgEarth/FlatteningLayer
+include/osgEarth/Formatter
+include/osgEarth/FractalElevationLayer
+include/osgEarth/FrameClock
+include/osgEarth/GARSGraticule
+include/osgEarth/GDAL
+include/osgEarth/GDALDEM
+include/osgEarth/GEOS
 include/osgEarth/GLSLChunker
 include/osgEarth/GLUtils
 include/osgEarth/GeoCommon
 include/osgEarth/GeoData
 include/osgEarth/GeoMath
+include/osgEarth/GeoPositionNode
+include/osgEarth/GeoPositionNodeAutoScaler
 include/osgEarth/GeoTransform
+include/osgEarth/GeodeticGraticule
+include/osgEarth/GeodeticLabelingEngine
 include/osgEarth/Geoid
+include/osgEarth/Geometry
 include/osgEarth/GeometryClamper
+include/osgEarth/GeometryCompiler
+include/osgEarth/GeometryFactory
+include/osgEarth/GeometryRasterizer
+include/osgEarth/GeometryUtils
+include/osgEarth/GraticuleLabelingEngine
+include/osgEarth/HTM
 include/osgEarth/HTTPClient
 include/osgEarth/HeightFieldUtils
 include/osgEarth/Horizon
 include/osgEarth/HorizonClipPlane
 include/osgEarth/IOTypes
+include/osgEarth/IconResource
+include/osgEarth/IconSymbol
 include/osgEarth/ImageLayer
 include/osgEarth/ImageMosaic
+include/osgEarth/ImageOverlay
+include/osgEarth/ImageOverlayEditor
+include/osgEarth/ImageToFeatureLayer
 include/osgEarth/ImageToHeightFieldConverter
 include/osgEarth/ImageUtils
+include/osgEarth/InstanceBuilder
+include/osgEarth/InstanceCloud
+include/osgEarth/InstanceCloud.cpp
+include/osgEarth/InstanceResource
+include/osgEarth/InstanceSymbol
 include/osgEarth/IntersectionPicker
+include/osgEarth/JoinPointsLinesFilter
 include/osgEarth/JsonUtils
+include/osgEarth/LabelNode
 include/osgEarth/LandCover
 include/osgEarth/LandCoverLayer
+include/osgEarth/LatLongFormatter
 include/osgEarth/Layer
-include/osgEarth/LayerListener
+include/osgEarth/LayerReference
 include/osgEarth/LayerShader
 include/osgEarth/Lighting
 include/osgEarth/LineDrawable
 include/osgEarth/LineFunctor
+include/osgEarth/LineOfSight
+include/osgEarth/LineSymbol
+include/osgEarth/LinearLineOfSight
+include/osgEarth/LoadableNode
+include/osgEarth/LocalGeometryNode
 include/osgEarth/LocalTangentPlane
 include/osgEarth/Locators
+include/osgEarth/LogarithmicDepthBuffer
+include/osgEarth/MBTiles
+include/osgEarth/MGRSFormatter
+include/osgEarth/MGRSGraticule
+include/osgEarth/MVT
 include/osgEarth/Map
 include/osgEarth/MapCallback
-include/osgEarth/MapFrame
 include/osgEarth/MapInfo
 include/osgEarth/MapModelChange
 include/osgEarth/MapNode
 include/osgEarth/MapNodeObserver
-include/osgEarth/MapNodeOptions
-include/osgEarth/MapOptions
-include/osgEarth/MaskLayer
-include/osgEarth/MaskSource
+include/osgEarth/MapboxGLImageLayer
+include/osgEarth/Math
+include/osgEarth/MeasureTool
 include/osgEarth/MemCache
 include/osgEarth/Memory
+include/osgEarth/MeshConsolidator
+include/osgEarth/MeshFlattener
+include/osgEarth/MeshSubdivider
 include/osgEarth/MetaTile
 include/osgEarth/Metrics
 include/osgEarth/ModelLayer
+include/osgEarth/ModelNode
+include/osgEarth/ModelResource
 include/osgEarth/ModelSource
+include/osgEarth/ModelSymbol
+include/osgEarth/MouseCoordsTool
 include/osgEarth/NativeProgramAdapter
+include/osgEarth/NetworkMonitor
 include/osgEarth/NodeUtils
 include/osgEarth/Notify
+include/osgEarth/OGRFeatureSource
+include/osgEarth/ObjectIDPicker
 include/osgEarth/ObjectIndex
+include/osgEarth/OgrUtils
 include/osgEarth/OverlayDecorator
 include/osgEarth/PagedNode
 include/osgEarth/PatchLayer
 include/osgEarth/PhongLightingEffect
 include/osgEarth/Picker
+include/osgEarth/PlaceNode
 include/osgEarth/PluginLoader
 include/osgEarth/PointDrawable
+include/osgEarth/PointSymbol
+include/osgEarth/PolygonSymbol
+include/osgEarth/PolygonizeLines
+include/osgEarth/PowerlineLayer
 include/osgEarth/PrimitiveIntersector
 include/osgEarth/Profile
 include/osgEarth/Progress
+include/osgEarth/Query
+include/osgEarth/RTTPicker
+include/osgEarth/RadialLineOfSight
 include/osgEarth/Random
+include/osgEarth/RectangleNode
+include/osgEarth/RefinePolicy
 include/osgEarth/Registry
+include/osgEarth/RenderSymbol
+include/osgEarth/ResampleFilter
+include/osgEarth/Resource
+include/osgEarth/ResourceCache
+include/osgEarth/ResourceLibrary
 include/osgEarth/ResourceReleaser
 include/osgEarth/Revisioning
+include/osgEarth/SDF
+include/osgEarth/ScaleFilter
+include/osgEarth/ScatterFilter
 include/osgEarth/SceneGraphCallback
 include/osgEarth/ScreenSpaceLayout
+include/osgEarth/ScreenSpaceLayoutCallout
+include/osgEarth/ScreenSpaceLayoutDeclutter
+include/osgEarth/ScreenSpaceLayoutImpl
+include/osgEarth/Script
+include/osgEarth/ScriptEngine
+include/osgEarth/ScriptFilter
+include/osgEarth/SelectExtentTool
+include/osgEarth/Session
 include/osgEarth/ShaderFactory
 include/osgEarth/ShaderGenerator
+include/osgEarth/ShaderLayer
 include/osgEarth/ShaderLoader
 include/osgEarth/ShaderMerger
 include/osgEarth/ShaderUtils
 include/osgEarth/Shaders
 include/osgEarth/Shadowing
+include/osgEarth/SimpleOceanLayer
+include/osgEarth/SimplePager
 include/osgEarth/SimplexNoise
+include/osgEarth/Skins
+include/osgEarth/Sky
+include/osgEarth/SkyView
 include/osgEarth/SpatialReference
+include/osgEarth/StarData
 include/osgEarth/StateSetCache
+include/osgEarth/StateTransition
 include/osgEarth/Status
 include/osgEarth/StringUtils
-include/osgEarth/TaskService
+include/osgEarth/Stroke
+include/osgEarth/Style
+include/osgEarth/StyleSelector
+include/osgEarth/StyleSheet
+include/osgEarth/SubstituteModelFilter
+include/osgEarth/Symbol
+include/osgEarth/TDTiles
+include/osgEarth/TFS
+include/osgEarth/TFSPackager
+include/osgEarth/TMS
+include/osgEarth/TMSBackFiller
+include/osgEarth/Tags
 include/osgEarth/Terrain
+include/osgEarth/TerrainConstraintLayer
 include/osgEarth/TerrainEffect
 include/osgEarth/TerrainEngineNode
 include/osgEarth/TerrainEngineRequirements
 include/osgEarth/TerrainLayer
 include/osgEarth/TerrainOptions
+include/osgEarth/TerrainProfile
 include/osgEarth/TerrainResources
 include/osgEarth/TerrainTileModel
 include/osgEarth/TerrainTileModelFactory
 include/osgEarth/TerrainTileNode
+include/osgEarth/TessellateOperator
 include/osgEarth/Tessellator
 include/osgEarth/Text
-include/osgEarth/ThreadingUtils
+include/osgEarth/TextSymbol
+include/osgEarth/TextSymbolizer
+include/osgEarth/TextureArena
+include/osgEarth/TextureArena.cpp
+include/osgEarth/TextureBuffer
+include/osgEarth/Threading
+include/osgEarth/ThreeDTilesLayer
+include/osgEarth/TileCache
 include/osgEarth/TileHandler
+include/osgEarth/TileIndex
+include/osgEarth/TileIndexBuilder
 include/osgEarth/TileKey
+include/osgEarth/TileLayer
 include/osgEarth/TileRasterizer
 include/osgEarth/TileSource
+include/osgEarth/TileSourceElevationLayer
+include/osgEarth/TileSourceImageLayer
 include/osgEarth/TileVisitor
+include/osgEarth/TiledFeatureModelGraph
+include/osgEarth/TiledFeatureModelLayer
 include/osgEarth/TimeControl
-include/osgEarth/TraversalData
+include/osgEarth/TopologyGraph
+include/osgEarth/TrackNode
+include/osgEarth/TransformFilter
 include/osgEarth/URI
+include/osgEarth/UTMGraticule
+include/osgEarth/UTMLabelingEngine
 include/osgEarth/Units
 include/osgEarth/Utils
 include/osgEarth/Version
 include/osgEarth/VerticalDatum
 include/osgEarth/VideoLayer
+include/osgEarth/ViewFitter
 include/osgEarth/Viewpoint
 include/osgEarth/VirtualProgram
 include/osgEarth/VisibleLayer
+include/osgEarth/WFS
+include/osgEarth/WMS
+include/osgEarth/WindLayer
+include/osgEarth/WingedEdgeMesh
+include/osgEarth/WireLines
+include/osgEarth/XYZ
+include/osgEarth/XYZFeatureSource
 include/osgEarth/XmlUtils
 include/osgEarth/optional
+include/osgEarth/rtree.h
 include/osgEarth/tinystr.h
 include/osgEarth/tinyxml.h
-include/osgEarthAnnotation/AnnotationData
-include/osgEarthAnnotation/AnnotationEditing
-include/osgEarthAnnotation/AnnotationLayer
-include/osgEarthAnnotation/AnnotationNode
-include/osgEarthAnnotation/AnnotationRegistry
-include/osgEarthAnnotation/AnnotationSettings
-include/osgEarthAnnotation/AnnotationUtils
-include/osgEarthAnnotation/BboxDrawable
-include/osgEarthAnnotation/CircleNode
-include/osgEarthAnnotation/Common
-include/osgEarthAnnotation/Draggers
-include/osgEarthAnnotation/EllipseNode
-include/osgEarthAnnotation/Export
-include/osgEarthAnnotation/FeatureEditing
-include/osgEarthAnnotation/FeatureNode
-include/osgEarthAnnotation/GeoPositionNode
-include/osgEarthAnnotation/GeoPositionNodeAutoScaler
-include/osgEarthAnnotation/ImageOverlay
-include/osgEarthAnnotation/ImageOverlayEditor
-include/osgEarthAnnotation/LabelNode
-include/osgEarthAnnotation/LocalGeometryNode
-include/osgEarthAnnotation/ModelNode
-include/osgEarthAnnotation/PlaceNode
-include/osgEarthAnnotation/RectangleNode
-include/osgEarthAnnotation/TrackNode
-include/osgEarthDrivers/agglite/AGGLiteOptions
-include/osgEarthDrivers/arcgis/ArcGISOptions
-include/osgEarthDrivers/bing/BingOptions
+include/osgEarth/vector_tile.pb.h
+include/osgEarth/weemesh.h
 include/osgEarthDrivers/cache_filesystem/FileSystemCache
-include/osgEarthDrivers/cache_leveldb/LevelDBCacheOptions
-include/osgEarthDrivers/cache_rocksdb/RocksDBCacheOptions
-include/osgEarthDrivers/cesiumion/CesiumIonOptions
 include/osgEarthDrivers/colorramp/ColorRampOptions
-include/osgEarthDrivers/debug/DebugOptions
-include/osgEarthDrivers/engine_mp/Common
-include/osgEarthDrivers/engine_mp/DynamicLODScaleCallback
-include/osgEarthDrivers/engine_mp/FileLocationCallback
-include/osgEarthDrivers/engine_mp/HeightFieldCache
-include/osgEarthDrivers/engine_mp/KeyNodeFactory
-include/osgEarthDrivers/engine_mp/MPGeometry
-include/osgEarthDrivers/engine_mp/MPShaders
-include/osgEarthDrivers/engine_mp/MPTerrainEngineNode
-include/osgEarthDrivers/engine_mp/MPTerrainEngineOptions
-include/osgEarthDrivers/engine_mp/SingleKeyNodeFactory
-include/osgEarthDrivers/engine_mp/TerrainNode
-include/osgEarthDrivers/engine_mp/TileGroup
-include/osgEarthDrivers/engine_mp/TileModel
-include/osgEarthDrivers/engine_mp/TileModelCompiler
-include/osgEarthDrivers/engine_mp/TileModelFactory
-include/osgEarthDrivers/engine_mp/TileNode
-include/osgEarthDrivers/engine_mp/TileNodeRegistry
-include/osgEarthDrivers/engine_mp/TilePagedLOD
 include/osgEarthDrivers/engine_rex/Common
+include/osgEarthDrivers/engine_rex/CreateTileImplementation
 include/osgEarthDrivers/engine_rex/DrawState
 include/osgEarthDrivers/engine_rex/DrawTileCommand
 include/osgEarthDrivers/engine_rex/EngineContext
@@ -268,10 +407,9 @@ include/osgEarthDrivers/engine_rex/GeometryPool
 include/osgEarthDrivers/engine_rex/LayerDrawable
 include/osgEarthDrivers/engine_rex/LoadTileData
 include/osgEarthDrivers/engine_rex/Loader
-include/osgEarthDrivers/engine_rex/MaskGenerator
+include/osgEarthDrivers/engine_rex/MeshEditor
 include/osgEarthDrivers/engine_rex/RenderBindings
 include/osgEarthDrivers/engine_rex/RexTerrainEngineNode
-include/osgEarthDrivers/engine_rex/RexTerrainEngineOptions
 include/osgEarthDrivers/engine_rex/SelectionInfo
 include/osgEarthDrivers/engine_rex/Shaders
 include/osgEarthDrivers/engine_rex/SurfaceNode
@@ -282,274 +420,40 @@ include/osgEarthDrivers/engine_rex/TileNode
 include/osgEarthDrivers/engine_rex/TileNodeRegistry
 include/osgEarthDrivers/engine_rex/TileRenderModel
 include/osgEarthDrivers/engine_rex/Unloader
-include/osgEarthDrivers/feature_elevation/FeatureElevationOptions
-include/osgEarthDrivers/feature_mapnikvectortiles/MVTFeatureOptions
-include/osgEarthDrivers/feature_ogr/FeatureCursorOGR
-include/osgEarthDrivers/feature_ogr/OGRFeatureOptions
-include/osgEarthDrivers/feature_tfs/TFSFeatureOptions
-include/osgEarthDrivers/feature_wfs/WFSFeatureOptions
-include/osgEarthDrivers/feature_xyz/XYZFeatureOptions
 include/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilterOptions
 include/osgEarthDrivers/featurefilter_join/JoinFeatureFilterOptions
-include/osgEarthDrivers/gdal/GDALOptions
 include/osgEarthDrivers/kml/KML
 include/osgEarthDrivers/kml/KMLOptions
-include/osgEarthDrivers/mask_feature/FeatureMaskOptions
-include/osgEarthDrivers/mbtiles/MBTilesOptions
-include/osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions
-include/osgEarthDrivers/model_simple/SimpleModelOptions
-include/osgEarthDrivers/osg/OSGOptions
 include/osgEarthDrivers/scriptengine_javascript/DuktapeEngine
 include/osgEarthDrivers/scriptengine_javascript/JSGeometry
 include/osgEarthDrivers/scriptengine_javascript/duk_config.h
 include/osgEarthDrivers/scriptengine_javascript/duktape.h
 include/osgEarthDrivers/sky_gl/GLSkyOptions
 include/osgEarthDrivers/sky_simple/SimpleSkyOptions
-include/osgEarthDrivers/skyview/SkyViewOptions
-include/osgEarthDrivers/tilecache/TileCacheOptions
-include/osgEarthDrivers/tileindex/TileIndexOptions
-include/osgEarthDrivers/tilepackage/TilePackageOptions
-include/osgEarthDrivers/tms/TMSOptions
-include/osgEarthDrivers/vpb/VPBOptions
-include/osgEarthDrivers/wcs/WCSOptions
-include/osgEarthDrivers/wms/TileService
-include/osgEarthDrivers/wms/WMSOptions
-include/osgEarthDrivers/xyz/XYZOptions
-include/osgEarthFeatures/AltitudeFilter
-include/osgEarthFeatures/BufferFilter
-include/osgEarthFeatures/BuildGeometryFilter
-include/osgEarthFeatures/BuildTextFilter
-include/osgEarthFeatures/CentroidFilter
-include/osgEarthFeatures/Common
-include/osgEarthFeatures/ConvertTypeFilter
-include/osgEarthFeatures/CropFilter
-include/osgEarthFeatures/ExtrudeGeometryFilter
-include/osgEarthFeatures/Feature
-include/osgEarthFeatures/FeatureCursor
-include/osgEarthFeatures/FeatureDisplayLayout
-include/osgEarthFeatures/FeatureIndex
-include/osgEarthFeatures/FeatureListSource
-include/osgEarthFeatures/FeatureMaskLayer
-include/osgEarthFeatures/FeatureModelGraph
-include/osgEarthFeatures/FeatureModelLayer
-include/osgEarthFeatures/FeatureModelSource
-include/osgEarthFeatures/FeatureSource
-include/osgEarthFeatures/FeatureSourceIndexNode
-include/osgEarthFeatures/FeatureSourceLayer
-include/osgEarthFeatures/FeatureTileSource
-include/osgEarthFeatures/Filter
-include/osgEarthFeatures/FilterContext
-include/osgEarthFeatures/GeometryCompiler
-include/osgEarthFeatures/GeometryUtils
-include/osgEarthFeatures/ImageToFeatureLayer
-include/osgEarthFeatures/LabelSource
-include/osgEarthFeatures/MVT
-include/osgEarthFeatures/OgrUtils
-include/osgEarthFeatures/PolygonizeLines
-include/osgEarthFeatures/ResampleFilter
-include/osgEarthFeatures/ScaleFilter
-include/osgEarthFeatures/ScatterFilter
-include/osgEarthFeatures/Script
-include/osgEarthFeatures/ScriptEngine
-include/osgEarthFeatures/ScriptFilter
-include/osgEarthFeatures/Session
-include/osgEarthFeatures/Shaders
-include/osgEarthFeatures/SubstituteModelFilter
-include/osgEarthFeatures/TessellateOperator
-include/osgEarthFeatures/TextSymbolizer
-include/osgEarthFeatures/TransformFilter
-include/osgEarthFeatures/VirtualFeatureSource
-include/osgEarthFeatures/vector_tile.pb.h
-include/osgEarthSplat/Coverage
-include/osgEarthSplat/Export
-include/osgEarthSplat/GroundCover
-include/osgEarthSplat/GroundCoverLayer
-include/osgEarthSplat/LandUseTileSource
-include/osgEarthSplat/NoiseTextureFactory
-include/osgEarthSplat/RoadSurfaceLayer
-include/osgEarthSplat/SplatCatalog
-include/osgEarthSplat/SplatCoverageLegend
-include/osgEarthSplat/SplatLayer
-include/osgEarthSplat/SplatOptions
-include/osgEarthSplat/SplatShaders
-include/osgEarthSplat/Surface
-include/osgEarthSplat/Zone
-include/osgEarthSymbology/AGG.h
-include/osgEarthSymbology/AltitudeSymbol
-include/osgEarthSymbology/BBoxSymbol
-include/osgEarthSymbology/BillboardResource
-include/osgEarthSymbology/BillboardSymbol
-include/osgEarthSymbology/Color
-include/osgEarthSymbology/Common
-include/osgEarthSymbology/CoverageSymbol
-include/osgEarthSymbology/CssUtils
-include/osgEarthSymbology/Expression
-include/osgEarthSymbology/ExtrusionSymbol
-include/osgEarthSymbology/Fill
-include/osgEarthSymbology/GEOS
-include/osgEarthSymbology/Geometry
-include/osgEarthSymbology/GeometryFactory
-include/osgEarthSymbology/GeometryRasterizer
-include/osgEarthSymbology/IconResource
-include/osgEarthSymbology/IconSymbol
-include/osgEarthSymbology/InstanceResource
-include/osgEarthSymbology/InstanceSymbol
-include/osgEarthSymbology/LineSymbol
-include/osgEarthSymbology/MeshConsolidator
-include/osgEarthSymbology/MeshFlattener
-include/osgEarthSymbology/MeshSubdivider
-include/osgEarthSymbology/ModelResource
-include/osgEarthSymbology/ModelSymbol
-include/osgEarthSymbology/PointSymbol
-include/osgEarthSymbology/PolygonSymbol
-include/osgEarthSymbology/Query
-include/osgEarthSymbology/RenderSymbol
-include/osgEarthSymbology/Resource
-include/osgEarthSymbology/ResourceCache
-include/osgEarthSymbology/ResourceLibrary
-include/osgEarthSymbology/Skins
-include/osgEarthSymbology/Stroke
-include/osgEarthSymbology/Style
-include/osgEarthSymbology/StyleSelector
-include/osgEarthSymbology/StyleSheet
-include/osgEarthSymbology/Symbol
-include/osgEarthSymbology/Tags
-include/osgEarthSymbology/TextSymbol
-include/osgEarthUtil/ActivityMonitorTool
-include/osgEarthUtil/ArcGIS
-include/osgEarthUtil/AtlasBuilder
-include/osgEarthUtil/AutoClipPlaneHandler
-include/osgEarthUtil/AutoScaleCallback
-include/osgEarthUtil/BrightnessContrastColorFilter
-include/osgEarthUtil/CMYKColorFilter
-include/osgEarthUtil/ChromaKeyColorFilter
-include/osgEarthUtil/ClampCallback
-include/osgEarthUtil/ClipSpace
-include/osgEarthUtil/ClusterNode
-include/osgEarthUtil/Common
-include/osgEarthUtil/ContourMap
-include/osgEarthUtil/Controls
-include/osgEarthUtil/DataScanner
-include/osgEarthUtil/EarthManipulator
-include/osgEarthUtil/Ephemeris
-include/osgEarthUtil/ExampleResources
-include/osgEarthUtil/Export
-include/osgEarthUtil/FlatteningLayer
-include/osgEarthUtil/Fog
-include/osgEarthUtil/Formatter
-include/osgEarthUtil/FractalElevationLayer
-include/osgEarthUtil/GARSGraticule
-include/osgEarthUtil/GLSLColorFilter
-include/osgEarthUtil/GammaColorFilter
-include/osgEarthUtil/GeodeticGraticule
-include/osgEarthUtil/GeodeticLabelingEngine
-include/osgEarthUtil/GraticuleLabelingEngine
-include/osgEarthUtil/HSLColorFilter
-include/osgEarthUtil/HTM
-include/osgEarthUtil/LODBlending
-include/osgEarthUtil/LatLongFormatter
-include/osgEarthUtil/LineOfSight
-include/osgEarthUtil/LinearLineOfSight
-include/osgEarthUtil/LogarithmicDepthBuffer
-include/osgEarthUtil/MGRSFormatter
-include/osgEarthUtil/MGRSGraticule
-include/osgEarthUtil/MeasureTool
-include/osgEarthUtil/MouseCoordsTool
-include/osgEarthUtil/MultiElevationLayer
-include/osgEarthUtil/NightColorFilter
-include/osgEarthUtil/Ocean
-include/osgEarthUtil/RGBColorFilter
-include/osgEarthUtil/RTTPicker
-include/osgEarthUtil/RadialLineOfSight
-include/osgEarthUtil/Shaders
-include/osgEarthUtil/Shadowing
-include/osgEarthUtil/SimpleOceanLayer
-include/osgEarthUtil/SimplePager
-include/osgEarthUtil/Sky
-include/osgEarthUtil/SpatialData
-include/osgEarthUtil/StarData
-include/osgEarthUtil/TFS
-include/osgEarthUtil/TFSPackager
-include/osgEarthUtil/TMS
-include/osgEarthUtil/TMSBackFiller
-include/osgEarthUtil/TMSPackager
-include/osgEarthUtil/TerrainProfile
-include/osgEarthUtil/TileIndex
-include/osgEarthUtil/TileIndexBuilder
-include/osgEarthUtil/TopologyGraph
-include/osgEarthUtil/UTMGraticule
-include/osgEarthUtil/UTMLabelingEngine
-include/osgEarthUtil/VerticalScale
-include/osgEarthUtil/ViewFitter
-include/osgEarthUtil/WFS
-include/osgEarthUtil/WMS
 lib/libosgEarth.so
-lib/libosgEarth.so.0
-lib/libosgEarth.so.%%PORTVERSION%%
-lib/libosgEarthAnnotation.so
-lib/libosgEarthAnnotation.so.0
-lib/libosgEarthAnnotation.so.%%PORTVERSION%%
-lib/libosgEarthFeatures.so
-lib/libosgEarthFeatures.so.0
-lib/libosgEarthFeatures.so.%%PORTVERSION%%
-lib/libosgEarthSplat.so
-lib/libosgEarthSplat.so.0
-lib/libosgEarthSplat.so.%%PORTVERSION%%
-lib/libosgEarthSymbology.so
-lib/libosgEarthSymbology.so.0
-lib/libosgEarthSymbology.so.%%PORTVERSION%%
-lib/libosgEarthUtil.so
-lib/libosgEarthUtil.so.0
-lib/libosgEarthUtil.so.%%PORTVERSION%%
-lib/osgdb_earth.so
-lib/osgdb_fastdxt.so
-lib/osgdb_gltf.so
-lib/osgdb_kml.so
-lib/osgdb_osgearth_agglite.so
-lib/osgdb_osgearth_arcgis.so
-lib/osgdb_osgearth_bing.so
-lib/osgdb_osgearth_bumpmap.so
-lib/osgdb_osgearth_cache_filesystem.so
-lib/osgdb_osgearth_cache_leveldb.so
-lib/osgdb_osgearth_cache_rocksdb.so
-lib/osgdb_osgearth_cesiumion.so
-lib/osgdb_osgearth_colorramp.so
-lib/osgdb_osgearth_debug.so
-lib/osgdb_osgearth_detail.so
-lib/osgdb_osgearth_engine_mp.so
-lib/osgdb_osgearth_engine_rex.so
-lib/osgdb_osgearth_feature_elevation.so
-lib/osgdb_osgearth_feature_mapnikvectortiles.so
-lib/osgdb_osgearth_feature_ogr.so
-lib/osgdb_osgearth_feature_tfs.so
-lib/osgdb_osgearth_feature_wfs.so
-lib/osgdb_osgearth_feature_xyz.so
-lib/osgdb_osgearth_featurefilter_intersect.so
-lib/osgdb_osgearth_featurefilter_join.so
-lib/osgdb_osgearth_gdal.so
-lib/osgdb_osgearth_label_annotation.so
-lib/osgdb_osgearth_mapinspector.so
-lib/osgdb_osgearth_mask_feature.so
-lib/osgdb_osgearth_mbtiles.so
-lib/osgdb_osgearth_model_feature_geom.so
-lib/osgdb_osgearth_model_simple.so
-lib/osgdb_osgearth_monitor.so
-lib/osgdb_osgearth_osg.so
-lib/osgdb_osgearth_scriptengine_javascript.so
-lib/osgdb_osgearth_sky_gl.so
-lib/osgdb_osgearth_sky_simple.so
-lib/osgdb_osgearth_skyview.so
-lib/osgdb_osgearth_terrainshader.so
-lib/osgdb_osgearth_tilecache.so
-lib/osgdb_osgearth_tileindex.so
-lib/osgdb_osgearth_tilepackage.so
-lib/osgdb_osgearth_tms.so
-lib/osgdb_osgearth_vdatum_egm2008.so
-lib/osgdb_osgearth_vdatum_egm84.so
-lib/osgdb_osgearth_vdatum_egm96.so
-lib/osgdb_osgearth_viewpoints.so
-lib/osgdb_osgearth_vpb.so
-lib/osgdb_osgearth_wcs.so
-lib/osgdb_osgearth_wms.so
-lib/osgdb_osgearth_xyz.so
-lib/osgdb_template.so
+lib/libosgEarth.so.113
+lib/libosgEarth.so.%%PORTVERSION%%.0
+lib/osgPlugins-3.6.5/osgdb_earth.so
+lib/osgPlugins-3.6.5/osgdb_fastdxt.so
+lib/osgPlugins-3.6.5/osgdb_gltf.so
+lib/osgPlugins-3.6.5/osgdb_kml.so
+lib/osgPlugins-3.6.5/osgdb_lerc.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_bumpmap.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_cache_filesystem.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_colorramp.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_detail.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_engine_rex.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_featurefilter_intersect.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_featurefilter_join.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_mapinspector.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_monitor.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_scriptengine_javascript.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_sky_gl.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_sky_simple.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_terrainshader.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_vdatum_egm2008.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_vdatum_egm84.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_vdatum_egm96.so
+lib/osgPlugins-3.6.5/osgdb_osgearth_viewpoints.so
+lib/osgPlugins-3.6.5/osgdb_template.so
+lib/osgPlugins-3.6.5/osgdb_webp.so