Updating

To: graphics/osg%netbsd.org@localhost, tech-pkg%netbsd.org@localhost
Subject: Updating
From: nia%netbsd.org@localhost (Nia Alarie)
Date: Wed, 1 Aug 2018 15:23:24 +0000 (UTC)
An update to graphics/osg 3.4.1 was suggested in TODO.

osg has releases in the 3.6 series, but I'm not sure about
compatibility, and most operating systems seem to currently be
shipping 3.4.1. I also prepared an update to 3.4.1 earlier.

osg has a *lot* of optional dependencies. I've made most of them
options and taken cues about what to enable by default from FreeBSD.

Some are just disabled because they're old/broken/for examples/
don't have support in other OSes or bits in pkgsrc. More can be added
later on, if needed.

The MASTER_SITES has been changed to GitHub because
openscenegraph.org now points there for download links.

After this is done, FlightGear/simgear needs to be updated
(it's currently so old it's broken), and OpenMW needs to be imported
from wip.

These are the only things using osg in pkgsrc currently.
Once the update is done, I can proceed with this work in the tree.

Thoughts/input?

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/osg/Makefile,v
retrieving revision 1.81
diff -u -r1.81 Makefile
--- Makefile	29 Apr 2018 21:31:21 -0000	1.81
+++ Makefile	1 Aug 2018 15:01:04 -0000
@@ -1,17 +1,20 @@
 # $NetBSD: Makefile,v 1.81 2018/04/29 21:31:21 adam Exp $
 
-DISTNAME=	OpenSceneGraph-3.0.1
-PKGNAME=	osg-3.0.1
-PKGREVISION=	61
+DISTNAME=	osg-3.4.1
 CATEGORIES=	graphics devel
-MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERSION_NOREV}/source/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_GITHUB:=openscenegraph/}
+GITHUB_PROJECT=	OpenSceneGraph
+GITHUB_TAG=	OpenSceneGraph-${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.openscenegraph.org/
 COMMENT=	High performance 3D graphics toolkit
 LICENSE=	gnu-lgpl-v2.1
 
+EXTRACT_USING=		bsdtar
+
+WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
@@ -19,6 +22,20 @@
 PKGCONFIG_OVERRIDE+=	packaging/pkgconfig/openthreads.pc.in
 
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DDYNAMIC_OPENSCENEGRAPH=ON
+CMAKE_ARGS+=		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+CMAKE_ARGS+=		-DOSG_USE_QT=OFF
+CMAKE_ARGS+=		-DBUILD_OSG_EXAMPLES=OFF
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE # disable legacy SDL
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_Lua51=TRUE # use Lua52
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_GTA=TRUE
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_Inventor=TRUE
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=TRUE
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_Xine=TRUE
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=TRUE
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=TRUE
 
 PLIST_VARS+=	quartz x11
 
@@ -27,28 +44,18 @@
 # jasper uses SIZE_MAX and friends in its headers.
 CXXFLAGS+=	-D__STDC_LIMIT_MACROS
 
-.if ${OPSYS} == "Darwin"
-PLIST.quartz=	yes
-.else
+.include "options.mk"
+
+.if ${OPSYS} != "Darwin"
 PLIST.x11=	yes
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.else
+PLIST.quartz=	yes
 .endif
-
-.include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
-.include "../../net/libvncserver/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/osg/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo	3 Nov 2015 21:34:11 -0000	1.10
+++ distinfo	1 Aug 2018 15:01:04 -0000
@@ -1,16 +1,19 @@
 $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 (osg-3.4.1.tar.gz) = 6fc56846f5790d85dd8139aecb958701f4f4e630
+RMD160 (osg-3.4.1.tar.gz) = 299ab7131433e7f36f0da10eb102014bce26ec83
+SHA512 (osg-3.4.1.tar.gz) = 4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143
+Size (osg-3.4.1.tar.gz) = 5686385 bytes
+SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = 42fecd77c2059b6157e5cab7734f7917a81a6a18
+SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b
 SHA1 (patch-ac) = 1f237646034ca837c837e44aff753cd590c47900
-SHA1 (patch-ad) = 2a9594128e357b20f7f8146398b7cb4068aca405
+SHA1 (patch-ad) = 909075cabe15541b182794b4fdf5baa038f07ed3
 SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
-SHA1 (patch-af) = 9e10c217fbd53827b445feb5cbc0d9b586eeb14f
-SHA1 (patch-applications_present3D_Cluster.cpp) = 7b9dd81805322eeb1a4a26a21faa0a12c28d4b75
+SHA1 (patch-applications_present3D_Cluster.cpp) = 1b05be4da6632356200192d8f5aa5f08270f68d8
 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_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
+SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = d8e9efa88898e240775ead76c5c9df4c86cd562c
 SHA1 (patch-src_osgViewer_DarwinUtils.mm) = 4ab021cb797cb6959bee4ba33caf257b2a6cedf3
+SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/osg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- PLIST	16 Jul 2016 00:23:58 -0000	1.5
+++ PLIST	1 Aug 2018 15:01:04 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/07/16 00:23:58 markd Exp $
+@comment $NetBSD$
 bin/osgarchive
 bin/osgconv
 bin/osgfilecache
@@ -28,22 +28,28 @@
 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/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/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/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/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/Texture2DArray
 include/osg/Texture2DMultisample
 include/osg/Texture3D
+include/osg/TextureBuffer
 include/osg/TextureCubeMap
 include/osg/TextureRectangle
 include/osg/Timer
@@ -165,6 +177,8 @@
 include/osg/Transform
 include/osg/TriangleFunctor
 include/osg/TriangleIndexFunctor
+include/osg/TriangleLinePointIndexFunctor
+include/osg/Types
 include/osg/Uniform
 include/osg/UserDataContainer
 include/osg/ValueObject
@@ -172,19 +186,31 @@
 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 +262,14 @@
 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 +286,7 @@
 include/osgDB/ImageProcessor
 include/osgDB/Input
 include/osgDB/InputStream
+include/osgDB/ObjectCache
 include/osgDB/ObjectWrapper
 include/osgDB/Options
 include/osgDB/Output
@@ -289,7 +319,10 @@
 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 +342,7 @@
 include/osgGA/TrackballManipulator
 include/osgGA/UFOManipulator
 include/osgGA/Version
+include/osgGA/Widget
 include/osgManipulator/AntiSquish
 include/osgManipulator/Command
 include/osgManipulator/CommandManager
@@ -382,10 +416,14 @@
 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 +435,7 @@
 include/osgShadow/ParallelSplitShadowMap
 include/osgShadow/ProjectionShadowMap
 include/osgShadow/ShadowMap
+include/osgShadow/ShadowSettings
 include/osgShadow/ShadowTechnique
 include/osgShadow/ShadowTexture
 include/osgShadow/ShadowVolume
@@ -404,6 +443,7 @@
 include/osgShadow/SoftShadowMap
 include/osgShadow/StandardShadowMap
 include/osgShadow/Version
+include/osgShadow/ViewDependentShadowMap
 include/osgShadow/ViewDependentShadowTechnique
 include/osgSim/BlinkSequence
 include/osgSim/ColorRange
@@ -429,7 +469,9 @@
 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 +492,22 @@
 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 +526,12 @@
 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 +554,7 @@
 include/osgViewer/CompositeViewer
 include/osgViewer/Export
 include/osgViewer/GraphicsWindow
+include/osgViewer/Keystone
 include/osgViewer/Renderer
 include/osgViewer/Scene
 include/osgViewer/Version
@@ -507,14 +568,23 @@
 ${PLIST.x11}include/osgViewer/api/X11/GraphicsHandleX11
 ${PLIST.x11}include/osgViewer/api/X11/GraphicsWindowX11
 ${PLIST.x11}include/osgViewer/api/X11/PixelBufferX11
+include/osgViewer/config/AcrossAllScreens
+include/osgViewer/config/PanoramicSphericalDisplay
+include/osgViewer/config/SingleScreen
+include/osgViewer/config/SingleWindow
+include/osgViewer/config/SphericalDisplay
+include/osgViewer/config/WoWVxDisplay
 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 +612,59 @@
 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.131
 lib/libosg.so.${PKGVERSION}
-lib/libosg.so.80
 lib/libosgAnimation.so
+lib/libosgAnimation.so.131
 lib/libosgAnimation.so.${PKGVERSION}
-lib/libosgAnimation.so.80
 lib/libosgDB.so
+lib/libosgDB.so.131
 lib/libosgDB.so.${PKGVERSION}
-lib/libosgDB.so.80
 lib/libosgFX.so
+lib/libosgFX.so.131
 lib/libosgFX.so.${PKGVERSION}
-lib/libosgFX.so.80
 lib/libosgGA.so
+lib/libosgGA.so.131
 lib/libosgGA.so.${PKGVERSION}
-lib/libosgGA.so.80
 lib/libosgManipulator.so
+lib/libosgManipulator.so.131
 lib/libosgManipulator.so.${PKGVERSION}
-lib/libosgManipulator.so.80
 lib/libosgParticle.so
+lib/libosgParticle.so.131
 lib/libosgParticle.so.${PKGVERSION}
-lib/libosgParticle.so.80
 lib/libosgPresentation.so
+lib/libosgPresentation.so.131
 lib/libosgPresentation.so.${PKGVERSION}
-lib/libosgPresentation.so.80
 lib/libosgShadow.so
+lib/libosgShadow.so.131
 lib/libosgShadow.so.${PKGVERSION}
-lib/libosgShadow.so.80
 lib/libosgSim.so
+lib/libosgSim.so.131
 lib/libosgSim.so.${PKGVERSION}
-lib/libosgSim.so.80
 lib/libosgTerrain.so
+lib/libosgTerrain.so.131
 lib/libosgTerrain.so.${PKGVERSION}
-lib/libosgTerrain.so.80
 lib/libosgText.so
+lib/libosgText.so.131
 lib/libosgText.so.${PKGVERSION}
-lib/libosgText.so.80
+lib/libosgUI.so
+lib/libosgUI.so.131
+lib/libosgUI.so.${PKGVERSION}
 lib/libosgUtil.so
+lib/libosgUtil.so.131
 lib/libosgUtil.so.${PKGVERSION}
-lib/libosgUtil.so.80
 lib/libosgViewer.so
+lib/libosgViewer.so.131
 lib/libosgViewer.so.${PKGVERSION}
-lib/libosgViewer.so.80
 lib/libosgVolume.so
+lib/libosgVolume.so.131
 lib/libosgVolume.so.${PKGVERSION}
-lib/libosgVolume.so.80
 lib/libosgWidget.so
+lib/libosgWidget.so.131
 lib/libosgWidget.so.${PKGVERSION}
-lib/libosgWidget.so.80
 lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
@@ -599,7 +672,7 @@
 lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
 lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so
-lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
+${PLIST.curl}lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dds.so
 lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osganimation.so
@@ -615,33 +688,40 @@
 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_gdal.so
-lib/osgPlugins-${PKGVERSION}/osgdb_geo.so
+${PLIST.openexr}lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
+${PLIST.ffmpeg}lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
+${PLIST.freetype}lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so
+${PLIST.gdal}lib/osgPlugins-${PKGVERSION}/osgdb_gdal.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
 ${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_imageio.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ive.so
-lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
+${PLIST.jasper}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
+${PLIST.lua}lib/osgPlugins-${PKGVERSION}/osgdb_lua.so
 lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so
 lib/osgPlugins-${PKGVERSION}/osgdb_lws.so
 lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
 lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_normals.so
 lib/osgPlugins-${PKGVERSION}/osgdb_obj.so
-lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so
+${PLIST.gdal}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
 lib/osgPlugins-${PKGVERSION}/osgdb_osgviewer.so
 lib/osgPlugins-${PKGVERSION}/osgdb_p3d.so
+${PLIST.pdf}lib/osgPlugins-${PKGVERSION}/osgdb_pdf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_pic.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ply.so
 ${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_png.so
@@ -655,26 +735,30 @@
 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
+${PLIST.svg}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_vnc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so
 lib/osgPlugins-${PKGVERSION}/osgdb_x.so
-${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_xine.so
 lib/osgPlugins-${PKGVERSION}/osgdb_zip.so
 lib/pkgconfig/openscenegraph-osg.pc
 lib/pkgconfig/openscenegraph-osgAnimation.pc
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ options.mk	1 Aug 2018 15:01:04 -0000
@@ -0,0 +1,92 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.osg
+PKG_SUPPORTED_OPTIONS+=	curl ffmpeg freetype gdal jasper libxml2 lua
+PKG_SUPPORTED_OPTIONS+=	openexr pdf sdl2 svg xrandr
+PKG_SUGGESTED_OPTIONS+=	ffmpeg freetype xrandr
+
+PLIST_VARS+=		curl ffmpeg freetype gdal jasper lua openexr pdf svg
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcurl)
+.include "../../www/curl/buildlink3.mk"
+PLIST.curl=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mffmpeg)
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
+PLIST.ffmpeg=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mfreetype)
+.include "../../graphics/freetype2/buildlink3.mk"
+PLIST.freetype=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Freetype=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mgdal)
+.include "../../geography/gdal-lib/buildlink3.mk"
+PLIST.gdal=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_GDAL=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mjasper)
+.include "../../graphics/jasper/buildlink3.mk"
+PLIST.jasper=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mlua)
+.include "../../lang/lua52/buildlink3.mk"
+PLIST.lua=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenexr)
+.include "../../graphics/openexr/buildlink3.mk"
+PLIST.openexr=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mpdf)
+.include "../../print/poppler-glib/buildlink3.mk"
+PLIST.pdf=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Poppler-glib=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl2)
+.include "../../devel/SDL2/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+PLIST.svg=	yes
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_RSVG=TRUE
+.endif
+
+.if !empty(PKG_OPTIONS:Mxrandr)
+.include "../../x11/libXrandr/buildlink3.mk"
+CMAKE_ARGS+=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
+.else
+CMAKE_ARGS+=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mlibxml2)
+.include "../../textproc/libxml2/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=TRUE
+.endif
Index: patches/patch-CMakeModules_FindFFmpeg.cmake
===================================================================
RCS file: patches/patch-CMakeModules_FindFFmpeg.cmake
diff -N patches/patch-CMakeModules_FindFFmpeg.cmake
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeModules_FindFFmpeg.cmake	1 Aug 2018 15:01:04 -0000
@@ -0,0 +1,44 @@
+$NetBSD$
+
+Find ffmpeg from pkgsrc
+
+--- CMakeModules/FindFFmpeg.cmake.orig	2017-08-28 16:50:49.000000000 +0000
++++ CMakeModules/FindFFmpeg.cmake
+@@ -30,7 +30,7 @@ MACRO(FFMPEG_FIND varname shortname head
+ 
+     FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
+         PATHS
+-        ${FFMPEG_ROOT}/include
++        ${FFMPEG_ROOT}/include/ffmpeg2
+         $ENV{FFMPEG_DIR}/include
+         ${FFMPEG_ROOT}
+         $ENV{FFMPEG_DIR}
+@@ -43,7 +43,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg2
+         DOC "Location of FFMPEG Headers"
+     )
+ 
+@@ -69,9 +69,9 @@ MACRO(FFMPEG_FIND varname shortname head
+     FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
+         NAMES ${shortname}
+         PATHS
+-        ${FFMPEG_ROOT}/lib
++        ${FFMPEG_ROOT}/lib/ffmpeg2
+         $ENV{FFMPEG_DIR}/lib
+-        ${FFMPEG_ROOT}/lib${shortname}
++        ${FFMPEG_ROOT}/lib/ffmpeg2${shortname}
+         $ENV{FFMPEG_DIR}/lib${shortname}
+         ~/Library/Frameworks
+         /Library/Frameworks
+@@ -84,6 +84,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/lib
+         /opt/lib
+         /usr/freeware/lib64
++        PATH_SUFFIXES ffmpeg2
+         DOC "Location of FFMPEG Libraries"
+     )
+ 
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/osg/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- patches/patch-ab	7 Mar 2012 16:27:35 -0000	1.3
+++ patches/patch-ab	1 Aug 2018 15:01:04 -0000
@@ -1,13 +1,15 @@
 $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)
+Support NetBSD.
+
+--- 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
  
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/osg/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- patches/patch-ad	7 Mar 2012 16:27:35 -0000	1.2
+++ patches/patch-ad	1 Aug 2018 15:01:04 -0000
@@ -1,6 +1,8 @@
 $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
+Support NetBSD.
+
+--- 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 +20,12 @@
  #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 +38,8 @@
 +    }
  #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
      {
Index: patches/patch-applications_present3D_Cluster.cpp
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/osg/patches/patch-applications_present3D_Cluster.cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-applications_present3D_Cluster.cpp
--- patches/patch-applications_present3D_Cluster.cpp	20 May 2012 19:28:19 -0000	1.2
+++ patches/patch-applications_present3D_Cluster.cpp	1 Aug 2018 15:01:04 -0000
@@ -1,30 +1,26 @@
-$NetBSD: patch-applications_present3D_Cluster.cpp,v 1.2 2012/05/20 19:28:19 marino Exp $
+$NetBSD$
 
 Support more platforms.
 
---- applications/present3D/Cluster.cpp.orig	2012-03-05 16:33:33.000000000 +0000
+--- applications/present3D/Cluster.cpp.orig	2017-08-28 16:50:49.000000000 +0000
 +++ applications/present3D/Cluster.cpp
-@@ -33,9 +33,12 @@
+@@ -33,7 +33,8 @@
  #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__) || defined(__FreeBSD_kernel__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || \
++    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;
+@@ -340,7 +341,8 @@ 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(__FreeBSD_kernel__) || defined(__GNU__)
++    defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
++    defined(__NetBSD__) || defined(__OpenBSD__)
+     socklen_t
  #else
      int
Index: patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
===================================================================
RCS file: patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
diff -N patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp	1 Aug 2018 15:01:04 -0000
@@ -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>
Index: patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
===================================================================
RCS file: patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
diff -N patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h	1 Aug 2018 15:01:04 -0000
@@ -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__
Index: patches/patch-src_osg_GLExtensions.cpp
===================================================================
RCS file: patches/patch-src_osg_GLExtensions.cpp
diff -N patches/patch-src_osg_GLExtensions.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_osg_GLExtensions.cpp	1 Aug 2018 15:01:04 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Support NetBSD.
+
+--- src/osg/GLExtensions.cpp.orig	2017-04-03 10:44:31.000000000 +0000
++++ src/osg/GLExtensions.cpp
+@@ -378,7 +378,7 @@ OSG_INIT_SINGLETON_PROXY(GLExtensionDisa
+         static void *handle = dlopen((const char *)0L, RTLD_LAZY);
+         return dlsym(handle, funcName);
+ 
+-    #elif defined (__FreeBSD__)
++    #elif defined (__FreeBSD__) || defined (__NetBSD__)
+ 
+         return dlsym( RTLD_DEFAULT, funcName );
+
Follow-Ups:
- Re: Updating
  - From: Thomas Klausner
Prev by Date: Re: Asterisk package naming
Next by Date: Re: Asterisk package naming
Previous by Thread: scanner problem with packages depending on devel/glib2
Next by Thread: Re: Updating
Indexes:
Home | Main Index | Thread Index | Old Index