osc: Update wip/osc to 3.4.0.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: osc: Update wip/osc to 3.4.0.
From: Mateusz Poszwa <old4%o2.pl@localhost>
Date: Fri, 06 Nov 2015 20:49:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Fri Nov 6 21:49:11 2015 +0100
Changeset:	cdaaafec642718393b92dae9ba746762f560879c

Modified Files:
	osg/Makefile
	osg/PLIST
	osg/buildlink3.mk
	osg/distinfo
	osg/patches/patch-ab
	osg/patches/patch-ad
	osg/patches/patch-applications_present3D_Cluster.cpp
Added Files:
	osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
	osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
Removed Files:
	osg/patches/patch-ac
	osg/patches/patch-af
	osg/patches/patch-include_OpenThreads_Atomic
	osg/patches/patch-src_OpenThreads_common_Atomic.cpp
	osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp
	osg/patches/patch-src_osgViewer_DarwinUtils.mm

Log Message:
osc: Update wip/osc to 3.4.0.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cdaaafec642718393b92dae9ba746762f560879c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 osg/Makefile                                       |   6 +-
 osg/PLIST                                          | 118 +++++++++++++++++----
 osg/buildlink3.mk                                  |   2 +-
 osg/distinfo                                       |  22 ++--
 osg/patches/patch-ab                               |  12 +--
 osg/patches/patch-ac                               |  34 ------
 osg/patches/patch-ad                               |  10 +-
 osg/patches/patch-af                               |  19 ----
 .../patch-applications_present3D_Cluster.cpp       |  24 ++---
 osg/patches/patch-include_OpenThreads_Atomic       |  15 ---
 .../patch-src_OpenThreads_common_Atomic.cpp        |  15 ---
 .../patch-src_osgPlugins_gif_ReaderWriterGIF.cpp   |  30 ------
 ...src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp |  16 +++
 ...atch-src_osgPlugins_osc_osc_OscHostEndianness.h |  15 +++
 osg/patches/patch-src_osgViewer_DarwinUtils.mm     |  37 -------
 15 files changed, 162 insertions(+), 213 deletions(-)

diffs:
diff --git a/osg/Makefile b/osg/Makefile
index 9266646..8da4d72 100644
--- a/osg/Makefile
+++ b/osg/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.55 2015/06/30 09:57:36 ryoon Exp $
 
-DISTNAME=	OpenSceneGraph-3.0.1
-PKGNAME=	osg-3.0.1
-PKGREVISION=	37
+DISTNAME=	OpenSceneGraph-3.4.0
+PKGNAME=	osg-3.4.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERSION_NOREV}/source/
 EXTRACT_SUFX=	.zip
@@ -39,6 +38,7 @@ PLIST.x11=	yes
 .include "../../mk/jpeg.buildlink3.mk"
 .endif
 
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/osg/PLIST b/osg/PLIST
index 97a084d..5c2eba4 100644
--- a/osg/PLIST
+++ b/osg/PLIST
@@ -28,22 +28,28 @@ include/osg/AutoTransform
 include/osg/Billboard
 include/osg/BlendColor
 include/osg/BlendEquation
+include/osg/BlendEquationi
 include/osg/BlendFunc
+include/osg/BlendFunci
 include/osg/BoundingBox
 include/osg/BoundingSphere
 include/osg/BoundsChecking
 include/osg/BufferIndexBinding
 include/osg/BufferObject
+include/osg/BufferTemplate
+include/osg/Callback
 include/osg/Camera
-include/osg/CameraNode
 include/osg/CameraView
+include/osg/Capability
 include/osg/ClampColor
 include/osg/ClearNode
+include/osg/ClipControl
 include/osg/ClipNode
 include/osg/ClipPlane
 include/osg/ClusterCullingCallback
 include/osg/CollectOccludersVisitor
 include/osg/ColorMask
+include/osg/ColorMaski
 include/osg/ColorMatrix
 include/osg/ComputeBoundsVisitor
 include/osg/Config
@@ -70,6 +76,7 @@ include/osg/FrontFace
 include/osg/GL
 include/osg/GL2Extensions
 include/osg/GLBeginEndAdapter
+include/osg/GLDefines
 include/osg/GLExtensions
 include/osg/GLObjects
 include/osg/GLU
@@ -113,6 +120,7 @@ include/osg/OccluderNode
 include/osg/OcclusionQueryNode
 include/osg/OperationThread
 include/osg/PagedLOD
+include/osg/PatchParameter
 include/osg/Plane
 include/osg/Point
 include/osg/PointSprite
@@ -121,6 +129,7 @@ include/osg/PolygonOffset
 include/osg/PolygonStipple
 include/osg/Polytope
 include/osg/PositionAttitudeTransform
+include/osg/PrimitiveRestartIndex
 include/osg/PrimitiveSet
 include/osg/Program
 include/osg/Projection
@@ -128,7 +137,9 @@ include/osg/ProxyNode
 include/osg/Quat
 include/osg/Referenced
 include/osg/RenderInfo
+include/osg/SampleMaski
 include/osg/Scissor
+include/osg/ScriptEngine
 include/osg/Sequence
 include/osg/ShadeModel
 include/osg/Shader
@@ -158,6 +169,7 @@ include/osg/Texture2D
 include/osg/Texture2DArray
 include/osg/Texture2DMultisample
 include/osg/Texture3D
+include/osg/TextureBuffer
 include/osg/TextureCubeMap
 include/osg/TextureRectangle
 include/osg/Timer
@@ -165,6 +177,7 @@ include/osg/TransferFunction
 include/osg/Transform
 include/osg/TriangleFunctor
 include/osg/TriangleIndexFunctor
+include/osg/Types
 include/osg/Uniform
 include/osg/UserDataContainer
 include/osg/ValueObject
@@ -172,19 +185,31 @@ include/osg/Vec2
 include/osg/Vec2b
 include/osg/Vec2d
 include/osg/Vec2f
+include/osg/Vec2i
 include/osg/Vec2s
+include/osg/Vec2ub
+include/osg/Vec2ui
+include/osg/Vec2us
 include/osg/Vec3
 include/osg/Vec3b
 include/osg/Vec3d
 include/osg/Vec3f
+include/osg/Vec3i
 include/osg/Vec3s
+include/osg/Vec3ub
+include/osg/Vec3ui
+include/osg/Vec3us
 include/osg/Vec4
 include/osg/Vec4b
 include/osg/Vec4d
 include/osg/Vec4f
+include/osg/Vec4i
 include/osg/Vec4s
 include/osg/Vec4ub
+include/osg/Vec4ui
+include/osg/Vec4us
 include/osg/Version
+include/osg/VertexAttribDivisor
 include/osg/VertexProgram
 include/osg/View
 include/osg/Viewport
@@ -236,11 +261,14 @@ include/osgAnimation/TimelineAnimationManager
 include/osgAnimation/UpdateBone
 include/osgAnimation/UpdateMaterial
 include/osgAnimation/UpdateMatrixTransform
+include/osgAnimation/UpdateUniform
 include/osgAnimation/Vec3Packed
 include/osgAnimation/VertexInfluence
 include/osgDB/Archive
 include/osgDB/AuthenticationMap
 include/osgDB/Callbacks
+include/osgDB/ClassInterface
+include/osgDB/ConvertBase64
 include/osgDB/ConvertUTF
 include/osgDB/DataTypes
 include/osgDB/DatabasePager
@@ -257,6 +285,7 @@ include/osgDB/ImagePager
 include/osgDB/ImageProcessor
 include/osgDB/Input
 include/osgDB/InputStream
+include/osgDB/ObjectCache
 include/osgDB/ObjectWrapper
 include/osgDB/Options
 include/osgDB/Output
@@ -289,7 +318,10 @@ include/osgFX/Version
 include/osgGA/AnimationPathManipulator
 include/osgGA/CameraManipulator
 include/osgGA/CameraViewSwitchManipulator
+include/osgGA/Device
 include/osgGA/DriveManipulator
+include/osgGA/Event
+include/osgGA/EventHandler
 include/osgGA/EventQueue
 include/osgGA/EventVisitor
 include/osgGA/Export
@@ -309,6 +341,7 @@ include/osgGA/TerrainManipulator
 include/osgGA/TrackballManipulator
 include/osgGA/UFOManipulator
 include/osgGA/Version
+include/osgGA/Widget
 include/osgManipulator/AntiSquish
 include/osgManipulator/Command
 include/osgManipulator/CommandManager
@@ -382,10 +415,14 @@ include/osgParticle/Version
 include/osgParticle/range
 include/osgPresentation/AnimationMaterial
 include/osgPresentation/CompileSlideCallback
+include/osgPresentation/Cursor
 include/osgPresentation/Export
+include/osgPresentation/KeyEventHandler
 include/osgPresentation/PickEventHandler
+include/osgPresentation/PropertyManager
 include/osgPresentation/SlideEventHandler
 include/osgPresentation/SlideShowConstructor
+include/osgPresentation/Timeout
 include/osgShadow/ConvexPolyhedron
 include/osgShadow/DebugShadowMap
 include/osgShadow/Export
@@ -397,6 +434,7 @@ include/osgShadow/OccluderGeometry
 include/osgShadow/ParallelSplitShadowMap
 include/osgShadow/ProjectionShadowMap
 include/osgShadow/ShadowMap
+include/osgShadow/ShadowSettings
 include/osgShadow/ShadowTechnique
 include/osgShadow/ShadowTexture
 include/osgShadow/ShadowVolume
@@ -404,6 +442,7 @@ include/osgShadow/ShadowedScene
 include/osgShadow/SoftShadowMap
 include/osgShadow/StandardShadowMap
 include/osgShadow/Version
+include/osgShadow/ViewDependentShadowMap
 include/osgShadow/ViewDependentShadowTechnique
 include/osgSim/BlinkSequence
 include/osgSim/ColorRange
@@ -429,7 +468,9 @@ include/osgSim/ShapeAttribute
 include/osgSim/SphereSegment
 include/osgSim/Version
 include/osgSim/VisibilityGroup
+include/osgTerrain/DisplacementMappingTechnique
 include/osgTerrain/Export
+include/osgTerrain/GeometryPool
 include/osgTerrain/GeometryTechnique
 include/osgTerrain/Layer
 include/osgTerrain/Locator
@@ -450,6 +491,22 @@ include/osgText/Text
 include/osgText/Text3D
 include/osgText/TextBase
 include/osgText/Version
+include/osgUI/AlignmentSettings
+include/osgUI/Callbacks
+include/osgUI/ColorPalette
+include/osgUI/ComboBox
+include/osgUI/Dialog
+include/osgUI/Export
+include/osgUI/FrameSettings
+include/osgUI/Label
+include/osgUI/LineEdit
+include/osgUI/Popup
+include/osgUI/PushButton
+include/osgUI/Style
+include/osgUI/TabWidget
+include/osgUI/TextSettings
+include/osgUI/Validator
+include/osgUI/Widget
 include/osgUtil/ConvertVec
 include/osgUtil/CubeMapGenerator
 include/osgUtil/CullVisitor
@@ -468,10 +525,12 @@ include/osgUtil/LineSegmentIntersector
 include/osgUtil/MeshOptimizers
 include/osgUtil/OperationArrayFunctor
 include/osgUtil/Optimizer
+include/osgUtil/PerlinNoise
 include/osgUtil/PlaneIntersector
 include/osgUtil/PolytopeIntersector
 include/osgUtil/PositionalStateContainer
 include/osgUtil/PrintVisitor
+include/osgUtil/RayIntersector
 include/osgUtil/ReflectionMapGenerator
 include/osgUtil/RenderBin
 include/osgUtil/RenderLeaf
@@ -494,6 +553,7 @@ include/osgUtil/Version
 include/osgViewer/CompositeViewer
 include/osgViewer/Export
 include/osgViewer/GraphicsWindow
+include/osgViewer/Keystone
 include/osgViewer/Renderer
 include/osgViewer/Scene
 include/osgViewer/Version
@@ -511,10 +571,13 @@ include/osgVolume/Export
 include/osgVolume/FixedFunctionTechnique
 include/osgVolume/Layer
 include/osgVolume/Locator
+include/osgVolume/MultipassTechnique
 include/osgVolume/Property
 include/osgVolume/RayTracedTechnique
 include/osgVolume/Version
 include/osgVolume/Volume
+include/osgVolume/VolumeScene
+include/osgVolume/VolumeSettings
 include/osgVolume/VolumeTechnique
 include/osgVolume/VolumeTile
 include/osgWidget/Box
@@ -542,56 +605,59 @@ include/osgWidget/Widget
 include/osgWidget/Window
 include/osgWidget/WindowManager
 lib/libOpenThreads.so
-lib/libOpenThreads.so.12
-lib/libOpenThreads.so.2.6.0
+lib/libOpenThreads.so.20
+lib/libOpenThreads.so.3.3.0
 lib/libosg.so
 lib/libosg.so.${PKGVERSION}
-lib/libosg.so.80
+lib/libosg.so.130
 lib/libosgAnimation.so
 lib/libosgAnimation.so.${PKGVERSION}
-lib/libosgAnimation.so.80
+lib/libosgAnimation.so.130
 lib/libosgDB.so
 lib/libosgDB.so.${PKGVERSION}
-lib/libosgDB.so.80
+lib/libosgDB.so.130
 lib/libosgFX.so
 lib/libosgFX.so.${PKGVERSION}
-lib/libosgFX.so.80
+lib/libosgFX.so.130
 lib/libosgGA.so
 lib/libosgGA.so.${PKGVERSION}
-lib/libosgGA.so.80
+lib/libosgGA.so.130
 lib/libosgManipulator.so
 lib/libosgManipulator.so.${PKGVERSION}
-lib/libosgManipulator.so.80
+lib/libosgManipulator.so.130
 lib/libosgParticle.so
 lib/libosgParticle.so.${PKGVERSION}
-lib/libosgParticle.so.80
+lib/libosgParticle.so.130
 lib/libosgPresentation.so
 lib/libosgPresentation.so.${PKGVERSION}
-lib/libosgPresentation.so.80
+lib/libosgPresentation.so.130
 lib/libosgShadow.so
 lib/libosgShadow.so.${PKGVERSION}
-lib/libosgShadow.so.80
+lib/libosgShadow.so.130
 lib/libosgSim.so
 lib/libosgSim.so.${PKGVERSION}
-lib/libosgSim.so.80
+lib/libosgSim.so.130
 lib/libosgTerrain.so
 lib/libosgTerrain.so.${PKGVERSION}
-lib/libosgTerrain.so.80
+lib/libosgTerrain.so.130
 lib/libosgText.so
 lib/libosgText.so.${PKGVERSION}
-lib/libosgText.so.80
+lib/libosgText.so.130
+lib/libosgUI.so
+lib/libosgUI.so.${PKGVERSION}
+lib/libosgUI.so.130
 lib/libosgUtil.so
 lib/libosgUtil.so.${PKGVERSION}
-lib/libosgUtil.so.80
+lib/libosgUtil.so.130
 lib/libosgViewer.so
 lib/libosgViewer.so.${PKGVERSION}
-lib/libosgViewer.so.80
+lib/libosgViewer.so.130
 lib/libosgVolume.so
 lib/libosgVolume.so.${PKGVERSION}
-lib/libosgVolume.so.80
+lib/libosgVolume.so.130
 lib/libosgWidget.so
 lib/libosgWidget.so.${PKGVERSION}
-lib/libosgWidget.so.80
+lib/libosgWidget.so.130
 lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
@@ -616,9 +682,10 @@ lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dw.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
+lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so
 lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
-lib/osgPlugins-${PKGVERSION}/osgdb_geo.so
 ${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
+lib/osgPlugins-${PKGVERSION}/osgdb_gles.so
 lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_gz.so
 lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so
@@ -626,7 +693,9 @@ ${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_imageio.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ive.so
 lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
 ${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_ktx.so
 lib/osgPlugins-${PKGVERSION}/osgdb_logo.so
+lib/osgPlugins-${PKGVERSION}/osgdb_lua.so
 lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so
 lib/osgPlugins-${PKGVERSION}/osgdb_lws.so
 lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
@@ -635,8 +704,10 @@ lib/osgPlugins-${PKGVERSION}/osgdb_normals.so
 lib/osgPlugins-${PKGVERSION}/osgdb_obj.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so
 lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so
+lib/osgPlugins-${PKGVERSION}/osgdb_osc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osga.so
+lib/osgPlugins-${PKGVERSION}/osgdb_osgjs.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osgshadow.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osgterrain.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osgtgz.so
@@ -652,23 +723,30 @@ lib/osgPlugins-${PKGVERSION}/osgdb_revisions.so
 lib/osgPlugins-${PKGVERSION}/osgdb_rgb.so
 lib/osgPlugins-${PKGVERSION}/osgdb_rot.so
 lib/osgPlugins-${PKGVERSION}/osgdb_scale.so
+lib/osgPlugins-${PKGVERSION}/osgdb_sdl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osganimation.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgfx.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgga.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgmanipulator.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgparticle.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgshadow.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgsim.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgterrain.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgtext.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgui.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgutil.so
+lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgviewer.so
 lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgvolume.so
 lib/osgPlugins-${PKGVERSION}/osgdb_shp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_stl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_svg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_tf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_tga.so
 lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so
 ${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so
 lib/osgPlugins-${PKGVERSION}/osgdb_trans.so
+lib/osgPlugins-${PKGVERSION}/osgdb_trk.so
 lib/osgPlugins-${PKGVERSION}/osgdb_txf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_txp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so
diff --git a/osg/buildlink3.mk b/osg/buildlink3.mk
index 153d35e..e378ef5 100644
--- a/osg/buildlink3.mk
+++ b/osg/buildlink3.mk
@@ -7,7 +7,7 @@ OSG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.osg+=	osg>=2.8.3
 BUILDLINK_ABI_DEPENDS.osg+=	osg>=3.0.1nb37
-BUILDLINK_PKGSRCDIR.osg?=	../../graphics/osg
+BUILDLINK_PKGSRCDIR.osg?=	../../wip/osg
 
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/osg/distinfo b/osg/distinfo
index 16a8120..c4ad09f 100644
--- a/osg/distinfo
+++ b/osg/distinfo
@@ -1,16 +1,12 @@
 $NetBSD: distinfo,v 1.10 2015/11/03 21:34:11 agc Exp $
 
-SHA1 (OpenSceneGraph-3.0.1.zip) = 13c7e39f6d62047ad944d8d28a0f0eb60384ce33
-RMD160 (OpenSceneGraph-3.0.1.zip) = 54b315c318b7ade2bcc65703cea5f41377e93a71
-SHA512 (OpenSceneGraph-3.0.1.zip) = 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912
-Size (OpenSceneGraph-3.0.1.zip) = 6780282 bytes
-SHA1 (patch-ab) = 70b58b8b42af77018a09d4024afaffb874b74ddf
-SHA1 (patch-ac) = 1f237646034ca837c837e44aff753cd590c47900
-SHA1 (patch-ad) = 2a9594128e357b20f7f8146398b7cb4068aca405
+SHA1 (OpenSceneGraph-3.4.0.zip) = 20b51f2c428fcef2687169dbb69ea170393ad69d
+RMD160 (OpenSceneGraph-3.4.0.zip) = 6043321fc1c9b23f0e536c4e18a96a97d8b16c30
+SHA512 (OpenSceneGraph-3.4.0.zip) = b598a7d68c9e5bf840d7b0a59a334037c3b6efe4d2dce333280b63a8ccef1b9a37cd5ff32b98f18e110ff9cbc48226f588e143cb1d68405edda3c60ab2f3f73a
+Size (OpenSceneGraph-3.4.0.zip) = 7975023 bytes
+SHA1 (patch-ab) = 3e9a591b271317623c15bde750fafe27951ddec7
+SHA1 (patch-ad) = d710056fead22adb11b265c2667873ab8b541115
 SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
-SHA1 (patch-af) = 9e10c217fbd53827b445feb5cbc0d9b586eeb14f
-SHA1 (patch-applications_present3D_Cluster.cpp) = 7b9dd81805322eeb1a4a26a21faa0a12c28d4b75
-SHA1 (patch-include_OpenThreads_Atomic) = 663f76cf4ffe5f52f24a1c68701c35bb8763063a
-SHA1 (patch-src_OpenThreads_common_Atomic.cpp) = 34687f53ba01832b7ea3e0b124a951efc0afe343
-SHA1 (patch-src_osgPlugins_gif_ReaderWriterGIF.cpp) = f876bbdf2fe282c6435118adbabb0823f4550fde
-SHA1 (patch-src_osgViewer_DarwinUtils.mm) = 4ab021cb797cb6959bee4ba33caf257b2a6cedf3
+SHA1 (patch-applications_present3D_Cluster.cpp) = ccbc1d524562d6f655a38c0ea3ff4c9549718be2
+SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
+SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = d8e9efa88898e240775ead76c5c9df4c86cd562c
diff --git a/osg/patches/patch-ab b/osg/patches/patch-ab
index 5605b30..61dfd4e 100644
--- a/osg/patches/patch-ab
+++ b/osg/patches/patch-ab
@@ -1,13 +1,13 @@
 $NetBSD: patch-ab,v 1.3 2012/03/07 16:27:35 adam Exp $
 
---- src/osgDB/FileUtils.cpp.orig	2009-01-12 17:28:37.000000000 +0200
-+++ src/osgDB/FileUtils.cpp	2009-01-12 17:30:14.000000000 +0200
-@@ -76,7 +76,7 @@
-     #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
+--- src/osgDB/FileUtils.cpp.orig	2015-06-01 13:40:20.000000000 +0000
++++ src/osgDB/FileUtils.cpp
+@@ -78,7 +78,7 @@ typedef char TCHAR;
          #define stat64 stat
      #endif
--#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
-+#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) || defined(__DragonFly__) && !defined(_LARGEFILE64_SOURCE))
+ #elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
+-      (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
++      (defined(__hpux) || defined(__NetBSD__) && !defined(_LARGEFILE64_SOURCE))
      #define stat64 stat
  #endif
  
diff --git a/osg/patches/patch-ac b/osg/patches/patch-ac
deleted file mode 100644
index e637ece..0000000
--- a/osg/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2012/03/07 16:27:35 adam Exp $
-
---- include/osg/Math.orig	2008-11-23 13:35:43.000000000 +0200
-+++ include/osg/Math	2009-01-14 09:49:00.000000000 +0200
-@@ -14,7 +14,7 @@
- #ifndef __OSG_MATH
- #define __OSG_MATH
- 
--#include <math.h>
-+#include <cmath>
- 
- #include <osg/Export>
- 
-@@ -207,14 +207,14 @@
-     inline bool isNaN(float v) { return _isnan(v)!=0; }
-     inline bool isNaN(double v) { return _isnan(v)!=0; }
- #else
--    #if defined(__APPLE__)
-+//    #if defined(__APPLE__)
-         inline bool isNaN(float v) { return std::isnan(v); }
-         inline bool isNaN(double v) { return std::isnan(v); }
--    #else
--        // Need to use to std::isnan to avoid undef problem from <cmath>
--        inline bool isNaN(float v) { return isnan(v); }
--        inline bool isNaN(double v) { return isnan(v); }
--    #endif
-+//    #else
-+//        // Need to use to std::isnan to avoid undef problem from <cmath>
-+//        inline bool isNaN(float v) { return isnan(v); }
-+//        inline bool isNaN(double v) { return isnan(v); }
-+//    #endif
- #endif
- 
- 
diff --git a/osg/patches/patch-ad b/osg/patches/patch-ad
index 90fe559..ac3cca1 100644
--- a/osg/patches/patch-ad
+++ b/osg/patches/patch-ad
@@ -1,6 +1,6 @@
 $NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $
 
---- src/OpenThreads/pthreads/PThread.cpp.orig	2011-06-23 20:09:26.000000000 +0000
+--- src/OpenThreads/pthreads/PThread.cpp.orig	2015-04-07 18:01:12.000000000 +0000
 +++ src/OpenThreads/pthreads/PThread.cpp
 @@ -135,6 +135,15 @@ private:
          {
@@ -18,12 +18,12 @@ $NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $
  #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
              cpu_set_t cpumask;
              CPU_ZERO( &cpumask );
-@@ -565,6 +574,18 @@ int Thread::setProcessorAffinity(unsigne
+@@ -592,6 +601,18 @@ int Thread::setProcessorAffinity(unsigne
      status = pthread_attr_setscope( &thread_attr, PTHREAD_SCOPE_BOUND_NP );
      return status;
  
 +#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
-+    if (pd->isRunning && Thread::CurrentThread()==this)
++    if (pd->isRunning() && Thread::CurrentThread()==this)
 +    {
 +            cpuset_t *cset;
 +            cset = cpuset_create();
@@ -36,8 +36,8 @@ $NetBSD: patch-ad,v 1.2 2012/03/07 16:27:35 adam Exp $
 +    }
  #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
  
-     if (pd->isRunning && Thread::CurrentThread()==this)
-@@ -1030,7 +1051,16 @@ int OpenThreads::SetProcessorAffinityOfC
+     if (pd->isRunning() && Thread::CurrentThread()==this)
+@@ -1057,7 +1078,16 @@ int OpenThreads::SetProcessorAffinityOfC
      }
      else
      {
diff --git a/osg/patches/patch-af b/osg/patches/patch-af
deleted file mode 100644
index bba23f0..0000000
--- a/osg/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2012/03/26 12:00:33 drochner Exp $
-
---- src/osgPlugins/xine/video_out_rgb.c.orig	2009-11-20 11:46:20.000000000 +0000
-+++ src/osgPlugins/xine/video_out_rgb.c
-@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
- 	clear(rgb_class, sizeof(rgbout_class_t));
- 
- 	rgb_class->driver_class.open_plugin     = open_plugin;
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
- 	rgb_class->driver_class.get_identifier  = get_identifier;
- 	rgb_class->driver_class.get_description = get_description;
-+#else
-+	rgb_class->driver_class.identifier  = get_identifier(NULL);
-+	rgb_class->driver_class.description = get_description(NULL);
-+#endif
-+
- 	rgb_class->driver_class.dispose         = dispose_class;
- 
- 	return(rgb_class);
diff --git a/osg/patches/patch-applications_present3D_Cluster.cpp b/osg/patches/patch-applications_present3D_Cluster.cpp
index acba820..2938e50 100644
--- a/osg/patches/patch-applications_present3D_Cluster.cpp
+++ b/osg/patches/patch-applications_present3D_Cluster.cpp
@@ -2,29 +2,23 @@ $NetBSD: patch-applications_present3D_Cluster.cpp,v 1.2 2012/05/20 19:28:19 mari
 
 Support more platforms.
 
---- applications/present3D/Cluster.cpp.orig	2012-03-05 16:33:33.000000000 +0000
+--- applications/present3D/Cluster.cpp.orig	2015-04-13 10:43:56.000000000 +0000
 +++ applications/present3D/Cluster.cpp
-@@ -33,9 +33,12 @@
+@@ -33,7 +33,7 @@
  #if defined(__linux)
      #include <unistd.h>
      #include <linux/sockios.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#elif defined(__FreeBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
      #include <unistd.h>
      #include <sys/sockio.h>
-+#elif defined(__DragonFly__)
-+    #include <unistd.h>
-+    #include <sys/sockio.h>
  #elif defined(__sgi)
-     #include <unistd.h>
-     #include <net/soioctl.h>
-@@ -336,7 +339,8 @@ void Receiver::sync( void )
-         return;
+@@ -338,7 +338,7 @@ void Receiver::sync( void )
      }
  
--#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
-+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-     socklen_t 
+ #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
+-    defined(__DragonFly__)
++    defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+     socklen_t
  #else
      int
diff --git a/osg/patches/patch-include_OpenThreads_Atomic b/osg/patches/patch-include_OpenThreads_Atomic
deleted file mode 100644
index 9f0a9a7..0000000
--- a/osg/patches/patch-include_OpenThreads_Atomic
+++ /dev/null
@@ -1,15 +0,0 @@
-$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)
diff --git a/osg/patches/patch-src_OpenThreads_common_Atomic.cpp b/osg/patches/patch-src_OpenThreads_common_Atomic.cpp
deleted file mode 100644
index bc6e5c1..0000000
--- a/osg/patches/patch-src_OpenThreads_common_Atomic.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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)
diff --git a/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp b/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp
deleted file mode 100644
index 3124188..0000000
--- a/osg/patches/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_osgPlugins_gif_ReaderWriterGIF.cpp,v 1.2 2014/05/23 13:45:07 obache Exp $
-
-* GIFLIB 5.x API change 
-
---- src/osgPlugins/gif/ReaderWriterGIF.cpp.orig	2011-05-05 12:39:35.000000000 +0000
-+++ src/osgPlugins/gif/ReaderWriterGIF.cpp
-@@ -370,7 +370,11 @@ GifImageStream** obj)
-     int interlacedoffset[] = { 0, 4, 2, 1 };
-     int interlacedjumps[] = { 8, 8, 4, 2 };
- 
-+#if GIFLIB_MAJOR >= 5
-+    giffile = DGifOpen(&fin,gif_read_stream, NULL);
-+#else
-     giffile = DGifOpen(&fin,gif_read_stream);
-+#endif
-     if (!giffile)
-     {
-         giferror = ERR_OPEN;
-@@ -557,7 +561,11 @@ GifImageStream** obj)
-     *width_ret = giffile->SWidth;
-     *height_ret = giffile->SHeight;
-     *numComponents_ret = 4;
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+    DGifCloseFile(giffile, NULL);
-+#else
-     DGifCloseFile(giffile);
-+#endif
-     return buffer;
- }
- 
diff --git a/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp b/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
new file mode 100644
index 0000000..954cdfa
--- /dev/null
+++ b/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+ntohl(3) is defined in arpa/inet.h, not in netinet/in.h.
+
+--- src/osgPlugins/osc/ip/posix/NetworkingUtils.cpp.orig	2013-02-04 12:50:51.000000000 +0000
++++ src/osgPlugins/osc/ip/posix/NetworkingUtils.cpp
+@@ -29,8 +29,8 @@
+ */
+ #include "ip/NetworkingUtils.h"
+ 
++#include <arpa/inet.h>
+ #include <netdb.h>
+-#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <string.h>
+ #include <stdio.h>
diff --git a/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h b/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
new file mode 100644
index 0000000..7c83c8c
--- /dev/null
+++ b/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Configure endianness for osc plug-in.
+
+--- src/osgPlugins/osc/osc/OscHostEndianness.h.orig	2015-07-23 11:14:00.000000000 +0000
++++ src/osgPlugins/osc/osc/OscHostEndianness.h
+@@ -64,7 +64,7 @@
+         #else
+             #error Unknown machine endianness detected.
+         #endif
+-    #elif defined(__FreeBSD__)
++    #elif defined(__FreeBSD__) || defined(__NetBSD__)
+         #include <sys/endian.h>
+         #if (_BYTE_ORDER == _LITTLE_ENDIAN)
+             #ifndef __LITTLE_ENDIAN__
diff --git a/osg/patches/patch-src_osgViewer_DarwinUtils.mm b/osg/patches/patch-src_osgViewer_DarwinUtils.mm
deleted file mode 100644
index 14b0faf..0000000
--- a/osg/patches/patch-src_osgViewer_DarwinUtils.mm
+++ /dev/null
@@ -1,37 +0,0 @@
-$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);
Prev by Date: osg: Import osg-3.0.1 as wip/osg.
Next by Date: simgear: Import simgear-2.8.0 as wip/simgear.
Previous by Thread: osg: Import osg-3.0.1 as wip/osg.
Next by Thread: simgear: Import simgear-2.8.0 as wip/simgear.
Indexes:
Home | Main Index | Thread Index | Old Index