4 files changed, 30 insertions, 29 deletions

diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 77e8db765fec..97da332dcd2b 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	osgearth
-PORTVERSION=	3.4
-PORTREVISION=	3
+PORTVERSION=	3.5
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	graphics geography
 
@@ -13,33 +12,42 @@ 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 <bsd.port.options.mk>
 
 .if ${ARCH} != amd64
diff --git a/graphics/osgearth/distinfo b/graphics/osgearth/distinfo
index ae9a78f59d26..2d0aa6d34d2f 100644
--- a/graphics/osgearth/distinfo
+++ b/graphics/osgearth/distinfo
@@ -1,6 +1,6 @@
-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
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,23 +1,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_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
@@ -28,8 +24,6 @@ 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
@@ -62,7 +56,6 @@ 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
@@ -222,7 +215,6 @@ include/osgEarth/MVT
 include/osgEarth/Map
 include/osgEarth/MapboxGLGlyphManager
 include/osgEarth/MapCallback
-include/osgEarth/MapInfo
 include/osgEarth/MapModelChange
 include/osgEarth/MapNode
 include/osgEarth/MapNodeObserver
@@ -332,6 +324,7 @@ include/osgEarth/TerrainEffect
 include/osgEarth/TerrainEngineNode
 include/osgEarth/TerrainEngineRequirements
 include/osgEarth/TerrainLayer
+include/osgEarth/TerrainMeshLayer
 include/osgEarth/TerrainOptions
 include/osgEarth/TerrainProfile
 include/osgEarth/TerrainResources
@@ -362,6 +355,7 @@ include/osgEarth/TileSourceImageLayer
 include/osgEarth/TileVisitor
 include/osgEarth/TiledFeatureModelGraph
 include/osgEarth/TiledFeatureModelLayer
+include/osgEarth/TiledModelLayer
 include/osgEarth/TimeControl
 include/osgEarth/TimeSeriesImage
 include/osgEarth/TopologyGraph
@@ -382,7 +376,6 @@ include/osgEarth/VisibleLayer
 include/osgEarth/WFS
 include/osgEarth/WMS
 include/osgEarth/WindLayer
-include/osgEarth/WingedEdgeMesh
 include/osgEarth/WireLines
 include/osgEarth/XYZ
 include/osgEarth/XYZFeatureSource
@@ -430,7 +423,7 @@ 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