Wed Mar 7 16:27:35 2012 UTC ()
Changes 3.0.1:
* OpenGL ES 1.1, and OpenGL ES 2.0 support
* OpenGL 3.x and 4.x support along with associated OpenGL extensions
* Supoort for Android on tablets and phones
* Support for IOS on tablets and phones (end users applications have already
  been accepted on the App Store)
* Introduction of Present3D application for immersive 3D presentations
* New extensible serializers that provide new .osgb binary, .osgt ascii and
  .osgx xml file native formats
* New generalized serializable metadata architecture
* New osgQt library that makes it straight forward to integrate !OpenSceneGraph
  with Qt, including web browsing via QWebKit.
* New FBX plugin based on the Audodesk FBX DSK that enables reading of the the
  .fbx 3D authoring and interchange format
* New directshow plugin for handling movies under Windows
* New pov plugin for exporting a scene to POV-Ray format, enabling use of
  POV-Ray to do photo-realistic ray tracing
* New ply plugin for reading ply files
* Improvements to osgText that enable bevelling of 3D text and highter quality
  2D fonts
* Improvements to osgVolume enabling high quality ray traced volume rendering
* Improvements to osgManipulator making it more flexible
* Improvements to osgParticle to support shader based particle effects
* Revamped 3ds plugin for reading and writing of .3ds files
* Revamped dxf plugin for reading and writing of .dxf files
* Support for Cocoa and 64bit OSX build
* Improved thread safety and efficiency of database paging
* New Texture and buffer object pools for efficiently managing GL object
  resources


(adam)
diff -r1.12 -r1.13 pkgsrc/graphics/osg/Makefile
diff -r1.2 -r1.3 pkgsrc/graphics/osg/PLIST
diff -r1.10 -r1.11 pkgsrc/graphics/osg/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/graphics/osg/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/osg/patches/patch-ab
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/patch-ad
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/patch-ae
diff -r0 -r1.1 pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
diff -r0 -r1.1 pkgsrc/graphics/osg/patches/patch-include_OpenThreads_Atomic
diff -r0 -r1.1 pkgsrc/graphics/osg/patches/patch-src_OpenThreads_common_Atomic.cpp
diff -r0 -r1.1 pkgsrc/graphics/osg/patches/patch-src_osgViewer_DarwinUtils.mm
diff -r1.1 -r0 pkgsrc/graphics/osg/patches/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp
diff -r1.1 -r1.2 pkgsrc/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp

cvs diff -r1.12 -r1.13 pkgsrc/graphics/osg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/osg/Makefile 2012/03/03 00:12:14 1.12
+++ pkgsrc/graphics/osg/Makefile 2012/03/07 16:27:35 1.13
@@ -1,45 +1,52 @@ @@ -1,45 +1,52 @@
1# $NetBSD: Makefile,v 1.12 2012/03/03 00:12:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2012/03/07 16:27:35 adam Exp $
2 2
3DISTNAME= OpenSceneGraph-${OSGVER} 3DISTNAME= OpenSceneGraph-3.0.1
4PKGNAME= osg-${OSGVER} 4PKGNAME= osg-3.0.1
5PKGREVISION= 9 
6CATEGORIES= graphics devel 5CATEGORIES= graphics devel
7MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${OSGVER}/source/ 6MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERION_NOREV}/source/
8EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.openscenegraph.org/ 10HOMEPAGE= http://www.openscenegraph.org/
12COMMENT= High performance 3D graphics toolkit 11COMMENT= High performance 3D graphics toolkit
13 
14LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
15 13
16OSGVER= 2.8.3 
17 
18PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
19 15
20USE_CMAKE= yes 16USE_CMAKE= yes
21USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
22USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
23PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in 19PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in
24PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in 20PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in
25 21
26CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 22CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
27 23
 24PLIST_VARS+= quartz x11
 25
 26.include "../../mk/bsd.prefs.mk"
 27
 28.if ${OPSYS} == "Darwin"
 29PLIST.quartz= yes
 30.else
 31PLIST.x11= yes
 32.include "../../graphics/MesaLib/buildlink3.mk"
 33.include "../../graphics/glu/buildlink3.mk"
 34.include "../../graphics/png/buildlink3.mk"
 35.include "../../graphics/tiff/buildlink3.mk"
 36.include "../../multimedia/xine-lib/buildlink3.mk"
 37.include "../../x11/libX11/buildlink3.mk"
 38.include "../../x11/libXrandr/buildlink3.mk"
 39.include "../../mk/giflib.buildlink3.mk"
 40.include "../../mk/jpeg.buildlink3.mk"
 41.endif
 42
 43.include "../../geography/gdal-lib/buildlink3.mk"
28.include "../../graphics/cairo/buildlink3.mk" 44.include "../../graphics/cairo/buildlink3.mk"
29.include "../../graphics/freetype2/buildlink3.mk" 45.include "../../graphics/freetype2/buildlink3.mk"
30.include "../../graphics/glu/buildlink3.mk" 
31.include "../../graphics/jasper/buildlink3.mk" 46.include "../../graphics/jasper/buildlink3.mk"
32.include "../../mk/jpeg.buildlink3.mk" 
33.include "../../mk/giflib.buildlink3.mk" 
34.include "../../graphics/librsvg/buildlink3.mk" 47.include "../../graphics/librsvg/buildlink3.mk"
35.include "../../graphics/MesaLib/buildlink3.mk" 
36.include "../../graphics/openexr/buildlink3.mk" 48.include "../../graphics/openexr/buildlink3.mk"
37.include "../../graphics/png/buildlink3.mk" 
38.include "../../graphics/tiff/buildlink3.mk" 
39.include "../../multimedia/ffmpeg/buildlink3.mk" 49.include "../../multimedia/ffmpeg/buildlink3.mk"
40.include "../../multimedia/xine-lib/buildlink3.mk" 
41.include "../../www/curl/buildlink3.mk" 50.include "../../www/curl/buildlink3.mk"
42.include "../../x11/libX11/buildlink3.mk" 
43.include "../../x11/libXrandr/buildlink3.mk" 
44.include "../../mk/pthread.buildlink3.mk" 51.include "../../mk/pthread.buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/graphics/osg/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/osg/PLIST 2011/12/11 11:59:06 1.2
+++ pkgsrc/graphics/osg/PLIST 2012/03/07 16:27:35 1.3
@@ -1,45 +1,48 @@ @@ -1,45 +1,48 @@
1@comment $NetBSD: PLIST,v 1.2 2011/12/11 11:59:06 marino Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/03/07 16:27:35 adam Exp $
2bin/osgarchive 2bin/osgarchive
3bin/osgconv 3bin/osgconv
4bin/osgfilecache 4bin/osgfilecache
5bin/osgversion 5bin/osgversion
6bin/osgviewer 6bin/osgviewer
 7bin/present3D
7include/OpenThreads/Atomic 8include/OpenThreads/Atomic
8include/OpenThreads/Barrier 9include/OpenThreads/Barrier
9include/OpenThreads/Block 10include/OpenThreads/Block
10include/OpenThreads/Condition 11include/OpenThreads/Condition
11include/OpenThreads/Config 12include/OpenThreads/Config
12include/OpenThreads/Exports 13include/OpenThreads/Exports
13include/OpenThreads/Mutex 14include/OpenThreads/Mutex
14include/OpenThreads/ReadWriteMutex 15include/OpenThreads/ReadWriteMutex
15include/OpenThreads/ReentrantMutex 16include/OpenThreads/ReentrantMutex
16include/OpenThreads/ScopedLock 17include/OpenThreads/ScopedLock
17include/OpenThreads/Thread 18include/OpenThreads/Thread
18include/OpenThreads/Version 19include/OpenThreads/Version
19include/osg/AlphaFunc 20include/osg/AlphaFunc
20include/osg/AnimationPath 21include/osg/AnimationPath
21include/osg/ApplicationUsage 22include/osg/ApplicationUsage
22include/osg/ArgumentParser 23include/osg/ArgumentParser
23include/osg/Array 24include/osg/Array
 25include/osg/ArrayDispatchers
24include/osg/AudioStream 26include/osg/AudioStream
25include/osg/AutoTransform 27include/osg/AutoTransform
26include/osg/Billboard 28include/osg/Billboard
27include/osg/BlendColor 29include/osg/BlendColor
28include/osg/BlendEquation 30include/osg/BlendEquation
29include/osg/BlendFunc 31include/osg/BlendFunc
30include/osg/BoundingBox 32include/osg/BoundingBox
31include/osg/BoundingSphere 33include/osg/BoundingSphere
32include/osg/BoundsChecking 34include/osg/BoundsChecking
 35include/osg/BufferIndexBinding
33include/osg/BufferObject 36include/osg/BufferObject
34include/osg/Camera 37include/osg/Camera
35include/osg/CameraNode 38include/osg/CameraNode
36include/osg/CameraView 39include/osg/CameraView
37include/osg/ClampColor 40include/osg/ClampColor
38include/osg/ClearNode 41include/osg/ClearNode
39include/osg/ClipNode 42include/osg/ClipNode
40include/osg/ClipPlane 43include/osg/ClipPlane
41include/osg/ClusterCullingCallback 44include/osg/ClusterCullingCallback
42include/osg/CollectOccludersVisitor 45include/osg/CollectOccludersVisitor
43include/osg/ColorMask 46include/osg/ColorMask
44include/osg/ColorMatrix 47include/osg/ColorMatrix
45include/osg/ComputeBoundsVisitor 48include/osg/ComputeBoundsVisitor
@@ -56,32 +59,34 @@ include/osg/DeleteHandler @@ -56,32 +59,34 @@ include/osg/DeleteHandler
56include/osg/Depth 59include/osg/Depth
57include/osg/DisplaySettings 60include/osg/DisplaySettings
58include/osg/DrawPixels 61include/osg/DrawPixels
59include/osg/Drawable 62include/osg/Drawable
60include/osg/Endian 63include/osg/Endian
61include/osg/Export 64include/osg/Export
62include/osg/Fog 65include/osg/Fog
63include/osg/FragmentProgram 66include/osg/FragmentProgram
64include/osg/FrameBufferObject 67include/osg/FrameBufferObject
65include/osg/FrameStamp 68include/osg/FrameStamp
66include/osg/FrontFace 69include/osg/FrontFace
67include/osg/GL 70include/osg/GL
68include/osg/GL2Extensions 71include/osg/GL2Extensions
 72include/osg/GLBeginEndAdapter
69include/osg/GLExtensions 73include/osg/GLExtensions
70include/osg/GLObjects 74include/osg/GLObjects
71include/osg/GLU 75include/osg/GLU
72include/osg/Geode 76include/osg/Geode
73include/osg/Geometry 77include/osg/Geometry
74include/osg/GraphicsContext 78include/osg/GraphicsContext
 79include/osg/GraphicsCostEstimator
75include/osg/GraphicsThread 80include/osg/GraphicsThread
76include/osg/Group 81include/osg/Group
77include/osg/Hint 82include/osg/Hint
78include/osg/Image 83include/osg/Image
79include/osg/ImageSequence 84include/osg/ImageSequence
80include/osg/ImageStream 85include/osg/ImageStream
81include/osg/ImageUtils 86include/osg/ImageUtils
82include/osg/KdTree 87include/osg/KdTree
83include/osg/LOD 88include/osg/LOD
84include/osg/Light 89include/osg/Light
85include/osg/LightModel 90include/osg/LightModel
86include/osg/LightSource 91include/osg/LightSource
87include/osg/LineSegment 92include/osg/LineSegment
@@ -92,80 +97,87 @@ include/osg/Material @@ -92,80 +97,87 @@ include/osg/Material
92include/osg/Math 97include/osg/Math
93include/osg/Matrix 98include/osg/Matrix
94include/osg/MatrixTransform 99include/osg/MatrixTransform
95include/osg/Matrixd 100include/osg/Matrixd
96include/osg/Matrixf 101include/osg/Matrixf
97include/osg/MixinVector 102include/osg/MixinVector
98include/osg/Multisample 103include/osg/Multisample
99include/osg/Node 104include/osg/Node
100include/osg/NodeCallback 105include/osg/NodeCallback
101include/osg/NodeTrackerCallback 106include/osg/NodeTrackerCallback
102include/osg/NodeVisitor 107include/osg/NodeVisitor
103include/osg/Notify 108include/osg/Notify
104include/osg/Object 109include/osg/Object
 110include/osg/Observer
 111include/osg/ObserverNodePath
105include/osg/OccluderNode 112include/osg/OccluderNode
106include/osg/OcclusionQueryNode 113include/osg/OcclusionQueryNode
107include/osg/OperationThread 114include/osg/OperationThread
108include/osg/PagedLOD 115include/osg/PagedLOD
109include/osg/Plane 116include/osg/Plane
110include/osg/Point 117include/osg/Point
111include/osg/PointSprite 118include/osg/PointSprite
112include/osg/PolygonMode 119include/osg/PolygonMode
113include/osg/PolygonOffset 120include/osg/PolygonOffset
114include/osg/PolygonStipple 121include/osg/PolygonStipple
115include/osg/Polytope 122include/osg/Polytope
116include/osg/PositionAttitudeTransform 123include/osg/PositionAttitudeTransform
117include/osg/PrimitiveSet 124include/osg/PrimitiveSet
118include/osg/Program 125include/osg/Program
119include/osg/Projection 126include/osg/Projection
120include/osg/ProxyNode 127include/osg/ProxyNode
121include/osg/Quat 128include/osg/Quat
122include/osg/Referenced 129include/osg/Referenced
123include/osg/RenderInfo 130include/osg/RenderInfo
124include/osg/Scissor 131include/osg/Scissor
125include/osg/Sequence 132include/osg/Sequence
126include/osg/ShadeModel 133include/osg/ShadeModel
127include/osg/Shader 134include/osg/Shader
 135include/osg/ShaderAttribute
 136include/osg/ShaderComposer
128include/osg/ShadowVolumeOccluder 137include/osg/ShadowVolumeOccluder
129include/osg/Shape 138include/osg/Shape
130include/osg/ShapeDrawable 139include/osg/ShapeDrawable
131include/osg/State 140include/osg/State
132include/osg/StateAttribute 141include/osg/StateAttribute
133include/osg/StateAttributeCallback 142include/osg/StateAttributeCallback
134include/osg/StateSet 143include/osg/StateSet
135include/osg/Stats 144include/osg/Stats
136include/osg/Stencil 145include/osg/Stencil
137include/osg/StencilTwoSided 146include/osg/StencilTwoSided
138include/osg/Switch 147include/osg/Switch
139include/osg/TemplatePrimitiveFunctor 148include/osg/TemplatePrimitiveFunctor
140include/osg/TexEnv 149include/osg/TexEnv
141include/osg/TexEnvCombine 150include/osg/TexEnvCombine
142include/osg/TexEnvFilter 151include/osg/TexEnvFilter
143include/osg/TexGen 152include/osg/TexGen
144include/osg/TexGenNode 153include/osg/TexGenNode
145include/osg/TexMat 154include/osg/TexMat
146include/osg/Texture 155include/osg/Texture
147include/osg/Texture1D 156include/osg/Texture1D
148include/osg/Texture2D 157include/osg/Texture2D
149include/osg/Texture2DArray 158include/osg/Texture2DArray
 159include/osg/Texture2DMultisample
150include/osg/Texture3D 160include/osg/Texture3D
151include/osg/TextureCubeMap 161include/osg/TextureCubeMap
152include/osg/TextureRectangle 162include/osg/TextureRectangle
153include/osg/Timer 163include/osg/Timer
154include/osg/TransferFunction 164include/osg/TransferFunction
155include/osg/Transform 165include/osg/Transform
156include/osg/TriangleFunctor 166include/osg/TriangleFunctor
157include/osg/TriangleIndexFunctor 167include/osg/TriangleIndexFunctor
158include/osg/Uniform 168include/osg/Uniform
 169include/osg/UserDataContainer
 170include/osg/ValueObject
159include/osg/Vec2 171include/osg/Vec2
160include/osg/Vec2b 172include/osg/Vec2b
161include/osg/Vec2d 173include/osg/Vec2d
162include/osg/Vec2f 174include/osg/Vec2f
163include/osg/Vec2s 175include/osg/Vec2s
164include/osg/Vec3 176include/osg/Vec3
165include/osg/Vec3b 177include/osg/Vec3b
166include/osg/Vec3d 178include/osg/Vec3d
167include/osg/Vec3f 179include/osg/Vec3f
168include/osg/Vec3s 180include/osg/Vec3s
169include/osg/Vec4 181include/osg/Vec4
170include/osg/Vec4b 182include/osg/Vec4b
171include/osg/Vec4d 183include/osg/Vec4d
@@ -218,143 +230,172 @@ include/osgAnimation/StackedTransformEle @@ -218,143 +230,172 @@ include/osgAnimation/StackedTransformEle
218include/osgAnimation/StackedTranslateElement 230include/osgAnimation/StackedTranslateElement
219include/osgAnimation/StatsHandler 231include/osgAnimation/StatsHandler
220include/osgAnimation/StatsVisitor 232include/osgAnimation/StatsVisitor
221include/osgAnimation/Target 233include/osgAnimation/Target
222include/osgAnimation/Timeline 234include/osgAnimation/Timeline
223include/osgAnimation/TimelineAnimationManager 235include/osgAnimation/TimelineAnimationManager
224include/osgAnimation/UpdateBone 236include/osgAnimation/UpdateBone
225include/osgAnimation/UpdateMaterial 237include/osgAnimation/UpdateMaterial
226include/osgAnimation/UpdateMatrixTransform 238include/osgAnimation/UpdateMatrixTransform
227include/osgAnimation/Vec3Packed 239include/osgAnimation/Vec3Packed
228include/osgAnimation/VertexInfluence 240include/osgAnimation/VertexInfluence
229include/osgDB/Archive 241include/osgDB/Archive
230include/osgDB/AuthenticationMap 242include/osgDB/AuthenticationMap
 243include/osgDB/Callbacks
231include/osgDB/ConvertUTF 244include/osgDB/ConvertUTF
 245include/osgDB/DataTypes
232include/osgDB/DatabasePager 246include/osgDB/DatabasePager
 247include/osgDB/DatabaseRevisions
233include/osgDB/DotOsgWrapper 248include/osgDB/DotOsgWrapper
234include/osgDB/DynamicLibrary 249include/osgDB/DynamicLibrary
235include/osgDB/Export 250include/osgDB/Export
236include/osgDB/Field 251include/osgDB/ExternalFileWriter
237include/osgDB/FieldReader 
238include/osgDB/FieldReaderIterator 
239include/osgDB/FileCache 252include/osgDB/FileCache
240include/osgDB/FileNameUtils 253include/osgDB/FileNameUtils
241include/osgDB/FileUtils 254include/osgDB/FileUtils
242include/osgDB/ImageOptions 255include/osgDB/ImageOptions
243include/osgDB/ImagePager 256include/osgDB/ImagePager
 257include/osgDB/ImageProcessor
244include/osgDB/Input 258include/osgDB/Input
 259include/osgDB/InputStream
 260include/osgDB/ObjectWrapper
 261include/osgDB/Options
245include/osgDB/Output 262include/osgDB/Output
 263include/osgDB/OutputStream
246include/osgDB/ParameterOutput 264include/osgDB/ParameterOutput
247include/osgDB/PluginQuery 265include/osgDB/PluginQuery
248include/osgDB/ReadFile 266include/osgDB/ReadFile
249include/osgDB/ReaderWriter 267include/osgDB/ReaderWriter
250include/osgDB/Registry 268include/osgDB/Registry
251include/osgDB/Serializer 269include/osgDB/Serializer
252include/osgDB/SharedStateManager 270include/osgDB/SharedStateManager
 271include/osgDB/StreamOperator
253include/osgDB/Version 272include/osgDB/Version
254include/osgDB/WriteFile 273include/osgDB/WriteFile
 274include/osgDB/XmlParser
255include/osgDB/fstream 275include/osgDB/fstream
256include/osgFX/AnisotropicLighting 276include/osgFX/AnisotropicLighting
257include/osgFX/BumpMapping 277include/osgFX/BumpMapping
258include/osgFX/Cartoon 278include/osgFX/Cartoon
259include/osgFX/Effect 279include/osgFX/Effect
260include/osgFX/Export 280include/osgFX/Export
261include/osgFX/MultiTextureControl 281include/osgFX/MultiTextureControl
 282include/osgFX/Outline
262include/osgFX/Registry 283include/osgFX/Registry
263include/osgFX/Scribe 284include/osgFX/Scribe
264include/osgFX/SpecularHighlights 285include/osgFX/SpecularHighlights
265include/osgFX/Technique 286include/osgFX/Technique
266include/osgFX/Validator 287include/osgFX/Validator
267include/osgFX/Version 288include/osgFX/Version
268include/osgGA/AnimationPathManipulator 289include/osgGA/AnimationPathManipulator
 290include/osgGA/CameraManipulator
269include/osgGA/CameraViewSwitchManipulator 291include/osgGA/CameraViewSwitchManipulator
270include/osgGA/DriveManipulator 292include/osgGA/DriveManipulator
271include/osgGA/EventQueue 293include/osgGA/EventQueue
272include/osgGA/EventVisitor 294include/osgGA/EventVisitor
273include/osgGA/Export 295include/osgGA/Export
 296include/osgGA/FirstPersonManipulator
274include/osgGA/FlightManipulator 297include/osgGA/FlightManipulator
275include/osgGA/GUIActionAdapter 298include/osgGA/GUIActionAdapter
276include/osgGA/GUIEventAdapter 299include/osgGA/GUIEventAdapter
277include/osgGA/GUIEventHandler 300include/osgGA/GUIEventHandler
278include/osgGA/KeySwitchMatrixManipulator 301include/osgGA/KeySwitchMatrixManipulator
279include/osgGA/MatrixManipulator 302include/osgGA/MultiTouchTrackballManipulator
280include/osgGA/NodeTrackerManipulator 303include/osgGA/NodeTrackerManipulator
 304include/osgGA/OrbitManipulator
 305include/osgGA/SphericalManipulator
 306include/osgGA/StandardManipulator
281include/osgGA/StateSetManipulator 307include/osgGA/StateSetManipulator
282include/osgGA/TerrainManipulator 308include/osgGA/TerrainManipulator
283include/osgGA/TrackballManipulator 309include/osgGA/TrackballManipulator
284include/osgGA/UFOManipulator 310include/osgGA/UFOManipulator
285include/osgGA/Version 311include/osgGA/Version
286include/osgManipulator/AntiSquish 312include/osgManipulator/AntiSquish
287include/osgManipulator/Command 313include/osgManipulator/Command
288include/osgManipulator/CommandManager 314include/osgManipulator/CommandManager
289include/osgManipulator/Constraint 315include/osgManipulator/Constraint
290include/osgManipulator/Dragger 316include/osgManipulator/Dragger
291include/osgManipulator/Export 317include/osgManipulator/Export
292include/osgManipulator/Projector 318include/osgManipulator/Projector
293include/osgManipulator/RotateCylinderDragger 319include/osgManipulator/RotateCylinderDragger
294include/osgManipulator/RotateSphereDragger 320include/osgManipulator/RotateSphereDragger
295include/osgManipulator/Scale1DDragger 321include/osgManipulator/Scale1DDragger
296include/osgManipulator/Scale2DDragger 322include/osgManipulator/Scale2DDragger
297include/osgManipulator/ScaleAxisDragger 323include/osgManipulator/ScaleAxisDragger
298include/osgManipulator/Selection 324include/osgManipulator/Selection
299include/osgManipulator/TabBoxDragger 325include/osgManipulator/TabBoxDragger
 326include/osgManipulator/TabBoxTrackballDragger
300include/osgManipulator/TabPlaneDragger 327include/osgManipulator/TabPlaneDragger
301include/osgManipulator/TabPlaneTrackballDragger 328include/osgManipulator/TabPlaneTrackballDragger
302include/osgManipulator/TrackballDragger 329include/osgManipulator/TrackballDragger
303include/osgManipulator/Translate1DDragger 330include/osgManipulator/Translate1DDragger
304include/osgManipulator/Translate2DDragger 331include/osgManipulator/Translate2DDragger
305include/osgManipulator/TranslateAxisDragger 332include/osgManipulator/TranslateAxisDragger
306include/osgManipulator/TranslatePlaneDragger 333include/osgManipulator/TranslatePlaneDragger
307include/osgManipulator/Version 334include/osgManipulator/Version
308include/osgParticle/AccelOperator 335include/osgParticle/AccelOperator
309include/osgParticle/AngularAccelOperator 336include/osgParticle/AngularAccelOperator
 337include/osgParticle/AngularDampingOperator
 338include/osgParticle/BounceOperator
310include/osgParticle/BoxPlacer 339include/osgParticle/BoxPlacer
311include/osgParticle/CenteredPlacer 340include/osgParticle/CenteredPlacer
 341include/osgParticle/CompositePlacer
312include/osgParticle/ConnectedParticleSystem 342include/osgParticle/ConnectedParticleSystem
313include/osgParticle/ConstantRateCounter 343include/osgParticle/ConstantRateCounter
314include/osgParticle/Counter 344include/osgParticle/Counter
 345include/osgParticle/DampingOperator
 346include/osgParticle/DomainOperator
315include/osgParticle/Emitter 347include/osgParticle/Emitter
316include/osgParticle/ExplosionDebrisEffect 348include/osgParticle/ExplosionDebrisEffect
317include/osgParticle/ExplosionEffect 349include/osgParticle/ExplosionEffect
 350include/osgParticle/ExplosionOperator
318include/osgParticle/Export 351include/osgParticle/Export
319include/osgParticle/FireEffect 352include/osgParticle/FireEffect
320include/osgParticle/FluidFrictionOperator 353include/osgParticle/FluidFrictionOperator
321include/osgParticle/FluidProgram 354include/osgParticle/FluidProgram
322include/osgParticle/ForceOperator 355include/osgParticle/ForceOperator
323include/osgParticle/Interpolator 356include/osgParticle/Interpolator
324include/osgParticle/LinearInterpolator 357include/osgParticle/LinearInterpolator
325include/osgParticle/ModularEmitter 358include/osgParticle/ModularEmitter
326include/osgParticle/ModularProgram 359include/osgParticle/ModularProgram
327include/osgParticle/MultiSegmentPlacer 360include/osgParticle/MultiSegmentPlacer
328include/osgParticle/Operator 361include/osgParticle/Operator
 362include/osgParticle/OrbitOperator
329include/osgParticle/Particle 363include/osgParticle/Particle
330include/osgParticle/ParticleEffect 364include/osgParticle/ParticleEffect
331include/osgParticle/ParticleProcessor 365include/osgParticle/ParticleProcessor
332include/osgParticle/ParticleSystem 366include/osgParticle/ParticleSystem
333include/osgParticle/ParticleSystemUpdater 367include/osgParticle/ParticleSystemUpdater
334include/osgParticle/Placer 368include/osgParticle/Placer
335include/osgParticle/PointPlacer 369include/osgParticle/PointPlacer
336include/osgParticle/PrecipitationEffect 370include/osgParticle/PrecipitationEffect
337include/osgParticle/Program 371include/osgParticle/Program
338include/osgParticle/RadialShooter 372include/osgParticle/RadialShooter
339include/osgParticle/RandomRateCounter 373include/osgParticle/RandomRateCounter
340include/osgParticle/SectorPlacer 374include/osgParticle/SectorPlacer
341include/osgParticle/SegmentPlacer 375include/osgParticle/SegmentPlacer
342include/osgParticle/Shooter 376include/osgParticle/Shooter
 377include/osgParticle/SinkOperator
343include/osgParticle/SmokeEffect 378include/osgParticle/SmokeEffect
344include/osgParticle/SmokeTrailEffect 379include/osgParticle/SmokeTrailEffect
345include/osgParticle/VariableRateCounter 380include/osgParticle/VariableRateCounter
346include/osgParticle/Version 381include/osgParticle/Version
347include/osgParticle/range 382include/osgParticle/range
 383include/osgPresentation/AnimationMaterial
 384include/osgPresentation/CompileSlideCallback
 385include/osgPresentation/Export
 386include/osgPresentation/PickEventHandler
 387include/osgPresentation/SlideEventHandler
 388include/osgPresentation/SlideShowConstructor
348include/osgShadow/ConvexPolyhedron 389include/osgShadow/ConvexPolyhedron
349include/osgShadow/DebugShadowMap 390include/osgShadow/DebugShadowMap
350include/osgShadow/Export 391include/osgShadow/Export
351include/osgShadow/LightSpacePerspectiveShadowMap 392include/osgShadow/LightSpacePerspectiveShadowMap
352include/osgShadow/MinimalCullBoundsShadowMap 393include/osgShadow/MinimalCullBoundsShadowMap
353include/osgShadow/MinimalDrawBoundsShadowMap 394include/osgShadow/MinimalDrawBoundsShadowMap
354include/osgShadow/MinimalShadowMap 395include/osgShadow/MinimalShadowMap
355include/osgShadow/OccluderGeometry 396include/osgShadow/OccluderGeometry
356include/osgShadow/ParallelSplitShadowMap 397include/osgShadow/ParallelSplitShadowMap
357include/osgShadow/ProjectionShadowMap 398include/osgShadow/ProjectionShadowMap
358include/osgShadow/ShadowMap 399include/osgShadow/ShadowMap
359include/osgShadow/ShadowTechnique 400include/osgShadow/ShadowTechnique
360include/osgShadow/ShadowTexture 401include/osgShadow/ShadowTexture
@@ -391,83 +432,91 @@ include/osgSim/VisibilityGroup @@ -391,83 +432,91 @@ include/osgSim/VisibilityGroup
391include/osgTerrain/Export 432include/osgTerrain/Export
392include/osgTerrain/GeometryTechnique 433include/osgTerrain/GeometryTechnique
393include/osgTerrain/Layer 434include/osgTerrain/Layer
394include/osgTerrain/Locator 435include/osgTerrain/Locator
395include/osgTerrain/Terrain 436include/osgTerrain/Terrain
396include/osgTerrain/TerrainTechnique 437include/osgTerrain/TerrainTechnique
397include/osgTerrain/TerrainTile 438include/osgTerrain/TerrainTile
398include/osgTerrain/ValidDataOperator 439include/osgTerrain/ValidDataOperator
399include/osgTerrain/Version 440include/osgTerrain/Version
400include/osgText/Export 441include/osgText/Export
401include/osgText/FadeText 442include/osgText/FadeText
402include/osgText/Font 443include/osgText/Font
403include/osgText/Font3D 444include/osgText/Font3D
 445include/osgText/Glyph
404include/osgText/KerningType 446include/osgText/KerningType
405include/osgText/String 447include/osgText/String
 448include/osgText/Style
406include/osgText/Text 449include/osgText/Text
407include/osgText/Text3D 450include/osgText/Text3D
408include/osgText/TextBase 451include/osgText/TextBase
409include/osgText/Version 452include/osgText/Version
410include/osgUtil/ConvertVec 453include/osgUtil/ConvertVec
411include/osgUtil/CubeMapGenerator 454include/osgUtil/CubeMapGenerator
412include/osgUtil/CullVisitor 455include/osgUtil/CullVisitor
413include/osgUtil/DelaunayTriangulator 456include/osgUtil/DelaunayTriangulator
414include/osgUtil/DisplayRequirementsVisitor 457include/osgUtil/DisplayRequirementsVisitor
415include/osgUtil/DrawElementTypeSimplifier 458include/osgUtil/DrawElementTypeSimplifier
416include/osgUtil/EdgeCollector 459include/osgUtil/EdgeCollector
417include/osgUtil/Export 460include/osgUtil/Export
418include/osgUtil/GLObjectsVisitor 461include/osgUtil/GLObjectsVisitor
419include/osgUtil/HalfWayMapGenerator 462include/osgUtil/HalfWayMapGenerator
420include/osgUtil/HighlightMapGenerator 463include/osgUtil/HighlightMapGenerator
 464include/osgUtil/IncrementalCompileOperation
421include/osgUtil/IntersectVisitor 465include/osgUtil/IntersectVisitor
422include/osgUtil/IntersectionVisitor 466include/osgUtil/IntersectionVisitor
423include/osgUtil/LineSegmentIntersector 467include/osgUtil/LineSegmentIntersector
 468include/osgUtil/MeshOptimizers
424include/osgUtil/OperationArrayFunctor 469include/osgUtil/OperationArrayFunctor
425include/osgUtil/Optimizer 470include/osgUtil/Optimizer
426include/osgUtil/PlaneIntersector 471include/osgUtil/PlaneIntersector
427include/osgUtil/PolytopeIntersector 472include/osgUtil/PolytopeIntersector
428include/osgUtil/PositionalStateContainer 473include/osgUtil/PositionalStateContainer
 474include/osgUtil/PrintVisitor
429include/osgUtil/ReflectionMapGenerator 475include/osgUtil/ReflectionMapGenerator
430include/osgUtil/RenderBin 476include/osgUtil/RenderBin
431include/osgUtil/RenderLeaf 477include/osgUtil/RenderLeaf
432include/osgUtil/RenderStage 478include/osgUtil/RenderStage
433include/osgUtil/ReversePrimitiveFunctor 479include/osgUtil/ReversePrimitiveFunctor
434include/osgUtil/SceneGraphBuilder 480include/osgUtil/SceneGraphBuilder
435include/osgUtil/SceneView 481include/osgUtil/SceneView
 482include/osgUtil/ShaderGen
436include/osgUtil/Simplifier 483include/osgUtil/Simplifier
437include/osgUtil/SmoothingVisitor 484include/osgUtil/SmoothingVisitor
438include/osgUtil/StateGraph 485include/osgUtil/StateGraph
439include/osgUtil/Statistics 486include/osgUtil/Statistics
440include/osgUtil/TangentSpaceGenerator 487include/osgUtil/TangentSpaceGenerator
441include/osgUtil/Tessellator 488include/osgUtil/Tessellator
442include/osgUtil/TransformAttributeFunctor 489include/osgUtil/TransformAttributeFunctor
443include/osgUtil/TransformCallback 490include/osgUtil/TransformCallback
444include/osgUtil/TriStripVisitor 491include/osgUtil/TriStripVisitor
445include/osgUtil/UpdateVisitor 492include/osgUtil/UpdateVisitor
446include/osgUtil/Version 493include/osgUtil/Version
447include/osgViewer/CompositeViewer 494include/osgViewer/CompositeViewer
448include/osgViewer/Export 495include/osgViewer/Export
449include/osgViewer/GraphicsWindow 496include/osgViewer/GraphicsWindow
450include/osgViewer/GraphicsWindowX11 
451include/osgViewer/PixelBufferX11 
452include/osgViewer/Renderer 497include/osgViewer/Renderer
453include/osgViewer/Scene 498include/osgViewer/Scene
454include/osgViewer/Version 499include/osgViewer/Version
455include/osgViewer/View 500include/osgViewer/View
456include/osgViewer/Viewer 501include/osgViewer/Viewer
457include/osgViewer/ViewerBase 502include/osgViewer/ViewerBase
458include/osgViewer/ViewerEventHandlers 503include/osgViewer/ViewerEventHandlers
459include/osgViewer/api/X11/GraphicsWindowX11 504${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsHandleCarbon
460include/osgViewer/api/X11/PixelBufferX11 505${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsWindowCarbon
 506${PLIST.quartz}include/osgViewer/api/Carbon/PixelBufferCarbon
 507${PLIST.x11}include/osgViewer/api/X11/GraphicsHandleX11
 508${PLIST.x11}include/osgViewer/api/X11/GraphicsWindowX11
 509${PLIST.x11}include/osgViewer/api/X11/PixelBufferX11
461include/osgVolume/Export 510include/osgVolume/Export
462include/osgVolume/FixedFunctionTechnique 511include/osgVolume/FixedFunctionTechnique
463include/osgVolume/Layer 512include/osgVolume/Layer
464include/osgVolume/Locator 513include/osgVolume/Locator
465include/osgVolume/Property 514include/osgVolume/Property
466include/osgVolume/RayTracedTechnique 515include/osgVolume/RayTracedTechnique
467include/osgVolume/Version 516include/osgVolume/Version
468include/osgVolume/Volume 517include/osgVolume/Volume
469include/osgVolume/VolumeTechnique 518include/osgVolume/VolumeTechnique
470include/osgVolume/VolumeTile 519include/osgVolume/VolumeTile
471include/osgWidget/Box 520include/osgWidget/Box
472include/osgWidget/Browser 521include/osgWidget/Browser
473include/osgWidget/Canvas 522include/osgWidget/Canvas
@@ -483,125 +532,164 @@ include/osgWidget/ScriptEngine @@ -483,125 +532,164 @@ include/osgWidget/ScriptEngine
483include/osgWidget/StyleInterface 532include/osgWidget/StyleInterface
484include/osgWidget/StyleManager 533include/osgWidget/StyleManager
485include/osgWidget/Table 534include/osgWidget/Table
486include/osgWidget/Types 535include/osgWidget/Types
487include/osgWidget/UIObjectParent 536include/osgWidget/UIObjectParent
488include/osgWidget/Util 537include/osgWidget/Util
489include/osgWidget/Version 538include/osgWidget/Version
490include/osgWidget/ViewerEventHandlers 539include/osgWidget/ViewerEventHandlers
491include/osgWidget/VncClient 540include/osgWidget/VncClient
492include/osgWidget/Widget 541include/osgWidget/Widget
493include/osgWidget/Window 542include/osgWidget/Window
494include/osgWidget/WindowManager 543include/osgWidget/WindowManager
495lib/libOpenThreads.so 544lib/libOpenThreads.so
496lib/libOpenThreads.so.11 545lib/libOpenThreads.so.12
497lib/libOpenThreads.so.2.4.0 546lib/libOpenThreads.so.2.6.0
498lib/libosg.so 547lib/libosg.so
499lib/libosg.so.${PKGVERSION} 548lib/libosg.so.${PKGVERSION}
500lib/libosg.so.65 549lib/libosg.so.80
501lib/libosgAnimation.so 550lib/libosgAnimation.so
502lib/libosgAnimation.so.${PKGVERSION} 551lib/libosgAnimation.so.${PKGVERSION}
503lib/libosgAnimation.so.65 552lib/libosgAnimation.so.80
504lib/libosgDB.so 553lib/libosgDB.so
505lib/libosgDB.so.${PKGVERSION} 554lib/libosgDB.so.${PKGVERSION}
506lib/libosgDB.so.65 555lib/libosgDB.so.80
507lib/libosgFX.so 556lib/libosgFX.so
508lib/libosgFX.so.${PKGVERSION} 557lib/libosgFX.so.${PKGVERSION}
509lib/libosgFX.so.65 558lib/libosgFX.so.80
510lib/libosgGA.so 559lib/libosgGA.so
511lib/libosgGA.so.${PKGVERSION} 560lib/libosgGA.so.${PKGVERSION}
512lib/libosgGA.so.65 561lib/libosgGA.so.80
513lib/libosgManipulator.so 562lib/libosgManipulator.so
514lib/libosgManipulator.so.${PKGVERSION} 563lib/libosgManipulator.so.${PKGVERSION}
515lib/libosgManipulator.so.65 564lib/libosgManipulator.so.80
516lib/libosgParticle.so 565lib/libosgParticle.so
517lib/libosgParticle.so.${PKGVERSION} 566lib/libosgParticle.so.${PKGVERSION}
518lib/libosgParticle.so.65 567lib/libosgParticle.so.80
 568lib/libosgPresentation.so
 569lib/libosgPresentation.so.${PKGVERSION}
 570lib/libosgPresentation.so.80
519lib/libosgShadow.so 571lib/libosgShadow.so
520lib/libosgShadow.so.${PKGVERSION} 572lib/libosgShadow.so.${PKGVERSION}
521lib/libosgShadow.so.65 573lib/libosgShadow.so.80
522lib/libosgSim.so 574lib/libosgSim.so
523lib/libosgSim.so.${PKGVERSION} 575lib/libosgSim.so.${PKGVERSION}
524lib/libosgSim.so.65 576lib/libosgSim.so.80
525lib/libosgTerrain.so 577lib/libosgTerrain.so
526lib/libosgTerrain.so.${PKGVERSION} 578lib/libosgTerrain.so.${PKGVERSION}
527lib/libosgTerrain.so.65 579lib/libosgTerrain.so.80
528lib/libosgText.so 580lib/libosgText.so
529lib/libosgText.so.${PKGVERSION} 581lib/libosgText.so.${PKGVERSION}
530lib/libosgText.so.65 582lib/libosgText.so.80
531lib/libosgUtil.so 583lib/libosgUtil.so
532lib/libosgUtil.so.${PKGVERSION} 584lib/libosgUtil.so.${PKGVERSION}
533lib/libosgUtil.so.65 585lib/libosgUtil.so.80
534lib/libosgViewer.so 586lib/libosgViewer.so
535lib/libosgViewer.so.${PKGVERSION} 587lib/libosgViewer.so.${PKGVERSION}
536lib/libosgViewer.so.65 588lib/libosgViewer.so.80
537lib/libosgVolume.so 589lib/libosgVolume.so
538lib/libosgVolume.so.${PKGVERSION} 590lib/libosgVolume.so.${PKGVERSION}
539lib/libosgVolume.so.65 591lib/libosgVolume.so.80
540lib/libosgWidget.so 592lib/libosgWidget.so
541lib/libosgWidget.so.${PKGVERSION} 593lib/libosgWidget.so.${PKGVERSION}
542lib/libosgWidget.so.65 594lib/libosgWidget.so.80
543lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so 595lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
544lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so 596lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
545lib/osgPlugins-${PKGVERSION}/osgdb_ac.so 597lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
546lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so 598lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so
547lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so 599lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so
548lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so 600lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
549lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so 601lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so
550lib/osgPlugins-${PKGVERSION}/osgdb_curl.so 602lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
551lib/osgPlugins-${PKGVERSION}/osgdb_dds.so 603lib/osgPlugins-${PKGVERSION}/osgdb_dds.so
 604lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osg.so
 605lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osganimation.so
 606lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgfx.so
 607lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgparticle.so
 608lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgshadow.so
 609lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgsim.so
 610lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgterrain.so
 611lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgtext.so
 612lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgviewer.so
 613lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgvolume.so
 614lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so
552lib/osgPlugins-${PKGVERSION}/osgdb_dot.so 615lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
553lib/osgPlugins-${PKGVERSION}/osgdb_dw.so 616lib/osgPlugins-${PKGVERSION}/osgdb_dw.so
554lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so 617lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
555lib/osgPlugins-${PKGVERSION}/osgdb_exr.so 618lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
556lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so 619lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
 620lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
557lib/osgPlugins-${PKGVERSION}/osgdb_geo.so 621lib/osgPlugins-${PKGVERSION}/osgdb_geo.so
558lib/osgPlugins-${PKGVERSION}/osgdb_gif.so 622${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
559lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so 623lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so
560lib/osgPlugins-${PKGVERSION}/osgdb_gz.so 624lib/osgPlugins-${PKGVERSION}/osgdb_gz.so
561lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so 625lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so
 626${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_imageio.so
562lib/osgPlugins-${PKGVERSION}/osgdb_ive.so 627lib/osgPlugins-${PKGVERSION}/osgdb_ive.so
563lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so 628lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
564lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so 629${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
565lib/osgPlugins-${PKGVERSION}/osgdb_logo.so 630lib/osgPlugins-${PKGVERSION}/osgdb_logo.so
566lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so 631lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so
567lib/osgPlugins-${PKGVERSION}/osgdb_lws.so 632lib/osgPlugins-${PKGVERSION}/osgdb_lws.so
568lib/osgPlugins-${PKGVERSION}/osgdb_md2.so 633lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
569lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so 634lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so
570lib/osgPlugins-${PKGVERSION}/osgdb_normals.so 635lib/osgPlugins-${PKGVERSION}/osgdb_normals.so
571lib/osgPlugins-${PKGVERSION}/osgdb_obj.so 636lib/osgPlugins-${PKGVERSION}/osgdb_obj.so
 637lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so
572lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so 638lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so
573lib/osgPlugins-${PKGVERSION}/osgdb_osg.so 639lib/osgPlugins-${PKGVERSION}/osgdb_osg.so
574lib/osgPlugins-${PKGVERSION}/osgdb_osga.so 640lib/osgPlugins-${PKGVERSION}/osgdb_osga.so
575lib/osgPlugins-${PKGVERSION}/osgdb_osganimation.so 
576lib/osgPlugins-${PKGVERSION}/osgdb_osgfx.so 
577lib/osgPlugins-${PKGVERSION}/osgdb_osgparticle.so 
578lib/osgPlugins-${PKGVERSION}/osgdb_osgshadow.so 641lib/osgPlugins-${PKGVERSION}/osgdb_osgshadow.so
579lib/osgPlugins-${PKGVERSION}/osgdb_osgsim.so 
580lib/osgPlugins-${PKGVERSION}/osgdb_osgterrain.so 642lib/osgPlugins-${PKGVERSION}/osgdb_osgterrain.so
581lib/osgPlugins-${PKGVERSION}/osgdb_osgtext.so 
582lib/osgPlugins-${PKGVERSION}/osgdb_osgtgz.so 643lib/osgPlugins-${PKGVERSION}/osgdb_osgtgz.so
583lib/osgPlugins-${PKGVERSION}/osgdb_osgviewer.so 644lib/osgPlugins-${PKGVERSION}/osgdb_osgviewer.so
584lib/osgPlugins-${PKGVERSION}/osgdb_osgvolume.so 645lib/osgPlugins-${PKGVERSION}/osgdb_p3d.so
585lib/osgPlugins-${PKGVERSION}/osgdb_osgwidget.so 
586lib/osgPlugins-${PKGVERSION}/osgdb_pic.so 646lib/osgPlugins-${PKGVERSION}/osgdb_pic.so
587lib/osgPlugins-${PKGVERSION}/osgdb_ply.so 647lib/osgPlugins-${PKGVERSION}/osgdb_ply.so
588lib/osgPlugins-${PKGVERSION}/osgdb_png.so 648${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_png.so
589lib/osgPlugins-${PKGVERSION}/osgdb_pnm.so 649lib/osgPlugins-${PKGVERSION}/osgdb_pnm.so
 650lib/osgPlugins-${PKGVERSION}/osgdb_pov.so
 651lib/osgPlugins-${PKGVERSION}/osgdb_pvr.so
 652lib/osgPlugins-${PKGVERSION}/osgdb_revisions.so
590lib/osgPlugins-${PKGVERSION}/osgdb_rgb.so 653lib/osgPlugins-${PKGVERSION}/osgdb_rgb.so
591lib/osgPlugins-${PKGVERSION}/osgdb_rot.so 654lib/osgPlugins-${PKGVERSION}/osgdb_rot.so
592lib/osgPlugins-${PKGVERSION}/osgdb_scale.so 655lib/osgPlugins-${PKGVERSION}/osgdb_scale.so
 656lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osg.so
 657lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osganimation.so
 658lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgfx.so
 659lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgmanipulator.so
 660lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgparticle.so
 661lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgshadow.so
 662lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgsim.so
 663lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgterrain.so
 664lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgtext.so
 665lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgvolume.so
593lib/osgPlugins-${PKGVERSION}/osgdb_shp.so 666lib/osgPlugins-${PKGVERSION}/osgdb_shp.so
594lib/osgPlugins-${PKGVERSION}/osgdb_stl.so 667lib/osgPlugins-${PKGVERSION}/osgdb_stl.so
595lib/osgPlugins-${PKGVERSION}/osgdb_svg.so 668lib/osgPlugins-${PKGVERSION}/osgdb_svg.so
596lib/osgPlugins-${PKGVERSION}/osgdb_tga.so 669lib/osgPlugins-${PKGVERSION}/osgdb_tga.so
597lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so 670lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so
598lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so 671${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so
599lib/osgPlugins-${PKGVERSION}/osgdb_trans.so 672lib/osgPlugins-${PKGVERSION}/osgdb_trans.so
600lib/osgPlugins-${PKGVERSION}/osgdb_txf.so 673lib/osgPlugins-${PKGVERSION}/osgdb_txf.so
601lib/osgPlugins-${PKGVERSION}/osgdb_txp.so 674lib/osgPlugins-${PKGVERSION}/osgdb_txp.so
602lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so 675lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so
603lib/osgPlugins-${PKGVERSION}/osgdb_x.so 676lib/osgPlugins-${PKGVERSION}/osgdb_x.so
604lib/osgPlugins-${PKGVERSION}/osgdb_xine.so 677${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_xine.so
605lib/osgPlugins-${PKGVERSION}/osgdb_zip.so 678lib/osgPlugins-${PKGVERSION}/osgdb_zip.so
 679lib/pkgconfig/openscenegraph-osg.pc
 680lib/pkgconfig/openscenegraph-osgAnimation.pc
 681lib/pkgconfig/openscenegraph-osgDB.pc
 682lib/pkgconfig/openscenegraph-osgFX.pc
 683lib/pkgconfig/openscenegraph-osgGA.pc
 684lib/pkgconfig/openscenegraph-osgManipulator.pc
 685lib/pkgconfig/openscenegraph-osgParticle.pc
 686lib/pkgconfig/openscenegraph-osgShadow.pc
 687lib/pkgconfig/openscenegraph-osgSim.pc
 688lib/pkgconfig/openscenegraph-osgTerrain.pc
 689lib/pkgconfig/openscenegraph-osgText.pc
 690lib/pkgconfig/openscenegraph-osgUtil.pc
 691lib/pkgconfig/openscenegraph-osgViewer.pc
 692lib/pkgconfig/openscenegraph-osgVolume.pc
 693lib/pkgconfig/openscenegraph-osgWidget.pc
606lib/pkgconfig/openscenegraph.pc 694lib/pkgconfig/openscenegraph.pc
607lib/pkgconfig/openthreads.pc 695lib/pkgconfig/openthreads.pc

cvs diff -r1.10 -r1.11 pkgsrc/graphics/osg/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/osg/buildlink3.mk 2012/03/03 00:12:14 1.10
+++ pkgsrc/graphics/osg/buildlink3.mk 2012/03/07 16:27:35 1.11
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.10 2012/03/03 00:12:14 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2012/03/07 16:27:35 adam Exp $
2 2
3BUILDLINK_TREE+= osg 3BUILDLINK_TREE+= osg
4 4
5.if !defined(OSG_BUILDLINK3_MK) 5.if !defined(OSG_BUILDLINK3_MK)
6OSG_BUILDLINK3_MK:= 6OSG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.osg+= osg>=2.8.3 8BUILDLINK_API_DEPENDS.osg+= osg>=2.8.3
9BUILDLINK_ABI_DEPENDS.osg?= osg>=2.8.3nb9 9BUILDLINK_ABI_DEPENDS.osg+= osg>=2.8.3nb9
10BUILDLINK_PKGSRCDIR.osg?= ../../graphics/osg 10BUILDLINK_PKGSRCDIR.osg?= ../../graphics/osg
11 11
12.include "../../graphics/cairo/buildlink3.mk" 12.include "../../graphics/cairo/buildlink3.mk"
13.include "../../graphics/freetype2/buildlink3.mk" 13.include "../../graphics/freetype2/buildlink3.mk"
14.include "../../graphics/glu/buildlink3.mk" 14.include "../../graphics/glu/buildlink3.mk"
15.include "../../graphics/jasper/buildlink3.mk" 15.include "../../graphics/jasper/buildlink3.mk"
16.include "../../mk/jpeg.buildlink3.mk" 16.include "../../mk/jpeg.buildlink3.mk"
17.include "../../mk/giflib.buildlink3.mk" 17.include "../../mk/giflib.buildlink3.mk"
18.include "../../graphics/librsvg/buildlink3.mk" 18.include "../../graphics/librsvg/buildlink3.mk"
19.include "../../graphics/MesaLib/buildlink3.mk" 19.include "../../graphics/MesaLib/buildlink3.mk"
20.include "../../graphics/openexr/buildlink3.mk" 20.include "../../graphics/openexr/buildlink3.mk"
21.include "../../graphics/png/buildlink3.mk" 21.include "../../graphics/png/buildlink3.mk"
22.include "../../graphics/tiff/buildlink3.mk" 22.include "../../graphics/tiff/buildlink3.mk"

cvs diff -r1.3 -r1.4 pkgsrc/graphics/osg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/osg/distinfo 2011/12/11 11:59:06 1.3
+++ pkgsrc/graphics/osg/distinfo 2012/03/07 16:27:35 1.4
@@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
1$NetBSD: distinfo,v 1.3 2011/12/11 11:59:06 marino Exp $ 1$NetBSD: distinfo,v 1.4 2012/03/07 16:27:35 adam Exp $
2 2
3SHA1 (OpenSceneGraph-2.8.3.zip) = 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc 3SHA1 (OpenSceneGraph-3.0.1.zip) = 13c7e39f6d62047ad944d8d28a0f0eb60384ce33
4RMD160 (OpenSceneGraph-2.8.3.zip) = 40a4988f4aefff7dbb6aab5225204ae41c945277 4RMD160 (OpenSceneGraph-3.0.1.zip) = 54b315c318b7ade2bcc65703cea5f41377e93a71
5Size (OpenSceneGraph-2.8.3.zip) = 6740017 bytes 5Size (OpenSceneGraph-3.0.1.zip) = 6780282 bytes
6SHA1 (patch-ab) = 28049bfe9e70301e5dba5c916ead51a31c86ac6c 6SHA1 (patch-ab) = 70b58b8b42af77018a09d4024afaffb874b74ddf
7SHA1 (patch-ac) = bc35c9b0a9c7612137c66018b36b35b9897065be 7SHA1 (patch-ac) = 1f237646034ca837c837e44aff753cd590c47900
8SHA1 (patch-ad) = 846f4f93104812125bffc8644948637de206bdc0 8SHA1 (patch-ad) = 2a9594128e357b20f7f8146398b7cb4068aca405
9SHA1 (patch-ae) = d882f09acac61f74a25cf3efc8f3b7b3756adae3 9SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
10SHA1 (patch-src-osgPlugins-curl-ReaderWriterCURL.cpp) = 4ece011ff1284011b7777f00b838d6673c22bd2a 10SHA1 (patch-applications_present3D_Cluster.cpp) = 51d952c863966c851d03cd7f4165abe9db27c9d3
11SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = c828563699eb726214995bae63fcf028ff3a374a 11SHA1 (patch-include_OpenThreads_Atomic) = 663f76cf4ffe5f52f24a1c68701c35bb8763063a
 12SHA1 (patch-src_OpenThreads_common_Atomic.cpp) = 34687f53ba01832b7ea3e0b124a951efc0afe343
 13SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = 1552f78a0ed17fcdaed9d87fe3d1f8220712f403
 14SHA1 (patch-src_osgViewer_DarwinUtils.mm) = 4ab021cb797cb6959bee4ba33caf257b2a6cedf3

cvs diff -r1.2 -r1.3 pkgsrc/graphics/osg/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/osg/patches/patch-ab 2011/12/11 11:59:06 1.2
+++ pkgsrc/graphics/osg/patches/patch-ab 2012/03/07 16:27:35 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.2 2011/12/11 11:59:06 marino Exp $ 1$NetBSD: patch-ab,v 1.3 2012/03/07 16:27:35 adam Exp $
2 2
3--- src/osgDB/FileUtils.cpp.orig 2009-01-12 17:28:37.000000000 +0200 3--- src/osgDB/FileUtils.cpp.orig 2009-01-12 17:28:37.000000000 +0200
4+++ src/osgDB/FileUtils.cpp 2009-01-12 17:30:14.000000000 +0200 4+++ src/osgDB/FileUtils.cpp 2009-01-12 17:30:14.000000000 +0200
5@@ -47,7 +47,7 @@ 5@@ -76,7 +76,7 @@
6 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) 6 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
7 #define stat64 stat 7 #define stat64 stat
8 #endif 8 #endif
9-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) 9-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
10+#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) || defined(__DragonFly__) && !defined(_LARGEFILE64_SOURCE)) 10+#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) || defined(__DragonFly__) && !defined(_LARGEFILE64_SOURCE))
11 #define stat64 stat 11 #define stat64 stat
12 #endif 12 #endif
13  13

cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/osg/patches/Attic/patch-ac 2010/08/26 13:08:49 1.1.1.1
+++ pkgsrc/graphics/osg/patches/Attic/patch-ac 2012/03/07 16:27:35 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ac,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ 1$NetBSD: patch-ac,v 1.2 2012/03/07 16:27:35 adam Exp $
2 2
3--- ./include/osg/Math.orig 2008-11-23 13:35:43.000000000 +0200 3--- include/osg/Math.orig 2008-11-23 13:35:43.000000000 +0200
4+++ ./include/osg/Math 2009-01-14 09:49:00.000000000 +0200 4+++ include/osg/Math 2009-01-14 09:49:00.000000000 +0200
5@@ -14,7 +14,7 @@ 5@@ -14,7 +14,7 @@
6 #ifndef __OSG_MATH 6 #ifndef __OSG_MATH
7 #define __OSG_MATH 7 #define __OSG_MATH
8  8
9-#include <math.h> 9-#include <math.h>
10+#include <cmath> 10+#include <cmath>
11  11
12 #include <osg/Export> 12 #include <osg/Export>
13  13
14@@ -200,14 +200,14 @@ 14@@ -207,14 +207,14 @@
15 inline bool isNaN(float v) { return _isnan(v)!=0; } 15 inline bool isNaN(float v) { return _isnan(v)!=0; }
16 inline bool isNaN(double v) { return _isnan(v)!=0; } 16 inline bool isNaN(double v) { return _isnan(v)!=0; }
17 #else 17 #else
18- #if defined(__APPLE__) 18- #if defined(__APPLE__)
19+// #if defined(__APPLE__) 19+// #if defined(__APPLE__)
20 inline bool isNaN(float v) { return std::isnan(v); } 20 inline bool isNaN(float v) { return std::isnan(v); }
21 inline bool isNaN(double v) { return std::isnan(v); } 21 inline bool isNaN(double v) { return std::isnan(v); }
22- #else 22- #else
23- // Need to use to std::isnan to avoid undef problem from <cmath> 23- // Need to use to std::isnan to avoid undef problem from <cmath>
24- inline bool isNaN(float v) { return isnan(v); } 24- inline bool isNaN(float v) { return isnan(v); }
25- inline bool isNaN(double v) { return isnan(v); } 25- inline bool isNaN(double v) { return isnan(v); }
26- #endif 26- #endif
27+// #else 27+// #else

cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/osg/patches/Attic/patch-ad 2010/08/26 13:08:49 1.1.1.1
+++ pkgsrc/graphics/osg/patches/Attic/patch-ad 2012/03/07 16:27:35 1.2
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1$NetBSD: patch-ad,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ 1$NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $
2 2
3--- ./src/OpenThreads/pthreads/PThread.c++.orig 2009-06-22 12:51:46.000000000 +0200 3--- src/OpenThreads/pthreads/PThread.cpp.orig 2011-06-23 20:09:26.000000000 +0000
4+++ ./src/OpenThreads/pthreads/PThread.c++ 2009-06-22 16:55:54.000000000 +0200 4+++ src/OpenThreads/pthreads/PThread.cpp
5@@ -124,6 +124,15 @@ 5@@ -135,6 +135,15 @@ private:
6 { 6 {
7 #if defined(__sgi) 7 #if defined(__sgi)
8 pthread_setrunon_np( pd->cpunum ); 8 pthread_setrunon_np( pd->cpunum );
9+#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP) 9+#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
10+ cpuset_t *cset; 10+ cpuset_t *cset;
11+ cset = cpuset_create(); 11+ cset = cpuset_create();
12+ if (cset != NULL) 12+ if (cset != NULL)
13+ { 13+ {
14+ cpuset_set(pd->cpunum, cset); 14+ cpuset_set(pd->cpunum, cset);
15+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset); 15+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset);
16+ cpuset_destroy(cset); 16+ cpuset_destroy(cset);
17+ } 17+ }
18 #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) 18 #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
19 cpu_set_t cpumask; 19 cpu_set_t cpumask;
20 CPU_ZERO( &cpumask ); 20 CPU_ZERO( &cpumask );
21@@ -537,6 +546,18 @@ 21@@ -565,6 +574,18 @@ int Thread::setProcessorAffinity(unsigne
22 status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP ); 22 status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP );
23 return status; 23 return status;
24  24
25+#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP) 25+#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
26+ if (pd->isRunning && Thread::CurrentThread()==this) 26+ if (pd->isRunning && Thread::CurrentThread()==this)
27+ { 27+ {
28+ cpuset_t *cset; 28+ cpuset_t *cset;
29+ cset = cpuset_create(); 29+ cset = cpuset_create();
30+ if (cset != NULL) 30+ if (cset != NULL)
31+ { 31+ {
32+ cpuset_set(pd->cpunum, cset); 32+ cpuset_set(pd->cpunum, cset);
33+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset); 33+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset);
34+ cpuset_destroy(cset); 34+ cpuset_destroy(cset);
35+ } 35+ }
36+ } 36+ }
37 #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) 37 #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
38  38
39 if (pd->isRunning && Thread::CurrentThread()==this) 39 if (pd->isRunning && Thread::CurrentThread()==this)
40@@ -974,7 +995,16 @@ 40@@ -1030,7 +1051,16 @@ int OpenThreads::SetProcessorAffinityOfC
41 } 41 }
42 else 42 else
43 { 43 {
44-#if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) 44-#if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
45+#if defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP) 45+#if defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
46+ cpuset_t *cset; 46+ cpuset_t *cset;
47+ cset = cpuset_create(); 47+ cset = cpuset_create();
48+ if (cset != NULL) 48+ if (cset != NULL)
49+ { 49+ {
50+ cpuset_set(cpunum, cset); 50+ cpuset_set(cpunum, cset);
51+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset); 51+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset);
52+ cpuset_destroy(cset); 52+ cpuset_destroy(cset);
53+ } 53+ }

cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/osg/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/graphics/osg/patches/Attic/patch-ae 2010/08/26 13:08:49 1.1.1.1
+++ pkgsrc/graphics/osg/patches/Attic/patch-ae 2012/03/07 16:27:35 1.2
@@ -1,24 +1,19 @@ @@ -1,24 +1,19 @@
1$NetBSD: patch-ae,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ 1$NetBSD: patch-ae,v 1.2 2012/03/07 16:27:35 adam Exp $
2 2
3--- ./CMakeLists.txt.orig 2009-06-22 19:23:08.000000000 +0200 3PkgSrc does not use lib64.
4+++ ./CMakeLists.txt 2009-06-22 19:23:54.000000000 +0200 4
5@@ -457,12 +457,13 @@ 5--- CMakeLists.txt.orig 2011-07-31 07:50:34.000000000 +0000
6 ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") 6+++ CMakeLists.txt
7 ENDIF(CYGWIN) 7@@ -586,12 +586,6 @@ IF(CYGWIN)
 8 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 9 ENDIF()
8  10
9-IF(UNIX AND NOT WIN32 AND NOT APPLE) 11-IF(UNIX AND NOT WIN32 AND NOT APPLE)
10- IF(CMAKE_SIZEOF_VOID_P MATCHES "8") 12- IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
11- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") 13- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
12- MARK_AS_ADVANCED(LIB_POSTFIX) 14- MARK_AS_ADVANCED(LIB_POSTFIX)
13- ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") 15- ENDIF()
14-ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) 16-ENDIF()
15+# pkgsrc does not use lib64 
16+#IF(UNIX AND NOT WIN32 AND NOT APPLE) 
17+# IF(CMAKE_SIZEOF_VOID_P MATCHES "8") 
18+# SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") 
19+# MARK_AS_ADVANCED(LIB_POSTFIX) 
20+# ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") 
21+#ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) 
22 IF(NOT DEFINED LIB_POSTFIX) 17 IF(NOT DEFINED LIB_POSTFIX)
23 SET(LIB_POSTFIX "") 18 SET(LIB_POSTFIX "")
24 ENDIF(NOT DEFINED LIB_POSTFIX) 19 ENDIF()

File Added: pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp
$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.1 2012/03/07 16:27:35 adam Exp $

Support more platforms.

--- applications/present3D/Cluster.cpp.orig	2012-03-05 16:33:33.000000000 +0000
+++ applications/present3D/Cluster.cpp
@@ -33,7 +33,7 @@
 #if defined(__linux)
     #include <unistd.h>
     #include <linux/sockios.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
     #include <unistd.h>
     #include <sys/sockio.h>
 #elif defined(__sgi)
@@ -336,7 +336,7 @@ void Receiver::sync( void )
         return;
     }
 
-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__NetBSD__) || defined(__OpenBSD__)
     socklen_t 
 #else
     int

File Added: pkgsrc/graphics/osg/patches/Attic/patch-include_OpenThreads_Atomic
$NetBSD: patch-include_OpenThreads_Atomic,v 1.1 2012/03/07 16:27:35 adam Exp $

Fix C error.

--- include/OpenThreads/Atomic.orig	2012-03-06 16:27:45.000000000 +0000
+++ include/OpenThreads/Atomic
@@ -241,7 +241,7 @@ _OPENTHREADS_ATOMIC_INLINE bool
 AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
 {
 #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
+    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
 #elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
     return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew);
 #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)

File Added: pkgsrc/graphics/osg/patches/Attic/patch-src_OpenThreads_common_Atomic.cpp
$NetBSD: patch-src_OpenThreads_common_Atomic.cpp,v 1.1 2012/03/07 16:27:35 adam Exp $

Fix C error.

--- src/OpenThreads/common/Atomic.cpp.orig	2012-03-05 21:26:31.000000000 +0000
+++ src/OpenThreads/common/Atomic.cpp
@@ -143,7 +143,7 @@ bool
 AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
 {
 #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
-    return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
+    return __sync_bool_compare_and_swap(&_ptr, (void *)ptrOld, ptrNew);
 #elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
     return ptrOld == InterlockedCompareExchangePointer((PVOID volatile*)&_ptr, (PVOID)ptrNew, (PVOID)ptrOld);
 #elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)

File Added: pkgsrc/graphics/osg/patches/Attic/patch-src_osgViewer_DarwinUtils.mm
$NetBSD: patch-src_osgViewer_DarwinUtils.mm,v 1.1 2012/03/07 16:27:35 adam Exp $

Work around depreciated API.

--- src/osgViewer/DarwinUtils.mm.orig	2012-03-06 14:49:28.000000000 +0000
+++ src/osgViewer/DarwinUtils.mm
@@ -313,7 +313,11 @@ void DarwinWindowingSystemInterface::get
     CGDirectDisplayID id = getDisplayID(si);
     resolution.width = CGDisplayPixelsWide(id);
     resolution.height = CGDisplayPixelsHigh(id);
-    resolution.colorDepth = CGDisplayBitsPerPixel(id);
+    CGDisplayModeRef displayMode = CGDisplayCopyDisplayMode(id);
+    CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(displayMode);
+    CGDisplayModeRelease(displayMode);
+    resolution.colorDepth = CFStringGetLength(pixelEncoding);
+    CFRelease(pixelEncoding);
     resolution.refreshRate = getDictDouble (CGDisplayCurrentMode(id), kCGDisplayRefreshRate);        // Not tested
     if (resolution.refreshRate<0) resolution.refreshRate = 0;
 }
@@ -402,7 +406,7 @@ bool DarwinWindowingSystemInterface::set
     CFDictionaryRef display_mode_values =
         CGDisplayBestModeForParametersAndRefreshRate(
                         displayid, 
-                        CGDisplayBitsPerPixel(displayid), 
+                        32, 
                         width, height,  
                         refresh,  
                         NULL);
@@ -432,7 +436,7 @@ bool DarwinWindowingSystemInterface::set
     CFDictionaryRef display_mode_values =
         CGDisplayBestModeForParametersAndRefreshRate(
                         displayid, 
-                        CGDisplayBitsPerPixel(displayid), 
+                        32, 
                         width, height,  
                         refreshRate,  
                         &success);

File Deleted: pkgsrc/graphics/osg/patches/Attic/patch-src-osgPlugins-curl-ReaderWriterCURL.cpp

cvs diff -r1.1 -r1.2 pkgsrc/graphics/osg/patches/Attic/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp (expand / switch to unified diff)

--- pkgsrc/graphics/osg/patches/Attic/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp 2011/12/11 11:59:06 1.1
+++ pkgsrc/graphics/osg/patches/Attic/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp 2012/03/07 16:27:35 1.2
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1$NetBSD: patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp,v 1.1 2011/12/11 11:59:06 marino Exp $ 1$NetBSD: patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp,v 1.2 2012/03/07 16:27:35 adam Exp $
2 2
3--- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.orig 2010-03-19 08:03:02.000000000 +0000 3Point to correct header files.
 4
 5--- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.orig 2012-03-05 21:20:14.000000000 +0000
4+++ src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 6+++ src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
5@@ -6,11 +6,12 @@ 7@@ -9,9 +9,9 @@ extern "C"
6 extern "C" 8 #define FF_API_OLD_SAMPLE_FMT 0
7 { 
8 #define __STDC_CONSTANT_MACROS 
9+#define FF_API_OLD_SAMPLE_FMT 0 
10 #include <errno.h> // for error codes defined in avformat.h 9 #include <errno.h> // for error codes defined in avformat.h
11 #include <stdint.h> 10 #include <stdint.h>
12-#include <avcodec.h> 11-#include <avcodec.h>
13-#include <avformat.h> 12-#include <avformat.h>
14-#include <avdevice.h> 13-#include <avdevice.h>
15+#include <libavcodec/avcodec.h> 14+#include <libavcodec/avcodec.h>
16+#include <libavformat/avformat.h> 15+#include <libavformat/avformat.h>
17+#include <libavdevice/avdevice.h> 16+#include <libavdevice/avdevice.h>
18  17
19 #ifdef USE_SWSCALE  18 #ifdef USE_SWSCALE
20 #include <swscale.h> 19 #include <swscale.h>