diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 97da332dcd2b..9851c226593a 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	osgearth
 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_c.so:graphics/geos \
 		libosg.so:graphics/osg \
 		libprotobuf.so:devel/protobuf \
 		libwebp.so:graphics/webp
 
-USES=		cmake compiler:c++14-lang gl pkgconfig sqlite
-USE_CXXSTD=	c++14
+USES=		cmake compiler:c++17-lang gl pkgconfig sqlite
+USE_CXXSTD=	c++17
 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_GL=		gl
 USE_LDCONFIG=	yes
 
 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
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-no-ia32-sse
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/osgearth/files/patch-protobuf b/graphics/osgearth/files/patch-protobuf
new file mode 100644
index 000000000000..981fffb56167
--- /dev/null
+++ b/graphics/osgearth/files/patch-protobuf
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2023-11-03 04:00:05.529976000 +0800
++++ CMakeLists.txt	2023-11-03 04:02:22.522059000 +0800
+@@ -23,7 +23,7 @@
+ set(OSGEARTH_SOVERSION 149)
+ 
+ # Require C++11
+-set_property(GLOBAL PROPERTY CXX_STANDARD 11)
++set_property(GLOBAL PROPERTY CXX_STANDARD 17)
+ set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED ON)
+ 
+ # Detect out-of-source build. You should always do an out-of-source build!
+--- src/osgEarthDrivers/fastdxt/intrinsic.cpp.orig	2023-05-16 14:53:59 UTC
++++ src/osgEarthDrivers/fastdxt/intrinsic.cpp
+@@ -45,7 +45,7 @@
+ void ExtractBlock_Intrinsics( const byte *inPtr, int width, byte *colorBlock ) 
+ {
+         __m128i t0, t1, t2, t3;
+-	register int w = width << 2;  // width*4
++	int w = width << 2;  // width*4
+ 
+         t0 = _mm_load_si128 ( (__m128i*) inPtr );
+         _mm_store_si128 ( (__m128i*) &colorBlock[0], t0 );   // copy first row, 16bytes