summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/osg/Makefile39
-rw-r--r--graphics/osg/PLIST90
-rw-r--r--graphics/osg/buildlink3.mk38
-rw-r--r--graphics/osg/distinfo12
-rw-r--r--graphics/osg/options.mk70
-rw-r--r--graphics/osg/patches/patch-ad59
-rw-r--r--graphics/osg/patches/patch-ae19
7 files changed, 93 insertions, 234 deletions
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 6a17ad8f5a3..3987d84d197 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.120 2020/11/21 09:34:53 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2021/01/16 14:44:50 nia Exp $
-DISTNAME= osg-3.4.1
-PKGREVISION= 36
+DISTNAME= osg-3.6.5
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=openscenegraph/}
GITHUB_PROJECT= OpenSceneGraph
@@ -12,8 +11,6 @@ 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
@@ -25,23 +22,27 @@ 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_Asio=TRUE
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
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DirectInput=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DirectShow=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=TRUE
+CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_FBX=TRUE
+CMAKE_ARGS+= -DOSG_USE_LOCAL_LUA_SOURCE=OFF
-BUILDLINK_TRANSFORM+= rm:-pedantic
-
-PLIST_VARS+= quartz x11
+PLIST_VARS+= quartz notdarwin
.include "../../mk/bsd.prefs.mk"
@@ -49,17 +50,27 @@ PLIST_VARS+= quartz x11
CXXFLAGS+= -D__STDC_LIMIT_MACROS
.include "options.mk"
-
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/ilmbase/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
+.include "../../lang/lua52/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
.if ${OPSYS} != "Darwin"
-PLIST.x11= yes
+PLIST.notdarwin= yes
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.else
-PLIST.quartz= yes
+PLIST.quartz= yes
.endif
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/osg/PLIST b/graphics/osg/PLIST
index 20740c51ae0..a7677caf83e 100644
--- a/graphics/osg/PLIST
+++ b/graphics/osg/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2018/08/04 01:05:10 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/01/16 14:44:50 nia Exp $
bin/osgarchive
bin/osgconv
bin/osgfilecache
bin/osgversion
bin/osgviewer
bin/present3D
+include/OpenThreads/Affinity
include/OpenThreads/Atomic
include/OpenThreads/Barrier
include/OpenThreads/Block
@@ -22,10 +23,11 @@ include/osg/AnimationPath
include/osg/ApplicationUsage
include/osg/ArgumentParser
include/osg/Array
-include/osg/ArrayDispatchers
+include/osg/AttributeDispatchers
include/osg/AudioStream
include/osg/AutoTransform
include/osg/Billboard
+include/osg/BindImageTexture
include/osg/BlendColor
include/osg/BlendEquation
include/osg/BlendEquationi
@@ -53,6 +55,7 @@ include/osg/ColorMaski
include/osg/ColorMatrix
include/osg/ComputeBoundsVisitor
include/osg/Config
+include/osg/ContextData
include/osg/ConvexPlanarOccluder
include/osg/ConvexPlanarPolygon
include/osg/CoordinateSystemNode
@@ -63,6 +66,8 @@ include/osg/CullStack
include/osg/CullingSet
include/osg/DeleteHandler
include/osg/Depth
+include/osg/DepthRangeIndexed
+include/osg/DispatchCompute
include/osg/DisplaySettings
include/osg/DrawPixels
include/osg/Drawable
@@ -75,7 +80,6 @@ include/osg/FrameStamp
include/osg/FrontFace
include/osg/GL
include/osg/GL2Extensions
-include/osg/GLBeginEndAdapter
include/osg/GLDefines
include/osg/GLExtensions
include/osg/GLObjects
@@ -87,6 +91,7 @@ include/osg/GraphicsCostEstimator
include/osg/GraphicsThread
include/osg/Group
include/osg/Hint
+include/osg/Identifier
include/osg/Image
include/osg/ImageSequence
include/osg/ImageStream
@@ -131,6 +136,7 @@ include/osg/Polytope
include/osg/PositionAttitudeTransform
include/osg/PrimitiveRestartIndex
include/osg/PrimitiveSet
+include/osg/PrimitiveSetIndirect
include/osg/Program
include/osg/Projection
include/osg/ProxyNode
@@ -138,7 +144,9 @@ include/osg/Quat
include/osg/Referenced
include/osg/RenderInfo
include/osg/SampleMaski
+include/osg/Sampler
include/osg/Scissor
+include/osg/ScissorIndexed
include/osg/ScriptEngine
include/osg/Sequence
include/osg/ShadeModel
@@ -157,6 +165,7 @@ include/osg/Stencil
include/osg/StencilTwoSided
include/osg/Switch
include/osg/TemplatePrimitiveFunctor
+include/osg/TemplatePrimitiveIndexFunctor
include/osg/TexEnv
include/osg/TexEnvCombine
include/osg/TexEnvFilter
@@ -181,7 +190,9 @@ include/osg/TriangleLinePointIndexFunctor
include/osg/Types
include/osg/Uniform
include/osg/UserDataContainer
+include/osg/ValueMap
include/osg/ValueObject
+include/osg/ValueStack
include/osg/Vec2
include/osg/Vec2b
include/osg/Vec2d
@@ -210,14 +221,17 @@ include/osg/Vec4ub
include/osg/Vec4ui
include/osg/Vec4us
include/osg/Version
+include/osg/VertexArrayState
include/osg/VertexAttribDivisor
include/osg/VertexProgram
include/osg/View
include/osg/Viewport
+include/osg/ViewportIndexed
include/osg/buffered_value
include/osg/fast_back_stack
include/osg/io_utils
include/osg/observer_ptr
+include/osg/os_utils
include/osg/ref_ptr
include/osgAnimation/Action
include/osgAnimation/ActionAnimation
@@ -241,6 +255,8 @@ include/osgAnimation/Interpolator
include/osgAnimation/Keyframe
include/osgAnimation/LinkVisitor
include/osgAnimation/MorphGeometry
+include/osgAnimation/MorphTransformHardware
+include/osgAnimation/MorphTransformSoftware
include/osgAnimation/RigGeometry
include/osgAnimation/RigTransform
include/osgAnimation/RigTransformHardware
@@ -431,14 +447,12 @@ include/osgShadow/LightSpacePerspectiveShadowMap
include/osgShadow/MinimalCullBoundsShadowMap
include/osgShadow/MinimalDrawBoundsShadowMap
include/osgShadow/MinimalShadowMap
-include/osgShadow/OccluderGeometry
include/osgShadow/ParallelSplitShadowMap
include/osgShadow/ProjectionShadowMap
include/osgShadow/ShadowMap
include/osgShadow/ShadowSettings
include/osgShadow/ShadowTechnique
include/osgShadow/ShadowTexture
-include/osgShadow/ShadowVolume
include/osgShadow/ShadowedScene
include/osgShadow/SoftShadowMap
include/osgShadow/StandardShadowMap
@@ -565,9 +579,9 @@ include/osgViewer/ViewerEventHandlers
${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsHandleCarbon
${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsWindowCarbon
${PLIST.quartz}include/osgViewer/api/Carbon/PixelBufferCarbon
-${PLIST.x11}include/osgViewer/api/X11/GraphicsHandleX11
-${PLIST.x11}include/osgViewer/api/X11/GraphicsWindowX11
-${PLIST.x11}include/osgViewer/api/X11/PixelBufferX11
+${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsHandleX11
+${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsWindowX11
+${PLIST.notdarwin}include/osgViewer/api/X11/PixelBufferX11
include/osgViewer/config/AcrossAllScreens
include/osgViewer/config/PanoramicSphericalDisplay
include/osgViewer/config/SingleScreen
@@ -612,58 +626,58 @@ include/osgWidget/Widget
include/osgWidget/Window
include/osgWidget/WindowManager
lib/libOpenThreads.so
-lib/libOpenThreads.so.20
-lib/libOpenThreads.so.3.3.0
+lib/libOpenThreads.so.21
+lib/libOpenThreads.so.3.3.1
lib/libosg.so
-lib/libosg.so.131
+lib/libosg.so.161
lib/libosg.so.${PKGVERSION}
lib/libosgAnimation.so
-lib/libosgAnimation.so.131
+lib/libosgAnimation.so.161
lib/libosgAnimation.so.${PKGVERSION}
lib/libosgDB.so
-lib/libosgDB.so.131
+lib/libosgDB.so.161
lib/libosgDB.so.${PKGVERSION}
lib/libosgFX.so
-lib/libosgFX.so.131
+lib/libosgFX.so.161
lib/libosgFX.so.${PKGVERSION}
lib/libosgGA.so
-lib/libosgGA.so.131
+lib/libosgGA.so.161
lib/libosgGA.so.${PKGVERSION}
lib/libosgManipulator.so
-lib/libosgManipulator.so.131
+lib/libosgManipulator.so.161
lib/libosgManipulator.so.${PKGVERSION}
lib/libosgParticle.so
-lib/libosgParticle.so.131
+lib/libosgParticle.so.161
lib/libosgParticle.so.${PKGVERSION}
lib/libosgPresentation.so
-lib/libosgPresentation.so.131
+lib/libosgPresentation.so.161
lib/libosgPresentation.so.${PKGVERSION}
lib/libosgShadow.so
-lib/libosgShadow.so.131
+lib/libosgShadow.so.161
lib/libosgShadow.so.${PKGVERSION}
lib/libosgSim.so
-lib/libosgSim.so.131
+lib/libosgSim.so.161
lib/libosgSim.so.${PKGVERSION}
lib/libosgTerrain.so
-lib/libosgTerrain.so.131
+lib/libosgTerrain.so.161
lib/libosgTerrain.so.${PKGVERSION}
lib/libosgText.so
-lib/libosgText.so.131
+lib/libosgText.so.161
lib/libosgText.so.${PKGVERSION}
lib/libosgUI.so
-lib/libosgUI.so.131
+lib/libosgUI.so.161
lib/libosgUI.so.${PKGVERSION}
lib/libosgUtil.so
-lib/libosgUtil.so.131
+lib/libosgUtil.so.161
lib/libosgUtil.so.${PKGVERSION}
lib/libosgViewer.so
-lib/libosgViewer.so.131
+lib/libosgViewer.so.161
lib/libosgViewer.so.${PKGVERSION}
lib/libosgVolume.so
-lib/libosgVolume.so.131
+lib/libosgVolume.so.161
lib/libosgVolume.so.${PKGVERSION}
lib/libosgWidget.so
-lib/libosgWidget.so.131
+lib/libosgWidget.so.161
lib/libosgWidget.so.${PKGVERSION}
lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
@@ -672,7 +686,7 @@ lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so
lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so
lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so
-${PLIST.curl}lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
+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
@@ -686,24 +700,22 @@ lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgviewer.so
lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgvolume.so
lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so
lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
-lib/osgPlugins-${PKGVERSION}/osgdb_dw.so
lib/osgPlugins-${PKGVERSION}/osgdb_dxf.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
+lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
+lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so
${PLIST.gdal}lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
-${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
+${PLIST.notdarwin}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
-${PLIST.jasper}lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
-${PLIST.x11}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
+${PLIST.notdarwin}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_lua.so
lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so
lib/osgPlugins-${PKGVERSION}/osgdb_lws.so
lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
@@ -724,7 +736,7 @@ 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
+${PLIST.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_png.so
lib/osgPlugins-${PKGVERSION}/osgdb_pnm.so
lib/osgPlugins-${PKGVERSION}/osgdb_pov.so
lib/osgPlugins-${PKGVERSION}/osgdb_pvr.so
@@ -752,7 +764,7 @@ ${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
+${PLIST.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so
lib/osgPlugins-${PKGVERSION}/osgdb_trans.so
lib/osgPlugins-${PKGVERSION}/osgdb_trk.so
lib/osgPlugins-${PKGVERSION}/osgdb_txf.so
diff --git a/graphics/osg/buildlink3.mk b/graphics/osg/buildlink3.mk
index a359a29c8e4..7e6a85862e3 100644
--- a/graphics/osg/buildlink3.mk
+++ b/graphics/osg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.93 2020/11/21 09:34:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.94 2021/01/16 14:44:50 nia Exp $
BUILDLINK_TREE+= osg
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= osg
OSG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.osg+= osg>=2.8.3
-BUILDLINK_ABI_DEPENDS.osg+= osg>=3.4.1nb36
+BUILDLINK_ABI_DEPENDS.osg+= osg>=3.6.5
BUILDLINK_PKGSRCDIR.osg?= ../../graphics/osg
.include "../../mk/bsd.fast.prefs.mk"
@@ -23,45 +23,25 @@ BUILDLINK_PKGSRCDIR.osg?= ../../graphics/osg
pkgbase := osg
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.osg:Mcurl)
-.include "../../www/curl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.osg:Mffmpeg)
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.osg:Mfreetype)
.include "../../graphics/freetype2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.osg:Mgdal)
-.include "../../geography/gdal-lib/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.osg:Mjasper)
.include "../../graphics/jasper/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.osg:Mlua)
+.include "../../graphics/openexr/buildlink3.mk"
.include "../../lang/lua52/buildlink3.mk"
-.endif
+.include "../../www/curl/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.osg:Mopenexr)
-.include "../../graphics/openexr/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.osg:Mgdal}
+.include "../../geography/gdal-lib/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.osg:Mpdf)
+.if ${PKG_BUILD_OPTIONS.osg:Mpdf}
.include "../../print/poppler-glib/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.osg:Msvg)
+.if ${PKG_BUILD_OPTIONS.osg:Msvg}
.include "../../graphics/librsvg/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.osg:Mlibxml2)
-.include "../../textproc/libxml2/buildlink3.mk"
-.endif
.endif # OSG_BUILDLINK3_MK
BUILDLINK_TREE+= -osg
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index a81410b9a22..aeb150afa85 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.12 2018/08/06 11:12:27 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2021/01/16 14:44:50 nia Exp $
-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 (osg-3.6.5.tar.gz) = aef898a4e48dc235d8f1a5fd3f753fd2cb7b7861
+RMD160 (osg-3.6.5.tar.gz) = 1b9e1fd9250f5c3de85966d94edf5be393fa3928
+SHA512 (osg-3.6.5.tar.gz) = 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
+Size (osg-3.6.5.tar.gz) = 5780762 bytes
SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = cb533fdfa7cc569b6e226e1ab422ef36d5d31c3a
SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b
-SHA1 (patch-ad) = 909075cabe15541b182794b4fdf5baa038f07ed3
-SHA1 (patch-ae) = ca2f8a6cd509a914f9b643429e8384faf476f2c8
SHA1 (patch-applications_present3D_Cluster.cpp) = 017b1d9b42760cad8deb77d7330b04f75aa0e814
SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = 4202df06c8ab49fa5f3787cc1c59e9f247d1a21b
diff --git a/graphics/osg/options.mk b/graphics/osg/options.mk
index 154d681ea90..6e1f52344d1 100644
--- a/graphics/osg/options.mk
+++ b/graphics/osg/options.mk
@@ -1,35 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2018/08/04 01:05:10 nia Exp $
+# $NetBSD: options.mk,v 1.2 2021/01/16 14:44:50 nia Exp $
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
+PKG_SUPPORTED_OPTIONS+= gdal pdf svg
+PLIST_VARS+= gdal 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/ffmpeg4/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
@@ -37,27 +13,6 @@ PLIST.gdal= yes
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
@@ -65,28 +20,9 @@ PLIST.pdf= yes
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
diff --git a/graphics/osg/patches/patch-ad b/graphics/osg/patches/patch-ad
deleted file mode 100644
index f49c225765d..00000000000
--- a/graphics/osg/patches/patch-ad
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2018/08/04 01:05:10 nia Exp $
-
-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:
- {
- #if defined(__sgi)
- pthread_setrunon_np( pd->cpunum );
-+#elif defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
-+ cpuset_t *cset;
-+ cset = cpuset_create();
-+ if (cset != NULL)
-+ {
-+ cpuset_set(pd->cpunum, cset);
-+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset);
-+ cpuset_destroy(cset);
-+ }
- #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 );
-@@ -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)
-+ {
-+ cpuset_t *cset;
-+ cset = cpuset_create();
-+ if (cset != NULL)
-+ {
-+ cpuset_set(pd->cpunum, cset);
-+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset);
-+ cpuset_destroy(cset);
-+ }
-+ }
- #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
-
- if (pd->isRunning() && Thread::CurrentThread()==this)
-@@ -1057,7 +1078,16 @@ int OpenThreads::SetProcessorAffinityOfC
- }
- else
- {
--#if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
-+#if defined(__NetBSD__) && defined(HAVE_PTHREAD_SETAFFINITY_NP)
-+ cpuset_t *cset;
-+ cset = cpuset_create();
-+ if (cset != NULL)
-+ {
-+ cpuset_set(cpunum, cset);
-+ pthread_setaffinity_np(pthread_self(), cpuset_size(cset), cset);
-+ cpuset_destroy(cset);
-+ }
-+#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 );
- CPU_SET( cpunum, &cpumask );
diff --git a/graphics/osg/patches/patch-ae b/graphics/osg/patches/patch-ae
deleted file mode 100644
index 7c887353c15..00000000000
--- a/graphics/osg/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2012/03/07 16:27:35 adam Exp $
-
-PkgSrc does not use lib64.
-
---- CMakeLists.txt.orig 2011-07-31 07:50:34.000000000 +0000
-+++ CMakeLists.txt
-@@ -586,12 +586,6 @@ IF(CYGWIN)
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
- ENDIF()
-
--IF(UNIX AND NOT WIN32 AND NOT APPLE)
-- IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
-- MARK_AS_ADVANCED(LIB_POSTFIX)
-- ENDIF()
--ENDIF()
- IF(NOT DEFINED LIB_POSTFIX)
- SET(LIB_POSTFIX "")
- ENDIF()
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 05:10:27 +0000