Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4889

3 files changed, 45 insertions, 4 deletions

diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index 12bc943d7..86ae5bd55 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
 Source: openimageio
-Version: Release-1.8.13
+Version: 1.8.16
 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
 Build-Depends: libjpeg-turbo, tiff, libpng, 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
 
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index c5786db64..93b04e627 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -3,13 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF Release-1.8.13
-    SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e
+    REF Release-1.8.16
+    SHA512 a919341df7d9625a869cad266d8434881b63a47f3da8daccf4bbab6675d45bd121ff780dd911a7447450fee44cd7bdd42d73aec59a99b667d6d98e79682db2c7
     HEAD_REF master
     PATCHES
         # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES'
         #             since libraw port installs 'raw_r' library as 'raw'
-        ${CMAKE_CURRENT_LIST_DIR}/fix_libraw.patch
+        fix_libraw.patch
+        use-webp.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
@@ -36,6 +37,7 @@ vcpkg_configure_cmake(
         -DOIIO_BUILD_TOOLS=OFF
         -DOIIO_BUILD_TESTS=OFF
         -DHIDE_SYMBOLS=ON
+        -DUSE_DICOM=OFF
         -DUSE_FFMPEG=OFF
         -DUSE_FIELD3D=OFF
         -DUSE_FREETYPE=OFF
@@ -45,14 +47,19 @@ vcpkg_configure_cmake(
         -DUSE_OCIO=OFF
         -DUSE_OPENCV=OFF
         -DUSE_OPENJPEG=OFF
+        -DUSE_OPENSSL=OFF
         -DUSE_PTEX=OFF
         -DUSE_PYTHON=OFF
         -DUSE_QT=OFF
+        -DUSE_WEBP=OFF
         -DBUILDSTATIC=${BUILDSTATIC}
         -DLINKSTATIC=${LINKSTATIC}
         -DBUILD_MISSING_PYBIND11=OFF
         -DBUILD_MISSING_DEPS=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+        -DVERBOSE=ON
+    OPTIONS_DEBUG
+        -DOPENEXR_CUSTOM_LIB_DIR=${CURRENT_INSTALLED_DIR}/debug/lib
 )
 
 vcpkg_install_cmake()
diff --git a/ports/openimageio/use-webp.patch b/ports/openimageio/use-webp.patch
new file mode 100644
index 000000000..1b03636e9
--- /dev/null
+++ b/ports/openimageio/use-webp.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index abd4e23..12a7f54 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -87,6 +87,7 @@ option (USE_FREETYPE "Use Freetype if found" ON)

+ option (USE_GIF "Use GIF if found" ON)

+ option (USE_PTEX "Use PTex if found" ON)

+ option (USE_LIBRAW "Use LibRaw if found" ON)

++option (USE_WEBP "Use WebP if found" ON)

+ set (LIBRAW_PATH "" CACHE STRING "Custom LibRaw path")

+ option (OIIO_THREAD_ALLOW_DCLP "OIIO threads may use DCLP for speed" ON)

+ option (USE_NUKE "Build Nuke plugins, if Nuke is found" ON)

+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake

+index 7dde986..66da94d 100644

+--- a/src/cmake/externalpackages.cmake

++++ b/src/cmake/externalpackages.cmake

+@@ -366,6 +366,7 @@ endif()

+ if (NOT WEBP_FIND_QUIETLY)

+     message (STATUS "WEBP_HOME=${WEBP_HOME}")

+ endif ()

++if(USE_WEBP)

+ find_path (WEBP_INCLUDE_DIR webp/encode.h

+            "${PROJECT_SOURCE_DIR}/src/include"

+            "${WEBP_HOME}")

+@@ -382,6 +383,9 @@ else()

+     set (WEBP_FOUND FALSE)

+     message (STATUS "WebP library not found")

+ endif()

++else()

++    set (WEBP_FOUND FALSE)

++endif()

+ # end Webp setup

+ ###########################################################################

+