pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/osg graphics/osg: Update to 3.4.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bebab784fb96
branches:  trunk
changeset: 383537:bebab784fb96
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Aug 04 01:05:10 2018 +0000

description:
graphics/osg: Update to 3.4.1.

Add various options for optional dependencies.

diffstat:

 graphics/osg/Makefile                                                      |   51 ++-
 graphics/osg/PLIST                                                         |  142 +++++++--
 graphics/osg/buildlink3.mk                                                 |   62 +++-
 graphics/osg/distinfo                                                      |   26 +-
 graphics/osg/options.mk                                                    |   92 ++++++
 graphics/osg/patches/patch-CMakeModules_FindFFmpeg.cmake                   |   44 +++
 graphics/osg/patches/patch-ab                                              |   16 +-
 graphics/osg/patches/patch-ad                                              |   14 +-
 graphics/osg/patches/patch-applications_present3D_Cluster.cpp              |   28 +-
 graphics/osg/patches/patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp |   16 +
 graphics/osg/patches/patch-src_osgPlugins_osc_osc_OscHostEndianness.h      |   15 +
 graphics/osg/patches/patch-src_osg_GLExtensions.cpp                        |   15 +
 12 files changed, 415 insertions(+), 106 deletions(-)

diffs (truncated from 952 to 300 lines):

diff -r 16abb7c52bf2 -r bebab784fb96 graphics/osg/Makefile
--- a/graphics/osg/Makefile     Fri Aug 03 21:21:21 2018 +0000
+++ b/graphics/osg/Makefile     Sat Aug 04 01:05:10 2018 +0000
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.81 2018/04/29 21:31:21 adam Exp $
+# $NetBSD: Makefile,v 1.82 2018/08/04 01:05:10 nia 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"
diff -r 16abb7c52bf2 -r bebab784fb96 graphics/osg/PLIST
--- a/graphics/osg/PLIST        Fri Aug 03 21:21:21 2018 +0000
+++ b/graphics/osg/PLIST        Sat Aug 04 01:05:10 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/07/16 00:23:58 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/08/04 01:05:10 nia Exp $
 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



Home | Main Index | Thread Index | Old Index