[openvdb]Upgrade version to 6.1.0, regenerate patches and fix build errors. (#6864)

1 files changed, 0 insertions, 207 deletions

diff --git a/ports/openvdb/0001-fix-cmake-modules.patch b/ports/openvdb/0001-fix-cmake-modules.patch
deleted file mode 100644
index 03cc2461e..000000000
--- a/ports/openvdb/0001-fix-cmake-modules.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
-index 2d9d9d3..e9b4abc 100644
---- a/cmake/FindBlosc.cmake
-+++ b/cmake/FindBlosc.cmake
-@@ -37,11 +37,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( BLOSC_LOCATION include/blosc.h
--  "$ENV{BLOSC_ROOT}"
--  NO_DEFAULT_PATH
--  NO_SYSTEM_ENVIRONMENT_PATH
--  )
-+FIND_PATH( BLOSC_LOCATION include/blosc.h)
- 
- FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc
-   REQUIRED_VARS BLOSC_LOCATION
-@@ -53,7 +49,7 @@ IF ( BLOSC_FOUND )
-     CACHE STRING "Blosc library directories")
- 
-   SET ( _blosc_library_name "blosc" )
--  
-+
-   # Static library setup
-   IF (Blosc_USE_STATIC_LIBS)
-     SET(CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP ${CMAKE_FIND_LIBRARY_SUFFIXES})
-@@ -69,7 +65,7 @@ IF ( BLOSC_FOUND )
-     NO_DEFAULT_PATH
-     NO_SYSTEM_ENVIRONMENT_PATH
-     )
--  
-+
-   # Static library tear down
-   IF (Blosc_USE_STATIC_LIBS)
-     SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
-diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
-index 0b72457..75951a6 100644
---- a/cmake/FindGLEW.cmake
-+++ b/cmake/FindGLEW.cmake
-@@ -39,11 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLEW_LOCATION include/GL/glew.h
--  "$ENV{GLEW_ROOT}"
--  NO_DEFAULT_PATH
--  NO_SYSTEM_ENVIRONMENT_PATH
--  )
-+FIND_PATH( GLEW_LOCATION include/GL/glew.h)
- 
- FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLEW
-   REQUIRED_VARS GLEW_LOCATION
-diff --git a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
-index cea0b86..07ea09e 100644
---- a/cmake/FindGLFW3.cmake
-+++ b/cmake/FindGLFW3.cmake
-@@ -39,11 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
--  "$ENV{GLFW3_ROOT}"
--  NO_DEFAULT_PATH
--  NO_SYSTEM_ENVIRONMENT_PATH
--)
-+FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h)
- 
- FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLFW3
-   REQUIRED_VARS GLFW3_LOCATION
-@@ -59,7 +59,7 @@ IF (GLFW3_FOUND)
- 	  NO_CMAKE_SYSTEM_PATH
- 	  )
-   ELSE (GLFW3_USE_STATIC_LIBS)
--    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw
-+    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3dll
-       PATHS ${GLFW3_LOCATION}/lib
-       PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
- 	  NO_DEFAULT_PATH
-diff --git a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake
-index 664affd..5197110 100644
---- a/cmake/FindILMBase.cmake
-+++ b/cmake/FindILMBase.cmake
-@@ -43,11 +43,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h
--  "$ENV{ILMBASE_ROOT}"
--  NO_DEFAULT_PATH
--  NO_SYSTEM_ENVIRONMENT_PATH
--  )
-+FIND_PATH ( ILMBASE_LOCATION include/OpenEXR/IlmBaseConfig.h)
- 
- FIND_PACKAGE_HANDLE_STANDARD_ARGS ( ILMBase
-   REQUIRED_VARS ILMBASE_LOCATION
-@@ -70,11 +66,13 @@ IF ( ILMBASE_FOUND )
- 	SET ( IEXMATH_LIBRARY_NAME   IexMath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}   )
- 	SET ( ILMTHREAD_LIBRARY_NAME IlmThread-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR} )
- 	SET ( IMATH_LIBRARY_NAME     Imath-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}     )
-+	SET ( HALF_LIBRARY_NAME      Half-${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}      )
-   ELSE ( ILMBASE_NAMESPACE_VERSIONING )
- 	SET ( IEX_LIBRARY_NAME       Iex       )
- 	SET ( IEXMATH_LIBRARY_NAME   IexMath   )
- 	SET ( ILMTHREAD_LIBRARY_NAME IlmThread )
- 	SET ( IMATH_LIBRARY_NAME     Imath     )
-+	SET ( HALF_LIBRARY_NAME      Half      )
-   ENDIF ( ILMBASE_NAMESPACE_VERSIONING )
- 
-   SET ( ILMBASE_INCLUDE_DIRS
-@@ -84,7 +82,7 @@ IF ( ILMBASE_FOUND )
-   SET ( ILMBASE_LIBRARYDIR ${ILMBASE_LOCATION}/lib
-     CACHE STRING "ILMBase library directories")
-   SET ( ILMBASE_FOUND TRUE )
--  
-+
-   SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-   IF (Ilmbase_USE_STATIC_LIBS)
-     IF (APPLE)
-@@ -129,14 +127,14 @@ IF ( ILMBASE_FOUND )
-     ELSEIF (WIN32)
-       # Link library
-       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
--      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR} )
-+      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
-       FIND_LIBRARY ( Ilmbase_IEX_LIBRARY ${IEX_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
-       FIND_LIBRARY ( Ilmbase_IEXMATH_LIBRARY ${IEXMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
-       FIND_LIBRARY ( Ilmbase_ILMTHREAD_LIBRARY ${ILMTHREAD_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
-       FIND_LIBRARY ( Ilmbase_IMATH_LIBRARY ${IMATH_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR} )
-       # Load library
-       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
--      FIND_LIBRARY ( Ilmbase_HALF_DLL Half PATHS ${ILMBASE_LOCATION}/bin
-+      FIND_LIBRARY ( Ilmbase_HALF_DLL ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LOCATION}/bin
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
-         )
-@@ -157,7 +155,7 @@ IF ( ILMBASE_FOUND )
- 		NO_SYSTEM_ENVIRONMENT_PATH
-         )
-     ELSE (APPLE)
--      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY Half PATHS ${ILMBASE_LIBRARYDIR}
-+      FIND_LIBRARY ( Ilmbase_HALF_LIBRARY ${HALF_LIBRARY_NAME} PATHS ${ILMBASE_LIBRARYDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
-         )
-diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
-index 6d69c03..5ecf8fa 100644
---- a/cmake/FindOpenEXR.cmake
-+++ b/cmake/FindOpenEXR.cmake
-@@ -38,11 +38,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH ( OPENEXR_LOCATION include/OpenEXR/OpenEXRConfig.h
--  ENV OPENEXR_ROOT
--  NO_DEFAULT_PATH
--  NO_SYSTEM_ENVIRONMENT_PATH
--  )
-+FIND_PATH ( OPENEXR_LOCATION include/OpenEXR/OpenEXRConfig.h)
- 
- FIND_PACKAGE_HANDLE_STANDARD_ARGS ( OpenEXR
-   REQUIRED_VARS OPENEXR_LOCATION
-@@ -59,7 +55,7 @@ IF ( OPENEXR_FOUND )
-   FILE ( STRINGS "${OPENEXR_LOCATION}/include/OpenEXR/OpenEXRConfig.h" _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR ")
-   STRING ( REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" _openexr_version_minor_unstrip "${_openexr_version_minor_string}")
-   STRING ( STRIP "${_openexr_version_minor_unstrip}" OPENEXR_VERSION_MINOR )
--  
-+
-   MESSAGE ( STATUS "Found OpenEXR v${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR} at ${OPENEXR_LOCATION}" )
- 
-   IF ( OPENEXR_NAMESPACE_VERSIONING )
-@@ -67,7 +63,7 @@ IF ( OPENEXR_FOUND )
-   ELSE ( OPENEXR_NAMESPACE_VERSIONING )
- 	SET ( ILMIMF_LIBRARY_NAME IlmImf )
-   ENDIF ( OPENEXR_NAMESPACE_VERSIONING )
--	
-+
-   SET ( OPENEXR_INCLUDE_DIRS
-     ${OPENEXR_LOCATION}/include
-     ${OPENEXR_LOCATION}/include/OpenEXR
-@@ -120,6 +116,5 @@ IF ( OPENEXR_FOUND )
-   ENDIF ()
- 
-   # SET( Openexr_ILMIMF_LIBRARY ${OPENEXR_ILMIMF_LIBRARY_PATH} CACHE STRING "Openexr's IlmImf library")
--  
--ENDIF ( OPENEXR_FOUND )
- 
-+ENDIF ( OPENEXR_FOUND )
-diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
-index 8a56ec0..9f5a7b4 100644
---- a/cmake/FindTBB.cmake
-+++ b/cmake/FindTBB.cmake
-@@ -42,14 +42,7 @@ FIND_PACKAGE ( PackageHandleStandardArgs )
- 
- # SET ( TBB_FOUND FALSE )
- 
--FIND_PATH( TBB_LOCATION include/tbb/tbb.h
--  "$ENV{TBB_ROOT}"
--  NO_DEFAULT_PATH
--  NO_CMAKE_ENVIRONMENT_PATH
--  NO_CMAKE_PATH
--  NO_SYSTEM_ENVIRONMENT_PATH
--  NO_CMAKE_SYSTEM_PATH
--  )
-+FIND_PATH( TBB_LOCATION include/tbb/tbb.h)
- 
- FIND_PACKAGE_HANDLE_STANDARD_ARGS ( TBB
-   REQUIRED_VARS TBB_LOCATION