[openimageio] Add dependency for feature tools (#17909)

* [openimageio] Add dependency for feature tool

* Update version files

* Update vcpkg.json

* Update versions/o-/openimageio.json

* Add dependency for tools

* Re-update versions/o-/openimageio.json

5 files changed, 123 insertions, 61 deletions

diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
deleted file mode 100644
index a5694dc1e..000000000
--- a/ports/openimageio/CONTROL
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: openimageio
-Version: 2.2.10.0
-Homepage: https://github.com/OpenImageIO/oiio
-Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
-Build-Depends: boost-algorithm, boost-asio, boost-config, boost-filesystem, boost-foreach, boost-random, boost-regex, boost-smart-ptr, boost-stacktrace, boost-static-assert, boost-system, boost-thread, boost-type-traits, fmt, libheif, libjpeg-turbo, libpng, openexr, robin-map, tiff, zlib
-
-Feature: libraw
-Build-Depends: libraw
-Description: Enable RAW image files support
-
-Feature: opencolorio
-Build-Depends: opencolorio
-Description: Enable opencolorio support for openimageio
-
-Feature: ffmpeg
-Build-Depends: ffmpeg[avresample]
-Description: Enable ffmpeg support for openimageio
-
-Feature: field3d
-Build-Depends: field3d
-Description: Enable field3D support for openimageio
-
-Feature: freetype
-Build-Depends: freetype
-Description: Enable freetype support for openimageio
-
-Feature: opencv
-Build-Depends: opencv
-Description: Enable opencv support for openimageio
-
-Feature: gif
-Build-Depends: giflib
-Description: Enable giflib support for openimageio
-
-Feature: openjpeg
-Build-Depends: openjpeg
-Description: Enable openjpeg support for openimageio
-
-Feature: webp
-Build-Depends: libwebp
-Description: Enable libwebp support for openimageio
-
-Feature: pybind11
-Build-Depends: pybind11
-Description: Enable Python bindings support for openimageio
-
-Feature: tools
-Description: Build openimageio tools
\ No newline at end of file
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index 55d6c0217..66d29e8c8 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -34,17 +34,18 @@ else()
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    libraw      USE_LIBRAW
-    opencolorio USE_OCIO
-    ffmpeg      USE_FFMPEG
-    field3d     USE_FIELD3D
-    freetype    USE_FREETYPE
-    gif         USE_GIF
-    opencv      USE_OPENCV
-    openjpeg    USE_OPENJPEG
-    webp        USE_WEBP
-    pybind11    USE_PYTHON
-    tools       OIIO_BUILD_TOOLS
+    FEATURES
+        libraw      USE_LIBRAW
+        opencolorio USE_OCIO
+        ffmpeg      USE_FFMPEG
+        field3d     USE_FIELD3D
+        freetype    USE_FREETYPE
+        gif         USE_GIF
+        opencv      USE_OPENCV
+        openjpeg    USE_OPENJPEG
+        webp        USE_WEBP
+        pybind11    USE_PYTHON
+        tools       OIIO_BUILD_TOOLS
 )
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -77,7 +78,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenImageIO TARGET_PATH share/Op
 
 if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(
-        TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool
+        TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool iv
         AUTO_CLEAN
     )
 endif()
diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json
new file mode 100644
index 000000000..b3aff1639
--- /dev/null
+++ b/ports/openimageio/vcpkg.json
@@ -0,0 +1,104 @@
+{
+  "name": "openimageio",
+  "version": "2.2.10.0",
+  "port-version": 1,
+  "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
+  "homepage": "https://github.com/OpenImageIO/oiio",
+  "dependencies": [
+    "boost-algorithm",
+    "boost-asio",
+    "boost-config",
+    "boost-filesystem",
+    "boost-foreach",
+    "boost-random",
+    "boost-regex",
+    "boost-smart-ptr",
+    "boost-stacktrace",
+    "boost-static-assert",
+    "boost-system",
+    "boost-thread",
+    "boost-type-traits",
+    "fmt",
+    "libheif",
+    "libjpeg-turbo",
+    "libpng",
+    "openexr",
+    "robin-map",
+    "tiff",
+    "zlib"
+  ],
+  "features": {
+    "ffmpeg": {
+      "description": "Enable ffmpeg support for openimageio",
+      "dependencies": [
+        {
+          "name": "ffmpeg",
+          "features": [
+            "avresample"
+          ]
+        }
+      ]
+    },
+    "field3d": {
+      "description": "Enable field3D support for openimageio",
+      "dependencies": [
+        "field3d"
+      ]
+    },
+    "freetype": {
+      "description": "Enable freetype support for openimageio",
+      "dependencies": [
+        "freetype"
+      ]
+    },
+    "gif": {
+      "description": "Enable giflib support for openimageio",
+      "dependencies": [
+        "giflib"
+      ]
+    },
+    "libraw": {
+      "description": "Enable RAW image files support",
+      "dependencies": [
+        "libraw"
+      ]
+    },
+    "opencolorio": {
+      "description": "Enable opencolorio support for openimageio",
+      "dependencies": [
+        "opencolorio"
+      ]
+    },
+    "opencv": {
+      "description": "Enable opencv support for openimageio",
+      "dependencies": [
+        "opencv"
+      ]
+    },
+    "openjpeg": {
+      "description": "Enable openjpeg support for openimageio",
+      "dependencies": [
+        "openjpeg"
+      ]
+    },
+    "pybind11": {
+      "description": "Enable Python bindings support for openimageio",
+      "dependencies": [
+        "pybind11"
+      ]
+    },
+    "tools": {
+      "description": "Build openimageio tools",
+      "dependencies": [
+        "opengl",
+        "qt5-base"
+      ]
+    },
+    "webp": {
+      "description": "Enable libwebp support for openimageio",
+      "dependencies": [
+        "libwebp"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 94a9ffb57..86709f37b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4522,7 +4522,7 @@
     },
     "openimageio": {
       "baseline": "2.2.10.0",
-      "port-version": 0
+      "port-version": 1
     },
     "openjpeg": {
       "baseline": "2.3.1",
diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json
index 8f05fd703..02f7e6436 100644
--- a/versions/o-/openimageio.json
+++ b/versions/o-/openimageio.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "2c57516ef37256b8b87a41801732e11b3ae1380c",
+      "version": "2.2.10.0",
+      "port-version": 1
+    },
+    {
       "git-tree": "f3b1e2083feeb5968429f3349acaa46fa71f3054",
       "version-string": "2.2.10.0",
       "port-version": 0