diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-10-12 12:16:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 12:16:20 -0700 |
| commit | 40386fe341a685105caabcb185b210fdc23299a4 (patch) | |
| tree | 727b06f5e1ef99dc7234b036ab596f7a0242a549 | |
| parent | 9bf57ae5d69c5e6208c08aab4338656540e09c5a (diff) | |
| download | vcpkg-40386fe341a685105caabcb185b210fdc23299a4.tar.gz vcpkg-40386fe341a685105caabcb185b210fdc23299a4.zip | |
[openimageio] Fix build tools on windows-static (#13962)
| -rw-r--r-- | ports/openimageio/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openimageio/fix-libheif.patch | 26 | ||||
| -rw-r--r-- | ports/openimageio/portfile.cmake | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 3612d396d..94973a0a7 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,6 +1,6 @@ Source: openimageio Version: 2.1.16.0 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/OpenImageIO/oiio Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, libheif, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace, fmt diff --git a/ports/openimageio/fix-libheif.patch b/ports/openimageio/fix-libheif.patch new file mode 100644 index 000000000..2d73832f2 --- /dev/null +++ b/ports/openimageio/fix-libheif.patch @@ -0,0 +1,26 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 1a17d1e..2ba4264 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -259,7 +259,7 @@ checked_find_package (Field3D + DEPS HDF5 + DEFINITIONS -DUSE_FIELD3D=1) + checked_find_package (GIF 4) +-checked_find_package (Libheif 1.3) # For HEIF/HEIC format ++checked_find_package (libheif CONFIG) # For HEIF/HEIC format + checked_find_package (LibRaw) + checked_find_package (OpenJPEG CONFIG) + checked_find_package (OpenVDB 5.0 +diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt +index cb5e5f9..f773fd5 100644 +--- a/src/heif.imageio/CMakeLists.txt ++++ b/src/heif.imageio/CMakeLists.txt +@@ -5,7 +5,7 @@ + if (LIBHEIF_FOUND) + add_oiio_plugin (heifinput.cpp heifoutput.cpp + INCLUDE_DIRS ${LIBHEIF_INCLUDES} +- LINK_LIBRARIES ${LIBHEIF_LIBRARIES} ++ LINK_LIBRARIES heif + DEFINITIONS "-DUSE_HEIF=1") + else () + message (WARNING "heif plugin will not be built") diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index f549457af..9b640c6f8 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-tools-path.patch fix-config-cmake.patch fix-dependfmt.patch + fix-libheif.patch # Remove this patch on the next update ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") |