diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 77e8db765fec..97da332dcd2b 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -1,49 +1,57 @@ PORTNAME= osgearth -PORTVERSION= 3.4 -PORTREVISION= 3 +PORTVERSION= 3.5 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= graphics geography MAINTAINER= zirias@FreeBSD.org COMMENT= C++ terrain rendering toolkit for OpenSceneGraph WWW= http://osgearth.org/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libcurl.so:ftp/curl \ libgdal.so:graphics/gdal \ - libgeos.so:graphics/geos \ + libgeos_c.so:graphics/geos \ libosg.so:graphics/osg \ - libprotoc.so:devel/protobuf \ + libprotobuf.so:devel/protobuf \ libwebp.so:graphics/webp -USES= cmake compiler:c++11-lang gl pkgconfig sqlite - +USES= cmake compiler:c++14-lang gl pkgconfig sqlite +USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= gwaldron ocornut:imgui Esri:lerc Tencent:rapidjson GH_PROJECT= imgui:imgui lerc:lerc rapidjson:rapidjson GH_TAGNAME= 9e8e5ac:imgui 19542a0:lerc f54b0e4:rapidjson - -USE_CXXSTD= c++11 +USE_GL= gl USE_LDCONFIG= yes -USE_GL+= gl glu CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \ -DCMAKE_LIBRARY_PATH:PATH=${LOCALBASE}/lib \ -DLIB_POSTFIX:STRING="" +LDFLAGS+= -Wl,--as-needed + PLIST_SUB= PORTVERSION=${PORTVERSION} +OPTIONS_DEFINE= SPDLOG +OPTIONS_DEFAULT= SPDLOG +SPDLOG_DESC= Logging support via devel/spdlog + +SPDLOG_LIB_DEPENDS= libspdlog.so:devel/spdlog + post-extract: .for sm in imgui lerc rapidjson @${MV} ${WRKSRC_${sm}}/* ${WRKSRC}/src/third_party/${sm}/ .endfor +post-patch-SPDLOG-off: + @${REINPLACE_CMD} '/find_package(spdlog)/d' ${WRKSRC}/CMakeLists.txt + .include .if ${ARCH} != amd64 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-no-ia32-sse .endif .include diff --git a/graphics/osgearth/distinfo b/graphics/osgearth/distinfo index ae9a78f59d26..2d0aa6d34d2f 100644 --- a/graphics/osgearth/distinfo +++ b/graphics/osgearth/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1689531343 -SHA256 (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 2a5aabd6950c598b2310842dfa1e9cf085d54692a0c787cef5627530fcbe682e -SIZE (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 119642993 +TIMESTAMP = 1698300300 +SHA256 (gwaldron-osgearth-osgearth-3.5_GH0.tar.gz) = 9204759f3df0d05356bdead71c13b9e9a086c9ebfa3daa93c149dd7aa664d378 +SIZE (gwaldron-osgearth-osgearth-3.5_GH0.tar.gz) = 119658258 SHA256 (ocornut-imgui-9e8e5ac_GH0.tar.gz) = da877be818e7f4f20915c9982081f958bf5f68b26a5afde64c263427aff8097b SIZE (ocornut-imgui-9e8e5ac_GH0.tar.gz) = 1592220 SHA256 (Esri-lerc-19542a0_GH0.tar.gz) = 5d48ae91b45343c68da336ef6996af3b9495452970185244e21253f4c711e529 SIZE (Esri-lerc-19542a0_GH0.tar.gz) = 4247805 SHA256 (Tencent-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e SIZE (Tencent-rapidjson-f54b0e4_GH0.tar.gz) = 1019457 diff --git a/graphics/osgearth/files/patch-CMakeLists.txt b/graphics/osgearth/files/patch-CMakeLists.txt index ab12b4b6f4f0..105746ac83b5 100644 --- a/graphics/osgearth/files/patch-CMakeLists.txt +++ b/graphics/osgearth/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ ---- CMakeLists.txt.orig 2023-07-17 15:47:49 UTC +--- CMakeLists.txt.orig 2023-10-23 13:54:59 UTC +++ CMakeLists.txt -@@ -335,4 +335,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConf - COMPATIBILITY SameMajorVersion ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_PREFIX}/cmake ) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/osgEarth ) +@@ -302,4 +302,4 @@ install( + ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfigVersion.cmake + DESTINATION +- ${CMAKE_INSTALL_PREFIX}/cmake ) ++ ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/osgEarth ) diff --git a/graphics/osgearth/pkg-plist b/graphics/osgearth/pkg-plist index 05b9cb587be0..0b9c9ee1476c 100644 --- a/graphics/osgearth/pkg-plist +++ b/graphics/osgearth/pkg-plist @@ -1,460 +1,453 @@ -bin/osgEarth_tests bin/osgearth_3pv bin/osgearth_annotation bin/osgearth_atlas bin/osgearth_bakefeaturetiles -bin/osgearth_bindless bin/osgearth_boundarygen bin/osgearth_city bin/osgearth_clamp bin/osgearth_cluster bin/osgearth_conv bin/osgearth_createtile -bin/osgearth_drawables bin/osgearth_eci bin/osgearth_ephemeris bin/osgearth_featurefilter bin/osgearth_features bin/osgearth_graticule bin/osgearth_heatmap -bin/osgearth_horizon bin/osgearth_infinitescroll bin/osgearth_lights bin/osgearth_los bin/osgearth_magnify bin/osgearth_manip bin/osgearth_map bin/osgearth_minimap bin/osgearth_mrt bin/osgearth_mvtindex bin/osgearth_occlusionculling -bin/osgearth_overlayviewer -bin/osgearth_shadercomp bin/osgearth_skyview bin/osgearth_terrainprofile bin/osgearth_tfs bin/osgearth_toc bin/osgearth_tracks bin/osgearth_transform bin/osgearth_version bin/osgearth_video bin/osgearth_viewer 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/CachePolicy include/osgEarth/CacheSeed include/osgEarth/Callouts include/osgEarth/CameraUtils include/osgEarth/Capabilities include/osgEarth/CascadeDrapingDecorator include/osgEarth/CentroidFilter include/osgEarth/CesiumIon include/osgEarth/Chonk 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/Composite include/osgEarth/Config include/osgEarth/Containers include/osgEarth/ContourMap include/osgEarth/Controls include/osgEarth/ConvertTypeFilter include/osgEarth/Coverage include/osgEarth/CoverageLayer 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/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/FilteredFeatureSource 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/GeometryCloud 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/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/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/MapboxGLGlyphManager include/osgEarth/MapCallback -include/osgEarth/MapInfo include/osgEarth/MapModelChange include/osgEarth/MapNode include/osgEarth/MapNodeObserver include/osgEarth/MapboxGLImageLayer include/osgEarth/MaterialLoader 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/MetadataNode 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/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/TerrainMeshLayer 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/TextSymbol include/osgEarth/TextSymbolizer include/osgEarth/TextureArena include/osgEarth/TextureBuffer include/osgEarth/Threading include/osgEarth/ThreeDTilesLayer include/osgEarth/TileCache include/osgEarth/TileEstimator include/osgEarth/TileHandler include/osgEarth/TileIndex include/osgEarth/TileIndexBuilder include/osgEarth/TileKey include/osgEarth/TileLayer include/osgEarth/TileMesher include/osgEarth/TileRasterizer include/osgEarth/TileSource include/osgEarth/TileSourceElevationLayer include/osgEarth/TileSourceImageLayer include/osgEarth/TileVisitor include/osgEarth/TiledFeatureModelGraph include/osgEarth/TiledFeatureModelLayer +include/osgEarth/TiledModelLayer include/osgEarth/TimeControl include/osgEarth/TimeSeriesImage 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/XYZModelGraph include/osgEarth/XYZModelLayer include/osgEarth/XmlUtils include/osgEarth/glyphs.pb.h include/osgEarth/optional include/osgEarth/rtree.h include/osgEarth/tinystr.h include/osgEarth/tinyxml.h include/osgEarth/vector_tile.pb.h include/osgEarth/weemesh.h include/osgEarthDrivers/cache_filesystem/FileSystemCache include/osgEarthDrivers/colorramp/ColorRampOptions 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 include/osgEarthDrivers/engine_rex/GeometryPool include/osgEarthDrivers/engine_rex/LayerDrawable include/osgEarthDrivers/engine_rex/LoadTileData include/osgEarthDrivers/engine_rex/Loader include/osgEarthDrivers/engine_rex/RenderBindings include/osgEarthDrivers/engine_rex/RexTerrainEngineNode include/osgEarthDrivers/engine_rex/SelectionInfo include/osgEarthDrivers/engine_rex/Shaders include/osgEarthDrivers/engine_rex/SurfaceNode include/osgEarthDrivers/engine_rex/TerrainCuller include/osgEarthDrivers/engine_rex/TerrainRenderData include/osgEarthDrivers/engine_rex/TileDrawable include/osgEarthDrivers/engine_rex/TileNode include/osgEarthDrivers/engine_rex/TileNodeRegistry include/osgEarthDrivers/engine_rex/TileRenderModel include/osgEarthDrivers/engine_rex/Unloader include/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilterOptions include/osgEarthDrivers/featurefilter_join/JoinFeatureFilterOptions include/osgEarthDrivers/kml/KML include/osgEarthDrivers/kml/KMLOptions 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 lib/libosgEarth.so -lib/libosgEarth.so.148 +lib/libosgEarth.so.149 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 share/cmake/Modules/osgEarth/osgEarthConfig.cmake share/cmake/Modules/osgEarth/osgEarthConfigVersion.cmake