mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 09:23:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openimageio] Fix broken hash (#19541)

Browse Source 
* [openimageio] Fix broken hash

* Update the baseline
This commit is contained in:
Phoebe 2021-08-14 04:40:07 +08:00 committed by GitHub
parent dfceb055d5
commit 4e3500436c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ports/openimageio/portfile.cmake
View File

@ -9,7 +9,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO OpenImageIO/oiio REPO OpenImageIO/oiio
REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0 REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0
SHA512 1b6a5e41607bd68590a19672ca777c953b92b347425c9fe8ca7d096959bece789d043a0fae1f7bf00a88dcb11815dd3501414c9ad979e1fe9dd1613bb9e04b0b SHA512 36e3aef52e082fcff64a16d10ad372a6335b3562c3d6e62aac88173476ae6c3694ac565084d50551724f47be83a7a8182e608c81c7a787392e576d9c401f65f5
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-config-cmake.patch fix-config-cmake.patch
@ -25,11 +25,7 @@ file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake"
file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl")
if(VCPKG_LIBRARY_LINKAGE STREQUAL static) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LINKSTATIC)
set(LINKSTATIC ON)
else()
set(LINKSTATIC OFF)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES FEATURES
@ -50,10 +46,10 @@ vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_add_to_path("${PYTHON3_DIR}")
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA OPTIONS
OPTIONS ${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
-DOIIO_BUILD_TESTS=OFF -DOIIO_BUILD_TESTS=OFF
-DUSE_DCMTK=OFF -DUSE_DCMTK=OFF
-DUSE_NUKE=OFF -DUSE_NUKE=OFF
@ -67,11 +63,11 @@ vcpkg_configure_cmake(
-DVERBOSE=ON -DVERBOSE=ON
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenImageIO TARGET_PATH share/OpenImageIO) vcpkg_cmake_config_fixup(PACKAGE_NAME OpenImageIO CONFIG_PATH lib/cmake/OpenImageIO)
if("tools" IN_LIST FEATURES) if("tools" IN_LIST FEATURES)
vcpkg_copy_tools( vcpkg_copy_tools(
@ -81,13 +77,13 @@ if("tools" IN_LIST FEATURES)
endif() endif()
# Clean # Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc"
${CURRENT_PACKAGES_DIR}/debug/doc "${CURRENT_PACKAGES_DIR}/debug/doc"
${CURRENT_PACKAGES_DIR}/debug/include "${CURRENT_PACKAGES_DIR}/debug/include"
${CURRENT_PACKAGES_DIR}/debug/share) "${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/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/OpenImageIO) file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO")
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

9
ports/openimageio/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "openimageio", "name": "openimageio",
"version": "2.2.17.0", "version": "2.2.17.0",
"port-version": 1,
"description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
"homepage": "https://github.com/OpenImageIO/oiio", "homepage": "https://github.com/OpenImageIO/oiio",
"dependencies": [ "dependencies": [
@ -24,6 +25,14 @@
"openexr", "openexr",
"robin-map", "robin-map",
"tiff", "tiff",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib" "zlib"
], ],
"features": { "features": {

2
versions/baseline.json
View File

@ -4658,7 +4658,7 @@
}, },
"openimageio": { "openimageio": {
"baseline": "2.2.17.0", "baseline": "2.2.17.0",
"port-version": 0 "port-version": 1
}, },
"openjpeg": { "openjpeg": {
"baseline": "2.3.1", "baseline": "2.3.1",

5
versions/o-/openimageio.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "1567eaa1f67e0996635f0d4213b55e9b97882acf",
"version": "2.2.17.0",
"port-version": 1
},
{ {
"git-tree": "886169206344e33a401999f301de01fe1e4fed01", "git-tree": "886169206344e33a401999f301de01fe1e4fed01",
"version": "2.2.17.0", "version": "2.2.17.0",