From 00b483825c2f60d9003c7b8cfe84ef3f8b583c44 Mon Sep 17 00:00:00 2001 From: Peter Steneteg Date: Thu, 14 Mar 2024 00:44:39 +0100 Subject: [PATCH] [openexr] package fix (#37408) --- ports/openexr/fix-cmake-package.patch | 21 +++++++++++++++++++++ ports/openexr/portfile.cmake | 2 ++ ports/openexr/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/openexr.json | 5 +++++ 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 ports/openexr/fix-cmake-package.patch diff --git a/ports/openexr/fix-cmake-package.patch b/ports/openexr/fix-cmake-package.patch new file mode 100644 index 0000000000..f40ab285ff --- /dev/null +++ b/ports/openexr/fix-cmake-package.patch @@ -0,0 +1,21 @@ +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 80946fb412..876dfaf1ee 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6 HEAD_REF main + PATCHES + fix-cmake-package.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1674 ) vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index ddbb6e19a5..8a3d8308da 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openexr", "version": "3.2.3", + "port-version": 1, "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 447f5494fe..0297df66fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6406,7 +6406,7 @@ }, "openexr": { "baseline": "3.2.3", - "port-version": 0 + "port-version": 1 }, "openfbx": { "baseline": "2022-07-18", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index a2bdf9be22..ea4e02503b 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99e1e8599b1c2601a39f94b511b623ac51878793", + "version": "3.2.3", + "port-version": 1 + }, { "git-tree": "ccd582f25f0177e879cd408487d541865569dd3a", "version": "3.2.3",