Tue Mar 2 09:41:56 2021 UTC ()
osg: fix buidling on Darwin; fix finding Lua52


(adam)
diff -r1.121 -r1.122 pkgsrc/graphics/osg/Makefile
diff -r1.7 -r1.8 pkgsrc/graphics/osg/PLIST
diff -r1.94 -r1.95 pkgsrc/graphics/osg/buildlink3.mk
diff -r1.13 -r1.14 pkgsrc/graphics/osg/distinfo
diff -r0 -r1.1 pkgsrc/graphics/osg/patches/patch-CMakeModules_FindLua52.cmake
cvs diff -r1.121 -r1.122 pkgsrc/graphics/osg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/osg/Makefile 2021/01/16 14:44:50 1.121
+++ pkgsrc/graphics/osg/Makefile 2021/03/02 09:41:56 1.122
@@ -1,37 +1,36 @@ @@ -1,37 +1,36 @@
1# $NetBSD: Makefile,v 1.121 2021/01/16 14:44:50 nia Exp $ 1# $NetBSD: Makefile,v 1.122 2021/03/02 09:41:56 adam Exp $
2 2
3DISTNAME= osg-3.6.5 3DISTNAME= osg-3.6.5
4CATEGORIES= graphics devel 4CATEGORIES= graphics devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=openscenegraph/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=openscenegraph/}
6GITHUB_PROJECT= OpenSceneGraph 6GITHUB_PROJECT= OpenSceneGraph
7GITHUB_TAG= OpenSceneGraph-${PKGVERSION_NOREV} 7GITHUB_TAG= OpenSceneGraph-${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.openscenegraph.org/ 10HOMEPAGE= http://www.openscenegraph.org/
11COMMENT= High performance 3D graphics toolkit 11COMMENT= High performance 3D graphics toolkit
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG} 14WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
15 15
16USE_CMAKE= yes 16USE_CMAKE= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in 19PKGCONFIG_OVERRIDE= packaging/pkgconfig/openscenegraph.pc.in
20PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in 20PKGCONFIG_OVERRIDE+= packaging/pkgconfig/openthreads.pc.in
21 21
22CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 22CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
23CMAKE_ARGS+= -DDYNAMIC_OPENSCENEGRAPH=ON 23CMAKE_ARGS+= -DDYNAMIC_OPENSCENEGRAPH=ON
24CMAKE_ARGS+= -DOSG_USE_LOCAL_LUA_SOURCE=OFF 
25CMAKE_ARGS+= -DBUILD_OSG_EXAMPLES=OFF 24CMAKE_ARGS+= -DBUILD_OSG_EXAMPLES=OFF
26CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Asio=TRUE 25CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Asio=TRUE
27CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE # disable legacy SDL 26CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE # disable legacy SDL
28CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GTA=TRUE 27CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GTA=TRUE
29CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=TRUE 28CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=TRUE
30CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=TRUE 29CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=TRUE
31CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE 30CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE
32CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE 31CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE
33CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=TRUE 32CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=TRUE
34CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=TRUE 33CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=TRUE
35CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=TRUE 34CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=TRUE
36CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=TRUE 35CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=TRUE
37CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=TRUE 36CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=TRUE
@@ -47,30 +46,30 @@ PLIST_VARS+= quartz notdarwin @@ -47,30 +46,30 @@ PLIST_VARS+= quartz notdarwin
47.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
48 47
49# jasper uses SIZE_MAX and friends in its headers. 48# jasper uses SIZE_MAX and friends in its headers.
50CXXFLAGS+= -D__STDC_LIMIT_MACROS 49CXXFLAGS+= -D__STDC_LIMIT_MACROS
51 50
52.include "options.mk" 51.include "options.mk"
53.include "../../devel/SDL2/buildlink3.mk" 52.include "../../devel/SDL2/buildlink3.mk"
54.include "../../devel/zlib/buildlink3.mk" 53.include "../../devel/zlib/buildlink3.mk"
55.include "../../fonts/fontconfig/buildlink3.mk" 54.include "../../fonts/fontconfig/buildlink3.mk"
56.include "../../graphics/freetype2/buildlink3.mk" 55.include "../../graphics/freetype2/buildlink3.mk"
57.include "../../graphics/jasper/buildlink3.mk" 56.include "../../graphics/jasper/buildlink3.mk"
58.include "../../graphics/ilmbase/buildlink3.mk" 57.include "../../graphics/ilmbase/buildlink3.mk"
59.include "../../graphics/openexr/buildlink3.mk" 58.include "../../graphics/openexr/buildlink3.mk"
 59.include "../../graphics/tiff/buildlink3.mk"
60.include "../../lang/lua52/buildlink3.mk" 60.include "../../lang/lua52/buildlink3.mk"
61.include "../../multimedia/ffmpeg4/buildlink3.mk" 61.include "../../multimedia/ffmpeg4/buildlink3.mk"
62.include "../../www/curl/buildlink3.mk" 62.include "../../www/curl/buildlink3.mk"
63.if ${OPSYS} != "Darwin" 63.if ${OPSYS} != "Darwin"
64PLIST.notdarwin= yes 64PLIST.notdarwin= yes
65.include "../../graphics/MesaLib/buildlink3.mk" 65.include "../../graphics/MesaLib/buildlink3.mk"
66.include "../../graphics/giflib/buildlink3.mk" 66.include "../../graphics/giflib/buildlink3.mk"
67.include "../../graphics/png/buildlink3.mk" 67.include "../../graphics/png/buildlink3.mk"
68.include "../../graphics/tiff/buildlink3.mk" 
69.include "../../x11/libX11/buildlink3.mk" 68.include "../../x11/libX11/buildlink3.mk"
70.include "../../x11/libXrandr/buildlink3.mk" 69.include "../../x11/libXrandr/buildlink3.mk"
71.include "../../mk/jpeg.buildlink3.mk" 70.include "../../mk/jpeg.buildlink3.mk"
72.else 71.else
73PLIST.quartz= yes 72PLIST.quartz= yes
74.endif 73.endif
75.include "../../mk/pthread.buildlink3.mk" 74.include "../../mk/pthread.buildlink3.mk"
76.include "../../mk/bsd.pkg.mk" 75.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/graphics/osg/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/osg/PLIST 2021/01/16 14:44:50 1.7
+++ pkgsrc/graphics/osg/PLIST 2021/03/02 09:41:56 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2021/01/16 14:44:50 nia Exp $ 1@comment $NetBSD: PLIST,v 1.8 2021/03/02 09:41:56 adam Exp $
2bin/osgarchive 2bin/osgarchive
3bin/osgconv 3bin/osgconv
4bin/osgfilecache 4bin/osgfilecache
5bin/osgversion 5bin/osgversion
6bin/osgviewer 6bin/osgviewer
7bin/present3D 7bin/present3D
8include/OpenThreads/Affinity 8include/OpenThreads/Affinity
9include/OpenThreads/Atomic 9include/OpenThreads/Atomic
10include/OpenThreads/Barrier 10include/OpenThreads/Barrier
11include/OpenThreads/Block 11include/OpenThreads/Block
12include/OpenThreads/Condition 12include/OpenThreads/Condition
13include/OpenThreads/Config 13include/OpenThreads/Config
14include/OpenThreads/Exports 14include/OpenThreads/Exports
@@ -566,29 +566,29 @@ include/osgUtil/TriStripVisitor @@ -566,29 +566,29 @@ include/osgUtil/TriStripVisitor
566include/osgUtil/UpdateVisitor 566include/osgUtil/UpdateVisitor
567include/osgUtil/Version 567include/osgUtil/Version
568include/osgViewer/CompositeViewer 568include/osgViewer/CompositeViewer
569include/osgViewer/Export 569include/osgViewer/Export
570include/osgViewer/GraphicsWindow 570include/osgViewer/GraphicsWindow
571include/osgViewer/Keystone 571include/osgViewer/Keystone
572include/osgViewer/Renderer 572include/osgViewer/Renderer
573include/osgViewer/Scene 573include/osgViewer/Scene
574include/osgViewer/Version 574include/osgViewer/Version
575include/osgViewer/View 575include/osgViewer/View
576include/osgViewer/Viewer 576include/osgViewer/Viewer
577include/osgViewer/ViewerBase 577include/osgViewer/ViewerBase
578include/osgViewer/ViewerEventHandlers 578include/osgViewer/ViewerEventHandlers
579${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsHandleCarbon 579${PLIST.quartz}include/osgViewer/api/Cocoa/GraphicsHandleCocoa
580${PLIST.quartz}include/osgViewer/api/Carbon/GraphicsWindowCarbon 580${PLIST.quartz}include/osgViewer/api/Cocoa/GraphicsWindowCocoa
581${PLIST.quartz}include/osgViewer/api/Carbon/PixelBufferCarbon 581${PLIST.quartz}include/osgViewer/api/Cocoa/PixelBufferCocoa
582${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsHandleX11 582${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsHandleX11
583${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsWindowX11 583${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsWindowX11
584${PLIST.notdarwin}include/osgViewer/api/X11/PixelBufferX11 584${PLIST.notdarwin}include/osgViewer/api/X11/PixelBufferX11
585include/osgViewer/config/AcrossAllScreens 585include/osgViewer/config/AcrossAllScreens
586include/osgViewer/config/PanoramicSphericalDisplay 586include/osgViewer/config/PanoramicSphericalDisplay
587include/osgViewer/config/SingleScreen 587include/osgViewer/config/SingleScreen
588include/osgViewer/config/SingleWindow 588include/osgViewer/config/SingleWindow
589include/osgViewer/config/SphericalDisplay 589include/osgViewer/config/SphericalDisplay
590include/osgViewer/config/WoWVxDisplay 590include/osgViewer/config/WoWVxDisplay
591include/osgVolume/Export 591include/osgVolume/Export
592include/osgVolume/FixedFunctionTechnique 592include/osgVolume/FixedFunctionTechnique
593include/osgVolume/Layer 593include/osgVolume/Layer
594include/osgVolume/Locator 594include/osgVolume/Locator
@@ -672,26 +672,27 @@ lib/libosgUtil.so.161 @@ -672,26 +672,27 @@ lib/libosgUtil.so.161
672lib/libosgUtil.so.${PKGVERSION} 672lib/libosgUtil.so.${PKGVERSION}
673lib/libosgViewer.so 673lib/libosgViewer.so
674lib/libosgViewer.so.161 674lib/libosgViewer.so.161
675lib/libosgViewer.so.${PKGVERSION} 675lib/libosgViewer.so.${PKGVERSION}
676lib/libosgVolume.so 676lib/libosgVolume.so
677lib/libosgVolume.so.161 677lib/libosgVolume.so.161
678lib/libosgVolume.so.${PKGVERSION} 678lib/libosgVolume.so.${PKGVERSION}
679lib/libosgWidget.so 679lib/libosgWidget.so
680lib/libosgWidget.so.161 680lib/libosgWidget.so.161
681lib/libosgWidget.so.${PKGVERSION} 681lib/libosgWidget.so.${PKGVERSION}
682lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so 682lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
683lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so 683lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
684lib/osgPlugins-${PKGVERSION}/osgdb_ac.so 684lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
 685${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_avfoundation.so
685lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so 686lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so
686lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so 687lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so
687lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so 688lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
688lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so 689lib/osgPlugins-${PKGVERSION}/osgdb_cfg.so
689lib/osgPlugins-${PKGVERSION}/osgdb_curl.so 690lib/osgPlugins-${PKGVERSION}/osgdb_curl.so
690lib/osgPlugins-${PKGVERSION}/osgdb_dds.so 691lib/osgPlugins-${PKGVERSION}/osgdb_dds.so
691lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osg.so 692lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osg.so
692lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osganimation.so 693lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osganimation.so
693lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgfx.so 694lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgfx.so
694lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgparticle.so 695lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgparticle.so
695lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgshadow.so 696lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgshadow.so
696lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgsim.so 697lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgsim.so
697lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgterrain.so 698lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgterrain.so
@@ -700,29 +701,30 @@ lib/osgPlugins-${PKGVERSION}/osgdb_depre @@ -700,29 +701,30 @@ lib/osgPlugins-${PKGVERSION}/osgdb_depre
700lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgvolume.so 701lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgvolume.so
701lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so 702lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so
702lib/osgPlugins-${PKGVERSION}/osgdb_dot.so 703lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
703lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so 704lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
704lib/osgPlugins-${PKGVERSION}/osgdb_exr.so 705lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
705lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so 706lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
706lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so 707lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so
707${PLIST.gdal}lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so 708${PLIST.gdal}lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
708${PLIST.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so 709${PLIST.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
709lib/osgPlugins-${PKGVERSION}/osgdb_gles.so 710lib/osgPlugins-${PKGVERSION}/osgdb_gles.so
710lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so 711lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so
711lib/osgPlugins-${PKGVERSION}/osgdb_gz.so 712lib/osgPlugins-${PKGVERSION}/osgdb_gz.so
712lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so 713lib/osgPlugins-${PKGVERSION}/osgdb_hdr.so
 714${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_imageio.so
713lib/osgPlugins-${PKGVERSION}/osgdb_ive.so 715lib/osgPlugins-${PKGVERSION}/osgdb_ive.so
714lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so 716lib/osgPlugins-${PKGVERSION}/osgdb_jp2.so
715${PLIST.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so 717lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
716lib/osgPlugins-${PKGVERSION}/osgdb_ktx.so 718lib/osgPlugins-${PKGVERSION}/osgdb_ktx.so
717lib/osgPlugins-${PKGVERSION}/osgdb_logo.so 719lib/osgPlugins-${PKGVERSION}/osgdb_logo.so
718lib/osgPlugins-${PKGVERSION}/osgdb_lua.so 720lib/osgPlugins-${PKGVERSION}/osgdb_lua.so
719lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so 721lib/osgPlugins-${PKGVERSION}/osgdb_lwo.so
720lib/osgPlugins-${PKGVERSION}/osgdb_lws.so 722lib/osgPlugins-${PKGVERSION}/osgdb_lws.so
721lib/osgPlugins-${PKGVERSION}/osgdb_md2.so 723lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
722lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so 724lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so
723lib/osgPlugins-${PKGVERSION}/osgdb_normals.so 725lib/osgPlugins-${PKGVERSION}/osgdb_normals.so
724lib/osgPlugins-${PKGVERSION}/osgdb_obj.so 726lib/osgPlugins-${PKGVERSION}/osgdb_obj.so
725${PLIST.gdal}lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so 727${PLIST.gdal}lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so
726lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so 728lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so
727lib/osgPlugins-${PKGVERSION}/osgdb_osc.so 729lib/osgPlugins-${PKGVERSION}/osgdb_osc.so
728lib/osgPlugins-${PKGVERSION}/osgdb_osg.so 730lib/osgPlugins-${PKGVERSION}/osgdb_osg.so
@@ -754,27 +756,27 @@ lib/osgPlugins-${PKGVERSION}/osgdb_seria @@ -754,27 +756,27 @@ lib/osgPlugins-${PKGVERSION}/osgdb_seria
754lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgsim.so 756lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgsim.so
755lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgterrain.so 757lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgterrain.so
756lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgtext.so 758lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgtext.so
757lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgui.so 759lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgui.so
758lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgutil.so 760lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgutil.so
759lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgviewer.so 761lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgviewer.so
760lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgvolume.so 762lib/osgPlugins-${PKGVERSION}/osgdb_serializers_osgvolume.so
761lib/osgPlugins-${PKGVERSION}/osgdb_shp.so 763lib/osgPlugins-${PKGVERSION}/osgdb_shp.so
762lib/osgPlugins-${PKGVERSION}/osgdb_stl.so 764lib/osgPlugins-${PKGVERSION}/osgdb_stl.so
763${PLIST.svg}lib/osgPlugins-${PKGVERSION}/osgdb_svg.so 765${PLIST.svg}lib/osgPlugins-${PKGVERSION}/osgdb_svg.so
764lib/osgPlugins-${PKGVERSION}/osgdb_tf.so 766lib/osgPlugins-${PKGVERSION}/osgdb_tf.so
765lib/osgPlugins-${PKGVERSION}/osgdb_tga.so 767lib/osgPlugins-${PKGVERSION}/osgdb_tga.so
766lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so 768lib/osgPlugins-${PKGVERSION}/osgdb_tgz.so
767${PLIST.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so 769lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so
768lib/osgPlugins-${PKGVERSION}/osgdb_trans.so 770lib/osgPlugins-${PKGVERSION}/osgdb_trans.so
769lib/osgPlugins-${PKGVERSION}/osgdb_trk.so 771lib/osgPlugins-${PKGVERSION}/osgdb_trk.so
770lib/osgPlugins-${PKGVERSION}/osgdb_txf.so 772lib/osgPlugins-${PKGVERSION}/osgdb_txf.so
771lib/osgPlugins-${PKGVERSION}/osgdb_txp.so 773lib/osgPlugins-${PKGVERSION}/osgdb_txp.so
772lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so 774lib/osgPlugins-${PKGVERSION}/osgdb_vtf.so
773lib/osgPlugins-${PKGVERSION}/osgdb_x.so 775lib/osgPlugins-${PKGVERSION}/osgdb_x.so
774lib/osgPlugins-${PKGVERSION}/osgdb_zip.so 776lib/osgPlugins-${PKGVERSION}/osgdb_zip.so
775lib/pkgconfig/openscenegraph-osg.pc 777lib/pkgconfig/openscenegraph-osg.pc
776lib/pkgconfig/openscenegraph-osgAnimation.pc 778lib/pkgconfig/openscenegraph-osgAnimation.pc
777lib/pkgconfig/openscenegraph-osgDB.pc 779lib/pkgconfig/openscenegraph-osgDB.pc
778lib/pkgconfig/openscenegraph-osgFX.pc 780lib/pkgconfig/openscenegraph-osgFX.pc
779lib/pkgconfig/openscenegraph-osgGA.pc 781lib/pkgconfig/openscenegraph-osgGA.pc
780lib/pkgconfig/openscenegraph-osgManipulator.pc 782lib/pkgconfig/openscenegraph-osgManipulator.pc
cvs diff -r1.94 -r1.95 pkgsrc/graphics/osg/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/osg/buildlink3.mk 2021/01/16 14:44:50 1.94
+++ pkgsrc/graphics/osg/buildlink3.mk 2021/03/02 09:41:56 1.95
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: buildlink3.mk,v 1.94 2021/01/16 14:44:50 nia Exp $ 1# $NetBSD: buildlink3.mk,v 1.95 2021/03/02 09:41:56 adam Exp $
2 2
3BUILDLINK_TREE+= osg 3BUILDLINK_TREE+= osg
4 4
5.if !defined(OSG_BUILDLINK3_MK) 5.if !defined(OSG_BUILDLINK3_MK)
6OSG_BUILDLINK3_MK:= 6OSG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.osg+= osg>=2.8.3 8BUILDLINK_API_DEPENDS.osg+= osg>=2.8.3
9BUILDLINK_ABI_DEPENDS.osg+= osg>=3.6.5 9BUILDLINK_ABI_DEPENDS.osg+= osg>=3.6.5
10BUILDLINK_PKGSRCDIR.osg?= ../../graphics/osg 10BUILDLINK_PKGSRCDIR.osg?= ../../graphics/osg
11 11
12.include "../../mk/bsd.fast.prefs.mk" 12.include "../../mk/bsd.fast.prefs.mk"
13 13
14.if ${OPSYS} != "Darwin" 14.if ${OPSYS} != "Darwin"
15.include "../../graphics/MesaLib/buildlink3.mk" 15.include "../../graphics/MesaLib/buildlink3.mk"
16.include "../../graphics/giflib/buildlink3.mk" 16.include "../../graphics/giflib/buildlink3.mk"
17.include "../../graphics/png/buildlink3.mk" 17.include "../../graphics/png/buildlink3.mk"
18.include "../../graphics/tiff/buildlink3.mk" 
19.include "../../x11/libX11/buildlink3.mk" 18.include "../../x11/libX11/buildlink3.mk"
20.include "../../mk/jpeg.buildlink3.mk" 19.include "../../mk/jpeg.buildlink3.mk"
21.endif 20.endif
22 21
23pkgbase := osg 22pkgbase := osg
24.include "../../mk/pkg-build-options.mk" 23.include "../../mk/pkg-build-options.mk"
25 24
26.include "../../graphics/freetype2/buildlink3.mk" 25.include "../../graphics/freetype2/buildlink3.mk"
27.include "../../graphics/jasper/buildlink3.mk" 26.include "../../graphics/jasper/buildlink3.mk"
28.include "../../graphics/openexr/buildlink3.mk" 27.include "../../graphics/openexr/buildlink3.mk"
 28.include "../../graphics/tiff/buildlink3.mk"
29.include "../../lang/lua52/buildlink3.mk" 29.include "../../lang/lua52/buildlink3.mk"
30.include "../../www/curl/buildlink3.mk" 30.include "../../www/curl/buildlink3.mk"
31.include "../../multimedia/ffmpeg4/buildlink3.mk" 31.include "../../multimedia/ffmpeg4/buildlink3.mk"
32 32
33.if ${PKG_BUILD_OPTIONS.osg:Mgdal} 33.if ${PKG_BUILD_OPTIONS.osg:Mgdal}
34.include "../../geography/gdal-lib/buildlink3.mk" 34.include "../../geography/gdal-lib/buildlink3.mk"
35.endif 35.endif
36 36
37.if ${PKG_BUILD_OPTIONS.osg:Mpdf} 37.if ${PKG_BUILD_OPTIONS.osg:Mpdf}
38.include "../../print/poppler-glib/buildlink3.mk" 38.include "../../print/poppler-glib/buildlink3.mk"
39.endif 39.endif
40 40
41.if ${PKG_BUILD_OPTIONS.osg:Msvg} 41.if ${PKG_BUILD_OPTIONS.osg:Msvg}
cvs diff -r1.13 -r1.14 pkgsrc/graphics/osg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/osg/distinfo 2021/01/16 14:44:50 1.13
+++ pkgsrc/graphics/osg/distinfo 2021/03/02 09:41:56 1.14
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.13 2021/01/16 14:44:50 nia Exp $ 1$NetBSD: distinfo,v 1.14 2021/03/02 09:41:56 adam Exp $
2 2
3SHA1 (osg-3.6.5.tar.gz) = aef898a4e48dc235d8f1a5fd3f753fd2cb7b7861 3SHA1 (osg-3.6.5.tar.gz) = aef898a4e48dc235d8f1a5fd3f753fd2cb7b7861
4RMD160 (osg-3.6.5.tar.gz) = 1b9e1fd9250f5c3de85966d94edf5be393fa3928 4RMD160 (osg-3.6.5.tar.gz) = 1b9e1fd9250f5c3de85966d94edf5be393fa3928
5SHA512 (osg-3.6.5.tar.gz) = 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b 5SHA512 (osg-3.6.5.tar.gz) = 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
6Size (osg-3.6.5.tar.gz) = 5780762 bytes 6Size (osg-3.6.5.tar.gz) = 5780762 bytes
7SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = cb533fdfa7cc569b6e226e1ab422ef36d5d31c3a 7SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = cb533fdfa7cc569b6e226e1ab422ef36d5d31c3a
 8SHA1 (patch-CMakeModules_FindLua52.cmake) = 859b67b513f239f9f02fa069d91549c4d984fbc9
8SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b 9SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b
9SHA1 (patch-applications_present3D_Cluster.cpp) = 017b1d9b42760cad8deb77d7330b04f75aa0e814 10SHA1 (patch-applications_present3D_Cluster.cpp) = 017b1d9b42760cad8deb77d7330b04f75aa0e814
10SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102 11SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
11SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = 4202df06c8ab49fa5f3787cc1c59e9f247d1a21b 12SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = 4202df06c8ab49fa5f3787cc1c59e9f247d1a21b
12SHA1 (patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp) = b9bc38773bfdc78056a4575f772abd7a1fbf09f3 13SHA1 (patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp) = b9bc38773bfdc78056a4575f772abd7a1fbf09f3
13SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08 14SHA1 (patch-src_osg_GLExtensions.cpp) = 5fc04fa162c5cf8aa34ddfb0152092b02e8eec08
File Added: pkgsrc/graphics/osg/patches/patch-CMakeModules_FindLua52.cmake
$NetBSD: patch-CMakeModules_FindLua52.cmake,v 1.1 2021/03/02 09:41:56 adam Exp $

Find Lua from PkgSrc.

--- CMakeModules/FindLua52.cmake.orig	2021-03-02 08:52:23.000000000 +0000
+++ CMakeModules/FindLua52.cmake
@@ -28,7 +28,7 @@
 find_path(LUA_INCLUDE_DIR lua.h
   HINTS
     ENV LUA_DIR
-  PATH_SUFFIXES include/lua52 include/lua5.2 include/lua include
+  PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua include
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks