osg: build with openexr3

4 files changed, 90 insertions, 0 deletions

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>