Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802

3 files changed, 113 insertions, 5 deletions

diff --git a/ports/devil/0003_fix-openexr.patch b/ports/devil/0003_fix-openexr.patch
new file mode 100644
index 000000000..d8038e4cf
--- /dev/null
+++ b/ports/devil/0003_fix-openexr.patch
@@ -0,0 +1,109 @@
+--- a/DevIL/src-IL/cmake/FindOpenEXR.cmake
++++ b/DevIL/src-IL/cmake/FindOpenEXR.cmake
+@@ -1,64 +1,13 @@
+-# Locate OpenEXR
+-# This module defines
+-# OPENEXR_LIBRARIES
+-# OPENEXR_FOUND, if false, do not try to link to OpenEXR 
+-# OPENEXR_INCLUDE_DIR, where to find the headers
+-#
+-# $OPENEXR_DIR is an environment variable that would
+-# correspond to the ./configure --prefix=$OPENEXR_DIR
+-#
+-# Created by Robert Osfield. 
++include(FindPackageHandleStandardArgs)
+ 
++find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
+ 
+-FIND_PATH(OPENEXR_INCLUDE_DIR ImfIO.h
+-    $ENV{OPENEXR_DIR}/include
+-    $ENV{OPENEXR_DIR}
+-    ~/Library/Frameworks
+-    /Library/Frameworks
+-    /usr/local/include
+-    /usr/include
+-    /sw/include # Fink
+-    /opt/local/include # DarwinPorts
+-    /opt/csw/include # Blastwave
+-    /opt/include
+-    /usr/freeware/include
+-)
++find_library(OPENEXR_HALF_LIBRARY NAMES Half)
++find_library(OPENEXR_IEX_LIBRARY NAMES Iex-2_2)
++find_library(OPENEXR_IMATH_LIBRARY NAMES Imath-2_2)
++find_library(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf-2_2)
++find_library(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread-2_2)
+ 
+-# Macro to find exr libraries (deduplicating search paths)
+-# example: OPENEXR_FIND_VAR(OPENEXR_IlmImf_LIBRARY IlmImf)
+-MACRO(OPENEXR_FIND_VAR varname libname)
+-    FIND_LIBRARY( ${varname}
+-        NAMES ${libname}
+-        PATHS
+-        $ENV{OPENEXR_DIR}/lib
+-        $ENV{OPENEXR_DIR}
+-        ~/Library/Frameworks
+-        /Library/Frameworks
+-        /usr/local/lib
+-        /usr/lib
+-        /sw/lib
+-        /opt/local/lib
+-        /opt/csw/lib
+-        /opt/lib
+-        /usr/freeware/lib64
+-    )
+-ENDMACRO(OPENEXR_FIND_VAR)
++set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY})
+ 
+-# Macro to find exr libraries (and debug versions)
+-# example: OPENEXR_FIND(IlmImf)
+-MACRO(OPENEXR_FIND libname)
+-    OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY ${libname})
+-    OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d)
+-ENDMACRO(OPENEXR_FIND)
+-
+-OPENEXR_FIND(IlmImf)
+-OPENEXR_FIND(IlmThread)
+-OPENEXR_FIND(Iex)
+-OPENEXR_FIND(Half)
+-
+-SET(OPENEXR_FOUND "NO")
+-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY)
+-    SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} )
+-    SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY )
+-    SET(OPENEXR_FOUND "YES")
+-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY)
++find_package_handle_standard_args(OPENEXR REQUIRED_VARS OPENEXR_LIBRARIES OPENEXR_INCLUDE_PATHS)
+--- a/DevIL/src-IL/src/il_exr.cpp
++++ b/DevIL/src-IL/src/il_exr.cpp
+@@ -15,14 +15,14 @@
+ #ifndef IL_NO_EXR
+ 
+ #ifndef HAVE_CONFIG_H // We are probably on a Windows box .
+-//#define OPENEXR_DLL
+-#define HALF_EXPORTS
++#define OPENEXR_DLL
++//#define HALF_EXPORTS
+ #endif //HAVE_CONFIG_H
+ 
+ #include "il_exr.h"
+-#include <ImfRgba.h>
+-#include <ImfArray.h>
+-#include <ImfRgbaFile.h>
++#include <OpenEXR/ImfRgba.h>
++#include <OpenEXR/ImfArray.h>
++#include <OpenEXR/ImfRgbaFile.h>
+ //#include <ImfTiledRgbaFile.h>
+ //#include <ImfInputFile.h>
+ //#include <ImfTiledInputFile.h>
+--- a/DevIL/src-IL/include/il_exr.h
++++ b/DevIL/src-IL/include/il_exr.h
+@@ -15,7 +15,7 @@
+ #define EXR_H
+ 
+ #include "il_internal.h"
+-#include <ImfIO.h>
++#include <OpenEXR/ImfIO.h>
+ 
+ 
+ //using namespace Imf;  // Using this leads to errors with Microsoft's IStream.
diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL
index cddc99222..18d263348 100644
--- a/ports/devil/CONTROL
+++ b/ports/devil/CONTROL
@@ -1,5 +1,5 @@
 Source: devil
-Version: 1.8.0-2
+Version: 1.8.0-3
 Build-Depends:
 Description: A full featured cross-platform image library
 Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms
diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake
index e49507386..7ab5a6c06 100644
--- a/ports/devil/portfile.cmake
+++ b/ports/devil/portfile.cmake
@@ -1,16 +1,15 @@
 include(vcpkg_common_functions)
 
-set(DEVIL_VERSION 1.8.0)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DentonW/DevIL
-    REF v${DEVIL_VERSION}
+    REF v1.8.0
     SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7
     HEAD_REF master
     PATCHES
         0001_fix-encoding.patch
         0002_fix-missing-mfc-includes.patch
+        0003_fix-openexr.patch
         enable-static.patch
 )
 
@@ -20,7 +19,7 @@ if("libpng" IN_LIST FEATURES)
 endif()
 
 set(IL_NO_TIF 1)
-if("libtiff" IN_LIST FEATURES)
+if("tiff" IN_LIST FEATURES)
     set(IL_NO_TIF 0)
 endif()