diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-08-10 10:11:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 01:11:41 -0700 |
| commit | be456649fd835f6d2d676b81886fb6a58d5b52da (patch) | |
| tree | 0c66be633d360fd814e238a9143a125be5c21b22 /ports/openimageio | |
| parent | 8b9f976fb390054095c466757a593da71dafa1b2 (diff) | |
| download | vcpkg-be456649fd835f6d2d676b81886fb6a58d5b52da.tar.gz vcpkg-be456649fd835f6d2d676b81886fb6a58d5b52da.zip | |
[yaml-cpp] update to 0.7.0 (#19272)
* [yaml-cpp] update to 0.7.0
* [opencolorio] update to 2.0.1
* [openimageio] Update to 2.2.17.0
* [pystring] move header to pystring subfolder
* add version files
Diffstat (limited to 'ports/openimageio')
| -rw-r--r-- | ports/openimageio/fix-dependency.patch | 122 | ||||
| -rw-r--r-- | ports/openimageio/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/openimageio/vcpkg.json | 3 |
3 files changed, 5 insertions, 131 deletions
diff --git a/ports/openimageio/fix-dependency.patch b/ports/openimageio/fix-dependency.patch deleted file mode 100644 index d594570f2..000000000 --- a/ports/openimageio/fix-dependency.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index e7261af3..195f46cb 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -102,7 +102,6 @@ if (MSVC AND NOT LINKSTATIC)
- add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?
- endif ()
-
--
- # JPEG -- prefer Turbo-JPEG to regular libjpeg
- checked_find_package (JPEGTurbo
- DEFINITIONS -DUSE_JPEG_TURBO=1
-@@ -145,7 +144,7 @@ checked_find_package (HDF5
- ISDEPOF Field3D)
- checked_find_package (OpenColorIO
- DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1)
--checked_find_package (OpenCV
-+checked_find_package (OpenCV CONFIG
- DEFINITIONS -DUSE_OPENCV=1)
-
- # Intel TBB
-@@ -155,7 +154,7 @@ checked_find_package (TBB 2017
- ISDEPOF OpenVDB)
-
- checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images
--checked_find_package (FFmpeg VERSION_MIN 2.6)
-+checked_find_package (FFMPEG)
- checked_find_package (Field3D
- DEPS HDF5
- DEFINITIONS -DUSE_FIELD3D=1)
-@@ -163,18 +162,25 @@ checked_find_package (GIF
- VERSION_MIN 4
- RECOMMEND_MIN 5.0
- RECOMMEND_MIN_REASON "for stability and thread safety")
--checked_find_package (Libheif VERSION_MIN 1.3) # For HEIF/HEIC format
--checked_find_package (LibRaw
-+checked_find_package (libheif CONFIG) # For HEIF/HEIC format
-+checked_find_package (LibRaw CONFIG
- RECOMMEND_MIN 0.18
- RECOMMEND_MIN_REASON "for ACES support and better camera metadata"
-- PRINT LibRaw_r_LIBRARIES )
--checked_find_package (OpenJpeg VERSION_MIN 2.0)
-+ PRINT LibRaw_LIBRARIES )
-+checked_find_package (OpenJPEG CONFIG)
- checked_find_package (OpenVDB
- VERSION_MIN 5.0
- DEPS TBB
- DEFINITIONS -DUSE_OPENVDB=1)
--checked_find_package (PTex)
--checked_find_package (WebP)
-+checked_find_package (ptex CONFIG)
-+set(PTEX_FOUND ${ptex_FOUND})
-+set(PTEX_LIBRARIES Ptex::Ptex)
-+checked_find_package (WebP CONFIG)
-+if(WebP_FOUND)
-+ set(WEBP_FOUND TRUE)
-+ add_library(WebP::WebP ALIAS WebP::webp)
-+ add_library(WebP::WebPDemux ALIAS WebP::webpdemux)
-+endif()
-
- option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)
- checked_find_package (R3DSDK) # RED camera
-@@ -287,5 +293,7 @@ macro (find_or_download_fmt)
- checked_find_package (fmt REQUIRED)
- endmacro()
-
--find_or_download_fmt()
-+find_package(fmt CONFIG REQUIRED)
-+get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-+checked_find_package (fmt CONFIG REQUIRED)
- include_directories (${FMT_INCLUDES})
-diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt
-index 6cf07636..8e77b1ed 100644
---- a/src/ffmpeg.imageio/CMakeLists.txt
-+++ b/src/ffmpeg.imageio/CMakeLists.txt
-@@ -11,7 +11,7 @@ if (NOT MSVC)
- PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
- endif()
-
--if (FFmpeg_FOUND)
-+if (FFMPEG_FOUND)
- add_oiio_plugin (ffmpeginput.cpp
- INCLUDE_DIRS ${FFMPEG_INCLUDES}
- LINK_LIBRARIES ${FFMPEG_LIBRARIES}
-diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt
-index a9e54e3f..00fac073 100644
---- a/src/field3d.imageio/CMakeLists.txt
-+++ b/src/field3d.imageio/CMakeLists.txt
-@@ -10,6 +10,6 @@ if (Field3D_FOUND)
- add_oiio_plugin (field3dinput.cpp field3doutput.cpp
- INCLUDE_DIRS ${FIELD3D_INCLUDES}
- LINK_LIBRARIES Field3D::Field3D
-- # ${HDF5_LIBRARIES}
-+ ${HDF5_LIBRARIES}
- ${SZIP_LIBRARY})
- endif()
-diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt
-index fed80015..884d1312 100644
---- a/src/heif.imageio/CMakeLists.txt
-+++ b/src/heif.imageio/CMakeLists.txt
-@@ -4,7 +4,7 @@
-
- if (Libheif_FOUND)
- add_oiio_plugin (heifinput.cpp heifoutput.cpp
-- LINK_LIBRARIES Libheif::Libheif
-+ LINK_LIBRARIES heif
- DEFINITIONS "-DUSE_HEIF=1")
- else ()
- message (WARNING "heif plugin will not be built")
-diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt
-index 81a0ff54..23326a0a 100644
---- a/src/raw.imageio/CMakeLists.txt
-+++ b/src/raw.imageio/CMakeLists.txt
-@@ -5,7 +5,7 @@
- if (LIBRAW_FOUND)
- add_oiio_plugin (rawinput.cpp
- INCLUDE_DIRS ${LibRaw_INCLUDE_DIR}
-- LINK_LIBRARIES ${LibRaw_r_LIBRARIES}
-+ LINK_LIBRARIES ${LibRaw_LIBRARIES}
- DEFINITIONS "-DUSE_LIBRAW=1")
- else ()
- message (WARNING "Raw plugin will not be built")
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 66d29e8c8..ab0e6d372 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -8,12 +8,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF 5167b11277fffcd9fe18fe4dc35b3eb2669d8c44 # 2.2.10 - SHA512 d5812cf93bbaf8a384e8ee9f443db95a92320b4c35959a528dff40eac405355d1dec924a975bef7f367d3a2179ded0a15b4be9737d37521719739958bb7f3123 + REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0 + SHA512 1b6a5e41607bd68590a19672ca777c953b92b347425c9fe8ca7d096959bece789d043a0fae1f7bf00a88dcb11815dd3501414c9ad979e1fe9dd1613bb9e04b0b HEAD_REF master PATCHES fix-config-cmake.patch - fix-dependency.patch fix_static_build.patch ) @@ -22,8 +21,7 @@ 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" - "${SOURCE_PATH}/src/cmake/modules/FindWebp.cmake") + "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake") file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") @@ -36,7 +34,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES libraw USE_LIBRAW - opencolorio USE_OCIO + opencolorio USE_OPENCOLORIO ffmpeg USE_FFMPEG field3d USE_FIELD3D freetype USE_FREETYPE @@ -57,7 +55,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DOIIO_BUILD_TESTS=OFF - -DHIDE_SYMBOLS=ON -DUSE_DCMTK=OFF -DUSE_NUKE=OFF -DUSE_QT=OFF diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index b3aff1639..8ec421738 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openimageio", - "version": "2.2.10.0", - "port-version": 1, + "version": "2.2.17.0", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ |
