osg: fix buidling on Darwin; fix finding Lua52

5 files changed, 29 insertions, 12 deletions

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 3987d84d197..9de701480de 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2021/01/16 14:44:50 nia Exp $
+# $NetBSD: Makefile,v 1.122 2021/03/02 09:41:56 adam Exp $
 
 DISTNAME=	osg-3.6.5
 CATEGORIES=	graphics devel
@@ -21,7 +21,6 @@ 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+=		-DBUILD_OSG_EXAMPLES=OFF
 CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_Asio=TRUE
 CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE # disable legacy SDL
@@ -57,6 +56,7 @@ CXXFLAGS+=	-D__STDC_LIMIT_MACROS
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/ilmbase/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/lua52/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
@@ -65,7 +65,6 @@ 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"
diff --git a/graphics/osg/PLIST b/graphics/osg/PLIST
index a7677caf83e..48f140dd423 100644
--- a/graphics/osg/PLIST
+++ b/graphics/osg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/01/16 14:44:50 nia Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/03/02 09:41:56 adam Exp $
 bin/osgarchive
 bin/osgconv
 bin/osgfilecache
@@ -576,9 +576,9 @@ include/osgViewer/View
 include/osgViewer/Viewer
 include/osgViewer/ViewerBase
 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.quartz}include/osgViewer/api/Cocoa/GraphicsHandleCocoa
+${PLIST.quartz}include/osgViewer/api/Cocoa/GraphicsWindowCocoa
+${PLIST.quartz}include/osgViewer/api/Cocoa/PixelBufferCocoa
 ${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsHandleX11
 ${PLIST.notdarwin}include/osgViewer/api/X11/GraphicsWindowX11
 ${PLIST.notdarwin}include/osgViewer/api/X11/PixelBufferX11
@@ -682,6 +682,7 @@ lib/libosgWidget.so.${PKGVERSION}
 lib/osgPlugins-${PKGVERSION}/osgdb_3dc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_3ds.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ac.so
+${PLIST.quartz}lib/osgPlugins-${PKGVERSION}/osgdb_avfoundation.so
 lib/osgPlugins-${PKGVERSION}/osgdb_bmp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_bsp.so
 lib/osgPlugins-${PKGVERSION}/osgdb_bvh.so
@@ -710,9 +711,10 @@ 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.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
+lib/osgPlugins-${PKGVERSION}/osgdb_jpeg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_ktx.so
 lib/osgPlugins-${PKGVERSION}/osgdb_logo.so
 lib/osgPlugins-${PKGVERSION}/osgdb_lua.so
@@ -764,7 +766,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.notdarwin}lib/osgPlugins-${PKGVERSION}/osgdb_tiff.so
+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 7e6a85862e3..52a7baee005 100644
--- a/graphics/osg/buildlink3.mk
+++ b/graphics/osg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.94 2021/01/16 14:44:50 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.95 2021/03/02 09:41:56 adam Exp $
 
 BUILDLINK_TREE+=	osg
 
@@ -15,7 +15,6 @@ BUILDLINK_PKGSRCDIR.osg?=	../../graphics/osg
 .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 "../../mk/jpeg.buildlink3.mk"
 .endif
@@ -26,6 +25,7 @@ pkgbase := osg
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/lua52/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index aeb150afa85..f79fee27c62 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.13 2021/01/16 14:44:50 nia Exp $
+$NetBSD: distinfo,v 1.14 2021/03/02 09:41:56 adam Exp $
 
 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-CMakeModules_FindLua52.cmake) = 859b67b513f239f9f02fa069d91549c4d984fbc9
 SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b
 SHA1 (patch-applications_present3D_Cluster.cpp) = 017b1d9b42760cad8deb77d7330b04f75aa0e814
 SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
diff --git a/graphics/osg/patches/patch-CMakeModules_FindLua52.cmake b/graphics/osg/patches/patch-CMakeModules_FindLua52.cmake
new file mode 100644
index 00000000000..52c991cc667
--- /dev/null
+++ b/graphics/osg/patches/patch-CMakeModules_FindLua52.cmake
@@ -0,0 +1,15 @@
+$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