osg: build with openexr3

6 files changed, 97 insertions, 4 deletions

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 97a6c8869c5..b32ee255276 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2021/07/09 08:59:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.132 2021/07/09 10:30:11 markd Exp $
 
 DISTNAME=	osg-3.6.5
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openscenegraph/}
 GITHUB_PROJECT=	OpenSceneGraph
@@ -58,7 +58,6 @@ CXXFLAGS+=	-D__STDC_LIMIT_MACROS
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/lua52/buildlink3.mk"
-.include "../../math/imath/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index f79fee27c62..c0c03ea2d0d 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2021/03/02 09:41:56 adam Exp $
+$NetBSD: distinfo,v 1.15 2021/07/09 10:30:11 markd Exp $
 
 SHA1 (osg-3.6.5.tar.gz) = aef898a4e48dc235d8f1a5fd3f753fd2cb7b7861
 RMD160 (osg-3.6.5.tar.gz) = 1b9e1fd9250f5c3de85966d94edf5be393fa3928
@@ -6,8 +6,12 @@ SHA512 (osg-3.6.5.tar.gz) = 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f509537
 Size (osg-3.6.5.tar.gz) = 5780762 bytes
 SHA1 (patch-CMakeModules_FindFFmpeg.cmake) = cb533fdfa7cc569b6e226e1ab422ef36d5d31c3a
 SHA1 (patch-CMakeModules_FindLua52.cmake) = 859b67b513f239f9f02fa069d91549c4d984fbc9
+SHA1 (patch-CMakeModules_FindOpenEXR.cmake) = c4f629085f274916e76d387a250f2a28a7918e04
+SHA1 (patch-CMakeModules_Findilmbase.cmake) = 48a8223e2e8dcc662d664210b3c64a4d3d2b25d1
 SHA1 (patch-ab) = 0bb683599daae3b2718693f9df8077b0333a410b
 SHA1 (patch-applications_present3D_Cluster.cpp) = 017b1d9b42760cad8deb77d7330b04f75aa0e814
+SHA1 (patch-src_osgPlugins_exr_CMakeLists.txt) = 33a0c955cfa3c7a3b177464f9e7270b517c3c29d
+SHA1 (patch-src_osgPlugins_exr_ReaderWriterEXR.cpp) = 228cb4b86018da219db4fb69b262c71531b4852b
 SHA1 (patch-src_osgPlugins_osc_ip_posix_NetworkingUtils.cpp) = 5748636ed17d23a0a595d38b2b392e773840a102
 SHA1 (patch-src_osgPlugins_osc_osc_OscHostEndianness.h) = 4202df06c8ab49fa5f3787cc1c59e9f247d1a21b
 SHA1 (patch-src_osgPlugins_osc_osc_OscOutboundPacketStream.cpp) = b9bc38773bfdc78056a4575f772abd7a1fbf09f3
diff --git a/graphics/osg/patches/patch-CMakeModules_FindOpenEXR.cmake b/graphics/osg/patches/patch-CMakeModules_FindOpenEXR.cmake
new file mode 100644
index 00000000000..05a97f21a84
--- /dev/null
+++ b/graphics/osg/patches/patch-CMakeModules_FindOpenEXR.cmake
@@ -0,0 +1,23 @@
+$NetBSD: patch-CMakeModules_FindOpenEXR.cmake,v 1.1 2021/07/09 10:30:11 markd Exp $
+
+openexr3 fix
+
+--- CMakeModules/FindOpenEXR.cmake.orig	2020-01-31 11:03:07.000000000 +0000
++++ CMakeModules/FindOpenEXR.cmake
+@@ -51,11 +51,11 @@ MACRO(OPENEXR_FIND libname)
+     OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d)
+ ENDMACRO(OPENEXR_FIND)
+ 
+-OPENEXR_FIND(IlmImf)
++OPENEXR_FIND(OpenEXR)
+ 
+ SET(OPENEXR_FOUND "NO")
+-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
+-    SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} )
+-    SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY )
++IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY)
++    SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} )
++    SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY )
+     SET(OPENEXR_FOUND "YES")
+-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
++ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY)
diff --git a/graphics/osg/patches/patch-CMakeModules_Findilmbase.cmake b/graphics/osg/patches/patch-CMakeModules_Findilmbase.cmake
new file mode 100644
index 00000000000..895c1c94184
--- /dev/null
+++ b/graphics/osg/patches/patch-CMakeModules_Findilmbase.cmake
@@ -0,0 +1,41 @@
+$NetBSD: patch-CMakeModules_Findilmbase.cmake,v 1.1 2021/07/09 10:30:11 markd Exp $
+
+openexr3 fix
+
+--- CMakeModules/Findilmbase.cmake.orig	2020-01-31 11:03:07.000000000 +0000
++++ CMakeModules/Findilmbase.cmake
+@@ -10,7 +10,7 @@
+ # Created by Robert Osfield. 
+ 
+ 
+-FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h
++FIND_PATH(ILMBASE_INCLUDE_DIR Imath/ImathVec.h
+     $ENV{ILMBASE_DIR}/include
+     $ENV{ILMBASE_DIR}
+     ~/Library/Frameworks
+@@ -28,7 +28,7 @@ FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/Im
+ # example: ILMBASE_FIND_VAR(OPENEXR_IlmThread_LIBRARY IlmThread)
+ MACRO(ILMBASE_FIND_VAR varname libname)
+     FIND_LIBRARY( ${varname}
+-        NAMES ${libname} ${libname}-2_1 ${libname}-2_2
++        NAMES ${libname} ${libname}-2_1 ${libname}-2_2 ${libname}-3_0
+         PATHS
+         $ENV{ILMBASE_DIR}/lib
+         $ENV{ILMBASE_DIR}
+@@ -53,11 +53,11 @@ ENDMACRO(ILMBASE_FIND)
+ 
+ ILMBASE_FIND(IlmThread)
+ ILMBASE_FIND(Iex)
+-ILMBASE_FIND(Half)
++ILMBASE_FIND(Imath)
+ 
+ SET(ILMBASE_FOUND "NO")
+-IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)
+-    SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Half_LIBRARY} ${ILMBASE_Iex_LIBRARY} )
+-    SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Half_LIBRARY ILMBASE_Iex_LIBRARY )
++IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY)
++    SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Imath_LIBRARY} ${ILMBASE_Iex_LIBRARY} )
++    SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Imath_LIBRARY ILMBASE_Iex_LIBRARY )
+     SET(ILMBASE_FOUND "YES")
+-ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)
++ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY)
diff --git a/graphics/osg/patches/patch-src_osgPlugins_exr_CMakeLists.txt b/graphics/osg/patches/patch-src_osgPlugins_exr_CMakeLists.txt
new file mode 100644
index 00000000000..67b29adf756
--- /dev/null
+++ b/graphics/osg/patches/patch-src_osgPlugins_exr_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_osgPlugins_exr_CMakeLists.txt,v 1.1 2021/07/09 10:30:11 markd Exp $
+
+openexr3 fix
+
+--- src/osgPlugins/exr/CMakeLists.txt.orig	2020-01-31 11:03:07.000000000 +0000
++++ src/osgPlugins/exr/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR )
++INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/Imath )
+ INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR )
+ 
+ SET(TARGET_SRC ReaderWriterEXR.cpp )
diff --git a/graphics/osg/patches/patch-src_osgPlugins_exr_ReaderWriterEXR.cpp b/graphics/osg/patches/patch-src_osgPlugins_exr_ReaderWriterEXR.cpp
new file mode 100644
index 00000000000..9693b9e63ae
--- /dev/null
+++ b/graphics/osg/patches/patch-src_osgPlugins_exr_ReaderWriterEXR.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_osgPlugins_exr_ReaderWriterEXR.cpp,v 1.1 2021/07/09 10:30:11 markd Exp $
+
+openexr3 fix
+
+--- src/osgPlugins/exr/ReaderWriterEXR.cpp.orig	2020-01-31 11:03:07.000000000 +0000
++++ src/osgPlugins/exr/ReaderWriterEXR.cpp
+@@ -13,6 +13,7 @@
+ #include <osgDB/FileNameUtils>
+ #include <osgDB/FileUtils>
+ 
++#include <ImfInt64.h>
+ #include <ImfRgbaFile.h>
+ #include <ImfIO.h>
+ #include <ImfArray.h>