diff options
| author | Xing Ji <33065325+jixingcn@users.noreply.github.com> | 2021-08-27 01:10:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 10:10:12 -0700 |
| commit | 17818aa503e5af0045beafae3a9265fe60c458bd (patch) | |
| tree | 969594d2e8db6aa9789264318c795a86f37ccfe1 | |
| parent | 383060ffb686cc87404cc972e39cb77d3b1ef4e1 (diff) | |
| download | vcpkg-17818aa503e5af0045beafae3a9265fe60c458bd.tar.gz vcpkg-17818aa503e5af0045beafae3a9265fe60c458bd.zip | |
[OpenColorIO] Fix OpenColorIO v2.0.1 can't be find_package (#19725)
* fix that opencolorio v2.0.1 can't be `find_package`, reference the master branch of opencolorio to generate `OpenColorIOTargets`
* run `vcpkg x-add-version --all`
* fix the `OpenColorIO` for linux
* vcpkg x-add-version --all
* patch for `OpenColorIOConfig.cmake` by https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1397
* vcpkg x-add-version --all
| -rw-r--r-- | ports/opencolorio/portfile.cmake | 13 | ||||
| -rw-r--r-- | ports/opencolorio/use-find-openexr.patch (renamed from ports/opencolorio/use-find-openxer.patch) | 0 | ||||
| -rw-r--r-- | ports/opencolorio/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/opencolorio.json | 5 |
5 files changed, 19 insertions, 2 deletions
diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index 27f21fda4..5967543b0 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -1,4 +1,10 @@ +vcpkg_download_distfile(config_patch_path + URLS https://patch-diff.githubusercontent.com/raw/AcademySoftwareFoundation/OpenColorIO/pull/1397.diff + FILENAME AcademySoftwareFoundation-OpenColorIO-b8e18214b.diff + SHA512 34a1afb79521e43138b8a695817a9eaf6c0de8cc1d85b4640967d0ad531287a4beb41660d461067cb67103fb3ee90e11bc50e1426a0d1ae6050f3ca434dd2f3d +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO @@ -6,8 +12,9 @@ vcpkg_from_github( SHA512 51568e21eaf863747f67fbcffa7f42ba32f5892e8295dac6c9deb0f6205f57c231ea34ce028d84915e4be2f2773e362b74eaf057c2e4cf3ad4b60bf13a0b73db HEAD_REF master PATCHES + ${config_patch_path} fix-pystring-name.patch - use-find-openxer.patch + use-find-openexr.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -31,12 +38,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenColorIO") + vcpkg_copy_pdbs() # Clean redundant files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake + ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake ) if (OCIO_BUILD_APPS) vcpkg_copy_tools( diff --git a/ports/opencolorio/use-find-openxer.patch b/ports/opencolorio/use-find-openexr.patch index 24f05e5a3..24f05e5a3 100644 --- a/ports/opencolorio/use-find-openxer.patch +++ b/ports/opencolorio/use-find-openexr.patch diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index 13d79cd86..f7be1eae5 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencolorio", "version-semver": "2.0.1", + "port-version": 1, "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6dea4286c..123b7a950 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4614,7 +4614,7 @@ }, "opencolorio": { "baseline": "2.0.1", - "port-version": 0 + "port-version": 1 }, "opencolorio-tools": { "baseline": "1.1.1", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 2326e6b1b..af8a54368 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "1cb605cb4249c89ebab09079982d8f2b4b249716", + "version-semver": "2.0.1", + "port-version": 1 + }, + { "git-tree": "3f0f60f376d80012eb0c3bd17ce51e3788070fe4", "version-semver": "2.0.1", "port-version": 0 |