diff --git a/ports/openimageio/fix-dependencies.patch b/ports/openimageio/fix-dependencies.patch index d923cc7a40918f..59dcea643676ee 100644 --- a/ports/openimageio/fix-dependencies.patch +++ b/ports/openimageio/fix-dependencies.patch @@ -2,13 +2,14 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in index 0a6afeb..2a67ee3 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in -@@ -2,6 +2,22 @@ +@@ -2,6 +2,23 @@ include(CMakeFindDependencyMacro) -+find_dependency(libheif CONFIG) ++if (@USE_LIBHEIF@) ++ find_dependency(libheif CONFIG) ++endif() +find_dependency(PNG) -+find_dependency(unofficial-libsquish CONFIG) +if(@USE_OPENCV@) + find_dependency(OpenCV CONFIG) +endif() diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index afbdd0b5842309..77470555025e5a 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -41,6 +41,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS opencv USE_OPENCV openjpeg USE_OPENJPEG webp USE_WEBP + libheif USE_LIBHEIF pybind11 USE_PYTHON tools OIIO_BUILD_TOOLS tools USE_OPENGL @@ -68,7 +69,7 @@ vcpkg_cmake_configure( -DINSTALL_DOCS=OFF -DENABLE_INSTALL_testtex=OFF "-DFMT_INCLUDES=${CURRENT_INSTALLED_DIR}/include" - "-DREQUIRED_DEPS=fmt;JPEG;Libheif;Libsquish;PNG;Robinmap" + "-DREQUIRED_DEPS=fmt;JPEG;PNG;Robinmap" MAYBE_UNUSED_VARIABLES ENABLE_INSTALL_testtex ) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index ee72251f1ee75a..96e24fa1de4483 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.4.5.0", - "port-version": 3, + "port-version": 4, "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", @@ -20,10 +20,8 @@ "boost-thread", "boost-type-traits", "fmt", - "libheif", "libjpeg-turbo", "libpng", - "libsquish", "openexr", "robin-map", "tiff", @@ -62,6 +60,12 @@ "giflib" ] }, + "libheif": { + "description": "Enable heif support for openimageio", + "dependencies": [ + "libheif" + ] + }, "libraw": { "description": "Enable RAW image files support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 67a8be3b730ad2..32a8998a92a08b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5618,7 +5618,7 @@ }, "openimageio": { "baseline": "2.4.5.0", - "port-version": 3 + "port-version": 4 }, "openjpeg": { "baseline": "2.5.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index ec8a2d8aab1ae0..104700d1b9aa8f 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c8df049a8e7b1c3e48006e78c4f5a9d451860a0", + "version": "2.4.5.0", + "port-version": 4 + }, { "git-tree": "d89c769d1b813eadd08173e4e9d18049ac8c1d23", "version": "2.4.5.0",