[yaml-cpp] update to 0.7.0 (#19272)

* [yaml-cpp] update to 0.7.0

* [opencolorio] update to 2.0.1

* [openimageio] Update to 2.2.17.0

* [pystring] move header to pystring subfolder

* add version files

33 files changed, 137 insertions, 873 deletions

diff --git a/ports/opencolorio-tools/0001-lcms-dependency-search.patch b/ports/opencolorio-tools/0001-lcms-dependency-search.patch
deleted file mode 100644
index 353a80615..000000000
--- a/ports/opencolorio-tools/0001-lcms-dependency-search.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/apps/ociobakelut/CMakeLists.txt b/src/apps/ociobakelut/CMakeLists.txt
-index d31b4e3..2b57d1c 100644
---- a/src/apps/ociobakelut/CMakeLists.txt
-+++ b/src/apps/ociobakelut/CMakeLists.txt
-@@ -5,6 +5,35 @@ if(LCMS_FOUND AND (LCMS_VERSION VERSION_EQUAL 2.1 OR LCMS_VERSION VERSION_GREATE
-     FIND_PACKAGE_MESSAGE(LCMS "Found lcms: ${LCMS_LIBRARIES}"
-         "${LCMS_INCLUDE_DIR}")
- else()
-+    find_path(LCMS_INCLUDE_DIRS
-+        NAMES
-+            lcms2.h
-+            lcms2_plugin.h
-+        HINTS
-+            ${LCMS_INCLUDEDIR}
-+            ${LCMS_INCLUDE_DIRS}
-+    )
-+
-+    find_library(LCMS_LIBRARIES
-+        LIBRARY_NAMES
-+            lcms
-+            lcms2
-+        HINTS
-+            ${LCMS_LIBRARY_DIRS}
-+    )
-+
-+    get_filename_component(LCMS_LIBRARY_DIRS ${LCMS_LIBRARIES} DIRECTORY)
-+
-+    find_package_handle_standard_args(LCMS
-+        REQUIRED_VARS
-+            LCMS_LIBRARIES
-+            LCMS_LIBRARY_DIRS
-+            LCMS_INCLUDE_DIRS
-+    )
-+    mark_as_advanced(LCMS_LIBRARIES LCMS_INCLUDE_DIRS LCMS_LIBRARY_DIRS LCMS_FOUND)
-+endif()
-+
-+if(NOT LCMS_FOUND)
-     find_package(Git)
-     if(NOT GIT_EXECUTABLE)
-         message("Git not found, could not build external LCMS as we cannot apply patch")
diff --git a/ports/opencolorio-tools/0002-msvc-cpluscplus.patch b/ports/opencolorio-tools/0002-msvc-cpluscplus.patch
deleted file mode 100644
index c4349ea12..000000000
--- a/ports/opencolorio-tools/0002-msvc-cpluscplus.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt
-index 82b0792..7d16bdf 100644
---- a/src/apps/ocioconvert/CMakeLists.txt
-+++ b/src/apps/ocioconvert/CMakeLists.txt
-@@ -6,16 +6,23 @@ if (OIIO_FOUND)
-         ${OIIO_INCLUDES}
-         ${ILMBASE_INCLUDES}
-     )
--    
-+
-     file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
--    
-+
-     add_executable(ocioconvert ${share_src_files} main.cpp)
--    
-+
-+    target_compile_options(ocioconvert
-+        PRIVATE
-+            $<$<CXX_COMPILER_ID:MSVC>:
-+                /Zc:__cplusplus # Enable updated __cplusplus macro
-+            >
-+    )
-+
-     set_target_properties(ocioconvert PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
- 
-     target_link_libraries(ocioconvert ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS})
--    
-+
-     target_link_OCIO(ocioconvert)
--    
-+
-     install(TARGETS ocioconvert EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
- endif()
-diff --git a/src/apps/ociodisplay/CMakeLists.txt b/src/apps/ociodisplay/CMakeLists.txt
-index d11b9e1..0f27d86 100644
---- a/src/apps/ociodisplay/CMakeLists.txt
-+++ b/src/apps/ociodisplay/CMakeLists.txt
-@@ -11,6 +11,13 @@ if (OIIO_FOUND)
- 
-     add_executable(ociodisplay main.cpp)
- 
-+    target_compile_options(ociodisplay
-+        PRIVATE
-+            $<$<CXX_COMPILER_ID:MSVC>:
-+                /Zc:__cplusplus # Enable updated __cplusplus macro
-+            >
-+    )
-+
-     # set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} )
-     set_target_properties(ociodisplay PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
-     target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES})
-diff --git a/src/apps/ociolutimage/CMakeLists.txt b/src/apps/ociolutimage/CMakeLists.txt
-index 528333f..821155d 100644
---- a/src/apps/ociolutimage/CMakeLists.txt
-+++ b/src/apps/ociolutimage/CMakeLists.txt
-@@ -6,16 +6,23 @@ if (OIIO_FOUND)
-         ${OIIO_INCLUDES}
-         ${ILMBASE_INCLUDES}
-     )
--    
-+
-     file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
--    
-+
-     add_executable(ociolutimage ${share_src_files} main.cpp)
--    
-+
-+    target_compile_options(ociolutimage
-+        PRIVATE
-+            $<$<CXX_COMPILER_ID:MSVC>:
-+                /Zc:__cplusplus # Enable updated __cplusplus macro
-+            >
-+    )
-+
-     set_target_properties(ociolutimage PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
- 
-     target_link_libraries(ociolutimage ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS})
--    
-+
-     target_link_OCIO(ociolutimage)
--    
-+
-     install(TARGETS ociolutimage EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
- endif()
diff --git a/ports/opencolorio-tools/0003-osx-self-assign-field.patch b/ports/opencolorio-tools/0003-osx-self-assign-field.patch
deleted file mode 100644
index 18947bbbd..000000000
--- a/ports/opencolorio-tools/0003-osx-self-assign-field.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/Config.cpp b/src/core/Config.cpp
-index f5cb379..5ea178e 100644
---- a/src/core/Config.cpp
-+++ b/src/core/Config.cpp
-@@ -330,7 +330,7 @@ OCIO_NAMESPACE_ENTER
-                 sanitytext_ = rhs.sanitytext_;
-                 
-                 cacheids_ = rhs.cacheids_;
--                cacheidnocontext_ = cacheidnocontext_;
-+                cacheidnocontext_ = rhs.cacheidnocontext_;
-             }
-             return *this;
-         }
diff --git a/ports/opencolorio-tools/0004-yaml-dependency-search.patch b/ports/opencolorio-tools/0004-yaml-dependency-search.patch
deleted file mode 100644
index 30c01d41a..000000000
--- a/ports/opencolorio-tools/0004-yaml-dependency-search.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4f3119..5cfa601 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,34 +244,49 @@ else(USE_EXTERNAL_TINYXML)
-     endif()
-     set_target_properties(TINYXML_LIB PROPERTIES FOLDER External)
- endif(USE_EXTERNAL_TINYXML)
--    
-+
- ###############################################################################
- ### YAML ###
- 
- if(USE_EXTERNAL_YAML)
--    # Set minimum yaml version for non-patched sources.
--    set(YAML_VERSION_MIN "0.3.0")
--    include(FindPkgConfig)
--    pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
--    find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
--        HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
--    find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
--        HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
--    set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
--    set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
--    set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
--
--    if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
--        message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
--    endif()
-+    find_package(yaml-cpp 0.3.0)
-+    if(yaml-cpp_FOUND)
-+        include(FindPackageMessage)
-+
-+        set(YAML_CPP_FOUND        ${yaml-cpp_FOUND})
-+        set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
-+        set(YAML_CPP_VERSION      ${yaml-cpp_VERSION})
-+        set(YAML_CPP_LIBRARIES    yaml-cpp)
-+
-+        find_package_message(yaml-cpp
-+            "Found yaml ${YAML_CPP_VERSION}: ${YAML_CPP_INCLUDE_DIRS}"
-+            "${YAML_CPP_INCLUDE_DIRS}:${YAML_CPP_LIBRARIES}"
-+        )
-+    else()
-+        # Set minimum yaml version for non-patched sources.
-+        set(YAML_VERSION_MIN "0.3.0")
-+        include(FindPkgConfig)
-+        pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
-+        find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
-+            HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
-+        find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
-+            HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
-+        set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
-+        set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
-+        set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
-+
-+        if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
-+            message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
-+        endif()
- 
--    find_package_handle_standard_args(yaml-cpp
--                                      REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
--    set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
--    mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+        find_package_handle_standard_args(yaml-cpp
-+                                          REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
-+        set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
-+        mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+    endif()
- 
-     if(YAML_CPP_FOUND)
--        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
-+        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0" AND YAML_CPP_VERSION VERSION_LESS "0.6.0")
-             # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
-             # Don't bother doing this step if we are already including the boost headers for shared_ptr
-             if(NOT OCIO_USE_BOOST_PTR)
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 4b931ef..12a1dbf 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -77,7 +77,14 @@ endif()
- if(OCIO_BUILD_STATIC)
-     list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp)
-     add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files})
--    add_dependencies(OpenColorIO_STATIC TINYXML_LIB YAML_CPP_LIB)
-+    add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
-+
-+    if(USE_EXTERNAL_YAML)
-+        target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES})
-+    else(USE_EXTERNAL_YAML)
-+        add_dependencies(OpenColorIO_STATIC YAML_CPP_LIB)
-+    endif()
-+
-     if(EXTERNAL_LIBRARIES)
-         target_link_libraries(OpenColorIO_STATIC ${EXTERNAL_LIBRARIES})
-     endif()
-diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp
-index aeee4d1..f1c662d 100644
---- a/src/core/OCIOYaml.cpp
-+++ b/src/core/OCIOYaml.cpp
-@@ -69,7 +69,7 @@ namespace YAML {
- 
- #ifdef WIN32
- #pragma warning( push )
--#pragma warning( disable: 4146 )
-+#pragma warning( disable: 4146 4251 )
- #endif
- 
- #include <yaml-cpp/yaml.h>
diff --git a/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch b/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch
deleted file mode 100644
index 319f88b73..000000000
--- a/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 45e55f9..f4b687d 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -77,7 +77,12 @@ endif()
- if(OCIO_BUILD_STATIC)
-     list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp)
-     add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files})
--    add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
-+
-+    if(USE_EXTERNAL_TINYXML)
-+        target_link_libraries(OpenColorIO_STATIC ${TINYXML_LIBRARIES})
-+    else(USE_EXTERNAL_TINYXML)
-+        add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
-+    endif(USE_EXTERNAL_TINYXML)
- 
-     if(USE_EXTERNAL_YAML)
-         target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES})
diff --git a/ports/opencolorio-tools/0006-oiio-dependency-search.patch b/ports/opencolorio-tools/0006-oiio-dependency-search.patch
deleted file mode 100644
index 09624e55c..000000000
--- a/ports/opencolorio-tools/0006-oiio-dependency-search.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5cfa601..f79807c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -475,7 +475,8 @@ endif()
- if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
- 
-     # Try to find OpenImageIO (OIIO) and OpenGL stuff
--    OCIOFindOpenImageIO()
-+    find_package(OpenImageIO CONFIG REQUIRED)
-+    set(OIIO_LIBRARIES OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util)
-     
-     if(OIIO_FOUND)
-         add_subdirectory(src/apps/ocioconvert)
diff --git a/ports/opencolorio-tools/CONTROL b/ports/opencolorio-tools/CONTROL
deleted file mode 100644
index 679933a25..000000000
--- a/ports/opencolorio-tools/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: opencolorio-tools
-Version: 1.1.1
-Homepage: https://opencolorio.org/
-Description: OpenColorIO applications, same source with port OpenColorIO.
-Build-Depends: openimageio[opencolorio]
diff --git a/ports/opencolorio-tools/portfile.cmake b/ports/opencolorio-tools/portfile.cmake
deleted file mode 100644
index f08786a32..000000000
--- a/ports/opencolorio-tools/portfile.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-# Note: Should be maintained simultaneously with opencolorio!
-SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(_BUILD_SHARED OFF)
-    set(_BUILD_STATIC ON)
-else()
-    set(_BUILD_SHARED ON)
-    set(_BUILD_STATIC OFF)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO imageworks/OpenColorIO
-    REF v1.1.1
-    SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-    HEAD_REF master
-    PATCHES
-        0001-lcms-dependency-search.patch
-        0002-msvc-cpluscplus.patch
-        0003-osx-self-assign-field.patch
-        0004-yaml-dependency-search.patch
-        0005-tinyxml-dependency-search.patch
-        0006-oiio-dependency-search.patch
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path(PREPEND ${PYTHON3_PATH})
-
-# TODO(theblackunknown) build additional targets based on feature
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DOCIO_BUILD_APPS=ON
-        -DOCIO_BUILD_SHARED:BOOL=${_BUILD_SHARED}
-        -DOCIO_BUILD_STATIC:BOOL=${_BUILD_STATIC}
-        -DOCIO_BUILD_TRUELIGHT:BOOL=OFF
-        -DOCIO_BUILD_NUKE:BOOL=OFF
-        -DOCIO_BUILD_DOCS:BOOL=OFF
-        -DOCIO_BUILD_TESTS:BOOL=OFF
-        -DOCIO_BUILD_PYGLUE:BOOL=OFF
-        -DOCIO_BUILD_JNIGLUE:BOOL=OFF
-        -DOCIO_STATIC_JNIGLUE:BOOL=OFF
-        -DUSE_EXTERNAL_TINYXML:BOOL=ON
-        -DUSE_EXTERNAL_YAML:BOOL=ON
-)
-
-vcpkg_install_cmake()
-
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools(TOOL_NAMES ociobakelut ociocheck)
-
-# Clean redundant files
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug
-    ${CURRENT_PACKAGES_DIR}/include
-    ${CURRENT_PACKAGES_DIR}/bin
-    ${CURRENT_PACKAGES_DIR}/lib
-    ${CURRENT_PACKAGES_DIR}/cmake
-    ${CURRENT_PACKAGES_DIR}/share)
-
-file(REMOVE ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake)
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/opencolorio/0001-lcms-dependency-search.patch b/ports/opencolorio/0001-lcms-dependency-search.patch
deleted file mode 100644
index 353a80615..000000000
--- a/ports/opencolorio/0001-lcms-dependency-search.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/apps/ociobakelut/CMakeLists.txt b/src/apps/ociobakelut/CMakeLists.txt
-index d31b4e3..2b57d1c 100644
---- a/src/apps/ociobakelut/CMakeLists.txt
-+++ b/src/apps/ociobakelut/CMakeLists.txt
-@@ -5,6 +5,35 @@ if(LCMS_FOUND AND (LCMS_VERSION VERSION_EQUAL 2.1 OR LCMS_VERSION VERSION_GREATE
-     FIND_PACKAGE_MESSAGE(LCMS "Found lcms: ${LCMS_LIBRARIES}"
-         "${LCMS_INCLUDE_DIR}")
- else()
-+    find_path(LCMS_INCLUDE_DIRS
-+        NAMES
-+            lcms2.h
-+            lcms2_plugin.h
-+        HINTS
-+            ${LCMS_INCLUDEDIR}
-+            ${LCMS_INCLUDE_DIRS}
-+    )
-+
-+    find_library(LCMS_LIBRARIES
-+        LIBRARY_NAMES
-+            lcms
-+            lcms2
-+        HINTS
-+            ${LCMS_LIBRARY_DIRS}
-+    )
-+
-+    get_filename_component(LCMS_LIBRARY_DIRS ${LCMS_LIBRARIES} DIRECTORY)
-+
-+    find_package_handle_standard_args(LCMS
-+        REQUIRED_VARS
-+            LCMS_LIBRARIES
-+            LCMS_LIBRARY_DIRS
-+            LCMS_INCLUDE_DIRS
-+    )
-+    mark_as_advanced(LCMS_LIBRARIES LCMS_INCLUDE_DIRS LCMS_LIBRARY_DIRS LCMS_FOUND)
-+endif()
-+
-+if(NOT LCMS_FOUND)
-     find_package(Git)
-     if(NOT GIT_EXECUTABLE)
-         message("Git not found, could not build external LCMS as we cannot apply patch")
diff --git a/ports/opencolorio/0002-msvc-cpluscplus.patch b/ports/opencolorio/0002-msvc-cpluscplus.patch
deleted file mode 100644
index c4349ea12..000000000
--- a/ports/opencolorio/0002-msvc-cpluscplus.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt
-index 82b0792..7d16bdf 100644
---- a/src/apps/ocioconvert/CMakeLists.txt
-+++ b/src/apps/ocioconvert/CMakeLists.txt
-@@ -6,16 +6,23 @@ if (OIIO_FOUND)
-         ${OIIO_INCLUDES}
-         ${ILMBASE_INCLUDES}
-     )
--    
-+
-     file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
--    
-+
-     add_executable(ocioconvert ${share_src_files} main.cpp)
--    
-+
-+    target_compile_options(ocioconvert
-+        PRIVATE
-+            $<$<CXX_COMPILER_ID:MSVC>:
-+                /Zc:__cplusplus # Enable updated __cplusplus macro
-+            >
-+    )
-+
-     set_target_properties(ocioconvert PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
- 
-     target_link_libraries(ocioconvert ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS})
--    
-+
-     target_link_OCIO(ocioconvert)
--    
-+
-     install(TARGETS ocioconvert EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
- endif()
-diff --git a/src/apps/ociodisplay/CMakeLists.txt b/src/apps/ociodisplay/CMakeLists.txt
-index d11b9e1..0f27d86 100644
---- a/src/apps/ociodisplay/CMakeLists.txt
-+++ b/src/apps/ociodisplay/CMakeLists.txt
-@@ -11,6 +11,13 @@ if (OIIO_FOUND)
- 
-     add_executable(ociodisplay main.cpp)
- 
-+    target_compile_options(ociodisplay
-+        PRIVATE
-+            $<$<CXX_COMPILER_ID:MSVC>:
-+                /Zc:__cplusplus # Enable updated __cplusplus macro
-+            >
-+    )
-+
-     # set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} )
-     set_target_properties(ociodisplay PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
-     target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES})
-diff --git a/src/apps/ociolutimage/CMakeLists.txt b/src/apps/ociolutimage/CMakeLists.txt
-index 528333f..821155d 100644
---- a/src/apps/ociolutimage/CMakeLists.txt
-+++ b/src/apps/ociolutimage/CMakeLists.txt
-@@ -6,16 +6,23 @@ if (OIIO_FOUND)
-         ${OIIO_INCLUDES}
-         ${ILMBASE_INCLUDES}
-     )
--    
-+
-     file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
--    
-+
-     add_executable(ociolutimage ${share_src_files} main.cpp)
--    
-+
-+    target_compile_options(ociolutimage
-+        PRIVATE
-+            $<$<CXX_COMPILER_ID:MSVC>:
-+                /Zc:__cplusplus # Enable updated __cplusplus macro
-+            >
-+    )
-+
-     set_target_properties(ociolutimage PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
- 
-     target_link_libraries(ociolutimage ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS})
--    
-+
-     target_link_OCIO(ociolutimage)
--    
-+
-     install(TARGETS ociolutimage EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
- endif()
diff --git a/ports/opencolorio/0003-osx-self-assign-field.patch b/ports/opencolorio/0003-osx-self-assign-field.patch
deleted file mode 100644
index 18947bbbd..000000000
--- a/ports/opencolorio/0003-osx-self-assign-field.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/Config.cpp b/src/core/Config.cpp
-index f5cb379..5ea178e 100644
---- a/src/core/Config.cpp
-+++ b/src/core/Config.cpp
-@@ -330,7 +330,7 @@ OCIO_NAMESPACE_ENTER
-                 sanitytext_ = rhs.sanitytext_;
-                 
-                 cacheids_ = rhs.cacheids_;
--                cacheidnocontext_ = cacheidnocontext_;
-+                cacheidnocontext_ = rhs.cacheidnocontext_;
-             }
-             return *this;
-         }
diff --git a/ports/opencolorio/0004-yaml-dependency-search.patch b/ports/opencolorio/0004-yaml-dependency-search.patch
deleted file mode 100644
index 30c01d41a..000000000
--- a/ports/opencolorio/0004-yaml-dependency-search.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4f3119..5cfa601 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,34 +244,49 @@ else(USE_EXTERNAL_TINYXML)
-     endif()
-     set_target_properties(TINYXML_LIB PROPERTIES FOLDER External)
- endif(USE_EXTERNAL_TINYXML)
--    
-+
- ###############################################################################
- ### YAML ###
- 
- if(USE_EXTERNAL_YAML)
--    # Set minimum yaml version for non-patched sources.
--    set(YAML_VERSION_MIN "0.3.0")
--    include(FindPkgConfig)
--    pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
--    find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
--        HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
--    find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
--        HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
--    set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
--    set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
--    set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
--
--    if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
--        message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
--    endif()
-+    find_package(yaml-cpp 0.3.0)
-+    if(yaml-cpp_FOUND)
-+        include(FindPackageMessage)
-+
-+        set(YAML_CPP_FOUND        ${yaml-cpp_FOUND})
-+        set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
-+        set(YAML_CPP_VERSION      ${yaml-cpp_VERSION})
-+        set(YAML_CPP_LIBRARIES    yaml-cpp)
-+
-+        find_package_message(yaml-cpp
-+            "Found yaml ${YAML_CPP_VERSION}: ${YAML_CPP_INCLUDE_DIRS}"
-+            "${YAML_CPP_INCLUDE_DIRS}:${YAML_CPP_LIBRARIES}"
-+        )
-+    else()
-+        # Set minimum yaml version for non-patched sources.
-+        set(YAML_VERSION_MIN "0.3.0")
-+        include(FindPkgConfig)
-+        pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
-+        find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
-+            HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
-+        find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
-+            HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
-+        set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
-+        set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
-+        set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
-+
-+        if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
-+            message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
-+        endif()
- 
--    find_package_handle_standard_args(yaml-cpp
--                                      REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
--    set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
--    mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+        find_package_handle_standard_args(yaml-cpp
-+                                          REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
-+        set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
-+        mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+    endif()
- 
-     if(YAML_CPP_FOUND)
--        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
-+        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0" AND YAML_CPP_VERSION VERSION_LESS "0.6.0")
-             # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
-             # Don't bother doing this step if we are already including the boost headers for shared_ptr
-             if(NOT OCIO_USE_BOOST_PTR)
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 4b931ef..12a1dbf 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -77,7 +77,14 @@ endif()
- if(OCIO_BUILD_STATIC)
-     list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp)
-     add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files})
--    add_dependencies(OpenColorIO_STATIC TINYXML_LIB YAML_CPP_LIB)
-+    add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
-+
-+    if(USE_EXTERNAL_YAML)
-+        target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES})
-+    else(USE_EXTERNAL_YAML)
-+        add_dependencies(OpenColorIO_STATIC YAML_CPP_LIB)
-+    endif()
-+
-     if(EXTERNAL_LIBRARIES)
-         target_link_libraries(OpenColorIO_STATIC ${EXTERNAL_LIBRARIES})
-     endif()
-diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp
-index aeee4d1..f1c662d 100644
---- a/src/core/OCIOYaml.cpp
-+++ b/src/core/OCIOYaml.cpp
-@@ -69,7 +69,7 @@ namespace YAML {
- 
- #ifdef WIN32
- #pragma warning( push )
--#pragma warning( disable: 4146 )
-+#pragma warning( disable: 4146 4251 )
- #endif
- 
- #include <yaml-cpp/yaml.h>
diff --git a/ports/opencolorio/0005-tinyxml-dependency-search.patch b/ports/opencolorio/0005-tinyxml-dependency-search.patch
deleted file mode 100644
index 319f88b73..000000000
--- a/ports/opencolorio/0005-tinyxml-dependency-search.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 45e55f9..f4b687d 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -77,7 +77,12 @@ endif()
- if(OCIO_BUILD_STATIC)
-     list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp)
-     add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files})
--    add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
-+
-+    if(USE_EXTERNAL_TINYXML)
-+        target_link_libraries(OpenColorIO_STATIC ${TINYXML_LIBRARIES})
-+    else(USE_EXTERNAL_TINYXML)
-+        add_dependencies(OpenColorIO_STATIC TINYXML_LIB)
-+    endif(USE_EXTERNAL_TINYXML)
- 
-     if(USE_EXTERNAL_YAML)
-         target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES})
diff --git a/ports/opencolorio/0006-oiio-dependency-search.patch b/ports/opencolorio/0006-oiio-dependency-search.patch
deleted file mode 100644
index 09624e55c..000000000
--- a/ports/opencolorio/0006-oiio-dependency-search.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5cfa601..f79807c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -475,7 +475,8 @@ endif()
- if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
- 
-     # Try to find OpenImageIO (OIIO) and OpenGL stuff
--    OCIOFindOpenImageIO()
-+    find_package(OpenImageIO CONFIG REQUIRED)
-+    set(OIIO_LIBRARIES OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util)
-     
-     if(OIIO_FOUND)
-         add_subdirectory(src/apps/ocioconvert)
diff --git a/ports/opencolorio/fix-pystring-name.patch b/ports/opencolorio/fix-pystring-name.patch
new file mode 100644
index 000000000..50a4ef5b7
--- /dev/null
+++ b/ports/opencolorio/fix-pystring-name.patch
@@ -0,0 +1,13 @@
+diff --git a/share/cmake/modules/Findpystring.cmake b/share/cmake/modules/Findpystring.cmake
+index a3e396de..4022ddf5 100644
+--- a/share/cmake/modules/Findpystring.cmake
++++ b/share/cmake/modules/Findpystring.cmake
+@@ -50,7 +50,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
+     # Find library
+     find_library(pystring_LIBRARY
+         NAMES
+-            ${_pystring_STATIC} pystring
++            ${_pystring_STATIC} pystring libpystring
+         HINTS
+             ${_pystring_SEARCH_DIRS}
+         PATH_SUFFIXES
diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake
index dcbac39b2..27f21fda4 100644
--- a/ports/opencolorio/portfile.cmake
+++ b/ports/opencolorio/portfile.cmake
@@ -1,73 +1,48 @@
-# Note: Should be maintained simultaneously with opencolorio-tools!
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(_BUILD_SHARED OFF)
-    set(_BUILD_STATIC ON)
-else()
-    set(_BUILD_SHARED ON)
-    set(_BUILD_STATIC OFF)
-endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/OpenColorIO
-    REF ebdec4111f449bea995d01ecd9693b7e704498fe # v1.1.1
-    SHA512 b93796541f8b086f137eaebeef102e29a4aabac6dba5b1696c9ab23d62af39b233ca52ce97b04ea432d85ae0a1fe186939c52aab0cd2c4cd5d2775ac5c021eef
+    REF 0645fdd6b5279ab94851af0c56919ff9800e0c38 # v2.0.1
+    SHA512 51568e21eaf863747f67fbcffa7f42ba32f5892e8295dac6c9deb0f6205f57c231ea34ce028d84915e4be2f2773e362b74eaf057c2e4cf3ad4b60bf13a0b73db
     HEAD_REF master
     PATCHES
-        0001-lcms-dependency-search.patch
-        0002-msvc-cpluscplus.patch
-        0003-osx-self-assign-field.patch
-        0004-yaml-dependency-search.patch
-        0005-tinyxml-dependency-search.patch
+        fix-pystring-name.patch
+        use-find-openxer.patch
 )
 
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path(PREPEND ${PYTHON3_PATH})
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools OCIO_BUILD_APPS
+)
 
-# TODO(theblackunknown) build additional targets based on feature
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DOCIO_BUILD_APPS=OFF
-        -DOCIO_BUILD_SHARED:BOOL=${_BUILD_SHARED}
-        -DOCIO_BUILD_STATIC:BOOL=${_BUILD_STATIC}
-        -DOCIO_BUILD_TRUELIGHT:BOOL=OFF
         -DOCIO_BUILD_NUKE:BOOL=OFF
         -DOCIO_BUILD_DOCS:BOOL=OFF
         -DOCIO_BUILD_TESTS:BOOL=OFF
-        -DOCIO_BUILD_PYGLUE:BOOL=OFF
-        -DOCIO_BUILD_JNIGLUE:BOOL=OFF
-        -DOCIO_STATIC_JNIGLUE:BOOL=OFF
-        -DUSE_EXTERNAL_TINYXML:BOOL=ON
-        -DUSE_EXTERNAL_YAML:BOOL=ON
+        -DOCIO_BUILD_GPU_TESTS:BOOL=OFF
+        -DOCIO_BUILD_PYTHON:BOOL=OFF
+        -DOCIO_INSTALL_EXT_PACKAGES=NONE
+        -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On
+        ${FEATURE_OPTIONS}
 )
 
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake")
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-file(READ "${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake" _contents)
-string(REPLACE
-    [=[get_filename_component(OpenColorIO_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)]=]
-    [=[get_filename_component(OpenColorIO_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(OpenColorIO_DIR "${OpenColorIO_DIR}" PATH)
-get_filename_component(OpenColorIO_DIR "${OpenColorIO_DIR}" PATH)]=]
-    _contents
-    "${_contents}")
-string(REPLACE "/cmake/OpenColorIO.cmake" "/share/opencolorio/OpenColorIO.cmake" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencolorio/OpenColorIOConfig.cmake" "${_contents}")
-
 # Clean redundant files
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
     ${CURRENT_PACKAGES_DIR}/debug/share
-    ${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake
-    ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake
 )
+if (OCIO_BUILD_APPS)
+    vcpkg_copy_tools(
+        TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut
+        AUTO_CLEAN
+    )
+endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/ports/opencolorio/use-find-openxer.patch b/ports/opencolorio/use-find-openxer.patch
new file mode 100644
index 000000000..24f05e5a3
--- /dev/null
+++ b/ports/opencolorio/use-find-openxer.patch
@@ -0,0 +1,13 @@
+diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
+index 8d9bfdd7..cce2fde2 100644
+--- a/share/cmake/modules/FindExtPackages.cmake
++++ b/share/cmake/modules/FindExtPackages.cmake
+@@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED)
+ 
+ # Half (OpenEXR/IlmBase)
+ # https://github.com/openexr/openexr
+-find_package(Half 2.4.0 REQUIRED)
++find_package(OpenEXR 2.4.0 CONFIG REQUIRED)
+ 
+ # pystring
+ # https://github.com/imageworks/pystring
diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json
index e942e139e..13d79cd86 100644
--- a/ports/opencolorio/vcpkg.json
+++ b/ports/opencolorio/vcpkg.json
@@ -1,29 +1,25 @@
 {
   "name": "opencolorio",
-  "version-semver": "1.1.1",
-  "port-version": 5,
+  "version-semver": "2.0.1",
   "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.",
   "homepage": "https://opencolorio.org/",
   "dependencies": [
+    "expat",
+    "openexr",
+    "pystring",
     {
-      "name": "freeglut",
-      "default-features": false
+      "name": "vcpkg-cmake",
+      "host": true
     },
-    {
-      "name": "glew",
-      "default-features": false
-    },
-    {
-      "name": "lcms",
-      "default-features": false
-    },
-    {
-      "name": "tinyxml",
-      "default-features": false
-    },
-    {
-      "name": "yaml-cpp",
-      "default-features": false
+    "yaml-cpp"
+  ],
+  "features": {
+    "tools": {
+      "description": "Installs tools",
+      "dependencies": [
+        "glew",
+        "lcms"
+      ]
     }
-  ]
+  }
 }
diff --git a/ports/openimageio/fix-dependency.patch b/ports/openimageio/fix-dependency.patch
deleted file mode 100644
index d594570f2..000000000
--- a/ports/openimageio/fix-dependency.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake

-index e7261af3..195f46cb 100644

---- a/src/cmake/externalpackages.cmake

-+++ b/src/cmake/externalpackages.cmake

-@@ -102,7 +102,6 @@ if (MSVC AND NOT LINKSTATIC)

-     add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?

- endif ()

- 

--

- # JPEG -- prefer Turbo-JPEG to regular libjpeg

- checked_find_package (JPEGTurbo

-                       DEFINITIONS -DUSE_JPEG_TURBO=1

-@@ -145,7 +144,7 @@ checked_find_package (HDF5

-                    ISDEPOF      Field3D)

- checked_find_package (OpenColorIO

-                    DEFINITIONS  -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1)

--checked_find_package (OpenCV

-+checked_find_package (OpenCV CONFIG

-                    DEFINITIONS  -DUSE_OPENCV=1)

- 

- # Intel TBB

-@@ -155,7 +154,7 @@ checked_find_package (TBB 2017

-                    ISDEPOF      OpenVDB)

- 

- checked_find_package (DCMTK VERSION_MIN 3.6.1)  # For DICOM images

--checked_find_package (FFmpeg VERSION_MIN 2.6)

-+checked_find_package (FFMPEG)

- checked_find_package (Field3D

-                    DEPS         HDF5

-                    DEFINITIONS  -DUSE_FIELD3D=1)

-@@ -163,18 +162,25 @@ checked_find_package (GIF

-                       VERSION_MIN 4

-                       RECOMMEND_MIN 5.0

-                       RECOMMEND_MIN_REASON "for stability and thread safety")

--checked_find_package (Libheif VERSION_MIN 1.3)  # For HEIF/HEIC format

--checked_find_package (LibRaw

-+checked_find_package (libheif CONFIG)  # For HEIF/HEIC format

-+checked_find_package (LibRaw CONFIG

-                       RECOMMEND_MIN 0.18

-                       RECOMMEND_MIN_REASON "for ACES support and better camera metadata"

--                      PRINT LibRaw_r_LIBRARIES )

--checked_find_package (OpenJpeg VERSION_MIN 2.0)

-+                      PRINT LibRaw_LIBRARIES )

-+checked_find_package (OpenJPEG CONFIG)

- checked_find_package (OpenVDB

-                       VERSION_MIN 5.0

-                       DEPS         TBB

-                       DEFINITIONS  -DUSE_OPENVDB=1)

--checked_find_package (PTex)

--checked_find_package (WebP)

-+checked_find_package (ptex CONFIG)

-+set(PTEX_FOUND ${ptex_FOUND})

-+set(PTEX_LIBRARIES Ptex::Ptex)

-+checked_find_package (WebP CONFIG)

-+if(WebP_FOUND)

-+    set(WEBP_FOUND TRUE)

-+    add_library(WebP::WebP ALIAS WebP::webp)

-+    add_library(WebP::WebPDemux ALIAS WebP::webpdemux)

-+endif()

- 

- option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)

- checked_find_package (R3DSDK)  # RED camera

-@@ -287,5 +293,7 @@ macro (find_or_download_fmt)

-     checked_find_package (fmt REQUIRED)

- endmacro()

- 

--find_or_download_fmt()

-+find_package(fmt CONFIG REQUIRED)

-+get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES)

-+checked_find_package (fmt CONFIG REQUIRED)

- include_directories (${FMT_INCLUDES})

-diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt

-index 6cf07636..8e77b1ed 100644

---- a/src/ffmpeg.imageio/CMakeLists.txt

-+++ b/src/ffmpeg.imageio/CMakeLists.txt

-@@ -11,7 +11,7 @@ if (NOT MSVC)

-                              PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")

- endif()

- 

--if (FFmpeg_FOUND)

-+if (FFMPEG_FOUND)

-     add_oiio_plugin (ffmpeginput.cpp

-                      INCLUDE_DIRS ${FFMPEG_INCLUDES}

-                      LINK_LIBRARIES ${FFMPEG_LIBRARIES}

-diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt

-index a9e54e3f..00fac073 100644

---- a/src/field3d.imageio/CMakeLists.txt

-+++ b/src/field3d.imageio/CMakeLists.txt

-@@ -10,6 +10,6 @@ if (Field3D_FOUND)

-     add_oiio_plugin (field3dinput.cpp field3doutput.cpp

-                      INCLUDE_DIRS ${FIELD3D_INCLUDES}

-                      LINK_LIBRARIES Field3D::Field3D

--                                    # ${HDF5_LIBRARIES}

-+                                    ${HDF5_LIBRARIES}

-                                     ${SZIP_LIBRARY})

- endif()

-diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt

-index fed80015..884d1312 100644

---- a/src/heif.imageio/CMakeLists.txt

-+++ b/src/heif.imageio/CMakeLists.txt

-@@ -4,7 +4,7 @@

- 

- if (Libheif_FOUND)

-     add_oiio_plugin (heifinput.cpp heifoutput.cpp

--                     LINK_LIBRARIES Libheif::Libheif

-+                     LINK_LIBRARIES heif

-                      DEFINITIONS "-DUSE_HEIF=1")

- else ()

-     message (WARNING "heif plugin will not be built")

-diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt

-index 81a0ff54..23326a0a 100644

---- a/src/raw.imageio/CMakeLists.txt

-+++ b/src/raw.imageio/CMakeLists.txt

-@@ -5,7 +5,7 @@

- if (LIBRAW_FOUND)

-     add_oiio_plugin (rawinput.cpp

-                      INCLUDE_DIRS ${LibRaw_INCLUDE_DIR}

--                     LINK_LIBRARIES ${LibRaw_r_LIBRARIES}

-+                     LINK_LIBRARIES ${LibRaw_LIBRARIES}

-                      DEFINITIONS "-DUSE_LIBRAW=1")

- else ()

-     message (WARNING "Raw plugin will not be built")

diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index 66d29e8c8..ab0e6d372 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -8,12 +8,11 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF 5167b11277fffcd9fe18fe4dc35b3eb2669d8c44 # 2.2.10
-    SHA512 d5812cf93bbaf8a384e8ee9f443db95a92320b4c35959a528dff40eac405355d1dec924a975bef7f367d3a2179ded0a15b4be9737d37521719739958bb7f3123
+    REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0
+    SHA512 1b6a5e41607bd68590a19672ca777c953b92b347425c9fe8ca7d096959bece789d043a0fae1f7bf00a88dcb11815dd3501414c9ad979e1fe9dd1613bb9e04b0b
     HEAD_REF master
     PATCHES
         fix-config-cmake.patch
-        fix-dependency.patch
         fix_static_build.patch
 )
 
@@ -22,8 +21,7 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
 file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake"
             "${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake"
             "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake"
-            "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake"
-            "${SOURCE_PATH}/src/cmake/modules/FindWebp.cmake")
+            "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake")
 
 file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl")
 
@@ -36,7 +34,7 @@ endif()
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         libraw      USE_LIBRAW
-        opencolorio USE_OCIO
+        opencolorio USE_OPENCOLORIO
         ffmpeg      USE_FFMPEG
         field3d     USE_FIELD3D
         freetype    USE_FREETYPE
@@ -57,7 +55,6 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS ${FEATURE_OPTIONS}
         -DOIIO_BUILD_TESTS=OFF
-        -DHIDE_SYMBOLS=ON
         -DUSE_DCMTK=OFF
         -DUSE_NUKE=OFF
         -DUSE_QT=OFF
diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json
index b3aff1639..8ec421738 100644
--- a/ports/openimageio/vcpkg.json
+++ b/ports/openimageio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openimageio",
-  "version": "2.2.10.0",
-  "port-version": 1,
+  "version": "2.2.17.0",
   "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
   "homepage": "https://github.com/OpenImageIO/oiio",
   "dependencies": [
diff --git a/ports/pystring/CMakeLists.txt b/ports/pystring/CMakeLists.txt
index ecfdaa4fb..ca410d6dc 100644
--- a/ports/pystring/CMakeLists.txt
+++ b/ports/pystring/CMakeLists.txt
@@ -15,5 +15,5 @@ install(
 )
 
 if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES pystring.h DESTINATION include)
+  install(FILES pystring.h DESTINATION include/pystring)
 endif()
diff --git a/ports/pystring/CONTROL b/ports/pystring/CONTROL
deleted file mode 100644
index 698e0466d..000000000
--- a/ports/pystring/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: pystring

-Version:  1.1.3-2

-Homepage: https://github.com/imageworks/pystring

-Description: Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string

diff --git a/ports/pystring/vcpkg.json b/ports/pystring/vcpkg.json
new file mode 100644
index 000000000..f9b0dcaff
--- /dev/null
+++ b/ports/pystring/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "pystring",
+  "version-semver": "1.1.3",
+  "port-version": 3,
+  "description": "Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string",
+  "homepage": "https://github.com/imageworks/pystring"
+}
diff --git a/ports/yaml-cpp/CONTROL b/ports/yaml-cpp/CONTROL
deleted file mode 100644
index 54a1c8dc0..000000000
--- a/ports/yaml-cpp/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: yaml-cpp
-Version: 0.6.3
-Port-Version: 1
-Homepage: https://github.com/jbeder/yaml-cpp
-Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.
diff --git a/ports/yaml-cpp/fix-include-path.patch b/ports/yaml-cpp/fix-include-path.patch
deleted file mode 100644
index 9a7e9ff42..000000000
--- a/ports/yaml-cpp/fix-include-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 4732a45..3de71cc 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -324,7 +324,7 @@ else()

- endif()

- 

- 

--file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}")

-+set(REL_INCLUDE_DIR "../../include")

- set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}")

- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in

- 	"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY)

diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake
index d6ca086ef..33208b0ea 100644
--- a/ports/yaml-cpp/portfile.cmake
+++ b/ports/yaml-cpp/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jbeder/yaml-cpp
-    REF 9a3624205e8774953ef18f57067b3426c1c5ada6 #v0.6.3
-    SHA512 9bd0f05b882beed748eddb5d615bf356b7d1f31c4e3a4bbf80a6bdeb30b33fa1e0ccf596161a489169e6a111a3112e371d8d00514a0bfd02e6a6a11513904bed
+    REF 0579ae3d976091d7d664aa9d2527e0d0cff25763 # yaml-cpp-0.7.0
+    SHA512 930f13737c23faf06be3fa9821492d6c677359e532212ced495173367a8aec45f87fbf3a5da47d4d1b61a95c25e0101bc7f8d175752434c63b25e097186e1745
     HEAD_REF master
-    PATCHES
-        fix-include-path.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -14,34 +12,34 @@ else()
     set(YAML_BUILD_SHARED_LIBS OFF)
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DYAML_CPP_BUILD_TOOLS=OFF
         -DYAML_CPP_BUILD_TESTS=OFF
         -DYAML_BUILD_SHARED_LIBS=${YAML_BUILD_SHARED_LIBS}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 endif()
-if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/yaml-cpp)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp")
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/yaml-cpp)
 endif()
 
 # Remove debug include files
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(READ ${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h DLL_H)
+file(READ "${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" DLL_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS)
     string(REPLACE "#ifdef YAML_CPP_DLL" "#if 1" DLL_H "${DLL_H}")
 else()
     string(REPLACE "#ifdef YAML_CPP_DLL" "#if 0" DLL_H "${DLL_H}")
 endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h "${DLL_H}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "${DLL_H}")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/yaml-cpp/vcpkg.json b/ports/yaml-cpp/vcpkg.json
new file mode 100644
index 000000000..afdbabbf7
--- /dev/null
+++ b/ports/yaml-cpp/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "yaml-cpp",
+  "version-semver": "0.7.0",
+  "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.",
+  "homepage": "https://github.com/jbeder/yaml-cpp",
+  "documentation": "https://codedocs.xyz/jbeder/yaml-cpp/index.html",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index f4b9cb33a..ecae6d2b7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4601,8 +4601,8 @@
       "port-version": 7
     },
     "opencolorio": {
-      "baseline": "1.1.1",
-      "port-version": 5
+      "baseline": "2.0.1",
+      "port-version": 0
     },
     "opencolorio-tools": {
       "baseline": "1.1.1",
@@ -4653,8 +4653,8 @@
       "port-version": 1
     },
     "openimageio": {
-      "baseline": "2.2.10.0",
-      "port-version": 1
+      "baseline": "2.2.17.0",
+      "port-version": 0
     },
     "openjpeg": {
       "baseline": "2.3.1",
@@ -5125,8 +5125,8 @@
       "port-version": 0
     },
     "pystring": {
-      "baseline": "1.1.3-2",
-      "port-version": 0
+      "baseline": "1.1.3",
+      "port-version": 3
     },
     "python2": {
       "baseline": "2.7.18",
@@ -6873,8 +6873,8 @@
       "port-version": 0
     },
     "yaml-cpp": {
-      "baseline": "0.6.3",
-      "port-version": 1
+      "baseline": "0.7.0",
+      "port-version": 0
     },
     "yara": {
       "baseline": "4.1.1",
diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json
index f4d3afa7d..2326e6b1b 100644
--- a/versions/o-/opencolorio.json
+++ b/versions/o-/opencolorio.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3f0f60f376d80012eb0c3bd17ce51e3788070fe4",
+      "version-semver": "2.0.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "c011ef89b247b0bc54a08016fe23793defd398a5",
       "version-semver": "1.1.1",
       "port-version": 5
diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json
index 02f7e6436..6c38b7238 100644
--- a/versions/o-/openimageio.json
+++ b/versions/o-/openimageio.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "886169206344e33a401999f301de01fe1e4fed01",
+      "version": "2.2.17.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "2c57516ef37256b8b87a41801732e11b3ae1380c",
       "version": "2.2.10.0",
       "port-version": 1
diff --git a/versions/p-/pystring.json b/versions/p-/pystring.json
index b29d9d27d..d89279e5a 100644
--- a/versions/p-/pystring.json
+++ b/versions/p-/pystring.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f79bc19acdfb0e0d9445191d54f89234c27db843",
+      "version-semver": "1.1.3",
+      "port-version": 3
+    },
+    {
       "git-tree": "33c038a18b859b695f9e1f7d4618278c9ef14e4a",
       "version-string": "1.1.3-2",
       "port-version": 0
diff --git a/versions/y-/yaml-cpp.json b/versions/y-/yaml-cpp.json
index 3e5888040..6b39e7fe0 100644
--- a/versions/y-/yaml-cpp.json
+++ b/versions/y-/yaml-cpp.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "a71932a4f18c3cc6e0bd2bdce57fbf744e0efe2b",
+      "version-semver": "0.7.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "045045b2d5b8cb6166b6d0d548effc0764623341",
       "version-string": "0.6.3",
       "port-version": 1