diff --git a/ports/openimageio/fix-openjpeg-linkage.patch b/ports/openimageio/fix-openjpeg-linkage.patch new file mode 100644 index 0000000000..7d3a24c2fe --- /dev/null +++ b/ports/openimageio/fix-openjpeg-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 1fc2059..62c4efb 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -222,7 +222,7 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER + # set (LIBRAW_FOUND 0) + endif () + +-checked_find_package (OpenJPEG VERSION_MIN 2.0) ++checked_find_package (OpenJPEG PREFER_CONFIG VERSION_MIN 2.0) + + checked_find_package (OpenVDB + VERSION_MIN 5.0 diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index a69fae17c9..4f93c86cf9 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-dependencies.patch fix-config-cmake.patch + fix-openjpeg-linkage.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index e5b6a47cd8..e361f99552 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "openimageio", "version": "2.3.10.1", - "port-version": 2, + "port-version": 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", "dependencies": [ "boost-algorithm", "boost-asio", diff --git a/versions/baseline.json b/versions/baseline.json index 75fe755444..a1bfe93734 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5094,7 +5094,7 @@ }, "openimageio": { "baseline": "2.3.10.1", - "port-version": 2 + "port-version": 3 }, "openjpeg": { "baseline": "2.4.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index ea3310044d..821542404b 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca", + "version": "2.3.10.1", + "port-version": 3 + }, { "git-tree": "a52afa5ed0495b47dd1c123d975746fdfa0b3459", "version": "2.3.10.1",