[openimageio] Update to 3.0.0.3 (microsoft#42175)

ports/openimageio/fix-dependencies.patch

@@ -1,10 +1,11 @@
-diff -u -r a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
+diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
+index ceaea62..2a2a359 100644
 --- a/src/cmake/Config.cmake.in
 +++ b/src/cmake/Config.cmake.in
-@@ -6,6 +6,30 @@
- 
+@@ -6,6 +6,33 @@
+
  include(CMakeFindDependencyMacro)
- 
+
 +find_dependency(Boost COMPONENTS @Boost_COMPONENTS@)
 +if(@USE_GIF@)
 +    find_dependency(GIF)
@@ -28,60 +29,61 @@ diff -u -r a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
 +if(@USE_WEBP@)
 +    find_dependency(WebP CONFIG)
 +endif()
++if(@USE_LIBRAW@)
++    find_dependency(LibRaw)
++endif()
 +
  # add here all the find_dependency() whenever switching to config based dependencies
  if (NOT @OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH@ AND NOT OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH)
-     if (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 3.0)
-diff -u -r a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+     find_dependency(Imath @Imath_VERSION@
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index f8670a8..816ba08 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
-@@ -177,10 +177,13 @@
- checked_find_package (Freetype
-                    DEFINITIONS  -DUSE_FREETYPE=1 )
+@@ -125,16 +125,18 @@ checked_find_package (Freetype
+                       VERSION_MIN 2.10.0
+                       DEFINITIONS USE_FREETYPE=1 )
 
--checked_find_package (OpenColorIO
+-checked_find_package (OpenColorIO REQUIRED
+-                      VERSION_MIN 2.2
+-                      VERSION_MAX 2.9
+-                     )
++find_package(OpenColorIO CONFIG REQUIRED)
 +set(OPENCOLORIO_INCLUDES "")
 +set(OPENCOLORIO_LIBRARIES OpenColorIO::OpenColorIO)
-+checked_find_package (OpenColorIO CONFIG
-                       DEFINITIONS  -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1
-                       # PREFER_CONFIG
-                       )
-+set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}")
- if (OpenColorIO_FOUND)
-     option (OIIO_DISABLE_BUILTIN_OCIO_CONFIGS
-            "For deveoper debugging/testing ONLY! Disable OCIO 2.2 builtin configs." OFF)
-@@ -191,7 +194,9 @@
-     set (OpenColorIO_FOUND 0)
++checked_find_package (OpenColorIO CONFIG)
+ if (NOT OPENCOLORIO_INCLUDES)
+     get_target_property(OPENCOLORIO_INCLUDES OpenColorIO::OpenColorIO INTERFACE_INCLUDE_DIRECTORIES)
  endif ()
+ include_directories(BEFORE ${OPENCOLORIO_INCLUDES})
 
--checked_find_package (OpenCV 3.0
+-checked_find_package (OpenCV 4.0
 +set(OPENCV_INCLUDES "")
 +set(OPENCV_LIBRARIES opencv_core)
 +checked_find_package (OpenCV CONFIG
-                    DEFINITIONS  -DUSE_OPENCV=1)
+                       DEFINITIONS USE_OPENCV=1)
 
  # Intel TBB
-@@ -205,12 +210,16 @@
-                       PREFER_CONFIG)
+@@ -146,11 +148,15 @@ checked_find_package (TBB 2017
+ # DCMTK is used to read DICOM images
+ checked_find_package (DCMTK CONFIG VERSION_MIN 3.6.1)
 
--checked_find_package (FFmpeg VERSION_MIN 3.0)
+-checked_find_package (FFmpeg VERSION_MIN 4.0)
 +checked_find_package (FFmpeg)
 +set(FFmpeg_FOUND "${FFMPEG_FOUND}")
 +set(FFMPEG_INCLUDES "${FFMPEG_INCLUDE_DIRS}")
- checked_find_package (GIF
-                       VERSION_MIN 4
-                       RECOMMEND_MIN 5.0
-                       RECOMMEND_MIN_REASON "for stability and thread safety")
+
+ checked_find_package (GIF VERSION_MIN 5.0)
 
  # For HEIF/HEIC/AVIF formats
 +set(LIBHEIF_INCLUDES "")
 +set(LIBHEIF_LIBRARIES heif)
- checked_find_package (Libheif VERSION_MIN 1.3
+ checked_find_package (Libheif VERSION_MIN 1.11
                        RECOMMEND_MIN 1.16
                        RECOMMEND_MIN_REASON "for orientation support")
-@@ -231,9 +240,8 @@
-     # set (LIBRAW_FOUND 0)
- endif ()
+@@ -159,9 +165,8 @@ checked_find_package (LibRaw
+                       VERSION_MIN 0.20.0
+                       PRINT LibRaw_r_LIBRARIES)
 
 -checked_find_package (OpenJPEG VERSION_MIN 2.0
 -                      RECOMMEND_MIN 2.2
@@ -91,12 +93,12 @@ diff -u -r a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
  # Note: Recent OpenJPEG versions have exported cmake configs, but we don't
  # find them reliable at all, so we stick to our FindOpenJPEG.cmake module.
 
-@@ -255,6 +263,8 @@
+@@ -178,6 +183,8 @@ if (NOT Ptex_FOUND OR NOT Ptex_VERSION)
      checked_find_package (Ptex)
  endif ()
 
 +set(WEBP_INCLUDES "")
 +set(WEBP_LIBRARIES WebP::webp WebP::webpdemux)
- checked_find_package (WebP)
- # Note: When WebP 1.1 (released late 2019) is our minimum, we can use their
- # exported configs and remove our FindWebP.cmake module.
+ checked_find_package (WebP VERSION_MIN 1.1)
+
+ option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)

ports/openimageio/fix-openexr-target-missing.patch

@@ -1,13 +1,13 @@
 diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
-index 08401a2..4f2694e 100644
+index 9ee9c9d..6b9e7c2 100644
 --- a/src/cmake/Config.cmake.in
 +++ b/src/cmake/Config.cmake.in
-@@ -24,6 +24,8 @@ if (NOT @OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH@ AND NOT OPENIMAGEIO_CONFIG_DO_NOT
-     if (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 3.0)
-         find_dependency(Imath @Imath_VERSION@
-                         HINTS @Imath_DIR@)
-+        find_dependency(OpenEXR @OpenEXR_VERSION@
+@@ -31,6 +31,8 @@ endif()
+ if (NOT @OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH@ AND NOT OPENIMAGEIO_CONFIG_DO_NOT_FIND_IMATH)
+     find_dependency(Imath @Imath_VERSION@
+                     HINTS @Imath_DIR@)
++    find_dependency(OpenEXR @OpenEXR_VERSION@
 +                        HINTS @OpenEXR_DIR@)
-     elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONFIG@)
-         find_dependency(IlmBase @OpenEXR_VERSION@
-                         HINTS @IlmBase_DIR@ @OpenEXR_DIR@)
+ endif ()
+
+ if (NOT @fmt_LOCAL_BUILD@ AND NOT @OIIO_INTERNALIZE_FMT@)

ports/openimageio/imath-version-guard.patch

@@ -1,15 +1,16 @@
-diff -u -r a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 816ba08..7fe6a14 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
-@@ -193,6 +193,11 @@
- else ()
-     set (OpenColorIO_FOUND 0)
+@@ -133,6 +133,11 @@ if (NOT OPENCOLORIO_INCLUDES)
+     get_target_property(OPENCOLORIO_INCLUDES OpenColorIO::OpenColorIO INTERFACE_INCLUDE_DIRECTORIES)
  endif ()
+ include_directories(BEFORE ${OPENCOLORIO_INCLUDES})
 +if(USE_OPENCOLORIO AND TARGET Imath::Imath AND OIIO_USING_IMATH STREQUAL "2")
 +    message(FATAL_ERROR
 +        "OpenColorIO and OpenEXR use incompatible versions of Imath. "
 +        "You cannot use openimageio[opencolorio] for this configuration.")
 +endif()
- 
+
  set(OPENCV_INCLUDES "")
  set(OPENCV_LIBRARIES opencv_core)

ports/openimageio/portfile.cmake

@@ -2,16 +2,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/OpenImageIO
     REF "v${VERSION}"
-    SHA512 1e24d7ffc3ad65a1fe1f53ae59006de912c0a8d85827d64671fab95350977e22e2d147cf26ffe362646c768747ec11e6f9aeae04ea66030f82ad597adf3135a5
+    SHA512 16d357fc6f75d39b1c9265edb45fe78dd2ea67a094885174a0a2bdd39ad19f8f69c16a7aaacac82a106a295e08e311d0315daafcb5641c24f644a52e66aaf667
     HEAD_REF master
     PATCHES
         fix-dependencies.patch
         fix-static-ffmpeg.patch
-        fix-openexr-dll.patch
         imath-version-guard.patch
         fix-openimageio_include_dir.patch
         fix-openexr-target-missing.patch
-        fix-dependency-libraw.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
@@ -70,6 +68,11 @@ vcpkg_cmake_configure(
     MAYBE_UNUSED_VARIABLES
         ENABLE_INSTALL_testtex
         ENABLE_IV
+        BUILD_MISSING_DEPS
+        BUILD_MISSING_FMT
+        BUILD_MISSING_ROBINMAP
+        INTERNALIZE_FMT
+        REQUIRED_DEPS
 )
 
 vcpkg_cmake_install()

ports/openimageio/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "openimageio",
-  "version": "2.5.16.0",
-  "port-version": 1,
+  "version": "3.0.0.3",
   "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
   "homepage": "https://github.com/OpenImageIO/oiio",
   "license": "BSD-3-Clause",
@@ -22,6 +21,7 @@
     "fmt",
     "libjpeg-turbo",
     "libpng",
+    "opencolorio",
     "openexr",
     "robin-map",
     {

ports/openvino/portfile.cmake

@@ -2,13 +2,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openvinotoolkit/openvino
     REF "${VERSION}"
-    SHA512 2bf3f00589d825b7f4ca40d43129d81af4ba62382f98b283a3a206e7661a7a69f178c6afafdde646db8d68cb7fc54ec5280d2f4ff4fbbffe24082cf6649dda29
+    SHA512 b003647de3de49e605943488ca9b2e5196b20d95b3152f0c2331c283d4cb253d1bbbb9cde04fa82733d3871d7128c6db6210957660bd89f26462798f782eca47
     HEAD_REF master
     PATCHES
         # vcpkg specific patch, because OV creates a file in source tree, which is prohibited
         001-disable-tools.patch
-        002-fix-onnx.patch
-        003-protobuf.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -37,8 +35,8 @@ if(ENABLE_INTEL_GPU)
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO oneapi-src/oneDNN
-        REF 4ccd07e3a10e1c08075cf824ac14708245fbc334
-        SHA512 c9a28f8427b5cd9c057a546b0b62303026f848045b26e0c9705e2f64d5bc84424ee15935d3bf5ee120d3c430a9dd41b7a6e26ef4fc0c53a2154ce83fcaee8b5a
+        REF 1722066ad4c0f15495f2d0fcbe9deb2bfd188c36
+        SHA512 0b0461bf42d67f0fe7c6c61289a28e42915f7ac2ea5cc569957b8bb601962bec6135e84a2716911394952dffe2bb557c2d59d42c7f80a8db3c3937ecc6bd8ce8
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
 
@@ -51,8 +49,8 @@ if(ENABLE_INTEL_CPU)
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO openvinotoolkit/oneDNN
-        REF c8ae8d96e963bd04214858319fa334968e5e73c9
-        SHA512 6877ca37c3678e738fa94767b70432d3fff73305342164d0902875d9bcce3fe12abaf52bfc6ae0ef288532324e746b01e604ab7e47f198e7776352b8f5b6f009
+        REF c60a9946aa2386890e5c9f5587974facb7624227
+        SHA512 cc91f5b2ece1c3f14af308e3da436447d07964fa5ffa848c571fe67197a367673bf7bf9cd979fab0c9b216f92c611bd8df7018ec8e080f10759582629c10cb9d
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
 
@@ -78,8 +76,8 @@ if(ENABLE_INTEL_CPU)
         vcpkg_from_github(
             OUT_SOURCE_PATH DEP_SOURCE_PATH
             REPO ARM-software/ComputeLibrary
-            REF v24.08
-            SHA512 82debaf8d8345b79b112afdabf6019c7ad8a9b30161d3061320a3da3040b2ad49153cc508caafe9fb1182c2669c958785acf2c361382080af273465d1727a71c
+            REF v24.09
+            SHA512 c755da7d576b9bc1f33c9505efe4ce9e50cb927978f929d61f31b213904dca45ddb78b7c0cf9b215e37d2028e0404f4e3435678c120bba16263b55fd701eb4f1
         )
         file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
     endif()
@@ -93,13 +91,13 @@ if(ENABLE_INTEL_NPU)
         REF v1.17.6
         SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e
     )
-    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero")
+    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/thirdparty/level_zero/level-zero")
 
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO intel/level-zero-npu-extensions
-        REF 16c85231a82ee1a0b06ed7ab7da3f411a0878ed7
-        SHA512 983468c7706dc44cfc248c491cf51d2f69181c16ae1e400ca689df39c51112e03227c2f311173b1665115cdd33fa7d51d48e75adaf8353564a980b37c16aaa66
+        REF a6487cc2c5da9aa13db9e005a320a1b6a0ee5919
+        SHA512 9c4f401f52fddaea30c71ac9a15a2cdeed9e688b0f0392c55c819351287e84772c7b6cbfc21446cde0b5a5be3319b6164d345a720d44d882c0eba0c7b477242c
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero-ext")
 endif()