Attachment #185740 for bug #221786

View | Details | Raw Unified | Return to bug 221786
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	osgearth
PORTVERSION=	2.8
DISTVERSIONPREFIX=	${PORTNAME}-
PORTREVISION=	1
CATEGORIES=	graphics geography

MAINTAINER=	lbartoletti@tuxfamily.org

COMMENT=	C++ terrain rendering toolkit for OpenSceneGraph

LICENSE=	LGPL3
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

BUILD_DEPENDS=	minizip:archivers/minizip
LIB_DEPENDS=	libosg.so:graphics/osg \


USE_LDCONFIG=	yes
USES=		cmake pkgconfig sqlite
USE_GL+=	gl glu
PLIST_SUB=	OSGVERSION=3.4.0

CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1463133065	1	TIMESTAMP = 1503080754
2	SHA256 (gwaldron-osgearth-osgearth-2.7_GH0.tar.gz) = cf973b664aeb79f70e48f5cd02ba670069ec273d71fe541604ed5b328d956d83	2	SHA256 (gwaldron-osgearth-osgearth-2.8_GH0.tar.gz) = 78120338ead2976018cc877e93342403bafe1b032f2f8b7de3915ba6c5c2486a
3	SIZE (gwaldron-osgearth-osgearth-2.7_GH0.tar.gz) = 61837911	3	SIZE (gwaldron-osgearth-osgearth-2.8_GH0.tar.gz) = 77472117




--- src/osgEarth/ThreadingUtils.cpp.orig	2016-02-10 18:21:28 UTC
+++ src/osgEarth/ThreadingUtils.cpp
@@ -23,6 +23,7 @@
 #else
 #   include <unistd.h>
 #   include <sys/syscall.h>
+#   include <sys/thr.h>
 #endif
 
 using namespace osgEarth::Threading;
@@ -40,6 +41,10 @@ unsigned osgEarth::Threading::getCurrent
   return ::syscall(SYS_thread_selfid);
 #elif __ANDROID__
   return gettid();
+#elif __FreeBSD__
+  long lwpid;
+  thr_self(&lwpid);
+  return lwpid;
 #else
   return (unsigned)::syscall(SYS_gettid);
 #endif

Lines 1-3 Link Here

(-)pkg-plist (-39 / +111 lines)
		1	bin/osgearth_3pv
1	bin/osgearth_annotation	2	bin/osgearth_annotation
2	bin/osgearth_atlas	3	bin/osgearth_atlas
3	bin/osgearth_backfill	4	bin/osgearth_backfill
Lines 8-17 Link Here
8	bin/osgearth_clamp	9	bin/osgearth_clamp
9	bin/osgearth_clipplane	10	bin/osgearth_clipplane
10	bin/osgearth_colorfilter	11	bin/osgearth_colorfilter
		12	bin/osgearth_computerangecallback
11	bin/osgearth_controls	13	bin/osgearth_controls
12	bin/osgearth_conv	14	bin/osgearth_conv
13	bin/osgearth_createtile	15	bin/osgearth_createtile
		16	bin/osgearth_datetime
		17	bin/osgearth_deformation
14	bin/osgearth_elevation	18	bin/osgearth_elevation
		19	bin/osgearth_ephemeris
15	bin/osgearth_featureeditor	20	bin/osgearth_featureeditor
16	bin/osgearth_featurefilter	21	bin/osgearth_featurefilter
17	bin/osgearth_featureinfo	22	bin/osgearth_featureinfo
Lines 19-24 Link Here
19	bin/osgearth_features	24	bin/osgearth_features
20	bin/osgearth_fog	25	bin/osgearth_fog
21	bin/osgearth_graticule	26	bin/osgearth_graticule
		27	bin/osgearth_horizon
		28	bin/osgearth_http
22	bin/osgearth_imageoverlay	29	bin/osgearth_imageoverlay
23	bin/osgearth_los	30	bin/osgearth_los
24	bin/osgearth_manip	31	bin/osgearth_manip
Lines 29-39 Link Here
29	bin/osgearth_occlusionculling	36	bin/osgearth_occlusionculling
30	bin/osgearth_overlayviewer	37	bin/osgearth_overlayviewer
31	bin/osgearth_package	38	bin/osgearth_package
		39	bin/osgearth_pagingtest
32	bin/osgearth_pick	40	bin/osgearth_pick
33	bin/osgearth_sequencecontrol	41	bin/osgearth_sequencecontrol
34	bin/osgearth_shadercomp	42	bin/osgearth_shadercomp
35	bin/osgearth_shadergen	43	bin/osgearth_shadergen
36	bin/osgearth_sharedlayer	44	bin/osgearth_sharedlayer
		45	bin/osgearth_skyview
		46	bin/osgearth_splat
		47	bin/osgearth_srstest
37	bin/osgearth_terrainprofile	48	bin/osgearth_terrainprofile
38	bin/osgearth_tfs	49	bin/osgearth_tfs
39	bin/osgearth_tileindex	50	bin/osgearth_tileindex
Lines 43-48 Link Here
43	bin/osgearth_transform	54	bin/osgearth_transform
44	bin/osgearth_version	55	bin/osgearth_version
45	bin/osgearth_viewer	56	bin/osgearth_viewer
		57	bin/osgearth_wfs
		58	bin/osgearth_xfbtest
46	include/osgEarth/AlphaEffect	59	include/osgEarth/AlphaEffect
47	include/osgEarth/AutoScale	60	include/osgEarth/AutoScale
48	include/osgEarth/Bounds	61	include/osgEarth/Bounds
Lines 62-78 Link Here
62	include/osgEarth/Containers	75	include/osgEarth/Containers
63	include/osgEarth/Cube	76	include/osgEarth/Cube
64	include/osgEarth/CullingUtils	77	include/osgEarth/CullingUtils
65	include/osgEarth/DPLineSegmentIntersector
66	include/osgEarth/DateTime	78	include/osgEarth/DateTime
67	include/osgEarth/Decluttering	79	include/osgEarth/DateTimeRange
68	include/osgEarth/DepthOffset	80	include/osgEarth/DepthOffset
		81	include/osgEarth/DPLineSegmentIntersector
69	include/osgEarth/DrapeableNode	82	include/osgEarth/DrapeableNode
		83	include/osgEarth/DrapingCullSet
70	include/osgEarth/DrapingTechnique	84	include/osgEarth/DrapingTechnique
71	include/osgEarth/DrawInstanced	85	include/osgEarth/DrawInstanced
72	include/osgEarth/ECEF	86	include/osgEarth/ECEF
73	include/osgEarth/ElevationField	87	include/osgEarth/ElevationLayer
74	include/osgEarth/ElevationLOD	88	include/osgEarth/ElevationLOD
75	include/osgEarth/ElevationLayer
76	include/osgEarth/ElevationQuery	89	include/osgEarth/ElevationQuery
77	include/osgEarth/Export	90	include/osgEarth/Export
78	include/osgEarth/Extension	91	include/osgEarth/Extension
Lines 80-97 Link Here
80	include/osgEarth/FileUtils	93	include/osgEarth/FileUtils
81	include/osgEarth/GeoCommon	94	include/osgEarth/GeoCommon
82	include/osgEarth/GeoData	95	include/osgEarth/GeoData
		96	include/osgEarth/Geoid
83	include/osgEarth/GeoMath	97	include/osgEarth/GeoMath
		98	include/osgEarth/GeometryClamper
84	include/osgEarth/GeoTransform	99	include/osgEarth/GeoTransform
85	include/osgEarth/Geoid	100	include/osgEarth/GLSLChunker
86	include/osgEarth/HTTPClient
87	include/osgEarth/HeightFieldUtils	101	include/osgEarth/HeightFieldUtils
88	include/osgEarth/Horizon	102	include/osgEarth/Horizon
89	include/osgEarth/IOTypes	103	include/osgEarth/HTTPClient
90	include/osgEarth/ImageLayer	104	include/osgEarth/ImageLayer
91	include/osgEarth/ImageMosaic	105	include/osgEarth/ImageMosaic
92	include/osgEarth/ImageToHeightFieldConverter	106	include/osgEarth/ImageToHeightFieldConverter
93	include/osgEarth/ImageUtils	107	include/osgEarth/ImageUtils
94	include/osgEarth/IntersectionPicker	108	include/osgEarth/IntersectionPicker
		109	include/osgEarth/IOTypes
95	include/osgEarth/JsonUtils	110	include/osgEarth/JsonUtils
96	include/osgEarth/Layer	111	include/osgEarth/Layer
97	include/osgEarth/LineFunctor	112	include/osgEarth/LineFunctor
Lines 110-115 Link Here
110	include/osgEarth/MaskNode	125	include/osgEarth/MaskNode
111	include/osgEarth/MaskSource	126	include/osgEarth/MaskSource
112	include/osgEarth/MemCache	127	include/osgEarth/MemCache
		128	include/osgEarth/Memory
113	include/osgEarth/ModelLayer	129	include/osgEarth/ModelLayer
114	include/osgEarth/ModelSource	130	include/osgEarth/ModelSource
115	include/osgEarth/NativeProgramAdapter	131	include/osgEarth/NativeProgramAdapter
Lines 116-121 Link Here
116	include/osgEarth/NodeUtils	132	include/osgEarth/NodeUtils
117	include/osgEarth/Notify	133	include/osgEarth/Notify
118	include/osgEarth/ObjectIndex	134	include/osgEarth/ObjectIndex
		135	include/osgEarth/optional
119	include/osgEarth/OverlayDecorator	136	include/osgEarth/OverlayDecorator
120	include/osgEarth/OverlayNode	137	include/osgEarth/OverlayNode
121	include/osgEarth/PhongLightingEffect	138	include/osgEarth/PhongLightingEffect
Lines 124-148 Link Here
124	include/osgEarth/Profile	141	include/osgEarth/Profile
125	include/osgEarth/Profiler	142	include/osgEarth/Profiler
126	include/osgEarth/Progress	143	include/osgEarth/Progress
		144	include/osgEarth/QuadTree
127	include/osgEarth/Random	145	include/osgEarth/Random
128	include/osgEarth/Registry	146	include/osgEarth/Registry
		147	include/osgEarth/ResourceReleaser
129	include/osgEarth/Revisioning	148	include/osgEarth/Revisioning
		149	include/osgEarth/ScreenSpaceLayout
130	include/osgEarth/ShaderFactory	150	include/osgEarth/ShaderFactory
131	include/osgEarth/ShaderGenerator	151	include/osgEarth/ShaderGenerator
132	include/osgEarth/ShaderLoader	152	include/osgEarth/ShaderLoader
		153	include/osgEarth/Shaders
133	include/osgEarth/ShaderUtils	154	include/osgEarth/ShaderUtils
134	include/osgEarth/Shaders	155	include/osgEarth/Shadowing
135	include/osgEarth/SharedSARepo	156	include/osgEarth/SharedSARepo
136	include/osgEarth/SpatialReference	157	include/osgEarth/SpatialReference
137	include/osgEarth/StateSetCache	158	include/osgEarth/StateSetCache
138	include/osgEarth/StateSetLOD	159	include/osgEarth/StateSetLOD
		160	include/osgEarth/Status
139	include/osgEarth/StringUtils	161	include/osgEarth/StringUtils
140	include/osgEarth/TaskService	162	include/osgEarth/TaskService
141	include/osgEarth/Terrain	163	include/osgEarth/Terrain
142	include/osgEarth/TerrainEffect	164	include/osgEarth/TerrainEffect
143	include/osgEarth/TerrainEngineNode	165	include/osgEarth/TerrainEngineNode
		166	include/osgEarth/TerrainEngineRequirements
144	include/osgEarth/TerrainLayer	167	include/osgEarth/TerrainLayer
145	include/osgEarth/TerrainOptions	168	include/osgEarth/TerrainOptions
		169	include/osgEarth/TerrainTileModel
		170	include/osgEarth/TerrainTileModelFactory
146	include/osgEarth/TerrainTileNode	171	include/osgEarth/TerrainTileNode
147	include/osgEarth/Tessellator	172	include/osgEarth/Tessellator
148	include/osgEarth/TextureCompositor	173	include/osgEarth/TextureCompositor
Lines 149-160 Link Here
149	include/osgEarth/ThreadingUtils	174	include/osgEarth/ThreadingUtils
150	include/osgEarth/TileHandler	175	include/osgEarth/TileHandler
151	include/osgEarth/TileKey	176	include/osgEarth/TileKey
		177	include/osgEarth/TileKeyDataStore
		178	include/osgEarth/TilePatchCallback
152	include/osgEarth/TileSource	179	include/osgEarth/TileSource
153	include/osgEarth/TileVisitor	180	include/osgEarth/TileVisitor
154	include/osgEarth/TimeControl	181	include/osgEarth/TimeControl
		182	include/osgEarth/tinystr.h
		183	include/osgEarth/tinyxml.h
155	include/osgEarth/TraversalData	184	include/osgEarth/TraversalData
		185	include/osgEarth/Units
156	include/osgEarth/URI	186	include/osgEarth/URI
157	include/osgEarth/Units
158	include/osgEarth/Utils	187	include/osgEarth/Utils
159	include/osgEarth/Version	188	include/osgEarth/Version
160	include/osgEarth/VerticalDatum	189	include/osgEarth/VerticalDatum
Lines 161-175 Link Here
161	include/osgEarth/Viewpoint	190	include/osgEarth/Viewpoint
162	include/osgEarth/VirtualProgram	191	include/osgEarth/VirtualProgram
163	include/osgEarth/XmlUtils	192	include/osgEarth/XmlUtils
164	include/osgEarth/optional
165	include/osgEarth/tinystr.h
166	include/osgEarth/tinyxml.h
167	include/osgEarthAnnotation/AnnotationData	193	include/osgEarthAnnotation/AnnotationData
168	include/osgEarthAnnotation/AnnotationEditing	194	include/osgEarthAnnotation/AnnotationEditing
		195	include/osgEarthAnnotation/AnnotationExtension
169	include/osgEarthAnnotation/AnnotationNode	196	include/osgEarthAnnotation/AnnotationNode
170	include/osgEarthAnnotation/AnnotationRegistry	197	include/osgEarthAnnotation/AnnotationRegistry
171	include/osgEarthAnnotation/AnnotationSettings	198	include/osgEarthAnnotation/AnnotationSettings
172	include/osgEarthAnnotation/AnnotationUtils	199	include/osgEarthAnnotation/AnnotationUtils
		200	include/osgEarthAnnotation/BboxDrawable
173	include/osgEarthAnnotation/CircleNode	201	include/osgEarthAnnotation/CircleNode
174	include/osgEarthAnnotation/Common	202	include/osgEarthAnnotation/Common
175	include/osgEarthAnnotation/Decoration	203	include/osgEarthAnnotation/Decoration
Lines 178-191 Link Here
178	include/osgEarthAnnotation/Export	206	include/osgEarthAnnotation/Export
179	include/osgEarthAnnotation/FeatureEditing	207	include/osgEarthAnnotation/FeatureEditing
180	include/osgEarthAnnotation/FeatureNode	208	include/osgEarthAnnotation/FeatureNode
		209	include/osgEarthAnnotation/GeoPositionNode
		210	include/osgEarthAnnotation/GeoPositionNodeAutoScaler
181	include/osgEarthAnnotation/HighlightDecoration	211	include/osgEarthAnnotation/HighlightDecoration
182	include/osgEarthAnnotation/ImageOverlay	212	include/osgEarthAnnotation/ImageOverlay
183	include/osgEarthAnnotation/ImageOverlayEditor	213	include/osgEarthAnnotation/ImageOverlayEditor
184	include/osgEarthAnnotation/LabelNode	214	include/osgEarthAnnotation/LabelNode
185	include/osgEarthAnnotation/LocalGeometryNode	215	include/osgEarthAnnotation/LocalGeometryNode
186	include/osgEarthAnnotation/LocalizedNode
187	include/osgEarthAnnotation/ModelNode	216	include/osgEarthAnnotation/ModelNode
188	include/osgEarthAnnotation/OrthoNode
189	include/osgEarthAnnotation/PlaceNode	217	include/osgEarthAnnotation/PlaceNode
190	include/osgEarthAnnotation/RectangleNode	218	include/osgEarthAnnotation/RectangleNode
191	include/osgEarthAnnotation/ScaleDecoration	219	include/osgEarthAnnotation/ScaleDecoration
Lines 207-213 Link Here
207	include/osgEarthDrivers/engine_mp/MPShaders	235	include/osgEarthDrivers/engine_mp/MPShaders
208	include/osgEarthDrivers/engine_mp/MPTerrainEngineNode	236	include/osgEarthDrivers/engine_mp/MPTerrainEngineNode
209	include/osgEarthDrivers/engine_mp/MPTerrainEngineOptions	237	include/osgEarthDrivers/engine_mp/MPTerrainEngineOptions
210	include/osgEarthDrivers/engine_mp/QuickReleaseGLObjects
211	include/osgEarthDrivers/engine_mp/SingleKeyNodeFactory	238	include/osgEarthDrivers/engine_mp/SingleKeyNodeFactory
212	include/osgEarthDrivers/engine_mp/TerrainNode	239	include/osgEarthDrivers/engine_mp/TerrainNode
213	include/osgEarthDrivers/engine_mp/TileGroup	240	include/osgEarthDrivers/engine_mp/TileGroup
Lines 217-222 Link Here
217	include/osgEarthDrivers/engine_mp/TileNode	244	include/osgEarthDrivers/engine_mp/TileNode
218	include/osgEarthDrivers/engine_mp/TileNodeRegistry	245	include/osgEarthDrivers/engine_mp/TileNodeRegistry
219	include/osgEarthDrivers/engine_mp/TilePagedLOD	246	include/osgEarthDrivers/engine_mp/TilePagedLOD
		247	include/osgEarthDrivers/engine_rex/Common
		248	include/osgEarthDrivers/engine_rex/EngineContext
		249	include/osgEarthDrivers/engine_rex/GeometryPool
		250	include/osgEarthDrivers/engine_rex/Loader
		251	include/osgEarthDrivers/engine_rex/LoadTileData
		252	include/osgEarthDrivers/engine_rex/MaskGenerator
		253	include/osgEarthDrivers/engine_rex/MPTexture
		254	include/osgEarthDrivers/engine_rex/RenderBindings
		255	include/osgEarthDrivers/engine_rex/RexTerrainEngineNode
		256	include/osgEarthDrivers/engine_rex/RexTerrainEngineOptions
		257	include/osgEarthDrivers/engine_rex/SelectionInfo
		258	include/osgEarthDrivers/engine_rex/Shaders
		259	include/osgEarthDrivers/engine_rex/SurfaceNode
		260	include/osgEarthDrivers/engine_rex/TileDrawable
		261	include/osgEarthDrivers/engine_rex/TileNode
		262	include/osgEarthDrivers/engine_rex/TileNodeRegistry
		263	include/osgEarthDrivers/engine_rex/Unloader
220	include/osgEarthDrivers/feature_elevation/FeatureElevationOptions	264	include/osgEarthDrivers/feature_elevation/FeatureElevationOptions
221	include/osgEarthDrivers/feature_ogr/FeatureCursorOGR	265	include/osgEarthDrivers/feature_ogr/FeatureCursorOGR
222	include/osgEarthDrivers/feature_ogr/OGRFeatureOptions	266	include/osgEarthDrivers/feature_ogr/OGRFeatureOptions
Lines 223-228 Link Here
223	include/osgEarthDrivers/feature_raster/RasterFeatureOptions	267	include/osgEarthDrivers/feature_raster/RasterFeatureOptions
224	include/osgEarthDrivers/feature_tfs/TFSFeatureOptions	268	include/osgEarthDrivers/feature_tfs/TFSFeatureOptions
225	include/osgEarthDrivers/feature_wfs/WFSFeatureOptions	269	include/osgEarthDrivers/feature_wfs/WFSFeatureOptions
		270	include/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilterOptions
		271	include/osgEarthDrivers/featurefilter_join/JoinFeatureFilterOptions
226	include/osgEarthDrivers/gdal/GDALOptions	272	include/osgEarthDrivers/gdal/GDALOptions
227	include/osgEarthDrivers/kml/KML	273	include/osgEarthDrivers/kml/KML
228	include/osgEarthDrivers/kml/KMLOptions	274	include/osgEarthDrivers/kml/KMLOptions
Lines 229-235 Link Here
229	include/osgEarthDrivers/mask_feature/FeatureMaskOptions	275	include/osgEarthDrivers/mask_feature/FeatureMaskOptions
230	include/osgEarthDrivers/mbtiles/MBTilesOptions	276	include/osgEarthDrivers/mbtiles/MBTilesOptions
231	include/osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions	277	include/osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions
232	include/osgEarthDrivers/model_feature_stencil/FeatureStencilModelOptions
233	include/osgEarthDrivers/model_simple/SimpleModelOptions	278	include/osgEarthDrivers/model_simple/SimpleModelOptions
234	include/osgEarthDrivers/ocean_simple/SimpleOceanOptions	279	include/osgEarthDrivers/ocean_simple/SimpleOceanOptions
235	include/osgEarthDrivers/osg/ColorRampOptions	280	include/osgEarthDrivers/osg/ColorRampOptions
Lines 236-246 Link Here
236	include/osgEarthDrivers/osg/OSGOptions	281	include/osgEarthDrivers/osg/OSGOptions
237	include/osgEarthDrivers/quadkey/QuadKeyOptions	282	include/osgEarthDrivers/quadkey/QuadKeyOptions
238	include/osgEarthDrivers/refresh/RefreshOptions	283	include/osgEarthDrivers/refresh/RefreshOptions
		284	include/osgEarthDrivers/scriptengine_javascript/duk_config.h
		285	include/osgEarthDrivers/scriptengine_javascript/duktape.h
239	include/osgEarthDrivers/scriptengine_javascript/DuktapeEngine	286	include/osgEarthDrivers/scriptengine_javascript/DuktapeEngine
240	include/osgEarthDrivers/scriptengine_javascript/JSGeometry	287	include/osgEarthDrivers/scriptengine_javascript/JSGeometry
241	include/osgEarthDrivers/scriptengine_javascript/duktape.h
242	include/osgEarthDrivers/sky_gl/GLSkyOptions	288	include/osgEarthDrivers/sky_gl/GLSkyOptions
243	include/osgEarthDrivers/sky_simple/SimpleSkyOptions	289	include/osgEarthDrivers/sky_simple/SimpleSkyOptions
		290	include/osgEarthDrivers/skyview/SkyViewOptions
244	include/osgEarthDrivers/splat_mask/SplatMaskOptions	291	include/osgEarthDrivers/splat_mask/SplatMaskOptions
245	include/osgEarthDrivers/template_matclass/TemplateMatClassOptions	292	include/osgEarthDrivers/template_matclass/TemplateMatClassOptions
246	include/osgEarthDrivers/tilecache/TileCacheOptions	293	include/osgEarthDrivers/tilecache/TileCacheOptions
Lines 257-263 Link Here
257	include/osgEarthFeatures/BufferFilter	304	include/osgEarthFeatures/BufferFilter
258	include/osgEarthFeatures/BuildGeometryFilter	305	include/osgEarthFeatures/BuildGeometryFilter
259	include/osgEarthFeatures/BuildTextFilter	306	include/osgEarthFeatures/BuildTextFilter
260	include/osgEarthFeatures/BuildTextOperator
261	include/osgEarthFeatures/CentroidFilter	307	include/osgEarthFeatures/CentroidFilter
262	include/osgEarthFeatures/Common	308	include/osgEarthFeatures/Common
263	include/osgEarthFeatures/ConvertTypeFilter	309	include/osgEarthFeatures/ConvertTypeFilter
Lines 279-285 Link Here
279	include/osgEarthFeatures/GeometryCompiler	325	include/osgEarthFeatures/GeometryCompiler
280	include/osgEarthFeatures/GeometryUtils	326	include/osgEarthFeatures/GeometryUtils
281	include/osgEarthFeatures/LabelSource	327	include/osgEarthFeatures/LabelSource
282	include/osgEarthFeatures/MeshClamper	328	include/osgEarthFeatures/MVT
283	include/osgEarthFeatures/OgrUtils	329	include/osgEarthFeatures/OgrUtils
284	include/osgEarthFeatures/OptimizerHints	330	include/osgEarthFeatures/OptimizerHints
285	include/osgEarthFeatures/PolygonizeLines	331	include/osgEarthFeatures/PolygonizeLines
Lines 288-293 Link Here
288	include/osgEarthFeatures/ScatterFilter	334	include/osgEarthFeatures/ScatterFilter
289	include/osgEarthFeatures/Script	335	include/osgEarthFeatures/Script
290	include/osgEarthFeatures/ScriptEngine	336	include/osgEarthFeatures/ScriptEngine
		337	include/osgEarthFeatures/ScriptFilter
291	include/osgEarthFeatures/Session	338	include/osgEarthFeatures/Session
292	include/osgEarthFeatures/SubstituteModelFilter	339	include/osgEarthFeatures/SubstituteModelFilter
293	include/osgEarthFeatures/TessellateOperator	340	include/osgEarthFeatures/TessellateOperator
Lines 294-301 Link Here
294	include/osgEarthFeatures/TextSymbolizer	341	include/osgEarthFeatures/TextSymbolizer
295	include/osgEarthFeatures/TransformFilter	342	include/osgEarthFeatures/TransformFilter
296	include/osgEarthFeatures/VirtualFeatureSource	343	include/osgEarthFeatures/VirtualFeatureSource
		344	include/osgEarthSplat/Coverage
		345	include/osgEarthSplat/Export
		346	include/osgEarthSplat/LandCover
		347	include/osgEarthSplat/LandCoverTerrainEffect
		348	include/osgEarthSplat/LandCoverTilePatchCallback
		349	include/osgEarthSplat/LandUseTileSource
		350	include/osgEarthSplat/NoiseTextureFactory
		351	include/osgEarthSplat/SplatCatalog
		352	include/osgEarthSplat/SplatCoverageLegend
		353	include/osgEarthSplat/SplatExtension
		354	include/osgEarthSplat/SplatOptions
		355	include/osgEarthSplat/SplatShaders
		356	include/osgEarthSplat/SplatTerrainEffect
		357	include/osgEarthSplat/Surface
		358	include/osgEarthSplat/Zone
297	include/osgEarthSymbology/AGG.h	359	include/osgEarthSymbology/AGG.h
298	include/osgEarthSymbology/AltitudeSymbol	360	include/osgEarthSymbology/AltitudeSymbol
		361	include/osgEarthSymbology/BBoxSymbol
		362	include/osgEarthSymbology/BillboardResource
		363	include/osgEarthSymbology/BillboardSymbol
299	include/osgEarthSymbology/Color	364	include/osgEarthSymbology/Color
300	include/osgEarthSymbology/Common	365	include/osgEarthSymbology/Common
301	include/osgEarthSymbology/CoverageSymbol	366	include/osgEarthSymbology/CoverageSymbol
Lines 303-312 Link Here
303	include/osgEarthSymbology/Expression	368	include/osgEarthSymbology/Expression
304	include/osgEarthSymbology/ExtrusionSymbol	369	include/osgEarthSymbology/ExtrusionSymbol
305	include/osgEarthSymbology/Fill	370	include/osgEarthSymbology/Fill
306	include/osgEarthSymbology/GEOS
307	include/osgEarthSymbology/Geometry	371	include/osgEarthSymbology/Geometry
308	include/osgEarthSymbology/GeometryFactory	372	include/osgEarthSymbology/GeometryFactory
309	include/osgEarthSymbology/GeometryRasterizer	373	include/osgEarthSymbology/GeometryRasterizer
		374	include/osgEarthSymbology/GEOS
310	include/osgEarthSymbology/IconResource	375	include/osgEarthSymbology/IconResource
311	include/osgEarthSymbology/IconSymbol	376	include/osgEarthSymbology/IconSymbol
312	include/osgEarthSymbology/InstanceResource	377	include/osgEarthSymbology/InstanceResource
Lines 341-349 Link Here
341	include/osgEarthUtil/AtlasBuilder	406	include/osgEarthUtil/AtlasBuilder
342	include/osgEarthUtil/AutoClipPlaneHandler	407	include/osgEarthUtil/AutoClipPlaneHandler
343	include/osgEarthUtil/BrightnessContrastColorFilter	408	include/osgEarthUtil/BrightnessContrastColorFilter
344	include/osgEarthUtil/CMYKColorFilter
345	include/osgEarthUtil/ChromaKeyColorFilter	409	include/osgEarthUtil/ChromaKeyColorFilter
346	include/osgEarthUtil/ClampCallback	410	include/osgEarthUtil/ClampCallback
		411	include/osgEarthUtil/CMYKColorFilter
347	include/osgEarthUtil/Common	412	include/osgEarthUtil/Common
348	include/osgEarthUtil/ContourMap	413	include/osgEarthUtil/ContourMap
349	include/osgEarthUtil/Controls	414	include/osgEarthUtil/Controls
Lines 355-363 Link Here
355	include/osgEarthUtil/FeatureQueryTool	420	include/osgEarthUtil/FeatureQueryTool
356	include/osgEarthUtil/Fog	421	include/osgEarthUtil/Fog
357	include/osgEarthUtil/Formatter	422	include/osgEarthUtil/Formatter
358	include/osgEarthUtil/GLSLColorFilter
359	include/osgEarthUtil/GammaColorFilter	423	include/osgEarthUtil/GammaColorFilter
360	include/osgEarthUtil/GeodeticGraticule	424	include/osgEarthUtil/GeodeticGraticule
		425	include/osgEarthUtil/GLSLColorFilter
361	include/osgEarthUtil/GraticuleExtension	426	include/osgEarthUtil/GraticuleExtension
362	include/osgEarthUtil/GraticuleNode	427	include/osgEarthUtil/GraticuleNode
363	include/osgEarthUtil/GraticuleOptions	428	include/osgEarthUtil/GraticuleOptions
Lines 364-399 Link Here
364	include/osgEarthUtil/GraticuleTerrainEffect	429	include/osgEarthUtil/GraticuleTerrainEffect
365	include/osgEarthUtil/HSLColorFilter	430	include/osgEarthUtil/HSLColorFilter
366	include/osgEarthUtil/HTM	431	include/osgEarthUtil/HTM
367	include/osgEarthUtil/LODBlending
368	include/osgEarthUtil/LatLongFormatter	432	include/osgEarthUtil/LatLongFormatter
		433	include/osgEarthUtil/LinearLineOfSight
369	include/osgEarthUtil/LineOfSight	434	include/osgEarthUtil/LineOfSight
370	include/osgEarthUtil/LinearLineOfSight	435	include/osgEarthUtil/LODBlending
371	include/osgEarthUtil/LogarithmicDepthBuffer	436	include/osgEarthUtil/LogarithmicDepthBuffer
		437	include/osgEarthUtil/MeasureTool
372	include/osgEarthUtil/MGRSFormatter	438	include/osgEarthUtil/MGRSFormatter
373	include/osgEarthUtil/MGRSGraticule	439	include/osgEarthUtil/MGRSGraticule
374	include/osgEarthUtil/MeasureTool
375	include/osgEarthUtil/MouseCoordsTool	440	include/osgEarthUtil/MouseCoordsTool
376	include/osgEarthUtil/NightColorFilter	441	include/osgEarthUtil/NightColorFilter
377	include/osgEarthUtil/ObjectLocator	442	include/osgEarthUtil/ObjectLocator
378	include/osgEarthUtil/Ocean	443	include/osgEarthUtil/Ocean
379	include/osgEarthUtil/PolyhedralLineOfSight	444	include/osgEarthUtil/PolyhedralLineOfSight
		445	include/osgEarthUtil/RadialLineOfSight
380	include/osgEarthUtil/RGBColorFilter	446	include/osgEarthUtil/RGBColorFilter
381	include/osgEarthUtil/RTTPicker	447	include/osgEarthUtil/RTTPicker
382	include/osgEarthUtil/RadialLineOfSight
383	include/osgEarthUtil/Shaders	448	include/osgEarthUtil/Shaders
384	include/osgEarthUtil/Shadowing	449	include/osgEarthUtil/Shadowing
		450	include/osgEarthUtil/SimplePager
385	include/osgEarthUtil/SimplexNoise	451	include/osgEarthUtil/SimplexNoise
386	include/osgEarthUtil/Sky	452	include/osgEarthUtil/Sky
387	include/osgEarthUtil/SpatialData	453	include/osgEarthUtil/SpatialData
388	include/osgEarthUtil/StarData	454	include/osgEarthUtil/StarData
		455	include/osgEarthUtil/TerrainProfile
389	include/osgEarthUtil/TFS	456	include/osgEarthUtil/TFS
390	include/osgEarthUtil/TFSPackager	457	include/osgEarthUtil/TFSPackager
		458	include/osgEarthUtil/TileIndex
		459	include/osgEarthUtil/TileIndexBuilder
391	include/osgEarthUtil/TMS	460	include/osgEarthUtil/TMS
392	include/osgEarthUtil/TMSBackFiller	461	include/osgEarthUtil/TMSBackFiller
393	include/osgEarthUtil/TMSPackager	462	include/osgEarthUtil/TMSPackager
394	include/osgEarthUtil/TerrainProfile
395	include/osgEarthUtil/TileIndex
396	include/osgEarthUtil/TileIndexBuilder
397	include/osgEarthUtil/UTMGraticule	463	include/osgEarthUtil/UTMGraticule
398	include/osgEarthUtil/VerticalScale	464	include/osgEarthUtil/VerticalScale
399	include/osgEarthUtil/WFS	465	include/osgEarthUtil/WFS
Lines 400-436 Link Here
400	include/osgEarthUtil/WMS	466	include/osgEarthUtil/WMS
401	lib/libosgEarth.so	467	lib/libosgEarth.so
402	lib/libosgEarth.so.0	468	lib/libosgEarth.so.0
403	lib/libosgEarth.so.2.6.0	469	lib/libosgEarth.so.2.8.0
404	lib/libosgEarthAnnotation.so	470	lib/libosgEarthAnnotation.so
405	lib/libosgEarthAnnotation.so.0	471	lib/libosgEarthAnnotation.so.0
406	lib/libosgEarthAnnotation.so.2.6.0	472	lib/libosgEarthAnnotation.so.2.8.0
407	lib/libosgEarthFeatures.so	473	lib/libosgEarthFeatures.so
408	lib/libosgEarthFeatures.so.0	474	lib/libosgEarthFeatures.so.0
409	lib/libosgEarthFeatures.so.2.6.0	475	lib/libosgEarthFeatures.so.2.8.0
		476	lib/libosgEarthSplat.so
		477	lib/libosgEarthSplat.so.0
		478	lib/libosgEarthSplat.so.2.8.0
410	lib/libosgEarthSymbology.so	479	lib/libosgEarthSymbology.so
411	lib/libosgEarthSymbology.so.0	480	lib/libosgEarthSymbology.so.0
412	lib/libosgEarthSymbology.so.2.6.0	481	lib/libosgEarthSymbology.so.2.8.0
413	lib/libosgEarthUtil.so	482	lib/libosgEarthUtil.so
414	lib/libosgEarthUtil.so.0	483	lib/libosgEarthUtil.so.0
415	lib/libosgEarthUtil.so.2.6.0	484	lib/libosgEarthUtil.so.2.8.0
416	lib/osgPlugins-%%OSGVERSION%%/osgdb_earth.so	485	lib/osgPlugins-%%OSGVERSION%%/osgdb_earth.so
417	lib/osgPlugins-%%OSGVERSION%%/osgdb_kml.so	486	lib/osgPlugins-%%OSGVERSION%%/osgdb_kml.so
418	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_agglite.so	487	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_agglite.so
		488	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_arcgis_map_cache.so
419	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_arcgis.so	489	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_arcgis.so
420	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_arcgis_map_cache.so
421	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_billboard.so
422	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_bing.so	490	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_bing.so
423	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_bumpmap.so	491	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_bumpmap.so
424	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_cache_filesystem.so	492	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_cache_filesystem.so
425	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_colorramp.so	493	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_colorramp.so
426	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_debug.so	494	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_debug.so
		495	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_detail.so
427	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_byo.so	496	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_byo.so
428	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_mp.so	497	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_mp.so
		498	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_rex.so
429	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_elevation.so	499	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_elevation.so
430	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_ogr.so	500	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_ogr.so
431	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_raster.so	501	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_raster.so
432	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_tfs.so	502	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_tfs.so
433	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_wfs.so	503	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_wfs.so
		504	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_featurefilter_intersect.so
		505	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_featurefilter_join.so
434	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_gdal.so	506	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_gdal.so
435	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_label_annotation.so	507	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_label_annotation.so
436	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mapinspector.so	508	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mapinspector.so
Lines 437-446 Link Here
437	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mask_feature.so	509	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mask_feature.so
438	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mbtiles.so	510	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mbtiles.so
439	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_feature_geom.so	511	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_feature_geom.so
440	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_feature_stencil.so
441	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_simple.so	512	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_simple.so
		513	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_monitor.so
442	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_noise.so	514	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_noise.so
443	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_normalmap.so
444	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_ocean_simple.so	515	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_ocean_simple.so
445	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_osg.so	516	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_osg.so
446	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_quadkey.so	517	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_quadkey.so
Lines 448-454 Link Here
448	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_scriptengine_javascript.so	519	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_scriptengine_javascript.so
449	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_sky_gl.so	520	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_sky_gl.so
450	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_sky_simple.so	521	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_sky_simple.so
451	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_splat.so	522	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_skyview.so
452	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_splat_mask.so	523	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_splat_mask.so
453	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_template_matclass.so	524	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_template_matclass.so
454	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_terrainshader.so	525	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_terrainshader.so
Lines 465-467 Link Here
465	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_wms.so	536	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_wms.so
466	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_xyz.so	537	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_xyz.so
467	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_yahoo.so	538	lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_yahoo.so
		539	lib/osgPlugins-%%OSGVERSION%%/osgdb_template.so

Return to bug 221786

Lines 2-10 Link Here

(-)Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= osgearth	4	PORTNAME= osgearth
5	PORTVERSION= 2.7	5	PORTVERSION= 2.8
6	DISTVERSIONPREFIX= ${PORTNAME}-	6	DISTVERSIONPREFIX= ${PORTNAME}-
7	PORTREVISION= 1
8	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
9		8
10	MAINTAINER= lbartoletti@tuxfamily.org	9	MAINTAINER= lbartoletti@tuxfamily.org
Lines 11-16 Link Here
11	COMMENT= C++ terrain rendering toolkit for OpenSceneGraph	10	COMMENT= C++ terrain rendering toolkit for OpenSceneGraph
12		11
13	LICENSE= LGPL3	12	LICENSE= LGPL3
		13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
14		14
15	BUILD_DEPENDS= minizip:archivers/minizip	15	BUILD_DEPENDS= minizip:archivers/minizip
16	LIB_DEPENDS= libosg.so:graphics/osg \	16	LIB_DEPENDS= libosg.so:graphics/osg \
Lines 22-27 Link Here
22		22
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24	USES= cmake pkgconfig sqlite	24	USES= cmake pkgconfig sqlite
		25	USE_GL+= gl glu
25	PLIST_SUB= OSGVERSION=3.4.0	26	PLIST_SUB= OSGVERSION=3.4.0
26		27
27	CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \	28	CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \

Lines 1-21 Link Here

(-)files/patch-src_osgEarth_ThreadingUtils.cpp (-21 lines)
1	--- src/osgEarth/ThreadingUtils.cpp.orig 2016-02-10 18:21:28 UTC
2	+++ src/osgEarth/ThreadingUtils.cpp
3	@@ -23,6 +23,7 @@
4	#else
5	# include <unistd.h>
6	# include <sys/syscall.h>
7	+# include <sys/thr.h>
8	#endif
9
10	using namespace osgEarth::Threading;
11	@@ -40,6 +41,10 @@ unsigned osgEarth::Threading::getCurrent
12	return ::syscall(SYS_thread_selfid);
13	#elif __ANDROID__
14	return gettid();
15	+#elif __FreeBSD__
16	+ long lwpid;
17	+ thr_self(&lwpid);
18	+ return lwpid;
19	#else
20	return (unsigned)::syscall(SYS_gettid);
21	#endif