graphics/osgearth: Update to 3.4

Changes from 3.2: Bugfixes, performance and maintenance, see https://github.com/gwaldron/osgearth/releases Take maintainership from lbartoletti@. PR: 272550 Approved by: lbartoletti (previous maintainer)
freebsd · Jul 20, 2023 · 10327d2 · 10327d2
1 parent 6199fc2
commit 10327d2
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 34 deletions.
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	osgearth
-PORTVERSION=	3.2
+PORTVERSION=	3.4
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	7
 CATEGORIES=	graphics geography
 
-MAINTAINER=	lbartoletti@FreeBSD.org
+MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	C++ terrain rendering toolkit for OpenSceneGraph
 WWW=		http://osgearth.org/
 
@@ -21,7 +20,9 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 USES=		cmake gl pkgconfig sqlite
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	gwaldron
+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_LDCONFIG=	yes
@@ -33,6 +34,11 @@ CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
+post-extract:
+.for sm in imgui lerc rapidjson
+	@${MV} ${WRKSRC_${sm}}/* ${WRKSRC}/src/third_party/${sm}/
+.endfor
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
@@ -42,10 +48,8 @@ USES+=		compiler:gcc-c++11-lib
 USES+=		compiler:c++11-lang
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == i386
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-i386
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/osgearth/distinfo b/graphics/osgearth/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1648530145
-SHA256 (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 7e1dd643b1f3b8d1ba9561b899c18176af988342b86c42d89a70be924cb747f6
-SIZE (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 121772329
+TIMESTAMP = 1689531343
+SHA256 (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 2a5aabd6950c598b2310842dfa1e9cf085d54692a0c787cef5627530fcbe682e
+SIZE (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 119642993
+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/extra-patch-i386 b/graphics/osgearth/files/extra-patch-i386
@@ -1,4 +1,4 @@
---- src/osgEarthDrivers/fastdxt/CMakeLists.txt.orig	2018-11-12 18:17:36 UTC
+--- src/osgEarthDrivers/fastdxt/CMakeLists.txt.orig	2023-05-16 14:53:59 UTC
 +++ src/osgEarthDrivers/fastdxt/CMakeLists.txt
 @@ -30,7 +30,6 @@ SET(TARGET_SRC
      dxt.cpp
@@ -8,12 +8,12 @@
  )
 
  SETUP_PLUGIN(fastdxt)
---- src/osgEarthDrivers/fastdxt/dxt.cpp.orig	2018-11-12 18:17:36 UTC
+--- src/osgEarthDrivers/fastdxt/dxt.cpp.orig	2023-05-16 14:53:59 UTC
 +++ src/osgEarthDrivers/fastdxt/dxt.cpp
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
+ #include "dxt.h"
  #include "util.h"
 
-
 -#define DXT_INTR 1
 +#define DXT_INTR 0
 

diff --git a/graphics/osgearth/files/patch-CMakeLists.txt b/graphics/osgearth/files/patch-CMakeLists.txt
@@ -0,0 +1,8 @@
+--- CMakeLists.txt.orig	2023-07-17 15:47:49 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 )
diff --git a/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt b/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt
@@ -1,8 +1,8 @@
---- src/osgEarthDrivers/lerc/CMakeLists.txt.orig	2021-08-09 17:37:52 UTC
+--- src/osgEarthDrivers/lerc/CMakeLists.txt.orig	2023-05-16 14:53:59 UTC
 +++ src/osgEarthDrivers/lerc/CMakeLists.txt
 @@ -1,4 +1,4 @@
--INCLUDE_DIRECTORIES( ../../third_party/lerc )
-+INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc )
+-INCLUDE_DIRECTORIES( ../../third_party/lerc/include )
++INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc/include )
 
  SET(TARGET_SRC
      ReaderWriterLERC.cpp
diff --git a/graphics/osgearth/pkg-plist b/graphics/osgearth/pkg-plist
@@ -2,24 +2,19 @@ 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_computerangecallback
-bin/osgearth_controls
 bin/osgearth_conv
 bin/osgearth_createtile
-bin/osgearth_decal
 bin/osgearth_drawables
 bin/osgearth_eci
-bin/osgearth_elevation
 bin/osgearth_ephemeris
 bin/osgearth_featurefilter
-bin/osgearth_featurequery
 bin/osgearth_features
-bin/osgearth_geodetic_graticule
 bin/osgearth_graticule
 bin/osgearth_heatmap
 bin/osgearth_horizon
@@ -29,16 +24,12 @@ bin/osgearth_los
 bin/osgearth_magnify
 bin/osgearth_manip
 bin/osgearth_map
-bin/osgearth_measure
 bin/osgearth_minimap
 bin/osgearth_mrt
 bin/osgearth_mvtindex
 bin/osgearth_occlusionculling
 bin/osgearth_overlayviewer
-bin/osgearth_scenegraphcallbacks
-bin/osgearth_sequencecontrol
 bin/osgearth_shadercomp
-bin/osgearth_shadergen
 bin/osgearth_skyview
 bin/osgearth_terrainprofile
 bin/osgearth_tfs
@@ -48,7 +39,6 @@ bin/osgearth_transform
 bin/osgearth_version
 bin/osgearth_video
 bin/osgearth_viewer
-bin/osgearth_wfs
 include/osgEarth/AGG.h
 include/osgEarth/ActivityMonitorTool
 include/osgEarth/AltitudeFilter
@@ -77,7 +67,6 @@ include/osgEarth/BuildGeometryFilter
 include/osgEarth/BuildTextFilter
 include/osgEarth/Cache
 include/osgEarth/CacheBin
-include/osgEarth/CacheEstimator
 include/osgEarth/CachePolicy
 include/osgEarth/CacheSeed
 include/osgEarth/Callouts
@@ -86,6 +75,7 @@ include/osgEarth/Capabilities
 include/osgEarth/CascadeDrapingDecorator
 include/osgEarth/CentroidFilter
 include/osgEarth/CesiumIon
+include/osgEarth/Chonk
 include/osgEarth/CircleNode
 include/osgEarth/ClampCallback
 include/osgEarth/ClampableNode
@@ -102,6 +92,8 @@ 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
@@ -127,7 +119,6 @@ include/osgEarth/ElevationQuery
 include/osgEarth/ElevationRanges
 include/osgEarth/EllipseNode
 include/osgEarth/Ellipsoid
-include/osgEarth/EllipsoidIntersector
 include/osgEarth/Endian
 include/osgEarth/Ephemeris
 include/osgEarth/ExampleResources
@@ -156,6 +147,7 @@ include/osgEarth/FileUtils
 include/osgEarth/Fill
 include/osgEarth/Filter
 include/osgEarth/FilterContext
+include/osgEarth/FilteredFeatureSource
 include/osgEarth/FlatteningLayer
 include/osgEarth/Formatter
 include/osgEarth/FractalElevationLayer
@@ -177,6 +169,7 @@ include/osgEarth/GeodeticLabelingEngine
 include/osgEarth/Geoid
 include/osgEarth/Geometry
 include/osgEarth/GeometryClamper
+include/osgEarth/GeometryCloud
 include/osgEarth/GeometryCompiler
 include/osgEarth/GeometryFactory
 include/osgEarth/GeometryRasterizer
@@ -199,7 +192,6 @@ 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
@@ -228,12 +220,14 @@ 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
@@ -242,6 +236,7 @@ include/osgEarth/MeshConsolidator
 include/osgEarth/MeshFlattener
 include/osgEarth/MeshSubdivider
 include/osgEarth/MetaTile
+include/osgEarth/MetadataNode
 include/osgEarth/Metrics
 include/osgEarth/ModelLayer
 include/osgEarth/ModelNode
@@ -349,16 +344,17 @@ include/osgEarth/Text
 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/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
@@ -367,6 +363,7 @@ include/osgEarth/TileVisitor
 include/osgEarth/TiledFeatureModelGraph
 include/osgEarth/TiledFeatureModelLayer
 include/osgEarth/TimeControl
+include/osgEarth/TimeSeriesImage
 include/osgEarth/TopologyGraph
 include/osgEarth/TrackNode
 include/osgEarth/TransformFilter
@@ -389,7 +386,10 @@ 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
@@ -407,7 +407,6 @@ include/osgEarthDrivers/engine_rex/GeometryPool
 include/osgEarthDrivers/engine_rex/LayerDrawable
 include/osgEarthDrivers/engine_rex/LoadTileData
 include/osgEarthDrivers/engine_rex/Loader
-include/osgEarthDrivers/engine_rex/MeshEditor
 include/osgEarthDrivers/engine_rex/RenderBindings
 include/osgEarthDrivers/engine_rex/RexTerrainEngineNode
 include/osgEarthDrivers/engine_rex/SelectionInfo
@@ -431,7 +430,7 @@ include/osgEarthDrivers/scriptengine_javascript/duktape.h
 include/osgEarthDrivers/sky_gl/GLSkyOptions
 include/osgEarthDrivers/sky_simple/SimpleSkyOptions
 lib/libosgEarth.so
-lib/libosgEarth.so.113
+lib/libosgEarth.so.148
 lib/libosgEarth.so.%%PORTVERSION%%.0
 lib/osgPlugins-3.6.5/osgdb_earth.so
 lib/osgPlugins-3.6.5/osgdb_fastdxt.so
@@ -457,3 +456,5 @@ 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