View | Details | Raw Unified | Return to bug 272550 | Differences between
and this patch

Collapse All | Expand All

(-)b/graphics/osgearth/Makefile (-10 / +11 lines)
Lines 1-7 Link Here
1
PORTNAME=	osgearth
1
PORTNAME=	osgearth
2
PORTVERSION=	3.2
2
PORTVERSION=	3.4
3
DISTVERSIONPREFIX=	${PORTNAME}-
3
DISTVERSIONPREFIX=	${PORTNAME}-
4
PORTREVISION=	7
5
CATEGORIES=	graphics geography
4
CATEGORIES=	graphics geography
6
5
7
MAINTAINER=	lbartoletti@FreeBSD.org
6
MAINTAINER=	lbartoletti@FreeBSD.org
Lines 21-27 LIB_DEPENDS= libcurl.so:ftp/curl \ Link Here
21
USES=		cmake gl pkgconfig sqlite
20
USES=		cmake gl pkgconfig sqlite
22
21
23
USE_GITHUB=	yes
22
USE_GITHUB=	yes
24
GH_ACCOUNT=	gwaldron
23
GH_ACCOUNT=	gwaldron ocornut:imgui Esri:lerc Tencent:rapidjson
24
GH_PROJECT=	imgui:imgui lerc:lerc rapidjson:rapidjson
25
GH_TAGNAME=	9e8e5ac:imgui 19542a0:lerc f54b0e4:rapidjson
25
26
26
USE_CXXSTD=	c++11
27
USE_CXXSTD=	c++11
27
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
Lines 33-38 CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \ Link Here
33
34
34
PLIST_SUB=	PORTVERSION=${PORTVERSION}
35
PLIST_SUB=	PORTVERSION=${PORTVERSION}
35
36
37
post-extract:
38
.for sm in imgui lerc rapidjson
39
	@${MV} ${WRKSRC_${sm}}/* ${WRKSRC}/src/third_party/${sm}/
40
41
.endfor
42
36
.include <bsd.port.options.mk>
43
.include <bsd.port.options.mk>
37
44
38
.if ${ARCH:Mpowerpc64*}
45
.if ${ARCH:Mpowerpc64*}
Lines 42-51 USES+= compiler:gcc-c++11-lib Link Here
42
USES+=		compiler:c++11-lang
49
USES+=		compiler:c++11-lang
43
.endif
50
.endif
44
51
45
.include <bsd.port.pre.mk>
52
.include <bsd.port.mk>
46
47
.if ${ARCH} == i386
48
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-i386
49
.endif
50
51
.include <bsd.port.post.mk>
(-)b/graphics/osgearth/distinfo (-3 / +9 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1648530145
1
TIMESTAMP = 1689531343
2
SHA256 (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 7e1dd643b1f3b8d1ba9561b899c18176af988342b86c42d89a70be924cb747f6
2
SHA256 (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 2a5aabd6950c598b2310842dfa1e9cf085d54692a0c787cef5627530fcbe682e
3
SIZE (gwaldron-osgearth-osgearth-3.2_GH0.tar.gz) = 121772329
3
SIZE (gwaldron-osgearth-osgearth-3.4_GH0.tar.gz) = 119642993
4
SHA256 (ocornut-imgui-9e8e5ac_GH0.tar.gz) = da877be818e7f4f20915c9982081f958bf5f68b26a5afde64c263427aff8097b
5
SIZE (ocornut-imgui-9e8e5ac_GH0.tar.gz) = 1592220
6
SHA256 (Esri-lerc-19542a0_GH0.tar.gz) = 5d48ae91b45343c68da336ef6996af3b9495452970185244e21253f4c711e529
7
SIZE (Esri-lerc-19542a0_GH0.tar.gz) = 4247805
8
SHA256 (Tencent-rapidjson-f54b0e4_GH0.tar.gz) = 35c330d40ed9def99e8dea8f3b0e4fda7610b813b6f4aac9a70ffefcb9ab1f1e
9
SIZE (Tencent-rapidjson-f54b0e4_GH0.tar.gz) = 1019457
(-)a/graphics/osgearth/files/extra-patch-i386 (-21 lines)
Removed Link Here
1
--- src/osgEarthDrivers/fastdxt/CMakeLists.txt.orig	2018-11-12 18:17:36 UTC
2
+++ src/osgEarthDrivers/fastdxt/CMakeLists.txt
3
@@ -30,7 +30,6 @@ SET(TARGET_SRC
4
     dxt.cpp
5
     util.cpp
6
     libdxt.cpp
7
-    intrinsic.cpp
8
 )
9
 
10
 SETUP_PLUGIN(fastdxt)
11
--- src/osgEarthDrivers/fastdxt/dxt.cpp.orig	2018-11-12 18:17:36 UTC
12
+++ src/osgEarthDrivers/fastdxt/dxt.cpp
13
@@ -7,7 +7,7 @@
14
 #include "util.h"
15
 
16
 
17
-#define DXT_INTR 1
18
+#define DXT_INTR 0
19
 
20
 void ExtractBlock( const byte *inPtr, int width, byte *colorBlock );
21
 void ExtractBlock_Intrinsics( const byte *inPtr, int width, byte *colorBlock );
(-)b/graphics/osgearth/files/patch-CMakeLists.txt (+8 lines)
Added Link Here
1
--- CMakeLists.txt.orig	2023-07-17 15:47:49 UTC
2
+++ CMakeLists.txt
3
@@ -335,4 +335,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConf
4
   COMPATIBILITY SameMajorVersion )
5
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfig.cmake
6
               ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfigVersion.cmake
7
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/cmake )
8
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/osgEarth )
(-)b/graphics/osgearth/files/patch-src_osgEarthDrivers_lerc_CMakeLists.txt (-3 / +3 lines)
Lines 1-8 Link Here
1
--- src/osgEarthDrivers/lerc/CMakeLists.txt.orig	2021-08-09 17:37:52 UTC
1
--- src/osgEarthDrivers/lerc/CMakeLists.txt.orig	2023-05-16 14:53:59 UTC
2
+++ src/osgEarthDrivers/lerc/CMakeLists.txt
2
+++ src/osgEarthDrivers/lerc/CMakeLists.txt
3
@@ -1,4 +1,4 @@
3
@@ -1,4 +1,4 @@
4
-INCLUDE_DIRECTORIES( ../../third_party/lerc )
4
-INCLUDE_DIRECTORIES( ../../third_party/lerc/include )
5
+INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc )
5
+INCLUDE_DIRECTORIES( BEFORE ../../third_party/lerc/include )
6
 
6
 
7
 SET(TARGET_SRC
7
 SET(TARGET_SRC
8
     ReaderWriterLERC.cpp
8
     ReaderWriterLERC.cpp
(-)b/graphics/osgearth/pkg-plist (-18 / +18 lines)
Lines 2-25 bin/osgEarth_tests Link Here
2
bin/osgearth_3pv
2
bin/osgearth_3pv
3
bin/osgearth_annotation
3
bin/osgearth_annotation
4
bin/osgearth_atlas
4
bin/osgearth_atlas
5
bin/osgearth_bakefeaturetiles
5
bin/osgearth_bindless
6
bin/osgearth_bindless
6
bin/osgearth_boundarygen
7
bin/osgearth_boundarygen
7
bin/osgearth_city
8
bin/osgearth_city
8
bin/osgearth_clamp
9
bin/osgearth_clamp
9
bin/osgearth_cluster
10
bin/osgearth_cluster
10
bin/osgearth_computerangecallback
11
bin/osgearth_controls
12
bin/osgearth_conv
11
bin/osgearth_conv
13
bin/osgearth_createtile
12
bin/osgearth_createtile
14
bin/osgearth_decal
15
bin/osgearth_drawables
13
bin/osgearth_drawables
16
bin/osgearth_eci
14
bin/osgearth_eci
17
bin/osgearth_elevation
18
bin/osgearth_ephemeris
15
bin/osgearth_ephemeris
19
bin/osgearth_featurefilter
16
bin/osgearth_featurefilter
20
bin/osgearth_featurequery
21
bin/osgearth_features
17
bin/osgearth_features
22
bin/osgearth_geodetic_graticule
23
bin/osgearth_graticule
18
bin/osgearth_graticule
24
bin/osgearth_heatmap
19
bin/osgearth_heatmap
25
bin/osgearth_horizon
20
bin/osgearth_horizon
Lines 29-44 bin/osgearth_los Link Here
29
bin/osgearth_magnify
24
bin/osgearth_magnify
30
bin/osgearth_manip
25
bin/osgearth_manip
31
bin/osgearth_map
26
bin/osgearth_map
32
bin/osgearth_measure
33
bin/osgearth_minimap
27
bin/osgearth_minimap
34
bin/osgearth_mrt
28
bin/osgearth_mrt
35
bin/osgearth_mvtindex
29
bin/osgearth_mvtindex
36
bin/osgearth_occlusionculling
30
bin/osgearth_occlusionculling
37
bin/osgearth_overlayviewer
31
bin/osgearth_overlayviewer
38
bin/osgearth_scenegraphcallbacks
39
bin/osgearth_sequencecontrol
40
bin/osgearth_shadercomp
32
bin/osgearth_shadercomp
41
bin/osgearth_shadergen
42
bin/osgearth_skyview
33
bin/osgearth_skyview
43
bin/osgearth_terrainprofile
34
bin/osgearth_terrainprofile
44
bin/osgearth_tfs
35
bin/osgearth_tfs
Lines 48-54 bin/osgearth_transform Link Here
48
bin/osgearth_version
39
bin/osgearth_version
49
bin/osgearth_video
40
bin/osgearth_video
50
bin/osgearth_viewer
41
bin/osgearth_viewer
51
bin/osgearth_wfs
52
include/osgEarth/AGG.h
42
include/osgEarth/AGG.h
53
include/osgEarth/ActivityMonitorTool
43
include/osgEarth/ActivityMonitorTool
54
include/osgEarth/AltitudeFilter
44
include/osgEarth/AltitudeFilter
Lines 77-83 include/osgEarth/BuildGeometryFilter Link Here
77
include/osgEarth/BuildTextFilter
67
include/osgEarth/BuildTextFilter
78
include/osgEarth/Cache
68
include/osgEarth/Cache
79
include/osgEarth/CacheBin
69
include/osgEarth/CacheBin
80
include/osgEarth/CacheEstimator
81
include/osgEarth/CachePolicy
70
include/osgEarth/CachePolicy
82
include/osgEarth/CacheSeed
71
include/osgEarth/CacheSeed
83
include/osgEarth/Callouts
72
include/osgEarth/Callouts
Lines 86-91 include/osgEarth/Capabilities Link Here
86
include/osgEarth/CascadeDrapingDecorator
75
include/osgEarth/CascadeDrapingDecorator
87
include/osgEarth/CentroidFilter
76
include/osgEarth/CentroidFilter
88
include/osgEarth/CesiumIon
77
include/osgEarth/CesiumIon
78
include/osgEarth/Chonk
89
include/osgEarth/CircleNode
79
include/osgEarth/CircleNode
90
include/osgEarth/ClampCallback
80
include/osgEarth/ClampCallback
91
include/osgEarth/ClampableNode
81
include/osgEarth/ClampableNode
Lines 102-107 include/osgEarth/Containers Link Here
102
include/osgEarth/ContourMap
92
include/osgEarth/ContourMap
103
include/osgEarth/Controls
93
include/osgEarth/Controls
104
include/osgEarth/ConvertTypeFilter
94
include/osgEarth/ConvertTypeFilter
95
include/osgEarth/Coverage
96
include/osgEarth/CoverageLayer
105
include/osgEarth/CoverageSymbol
97
include/osgEarth/CoverageSymbol
106
include/osgEarth/CropFilter
98
include/osgEarth/CropFilter
107
include/osgEarth/CssUtils
99
include/osgEarth/CssUtils
Lines 127-133 include/osgEarth/ElevationQuery Link Here
127
include/osgEarth/ElevationRanges
119
include/osgEarth/ElevationRanges
128
include/osgEarth/EllipseNode
120
include/osgEarth/EllipseNode
129
include/osgEarth/Ellipsoid
121
include/osgEarth/Ellipsoid
130
include/osgEarth/EllipsoidIntersector
131
include/osgEarth/Endian
122
include/osgEarth/Endian
132
include/osgEarth/Ephemeris
123
include/osgEarth/Ephemeris
133
include/osgEarth/ExampleResources
124
include/osgEarth/ExampleResources
Lines 156-161 include/osgEarth/FileUtils Link Here
156
include/osgEarth/Fill
147
include/osgEarth/Fill
157
include/osgEarth/Filter
148
include/osgEarth/Filter
158
include/osgEarth/FilterContext
149
include/osgEarth/FilterContext
150
include/osgEarth/FilteredFeatureSource
159
include/osgEarth/FlatteningLayer
151
include/osgEarth/FlatteningLayer
160
include/osgEarth/Formatter
152
include/osgEarth/Formatter
161
include/osgEarth/FractalElevationLayer
153
include/osgEarth/FractalElevationLayer
Lines 177-182 include/osgEarth/GeodeticLabelingEngine Link Here
177
include/osgEarth/Geoid
169
include/osgEarth/Geoid
178
include/osgEarth/Geometry
170
include/osgEarth/Geometry
179
include/osgEarth/GeometryClamper
171
include/osgEarth/GeometryClamper
172
include/osgEarth/GeometryCloud
180
include/osgEarth/GeometryCompiler
173
include/osgEarth/GeometryCompiler
181
include/osgEarth/GeometryFactory
174
include/osgEarth/GeometryFactory
182
include/osgEarth/GeometryRasterizer
175
include/osgEarth/GeometryRasterizer
Lines 199-205 include/osgEarth/ImageToHeightFieldConverter Link Here
199
include/osgEarth/ImageUtils
192
include/osgEarth/ImageUtils
200
include/osgEarth/InstanceBuilder
193
include/osgEarth/InstanceBuilder
201
include/osgEarth/InstanceCloud
194
include/osgEarth/InstanceCloud
202
include/osgEarth/InstanceCloud.cpp
203
include/osgEarth/InstanceResource
195
include/osgEarth/InstanceResource
204
include/osgEarth/InstanceSymbol
196
include/osgEarth/InstanceSymbol
205
include/osgEarth/IntersectionPicker
197
include/osgEarth/IntersectionPicker
Lines 228-239 include/osgEarth/MGRSFormatter Link Here
228
include/osgEarth/MGRSGraticule
220
include/osgEarth/MGRSGraticule
229
include/osgEarth/MVT
221
include/osgEarth/MVT
230
include/osgEarth/Map
222
include/osgEarth/Map
223
include/osgEarth/MapboxGLGlyphManager
231
include/osgEarth/MapCallback
224
include/osgEarth/MapCallback
232
include/osgEarth/MapInfo
225
include/osgEarth/MapInfo
233
include/osgEarth/MapModelChange
226
include/osgEarth/MapModelChange
234
include/osgEarth/MapNode
227
include/osgEarth/MapNode
235
include/osgEarth/MapNodeObserver
228
include/osgEarth/MapNodeObserver
236
include/osgEarth/MapboxGLImageLayer
229
include/osgEarth/MapboxGLImageLayer
230
include/osgEarth/MaterialLoader
237
include/osgEarth/Math
231
include/osgEarth/Math
238
include/osgEarth/MeasureTool
232
include/osgEarth/MeasureTool
239
include/osgEarth/MemCache
233
include/osgEarth/MemCache
Lines 242-247 include/osgEarth/MeshConsolidator Link Here
242
include/osgEarth/MeshFlattener
236
include/osgEarth/MeshFlattener
243
include/osgEarth/MeshSubdivider
237
include/osgEarth/MeshSubdivider
244
include/osgEarth/MetaTile
238
include/osgEarth/MetaTile
239
include/osgEarth/MetadataNode
245
include/osgEarth/Metrics
240
include/osgEarth/Metrics
246
include/osgEarth/ModelLayer
241
include/osgEarth/ModelLayer
247
include/osgEarth/ModelNode
242
include/osgEarth/ModelNode
Lines 349-364 include/osgEarth/Text Link Here
349
include/osgEarth/TextSymbol
344
include/osgEarth/TextSymbol
350
include/osgEarth/TextSymbolizer
345
include/osgEarth/TextSymbolizer
351
include/osgEarth/TextureArena
346
include/osgEarth/TextureArena
352
include/osgEarth/TextureArena.cpp
353
include/osgEarth/TextureBuffer
347
include/osgEarth/TextureBuffer
354
include/osgEarth/Threading
348
include/osgEarth/Threading
355
include/osgEarth/ThreeDTilesLayer
349
include/osgEarth/ThreeDTilesLayer
356
include/osgEarth/TileCache
350
include/osgEarth/TileCache
351
include/osgEarth/TileEstimator
357
include/osgEarth/TileHandler
352
include/osgEarth/TileHandler
358
include/osgEarth/TileIndex
353
include/osgEarth/TileIndex
359
include/osgEarth/TileIndexBuilder
354
include/osgEarth/TileIndexBuilder
360
include/osgEarth/TileKey
355
include/osgEarth/TileKey
361
include/osgEarth/TileLayer
356
include/osgEarth/TileLayer
357
include/osgEarth/TileMesher
362
include/osgEarth/TileRasterizer
358
include/osgEarth/TileRasterizer
363
include/osgEarth/TileSource
359
include/osgEarth/TileSource
364
include/osgEarth/TileSourceElevationLayer
360
include/osgEarth/TileSourceElevationLayer
Lines 367-372 include/osgEarth/TileVisitor Link Here
367
include/osgEarth/TiledFeatureModelGraph
363
include/osgEarth/TiledFeatureModelGraph
368
include/osgEarth/TiledFeatureModelLayer
364
include/osgEarth/TiledFeatureModelLayer
369
include/osgEarth/TimeControl
365
include/osgEarth/TimeControl
366
include/osgEarth/TimeSeriesImage
370
include/osgEarth/TopologyGraph
367
include/osgEarth/TopologyGraph
371
include/osgEarth/TrackNode
368
include/osgEarth/TrackNode
372
include/osgEarth/TransformFilter
369
include/osgEarth/TransformFilter
Lines 389-395 include/osgEarth/WingedEdgeMesh Link Here
389
include/osgEarth/WireLines
386
include/osgEarth/WireLines
390
include/osgEarth/XYZ
387
include/osgEarth/XYZ
391
include/osgEarth/XYZFeatureSource
388
include/osgEarth/XYZFeatureSource
389
include/osgEarth/XYZModelGraph
390
include/osgEarth/XYZModelLayer
392
include/osgEarth/XmlUtils
391
include/osgEarth/XmlUtils
392
include/osgEarth/glyphs.pb.h
393
include/osgEarth/optional
393
include/osgEarth/optional
394
include/osgEarth/rtree.h
394
include/osgEarth/rtree.h
395
include/osgEarth/tinystr.h
395
include/osgEarth/tinystr.h
Lines 407-413 include/osgEarthDrivers/engine_rex/GeometryPool Link Here
407
include/osgEarthDrivers/engine_rex/LayerDrawable
407
include/osgEarthDrivers/engine_rex/LayerDrawable
408
include/osgEarthDrivers/engine_rex/LoadTileData
408
include/osgEarthDrivers/engine_rex/LoadTileData
409
include/osgEarthDrivers/engine_rex/Loader
409
include/osgEarthDrivers/engine_rex/Loader
410
include/osgEarthDrivers/engine_rex/MeshEditor
411
include/osgEarthDrivers/engine_rex/RenderBindings
410
include/osgEarthDrivers/engine_rex/RenderBindings
412
include/osgEarthDrivers/engine_rex/RexTerrainEngineNode
411
include/osgEarthDrivers/engine_rex/RexTerrainEngineNode
413
include/osgEarthDrivers/engine_rex/SelectionInfo
412
include/osgEarthDrivers/engine_rex/SelectionInfo
Lines 431-437 include/osgEarthDrivers/scriptengine_javascript/duktape.h Link Here
431
include/osgEarthDrivers/sky_gl/GLSkyOptions
430
include/osgEarthDrivers/sky_gl/GLSkyOptions
432
include/osgEarthDrivers/sky_simple/SimpleSkyOptions
431
include/osgEarthDrivers/sky_simple/SimpleSkyOptions
433
lib/libosgEarth.so
432
lib/libosgEarth.so
434
lib/libosgEarth.so.113
433
lib/libosgEarth.so.148
435
lib/libosgEarth.so.%%PORTVERSION%%.0
434
lib/libosgEarth.so.%%PORTVERSION%%.0
436
lib/osgPlugins-3.6.5/osgdb_earth.so
435
lib/osgPlugins-3.6.5/osgdb_earth.so
437
lib/osgPlugins-3.6.5/osgdb_fastdxt.so
436
lib/osgPlugins-3.6.5/osgdb_fastdxt.so
Lines 457-459 lib/osgPlugins-3.6.5/osgdb_osgearth_vdatum_egm96.so Link Here
457
lib/osgPlugins-3.6.5/osgdb_osgearth_viewpoints.so
456
lib/osgPlugins-3.6.5/osgdb_osgearth_viewpoints.so
458
lib/osgPlugins-3.6.5/osgdb_template.so
457
lib/osgPlugins-3.6.5/osgdb_template.so
459
lib/osgPlugins-3.6.5/osgdb_webp.so
458
lib/osgPlugins-3.6.5/osgdb_webp.so
460
- 
459
share/cmake/Modules/osgEarth/osgEarthConfig.cmake
460
share/cmake/Modules/osgEarth/osgEarthConfigVersion.cmake

Return to bug 272550