[openexr] Update from 2 to 3.1.5, patch all consuming ports

ports/directxtex/enable_openexr_support.patch

@@ -1,3 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc0a3e8..7447741 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -156,7 +156,7 @@ target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11)
+
+ if(ENABLE_OPENEXR_SUPPORT)
+   find_package(OpenEXR REQUIRED)
+-  target_include_directories(${PROJECT_NAME} PRIVATE ${OPENEXR_INCLUDE_DIRS}/OpenEXR)
++  target_link_libraries(${PROJECT_NAME} PRIVATE OpenEXR::OpenEXR)
+ endif()
+
+ if ((${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16") AND (NOT MINGW))
+@@ -299,6 +299,7 @@ if(MSVC)
+     endif()
+
+     if((MSVC_VERSION GREATER_EQUAL 1928) AND (CMAKE_SIZEOF_VOID_P EQUAL 8)
++       AND NOT ENABLE_OPENEXR_SUPPORT
+        AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)))
+       foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
+         target_compile_options(${t} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
 diff --git a/DirectXTexEXR.cpp b/DirectXTexEXR.cpp
 index 17bd171..825cfe4 100644
 --- a/DirectXTex/DirectXTexEXR.cpp
@@ -20,3 +41,47 @@ index 17bd171..825cfe4 100644
  namespace
  {
      struct handle_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } };
+@@ -161,7 +161,7 @@ namespace
+             return result.QuadPart >= m_EOF;
+         }
+
+-        Imf::Int64 tellg() override
++        uint64_t tellg() override
+         {
+             const LARGE_INTEGER dist = {};
+             LARGE_INTEGER result;
+@@ -169,10 +169,10 @@ namespace
+             {
+                 throw com_exception(HRESULT_FROM_WIN32(GetLastError()));
+             }
+-            return static_cast<Imf::Int64>(result.QuadPart);
++            return static_cast<uint64_t>(result.QuadPart);
+         }
+
+-        void seekg(Imf::Int64 pos) override
++        void seekg(uint64_t pos) override
+         {
+             LARGE_INTEGER dist;
+             dist.QuadPart = static_cast<LONGLONG>(pos);
+@@ -213,7 +213,7 @@ namespace
+             }
+         }
+
+-        Imf::Int64 tellp() override
++        uint64_t tellp() override
+         {
+             const LARGE_INTEGER dist = {};
+             LARGE_INTEGER result;
+@@ -221,10 +221,10 @@ namespace
+             {
+                 throw com_exception(HRESULT_FROM_WIN32(GetLastError()));
+             }
+-            return static_cast<Imf::Int64>(result.QuadPart);
++            return static_cast<uint64_t>(result.QuadPart);
+         }
+
+-        void seekp(Imf::Int64 pos) override
++        void seekp(uint64_t pos) override
+         {
+             LARGE_INTEGER dist;
+             dist.QuadPart = static_cast<LONGLONG>(pos);

ports/directxtex/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "directxtex",
   "version-date": "2022-07-29",
+  "port-version": 1,
   "description": "DirectXTex texture processing library",
   "homepage": "https://github.com/Microsoft/DirectXTex",
   "documentation": "https://github.com/microsoft/DirectXTex/wiki",

ports/freeimage/CMakeLists.txt

@@ -107,7 +107,8 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES}
                                 WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder
                                 ${JXR_LIBRARIES}
                                 ${LibRaw_LIBRARIES}
-                                OpenEXR::IlmImf)
+                                OpenEXR::OpenEXR
+                                Imath::Imath)
 
 target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS})
 
@@ -153,6 +154,7 @@ find_dependency(WebP CONFIG)
 find_dependency(JXR)
 find_dependency(LibRaw)
 find_dependency(OpenEXR)
+find_dependency(Imath)
 include(\"\${CMAKE_CURRENT_LIST_DIR}/freeimage-targets.cmake\")
 ")
 

ports/freeimage/use-external-openexr.patch

@@ -25,10 +25,38 @@ index b286430..82b3b72 100644
 +#include <OpenEXR/ImfRgba.h>
 +#include <OpenEXR/ImfArray.h>
 +#include <OpenEXR/ImfPreviewImage.h>
-+#include <OpenEXR/half.h>
++#include <Imath/half.h>
 
 
  // ==========================================================
+@@ -66,11 +66,11 @@ public:
+ 		return ((unsigned)n != _io->read_proc(c, 1, n, _handle));
+ 	}
+
+-	virtual Imath::Int64 tellg() {
++	virtual uint64_t tellg() {
+ 		return _io->tell_proc(_handle);
+ 	}
+
+-	virtual void seekg(Imath::Int64 pos) {
++	virtual void seekg(uint64_t pos) {
+ 		_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
+ 	}
+
+@@ -100,11 +100,11 @@ public:
+ 		}
+ 	}
+
+-	virtual Imath::Int64 tellp() {
++	virtual uint64_t tellp() {
+ 		return _io->tell_proc(_handle);
+ 	}
+
+-	virtual void seekp(Imath::Int64 pos) {
++	virtual void seekp(uint64_t pos) {
+ 		_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
+ 	}
+ };
 diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
 index 562fdd7..ce12649 100644
 --- a/Source/FreeImage/PluginTIFF.cpp
@@ -38,7 +66,7 @@ index 562fdd7..ce12649 100644
  #include <tiffio.h>
  #include "../Metadata/FreeImageTag.h"
 -#include "../OpenEXR/Half/half.h"
-+#include <OpenEXR/half.h>
++#include <Imath/half.h>
 
  #include "FreeImageIO.h"
  #include "PSDParser.h"

ports/freeimage/vcpkg.json

@@ -1,10 +1,12 @@
 {
   "name": "freeimage",
   "version": "3.18.0",
-  "port-version": 23,
+  "port-version": 24,
   "description": "Support library for graphics image formats",
   "homepage": "https://sourceforge.net/projects/freeimage/",
+  "license": "GPL-2.0-only OR GPL-3.0-only OR FreeImage",
   "dependencies": [
+    "imath",
     "jxrlib",
     "libjpeg-turbo",
     "libpng",

ports/ilmbase/vcpkg.json

@@ -1,9 +1,8 @@
 {
   "name": "ilmbase",
-  "version-string": "2.3.0",
-  "port-version": 1,
-  "description": "empty package, linking to newer one",
+  "version": "3",
+  "description": "Obsolete, use port imath instead",
   "dependencies": [
-    "openexr"
+    "imath"
   ]
 }

ports/opencv2/0003-force-package-requirements.patch

@@ -45,12 +45,3 @@
      if(PNG_FOUND)
        include(CheckIncludeFile)
        check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
-@@ -151,7 +151,7 @@ if(WITH_OPENEXR)
-   if(BUILD_OPENEXR)
-     ocv_clear_vars(OPENEXR_FOUND)
-   else()
--    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
-+    find_package(OpenEXR REQUIRED)
-   endif()
-
-   if(NOT OPENEXR_FOUND)

ports/opencv2/0019-fix-openexr.patch

@@ -0,0 +1,30 @@
+diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
+index 9b43066..c1cc11f 100644
+--- a/cmake/OpenCVFindLibsGrfmt.cmake
++++ b/cmake/OpenCVFindLibsGrfmt.cmake
+@@ -151,7 +151,12 @@ if(WITH_OPENEXR)
+   if(BUILD_OPENEXR)
+     ocv_clear_vars(OPENEXR_FOUND)
+   else()
+-    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
++    find_package(Imath CONFIG REQUIRED)
++    find_package(OpenEXR CONFIG REQUIRED)
++    set(OPENEXR_LIBRARIES Imath::Imath OpenEXR::OpenEXR)
++    set(OPENEXR_INCLUDE_PATHS "")
++    set(OPENEXR_VERSION "${OpenEXR_VERSION}")
++    set(OPENEXR_FOUND 1)
+   endif()
+
+   if(NOT OPENEXR_FOUND)
+diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp
+index 399e586..b8cd270 100644
+--- a/modules/highgui/src/grfmt_exr.cpp
++++ b/modules/highgui/src/grfmt_exr.cpp
+@@ -57,6 +57,7 @@
+ #include <ImfOutputFile.h>
+ #include <ImfChannelList.h>
+ #include <ImfStandardAttributes.h>
++#include <ImfFrameBuffer.h>
+ #include <half.h>
+ #include "grfmt_exr.hpp"
+

ports/opencv2/portfile.cmake

@@ -15,7 +15,10 @@ vcpkg_from_github(
       0005-fix-cuda.patch
       0006-fix-jasper.patch
       0007-fix-config.patch
+      0019-fix-openexr.patch
 )
+# Disallow accidental build of vendored copies
+file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
 
 file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
 file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
@@ -126,7 +129,7 @@ find_dependency(Threads)")
     string(APPEND DEPS_STRING "\nfind_dependency(CUDA)")
   endif()
   if("openexr" IN_LIST FEATURES)
-    string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)")
+    string(APPEND DEPS_STRING "\nfind_dependency(Imath CONFIG)\nfind_dependency(OpenEXR CONFIG)")
   endif()
   if("png" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(PNG)")

ports/opencv2/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "opencv2",
   "version": "2.4.13.7",
-  "port-version": 14,
+  "port-version": 15,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",
@@ -102,6 +102,7 @@
     "openexr": {
       "description": "OpenEXR support for opencv",
       "dependencies": [
+        "imath",
         "openexr"
       ]
     },

ports/opencv3/0003-force-package-requirements.patch

@@ -54,15 +54,6 @@
      if(PNG_FOUND)
        include(CheckIncludeFile)
        check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
-@@ -229,7 +229,7 @@ if(WITH_OPENEXR)
-   ocv_clear_vars(HAVE_OPENEXR)
-   if(NOT BUILD_OPENEXR)
-     ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
--    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
-+    find_package(OpenEXR REQUIRED)
-   endif()
-
-   if(OPENEXR_FOUND)
 @@ -247,7 +247,7 @@ endif()
 
  # --- GDAL (optional) ---

ports/opencv3/portfile.cmake

@@ -22,6 +22,8 @@ vcpkg_from_github(
       0011-remove-python2.patch
       0012-fix-zlib.patch
 )
+# Disallow accidental build of vendored copies
+file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
   set(TARGET_IS_AARCH64 1)

ports/opencv3/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",

ports/opencv4/0003-force-package-requirements.patch

@@ -63,15 +63,6 @@
      if(PNG_FOUND)
        include(CheckIncludeFile)
        check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
-@@ -257,7 +257,7 @@ if(WITH_OPENEXR)
-   ocv_clear_vars(HAVE_OPENEXR)
-   if(NOT BUILD_OPENEXR)
-     ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
--    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
-+    find_package(OpenEXR REQUIRED)
-   endif()
-
-   if(OPENEXR_FOUND)
 @@ -275,7 +275,7 @@ endif()
 
  # --- GDAL (optional) ---

ports/opencv4/portfile.cmake

@@ -25,6 +25,8 @@ vcpkg_from_github(
       0015-fix-freetype.patch
       0017-mingw-strsafe-no-deprecate.patch
 )
+# Disallow accidental build of vendored copies
+file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
   set(TARGET_IS_AARCH64 1)

ports/opencv4/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.6.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",