git: 95e3feedcf77 - main - graphics/osgearth: Update to 3.6.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 31 Aug 2024 17:17:44 UTC
The branch main has been updated by zirias:
URL: https://cgit.FreeBSD.org/ports/commit/?id=95e3feedcf77ace7923afbf065906233f6bbd363
commit 95e3feedcf77ace7923afbf065906233f6bbd363
Author: Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2024-08-31 17:15:56 +0000
Commit: Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2024-08-31 17:17:27 +0000
graphics/osgearth: Update to 3.6.1
New upstream release, release notes:
https://github.com/gwaldron/osgearth/blob/master/docs/source/releasenotes.md
---
graphics/osgearth/Makefile | 5 +-
graphics/osgearth/distinfo | 10 +--
graphics/osgearth/files/extra-patch-no-ia32-sse | 20 +++---
graphics/osgearth/files/patch-CMakeLists.txt | 19 ++++--
.../patch-cmake_install-package-config-files.cmake | 11 ++++
graphics/osgearth/files/patch-cmake_oe__unix.cmake | 13 ++++
graphics/osgearth/files/patch-protobuf | 11 ----
.../patch-src_osgEarthDrivers_lerc_CMakeLists.txt | 8 ---
graphics/osgearth/pkg-plist | 76 +++++++---------------
9 files changed, 78 insertions(+), 95 deletions(-)
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index e60947f3e3e5..4575b146d7b1 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -1,7 +1,6 @@
PORTNAME= osgearth
-PORTVERSION= 3.5
+PORTVERSION= 3.6.1
DISTVERSIONPREFIX= ${PORTNAME}-
-PORTREVISION= 3
CATEGORIES= graphics geography
MAINTAINER= zirias@FreeBSD.org
@@ -23,7 +22,7 @@ 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
+GH_TAGNAME= cab7edd:imgui 19542a0:lerc f54b0e4:rapidjson
USE_GL= gl
USE_LDCONFIG= yes
diff --git a/graphics/osgearth/distinfo b/graphics/osgearth/distinfo
index 2d0aa6d34d2f..3dcacd9a3310 100644
--- a/graphics/osgearth/distinfo
+++ b/graphics/osgearth/distinfo
@@ -1,8 +1,8 @@
-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
+TIMESTAMP = 1724998365
+SHA256 (gwaldron-osgearth-osgearth-3.6.1_GH0.tar.gz) = 38069c30520331b476c9cd3833e0471c3fc96e12e327404aa0ad13fc2c58c9fe
+SIZE (gwaldron-osgearth-osgearth-3.6.1_GH0.tar.gz) = 119666978
+SHA256 (ocornut-imgui-cab7edd_GH0.tar.gz) = aab343459ef16baab1ace818296220ff11c5c0140dca832bef82c646adb9f3b2
+SIZE (ocornut-imgui-cab7edd_GH0.tar.gz) = 1806446
SHA256 (Esri-lerc-19542a0_GH0.tar.gz) = 5d48ae91b45343c68da336ef6996af3b9495452970185244e21253f4c711e529
SIZE (Esri-lerc-19542a0_GH0.tar.gz) = 4247805
SHA256 (Tencent-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e
diff --git a/graphics/osgearth/files/extra-patch-no-ia32-sse b/graphics/osgearth/files/extra-patch-no-ia32-sse
index ae7e8a338d36..9fc54fdcac0b 100644
--- a/graphics/osgearth/files/extra-patch-no-ia32-sse
+++ b/graphics/osgearth/files/extra-patch-no-ia32-sse
@@ -1,14 +1,16 @@
---- src/osgEarthDrivers/fastdxt/CMakeLists.txt.orig 2023-05-16 14:53:59 UTC
+--- src/osgEarthDrivers/fastdxt/CMakeLists.txt.orig 2024-08-31 11:55:43 UTC
+++ src/osgEarthDrivers/fastdxt/CMakeLists.txt
-@@ -30,7 +30,6 @@ SET(TARGET_SRC
- dxt.cpp
- util.cpp
- libdxt.cpp
-- intrinsic.cpp
- )
+@@ -11,8 +11,7 @@ if(OSGEARTH_ENABLE_FASTDXT)
+ FastDXTImageProcessor.cpp
+ dxt.cpp
+ util.cpp
+- libdxt.cpp
+- intrinsic.cpp )
++ libdxt.cpp )
- SETUP_PLUGIN(fastdxt)
---- src/osgEarthDrivers/fastdxt/dxt.cpp.orig 2023-05-16 14:53:59 UTC
+ ENDIF()
+
+--- src/osgEarthDrivers/fastdxt/dxt.cpp.orig 2024-08-31 11:55:04 UTC
+++ src/osgEarthDrivers/fastdxt/dxt.cpp
@@ -6,7 +6,7 @@
#include "dxt.h"
diff --git a/graphics/osgearth/files/patch-CMakeLists.txt b/graphics/osgearth/files/patch-CMakeLists.txt
index 105746ac83b5..ebd04a0b9d90 100644
--- a/graphics/osgearth/files/patch-CMakeLists.txt
+++ b/graphics/osgearth/files/patch-CMakeLists.txt
@@ -1,8 +1,13 @@
---- CMakeLists.txt.orig 2023-10-23 13:54:59 UTC
+--- CMakeLists.txt.orig 2024-08-30 10:19:42 UTC
+++ CMakeLists.txt
-@@ -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 )
+@@ -26,8 +26,8 @@ set(OSGEARTH_SOVERSION 158)
+ # Increment this each time the ABI changes
+ set(OSGEARTH_SOVERSION 158)
+
+-# Require C++14
+-set(CMAKE_CXX_STANDARD 14)
++# Require C++17
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+ # Detect out-of-source build. We'll need this for protobuf generated files.
diff --git a/graphics/osgearth/files/patch-cmake_install-package-config-files.cmake b/graphics/osgearth/files/patch-cmake_install-package-config-files.cmake
new file mode 100644
index 000000000000..f9be9fbeaffc
--- /dev/null
+++ b/graphics/osgearth/files/patch-cmake_install-package-config-files.cmake
@@ -0,0 +1,11 @@
+--- cmake/install-package-config-files.cmake.orig 2024-08-30 10:43:51 UTC
++++ cmake/install-package-config-files.cmake
+@@ -2,7 +2,7 @@ function(osgearth_install_package_config_files TARGET
+
+ include(CMakePackageConfigHelpers)
+
+- set(PACKAGE_INSTALL_DIR share/osgearth)
++ set(PACKAGE_INSTALL_DIR share/cmake/Modules/osgEarth)
+ #set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
+ #set(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+
diff --git a/graphics/osgearth/files/patch-cmake_oe__unix.cmake b/graphics/osgearth/files/patch-cmake_oe__unix.cmake
new file mode 100644
index 000000000000..d38f3a3c5c7a
--- /dev/null
+++ b/graphics/osgearth/files/patch-cmake_oe__unix.cmake
@@ -0,0 +1,13 @@
+--- cmake/oe_unix.cmake.orig 2024-07-24 17:28:38 UTC
++++ cmake/oe_unix.cmake
+@@ -12,8 +12,7 @@ if(UNIX AND NOT ANDROID)
+ # for ptheads in linux
+ find_package(Threads REQUIRED)
+
+- # add 64 to the lib prefix.
+- set(INSTALL_LIBRARY_FOLDER "lib64")
+- set(INSTALL_PLUGINS_FOLDER "lib64")
++ set(INSTALL_LIBRARY_FOLDER "lib")
++ set(INSTALL_PLUGINS_FOLDER "lib")
+
+ endif(UNIX AND NOT ANDROID)
diff --git a/graphics/osgearth/files/patch-protobuf b/graphics/osgearth/files/patch-protobuf
index 981fffb56167..7a745293db8e 100644
--- a/graphics/osgearth/files/patch-protobuf
+++ b/graphics/osgearth/files/patch-protobuf
@@ -1,14 +1,3 @@
---- 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 @@
diff --git a/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt b/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt
deleted file mode 100644
index 7c50938eb372..000000000000
--- a/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 )
-+INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc/include )
-
- SET(TARGET_SRC
- ReaderWriterLERC.cpp
diff --git a/graphics/osgearth/pkg-plist b/graphics/osgearth/pkg-plist
index 0b9c9ee1476c..a807d8eafca3 100644
--- a/graphics/osgearth/pkg-plist
+++ b/graphics/osgearth/pkg-plist
@@ -3,38 +3,25 @@ bin/osgearth_annotation
bin/osgearth_atlas
bin/osgearth_bakefeaturetiles
bin/osgearth_boundarygen
-bin/osgearth_city
bin/osgearth_clamp
-bin/osgearth_cluster
bin/osgearth_conv
-bin/osgearth_createtile
-bin/osgearth_eci
-bin/osgearth_ephemeris
bin/osgearth_featurefilter
bin/osgearth_features
-bin/osgearth_graticule
bin/osgearth_heatmap
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_simple
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
@@ -56,12 +43,14 @@ include/osgEarth/BillboardSymbol
include/osgEarth/Bing
include/osgEarth/Bounds
include/osgEarth/BufferFilter
+include/osgEarth/BuildConfig
include/osgEarth/BuildGeometryFilter
include/osgEarth/BuildTextFilter
include/osgEarth/Cache
include/osgEarth/CacheBin
include/osgEarth/CachePolicy
include/osgEarth/CacheSeed
+include/osgEarth/Callbacks
include/osgEarth/Callouts
include/osgEarth/CameraUtils
include/osgEarth/Capabilities
@@ -80,6 +69,8 @@ include/osgEarth/Color
include/osgEarth/ColorFilter
include/osgEarth/Common
include/osgEarth/Composite
+include/osgEarth/CompositeTiledModelLayer
+include/osgEarth/CompressedArray
include/osgEarth/Config
include/osgEarth/Containers
include/osgEarth/ContourMap
@@ -135,7 +126,6 @@ include/osgEarth/FeatureRasterizer
include/osgEarth/FeatureSDFLayer
include/osgEarth/FeatureSource
include/osgEarth/FeatureSourceIndexNode
-include/osgEarth/FileGDBFeatureSource
include/osgEarth/FileUtils
include/osgEarth/Fill
include/osgEarth/Filter
@@ -190,6 +180,7 @@ include/osgEarth/InstanceSymbol
include/osgEarth/IntersectionPicker
include/osgEarth/JoinPointsLinesFilter
include/osgEarth/JsonUtils
+include/osgEarth/LODGenerator
include/osgEarth/LabelNode
include/osgEarth/LandCover
include/osgEarth/LandCoverLayer
@@ -223,7 +214,7 @@ include/osgEarth/MaterialLoader
include/osgEarth/Math
include/osgEarth/MeasureTool
include/osgEarth/MemCache
-include/osgEarth/Memory
+include/osgEarth/MemoryUtils
include/osgEarth/MeshConsolidator
include/osgEarth/MeshFlattener
include/osgEarth/MeshSubdivider
@@ -235,16 +226,17 @@ 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/NoiseTextureFactory
include/osgEarth/Notify
include/osgEarth/OGRFeatureSource
include/osgEarth/ObjectIDPicker
include/osgEarth/ObjectIndex
include/osgEarth/OgrUtils
include/osgEarth/OverlayDecorator
+include/osgEarth/PBRMaterial
include/osgEarth/PagedNode
include/osgEarth/PatchLayer
include/osgEarth/PhongLightingEffect
@@ -271,7 +263,6 @@ include/osgEarth/ResampleFilter
include/osgEarth/Resource
include/osgEarth/ResourceCache
include/osgEarth/ResourceLibrary
-include/osgEarth/ResourceReleaser
include/osgEarth/Revisioning
include/osgEarth/SDF
include/osgEarth/ScaleFilter
@@ -297,6 +288,7 @@ include/osgEarth/Shadowing
include/osgEarth/SimpleOceanLayer
include/osgEarth/SimplePager
include/osgEarth/SimplexNoise
+include/osgEarth/SimplifyFilter
include/osgEarth/Skins
include/osgEarth/Sky
include/osgEarth/SkyView
@@ -353,7 +345,6 @@ include/osgEarth/TileSource
include/osgEarth/TileSourceElevationLayer
include/osgEarth/TileSourceImageLayer
include/osgEarth/TileVisitor
-include/osgEarth/TiledFeatureModelGraph
include/osgEarth/TiledFeatureModelLayer
include/osgEarth/TiledModelLayer
include/osgEarth/TimeControl
@@ -379,7 +370,6 @@ include/osgEarth/WindLayer
include/osgEarth/WireLines
include/osgEarth/XYZ
include/osgEarth/XYZFeatureSource
-include/osgEarth/XYZModelGraph
include/osgEarth/XYZModelLayer
include/osgEarth/XmlUtils
include/osgEarth/glyphs.pb.h
@@ -388,43 +378,26 @@ include/osgEarth/rtree.h
include/osgEarth/tinystr.h
include/osgEarth/tinyxml.h
include/osgEarth/vector_tile.pb.h
+include/osgEarth/weejobs.h
include/osgEarth/weemesh.h
+include/osgEarthDrivers/bumpmap/BumpMapOptions
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/detail/DetailExtension
+include/osgEarthDrivers/detail/DetailOptions
+include/osgEarthDrivers/detail/DetailTerrainEffect
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
+include/osgEarthDrivers/terrainshader/TerrainShaderExtension
+include/osgEarthDrivers/terrainshader/TerrainShaderOptions
+include/osgEarthDrivers/viewpoints/ViewpointsExtension
lib/libosgEarth.so
-lib/libosgEarth.so.149
-lib/libosgEarth.so.%%PORTVERSION%%.0
+lib/libosgEarth.so.158
+lib/libosgEarth.so.%%PORTVERSION%%
lib/osgPlugins-3.6.5/osgdb_earth.so
lib/osgPlugins-3.6.5/osgdb_fastdxt.so
lib/osgPlugins-3.6.5/osgdb_gltf.so
@@ -437,8 +410,6 @@ 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
@@ -448,6 +419,7 @@ 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
+share/cmake/Modules/osgEarth/osgEarth-config.cmake
+share/cmake/Modules/osgEarth/osgEarth-configVersion.cmake
+share/cmake/Modules/osgEarth/osgEarth-targets-%%CMAKE_BUILD_TYPE%%.cmake
+share/cmake/Modules/osgEarth/osgEarth-targets.cmake