[openimageio] Update to v2.4.5.0 (#27766)

* update openimageio * update version * update openimageio * update version * update openimageio * update version * update format * update version * update format * update version * update openimageio * update version * format * version * update openimageio * update version * Add vcpkg_minimum_required * update version Co-authored-by: Monica <v-liumonica@microsoft.com>
2022-12-14 11:15:34 +08:00 · 2022-12-14 11:15:34 +08:00 · 17851654c9
parent 16fc24d042
commit 17851654c9
8 changed files with 54 additions and 44 deletions
--- a/ports/openimageio/fix-dependencies.patch
+++ b/ports/openimageio/fix-dependencies.patch
@ -1,11 +1,11 @@
 diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
-index b690864..fb45388 100644
+index 0a6afeb..2a67ee3 100644
 --- a/src/cmake/Config.cmake.in
 +++ b/src/cmake/Config.cmake.in
-@@ -1,6 +1,21 @@
- @PACKAGE_INIT@
+@@ -2,6 +2,22 @@
 
 include(CMakeFindDependencyMacro)
+ 
 +find_dependency(libheif CONFIG)
 +find_dependency(PNG)
 +find_dependency(unofficial-libsquish CONFIG)
@ -21,14 +21,15 @@ index b690864..fb45388 100644
 +if(@USE_WEBP@)
 +    find_dependency(WebP CONFIG)
 +endif()
- 
+
 # add here all the find_dependency() whenever switching to config based dependencies
- if (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 3.0)
+ 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 --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 631035a..d416d78 100644
+index 3ca046b..dad053c 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
-@@ -158,14 +158,19 @@ endif ()
+@@ -174,14 +174,19 @@ endif ()
 checked_find_package (Freetype
                    DEFINITIONS  -DUSE_FREETYPE=1 )
 
@ -40,8 +41,8 @@ index 631035a..d416d78 100644
                       # PREFER_CONFIG
                       )
 +set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}")
- if (NOT OPENCOLORIO_FOUND)
-     set (OPENCOLORIO_FOUND 0)
+ if (NOT OpenColorIO_FOUND)
+     set (OpenColorIO_FOUND 0)
 endif ()
 -checked_find_package (OpenCV 3.0
 +set(OPENCV_INCLUDES "")
@ -50,19 +51,18 @@ index 631035a..d416d78 100644
                    DEFINITIONS  -DUSE_OPENCV=1)
 
 # Intel TBB
-@@ -175,7 +177,9 @@ checked_find_package (TBB 2017
+@@ -191,14 +196,18 @@ checked_find_package (TBB 2017
                       PREFER_CONFIG)
 
 checked_find_package (DCMTK VERSION_MIN 3.6.1)  # For DICOM images
 -checked_find_package (FFmpeg VERSION_MIN 3.0)
-+checked_find_package (FFMPEG)
+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
-@@ -200,7 +200,9 @@ if (ENABLE_FIELD3D)
- endif ()
+                       RECOMMEND_MIN_REASON "for stability and thread safety")
 
 # For HEIF/HEIC/AVIF formats
 -checked_find_package (Libheif VERSION_MIN 1.3
@ -72,7 +72,7 @@ index 631035a..d416d78 100644
                       RECOMMEND_MIN 1.7
                       RECOMMEND_MIN_REASON "for AVIF support")
 if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11)
-@@ -221,9 +222,8 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER
+@@ -219,9 +228,8 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER
     # set (LIBRAW_FOUND 0)
 endif ()
 
@ -84,7 +84,7 @@ index 631035a..d416d78 100644
 # 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.
 
-@@ -240,6 +243,8 @@ if (NOT Ptex_FOUND OR NOT Ptex_VERSION)
+@@ -238,6 +246,8 @@ if (NOT Ptex_FOUND OR NOT Ptex_VERSION)
     checked_find_package (Ptex)
 endif ()
 
@ -93,14 +93,3 @@ index 631035a..d416d78 100644
 checked_find_package (WebP)
 
 option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)
-@@ -307,7 +309,9 @@ endmacro()
- option (USE_EMBEDDED_LIBSQUISH
-         "Force use of embedded Libsquish, even if external is found" OFF)
- if (NOT USE_EMBEDDED_LIBSQUISH)
-    checked_find_package (Libsquish)
-+    set(LIBSQUISH_INCLUDES "")
-+    set(LIBSQUISH_LIBRARIES unofficial::libsquish::squish)
-+    checked_find_package (Libsquish NAMES unofficial-libsquish)
- endif ()
- 
- 
--- a/ports/openimageio/fix-openexr-dll.patch
+++ b/ports/openimageio/fix-openexr-dll.patch
@ -1,13 +1,13 @@
 diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index b50a923..c3250b9 100644
+index dad053c..4d7e11c 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
-@@ -108,7 +108,7 @@ if (CMAKE_COMPILER_IS_CLANG AND OPENEXR_VERSION VERSION_LESS 2.3)
-     # clang C++ >= 11 doesn't like 'register' keyword in old exr headers
-     add_compile_options (-Wno-deprecated-register)
- endif ()
+@@ -103,7 +103,7 @@ checked_find_package (OpenEXR REQUIRED
+ # building against Imath/OpenEXR 3.x when there is still a system-level
+ # install version of 2.x.
+ include_directories(BEFORE ${IMATH_INCLUDES} ${OPENEXR_INCLUDES})
 -if (MSVC AND NOT LINKSTATIC)
 +if (WIN32 AND BUILD_SHARED_LIBS)
     add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?
 endif ()
- 
+ if (OPENEXR_VERSION VERSION_GREATER_EQUAL 3.0)
--- a/ports/openimageio/fix-openimageio_include_dir.patch
+++ b/ports/openimageio/fix-openimageio_include_dir.patch
@ -0,0 +1,13 @@
+diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
+index 2a67ee3..11a5d67 100644
+--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
+@@ -53,7 +53,7 @@ endif ()
+ 
+ # Compute the installation prefix relative to this file. Note that cmake files are installed
+ # to ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} (see OIIO_CONFIG_INSTALL_DIR)
+-get_filename_component(_CURR_INSTALL_LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
+get_filename_component(_CURR_INSTALL_LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../" ABSOLUTE)
+ get_filename_component(_ABS_CMAKE_INSTALL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@" ABSOLUTE)
+ get_filename_component(_ABS_CMAKE_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@" ABSOLUTE)
+ file(RELATIVE_PATH _INCLUDEDIR_RELATIVE_TO_LIBDIR
--- a/ports/openimageio/imath-version-guard.patch
+++ b/ports/openimageio/imath-version-guard.patch
@ -1,10 +1,10 @@
 diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index b50a923..cec6e43 100644
+index 4d7e11c..0f15ba9 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
-@@ -168,6 +168,11 @@ set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}")
- if (NOT OPENCOLORIO_FOUND)
-     set (OPENCOLORIO_FOUND 0)
+@@ -184,6 +184,11 @@ set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}")
+ if (NOT OpenColorIO_FOUND)
+     set (OpenColorIO_FOUND 0)
 endif ()
 +if(USE_OPENCOLORIO AND TARGET Imath::Imath AND OIIO_USING_IMATH STREQUAL "2")
 +    message(FATAL_ERROR
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@ -1,14 +1,17 @@
+vcpkg_minimum_required(VERSION 2022-10-12)
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO OpenImageIO/oiio
-    REF v2.3.17.0
-    SHA512 25cb1a671e7cd5154e363eef178ab091fd7d55868746a4394340567a794f6c6f0295e58721a5b4ee8bf66b4cc0e6a01c3e82f9cc9de9953ae349d45738a04700
+    REF v${VERSION}
+    SHA512 c7a4283b78197c262d8da31460ce8b07b44546f822142e32e6c1ea22376e1c4b9cfe9c39cc0994987c6c4f653c1f2764057944da97a3a090bf1bcb74a2a0b2c2
    HEAD_REF master
    PATCHES
        fix-dependencies.patch
        fix-static-ffmpeg.patch
        fix-openexr-dll.patch
        imath-version-guard.patch
+        fix-openimageio_include_dir.patch
 )

 file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
@ -59,13 +62,14 @@ vcpkg_cmake_configure(
        -DVERBOSE=ON
        -DBUILD_DOCS=OFF
        -DINSTALL_DOCS=OFF
+        -DENABLE_INSTALL_testtex=OFF
        "-DREQUIRED_DEPS=fmt;JPEG;Libheif;Libsquish;PNG;Robinmap"
+    MAYBE_UNUSED_VARIABLES
+        ENABLE_INSTALL_testtex
 )

 vcpkg_cmake_install()

-vcpkg_copy_pdbs()
-
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenImageIO)

 if("tools" IN_LIST FEATURES)
--- a/ports/openimageio/vcpkg.json
+++ b/ports/openimageio/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "openimageio",
-  "version": "2.3.17.0",
-  "port-version": 4,
+  "version": "2.4.5.0",
  "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",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -5521,8 +5521,8 @@
      "port-version": 2
    },
    "openimageio": {
-      "baseline": "2.3.17.0",
-      "port-version": 4
+      "baseline": "2.4.5.0",
+      "port-version": 0
    },
    "openjpeg": {
      "baseline": "2.5.0",
--- a/versions/o-/openimageio.json
+++ b/versions/o-/openimageio.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "74ab484049a78fea2929dc9afc4ae5a6b9b2dd45",
+      "version": "2.4.5.0",
+      "port-version": 0
+    },
    {
      "git-tree": "4317b62fd8bf1e11d9da42132ecfdf1ccb03a8af",
      "version": "2.3.17.0",