Merge branch 'master' into vcpkg_nuget

7 files changed, 110 insertions, 79 deletions

diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index be2dab3c9..70b2e528f 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,9 +1,13 @@
 Source: openimageio
-Version: 1.8.16
+Version: 2019-08-08-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, 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
+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, boost-stacktrace
 
 Feature: libraw
 Build-Depends: libraw
 Description: Enable RAW image files support
+
+Feature: opencolorio
+Build-Depends: opencolorio
+Description: Enable opencolorio support for openimageio
\ No newline at end of file
diff --git a/ports/openimageio/fix_libraw.patch b/ports/openimageio/fix_libraw.patch
index 0870a567f..707530247 100644
--- a/ports/openimageio/fix_libraw.patch
+++ b/ports/openimageio/fix_libraw.patch
@@ -1,8 +1,8 @@
 diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 5eeb7d3..3e8bfcb 100644
+index 2692bb0..f2709d0 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
-@@ -336,7 +336,7 @@ if (USE_LIBRAW)
+@@ -380,7 +380,7 @@ if (USE_LIBRAW)
          message (STATUS "Looking for LibRaw with ${LIBRAW_PATH}")
      endif ()
      find_package (LibRaw)
@@ -11,7 +11,7 @@ index 5eeb7d3..3e8bfcb 100644
          set (LIBRAW_FOUND TRUE)
          include_directories (${LibRaw_INCLUDE_DIR})
          if (NOT LibRaw_FIND_QUIETLY)
-@@ -350,7 +350,7 @@ if (USE_LIBRAW)
+@@ -394,7 +394,7 @@ if (USE_LIBRAW)
      if (LINKSTATIC)
          find_package (Jasper)
          find_library (LCMS2_LIBRARIES NAMES lcms2)
@@ -20,11 +20,6 @@ index 5eeb7d3..3e8bfcb 100644
      endif ()
  else ()
      message (STATUS "Not using LibRaw")
-@@ -494,4 +494,3 @@ if (USE_DICOM)
- endif()
- # end DCMTK setup
- ###########################################################################
--
 diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt
 index e3608a2..f503035 100644
 --- a/src/raw.imageio/CMakeLists.txt
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index 790273975..aeccf0bc0 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -3,16 +3,21 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF Release-1.8.16
-    SHA512 a919341df7d9625a869cad266d8434881b63a47f3da8daccf4bbab6675d45bd121ff780dd911a7447450fee44cd7bdd42d73aec59a99b667d6d98e79682db2c7
+    REF ad1ab61a56c63d770e4beb335efe8b1f1a9e36cd
+    SHA512 48ee7862583e7adb86b56b20634c34aebf83ef0a3a14ad96182494ce6a84cb027334840a6c4c335e9342110c3a36532e3eeae22a3ed7363cd91b27cb7ca58154
     HEAD_REF master
     PATCHES
         fix_libraw.patch
         use-webp.patch
         remove_wrong_dependency.patch
+        use-vcpkg-find-openexr.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
+
+file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake")
+file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake")
+
 file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -23,16 +28,15 @@ else()
     set(LINKSTATIC OFF)
 endif()
 
-# Features
-set(USE_LIBRAW OFF)
-if("libraw" IN_LIST FEATURES)
-    set(USE_LIBRAW ON)
-endif()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    libraw USE_LIBRAW
+    opencolorio USE_OCIO 
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
+    OPTIONS ${FEATURE_OPTIONS}
         -DOIIO_BUILD_TOOLS=OFF
         -DOIIO_BUILD_TESTS=OFF
         -DHIDE_SYMBOLS=ON
@@ -41,9 +45,7 @@ vcpkg_configure_cmake(
         -DUSE_FIELD3D=OFF
         -DUSE_FREETYPE=OFF
         -DUSE_GIF=OFF
-        -DUSE_LIBRAW=${USE_LIBRAW}
         -DUSE_NUKE=OFF
-        -DUSE_OCIO=OFF
         -DUSE_OPENCV=OFF
         -DUSE_OPENJPEG=OFF
         -DUSE_OPENSSL=OFF
@@ -71,6 +73,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+file(COPY ${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openimageio)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/openimageio/LICENSE ${CURRENT_PACKAGES_DIR}/share/openimageio/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/openimageio)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/openimageio/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/openimageio/copyright)
diff --git a/ports/openimageio/remove_wrong_dependency.patch b/ports/openimageio/remove_wrong_dependency.patch
index dabf47b1e..5338c6563 100644
--- a/ports/openimageio/remove_wrong_dependency.patch
+++ b/ports/openimageio/remove_wrong_dependency.patch
@@ -1,23 +1,15 @@
-diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
-index c528adc..bc133b6 100644
---- a/src/libOpenImageIO/CMakeLists.txt
-+++ b/src/libOpenImageIO/CMakeLists.txt
-@@ -162,9 +162,6 @@ if (WIN32)
-     target_link_libraries (OpenImageIO psapi.lib)
- endif ()
- 
--if (VISIBILITY_MAP_FILE)
--    add_dependencies (OpenImageIO "${VISIBILITY_MAP_FILE}")
--endif ()
- 
- if (USE_EXTERNAL_PUGIXML)
-     target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES})
-@@ -230,7 +227,7 @@ if (OIIO_BUILD_TESTS)
-     set_target_properties (imagespec_test PROPERTIES FOLDER "Unit Tests")
-     target_link_libraries (imagespec_test OpenImageIO ${Boost_LIBRARIES})
-     add_test (unit_imagespec imagespec_test)
--    
-+
-     add_executable (imagespeed_test imagespeed_test.cpp)
-     set_target_properties (imagespeed_test PROPERTIES FOLDER "Unit Tests")
-     target_link_libraries (imagespeed_test OpenImageIO ${Boost_LIBRARIES})
+diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt

+index 5449675..cdd5235 100644

+--- a/src/libOpenImageIO/CMakeLists.txt

++++ b/src/libOpenImageIO/CMakeLists.txt

+@@ -171,10 +171,6 @@ elseif(MINGW)

+     target_link_libraries (OpenImageIO psapi ws2_32)

+ endif ()

+ 

+-if (VISIBILITY_MAP_FILE)

+-    add_dependencies (OpenImageIO "${VISIBILITY_MAP_FILE}")

+-endif ()

+-

+ if (USE_EXTERNAL_PUGIXML)

+     target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES})

+ endif ()

diff --git a/ports/openimageio/use-vcpkg-find-openexr.patch b/ports/openimageio/use-vcpkg-find-openexr.patch
new file mode 100644
index 000000000..bacc4f686
--- /dev/null
+++ b/ports/openimageio/use-vcpkg-find-openexr.patch
@@ -0,0 +1,27 @@
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 7ebc1cf..a920c72 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -64,12 +64,19 @@ find_package (PNG REQUIRED)
+ ###########################################################################
+ # IlmBase & OpenEXR setup
+ 
++find_package (Threads)
++if (CMAKE_USE_PTHREADS_INIT)
++    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
++endif ()
++
+ find_package (OpenEXR 2.0 REQUIRED)
+ #OpenEXR 2.2 still has problems with importing ImathInt64.h unqualified
+ #thus need for ilmbase/OpenEXR
+-include_directories ("${OPENEXR_INCLUDE_DIR}"
+-                     "${ILMBASE_INCLUDE_DIR}"
+-                     "${ILMBASE_INCLUDE_DIR}/OpenEXR")
++set(ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS}  CACHE STRING "The libraries needed to use IlmBase")
++set(OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES}  CACHE STRING "The libraries needed to use OpenEXR")
++set(ILMBASE_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR})
++set(ILMBASE_FOUND TRUE)
++include_directories ("${OPENEXR_INCLUDE_DIR}")
+ if (NOT OpenEXR_FIND_QUIETLY)
+     message (STATUS "OPENEXR_INCLUDE_DIR = ${OPENEXR_INCLUDE_DIR}")
+     message (STATUS "OPENEXR_LIBRARIES = ${OPENEXR_LIBRARIES}")
diff --git a/ports/openimageio/use-webp.patch b/ports/openimageio/use-webp.patch
index 1b03636e9..ab03b1703 100644
--- a/ports/openimageio/use-webp.patch
+++ b/ports/openimageio/use-webp.patch
@@ -1,34 +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

- ###########################################################################

- 

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7f43455..393af70 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,6 +96,7 @@ option (USE_GIF "Use GIF if found" ON)
+ option (USE_PTEX "Use PTex if found" ON)
+ option (USE_WEBP "Use WebP 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 f2709d0..3a95da6 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -411,6 +411,7 @@ if (USE_WEBP)
+     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}")
+@@ -427,6 +428,9 @@ if (USE_WEBP)
+         set (WEBP_FOUND FALSE)
+         message (STATUS "WebP library not found")
+     endif()
++    else()
++        set (WEBP_FOUND FALSE)
++    endif()
+ else ()
+     message (STATUS "Not using WebP")
+ endif ()
diff --git a/ports/openimageio/vcpkg-cmake-wrapper.cmake b/ports/openimageio/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..82dc991f0
--- /dev/null
+++ b/ports/openimageio/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,8 @@
+set(OPENIMAGEIO_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+if(NOT OPENIMAGEIO_LIBRARIES)
+  _find_package(${ARGS})
+endif()
+
+set(CMAKE_MODULE_PATH ${OPENIMAGEIO_PREV_MODULE_PATH})