diff --git a/ports/openexr/fix-cmake-package.patch b/ports/openexr/fix-cmake-package.patch deleted file mode 100644 index f40ab285ff..0000000000 --- a/ports/openexr/fix-cmake-package.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/cmake/OpenEXRConfig.cmake.in b/cmake/OpenEXRConfig.cmake.in -index fbb98c0a..37073a69 100644 ---- a/cmake/OpenEXRConfig.cmake.in -+++ b/cmake/OpenEXRConfig.cmake.in -@@ -8,11 +8,12 @@ include(CMakeFindDependencyMacro) - set(openexr_needthreads @OPENEXR_ENABLE_THREADING@) - if (openexr_needthreads) - set(THREADS_PREFER_PTHREAD_FLAG ON) -- find_dependency(Threads REQUIRED) -+ find_dependency(Threads) - endif() - unset(openexr_needthreads) - --find_dependency(Imath REQUIRED) -+find_dependency(Imath) -+find_dependency(libdeflate) - - include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") - check_required_components("@PROJECT_NAME@") - - diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index 876dfaf1ee..ca7def81b3 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openexr REF "v${VERSION}" - SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6 + SHA512 ecc3d8b206bda5e5897ac9cd797a8432b76981de10d49cbb107af2b4108c22186de0dda25a9a43b07e18d641ef71508445d95f659a4ca932e029d48ee029a492 HEAD_REF main - PATCHES - fix-cmake-package.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1674 ) vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS @@ -18,8 +16,9 @@ vcpkg_cmake_configure( OPTIONS ${OPTIONS} -DBUILD_TESTING=OFF - -DOPENEXR_INSTALL_EXAMPLES=OFF -DBUILD_WEBSITE=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_libdeflate=ON + -DOPENEXR_BUILD_EXAMPLES=OFF -DOPENEXR_INSTALL_PKG_CONFIG=ON OPTIONS_DEBUG -DOPENEXR_BUILD_TOOLS=OFF @@ -34,7 +33,18 @@ vcpkg_fixup_pkgconfig() if(OPENEXR_INSTALL_TOOLS) vcpkg_copy_tools( - TOOL_NAMES exrenvmap exrheader exrinfo exrmakepreview exrmaketiled exrmultipart exrmultiview exrstdattr exr2aces + TOOL_NAMES + exr2aces + # not installed: exrcheck + exrenvmap + exrheader + exrinfo + exrmakepreview + exrmaketiled + exrmanifest + exrmultipart + exrmultiview + exrstdattr AUTO_CLEAN ) endif() diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index 8a3d8308da..6b8fd438c2 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openexr", - "version": "3.2.3", - "port-version": 1, + "version": "3.2.4", "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ed4191973c..884abaab98 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6545,8 +6545,8 @@ "port-version": 1 }, "openexr": { - "baseline": "3.2.3", - "port-version": 1 + "baseline": "3.2.4", + "port-version": 0 }, "openfbx": { "baseline": "2022-07-18", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index ea4e02503b..d23a6e9bd3 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e923ca0019af5626449e2712f054c608a3198ecc", + "version": "3.2.4", + "port-version": 0 + }, { "git-tree": "99e1e8599b1c2601a39f94b511b623ac51878793", "version": "3.2.3",