From 574c125d6f1dd8150dadf1e116cd182823591626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 17 Sep 2021 08:25:52 +0800 Subject: [PATCH] [openimageio] Re-fix the usage (#20092) * [openimageio] Re-fix the usage * version --- ports/openimageio/portfile.cmake | 5 ++--- ports/openimageio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index cd4ce9c525..124c7183b8 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -21,7 +21,6 @@ vcpkg_from_github( file(REMOVE_RECURSE "${SOURCE_PATH}/ext") file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake") @@ -85,8 +84,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" "${CURRENT_PACKAGES_DIR}/debug/share") file(COPY "${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") -file(COPY "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/openimageio") +file(COPY "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index cb30bf6f82..35ac610110 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.3.7.2", - "port-version": 1, + "port-version": 2, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b78df9febf..6b6b5f0f88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4786,7 +4786,7 @@ }, "openimageio": { "baseline": "2.3.7.2", - "port-version": 1 + "port-version": 2 }, "openjpeg": { "baseline": "2.3.1", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 1ebf88c90a..827012dfdb 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6084a6398514fc24fd450a7b9290937b1274d7b6", + "version": "2.3.7.2", + "port-version": 2 + }, { "git-tree": "799ea36f0486224257ecfea149b429d81e74a879", "version": "2.3.7.2",