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

5 files changed, 42 insertions, 48 deletions

diff --git a/ports/devil/0001_fix-encoding.patch b/ports/devil/0001_fix-encoding.patch
index 395171e71..59d826d25 100644
--- a/ports/devil/0001_fix-encoding.patch
+++ b/ports/devil/0001_fix-encoding.patch
@@ -1,7 +1,7 @@
-diff --git a/src-ILU/include/ilu_error/ilu_err-french.h b/src-ILU/include/ilu_error/ilu_err-french.h
+diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h b/DevIL/src-ILU/include/ilu_error/ilu_err-french.h
 index d3b280d..445440e 100644
---- a/src-ILU/include/ilu_error/ilu_err-french.h
-+++ b/src-ILU/include/ilu_error/ilu_err-french.h
+--- a/DevIL/src-ILU/include/ilu_error/ilu_err-french.h
++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-french.h
 @@ -17,19 +17,19 @@
  #include "ilu_internal.h"
  
@@ -41,10 +41,10 @@ index d3b280d..445440e 100644
  	IL_TEXT("jpeg : erreur dans la librairie"),
  	IL_TEXT("png : erreur dans la librairie"),
  	IL_TEXT("tiff : erreur dans la librairie"),
-diff --git a/src-ILU/include/ilu_error/ilu_err-german.h b/src-ILU/include/ilu_error/ilu_err-german.h
+diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h b/DevIL/src-ILU/include/ilu_error/ilu_err-german.h
 index bf3f05c..acdbe8a 100644
---- a/src-ILU/include/ilu_error/ilu_err-german.h
-+++ b/src-ILU/include/ilu_error/ilu_err-german.h
+--- a/DevIL/src-ILU/include/ilu_error/ilu_err-german.h
++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-german.h
 @@ -6,7 +6,7 @@
  //
  // Filename: src-ILU/include/ilu_error/ilu_err_German.h
@@ -91,10 +91,10 @@ index bf3f05c..acdbe8a 100644
  	IL_TEXT("Fehler beim Lesen der Datei")
  };
  
-diff --git a/src-ILU/include/ilu_error/ilu_err-italian.h b/src-ILU/include/ilu_error/ilu_err-italian.h
+diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h b/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h
 index 09d7bd1..d34b23f 100644
---- a/src-ILU/include/ilu_error/ilu_err-italian.h
-+++ b/src-ILU/include/ilu_error/ilu_err-italian.h
+--- a/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h
++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-italian.h
 @@ -22,13 +22,13 @@ ILconst_string iluErrorStringsItalian[IL_FILE_READ_ERROR - IL_INVALID_ENUM + 1]
  	IL_TEXT("configuri non sostenne"),
  	IL_TEXT("erreur interne"),
@@ -112,10 +112,10 @@ index 09d7bd1..d34b23f 100644
  	IL_TEXT("equivalente fuori-configuri"),
  	IL_TEXT("inondi di batteria"),
      IL_TEXT("insufficienza di batteria"),
-diff --git a/src-ILU/include/ilu_error/ilu_err-spanish.h b/src-ILU/include/ilu_error/ilu_err-spanish.h
+diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h b/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h
 index 77b5a24..0945fdf 100644
---- a/src-ILU/include/ilu_error/ilu_err-spanish.h
-+++ b/src-ILU/include/ilu_error/ilu_err-spanish.h
+--- a/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h
++++ b/DevIL/src-ILU/include/ilu_error/ilu_err-spanish.h
 @@ -6,7 +6,7 @@
  //
  // Filename: src-ILU/include/ilu_error/ilu_err-spanish.h
diff --git a/ports/devil/0002_fix-missing-mfc-includes.patch b/ports/devil/0002_fix-missing-mfc-includes.patch
index 755d0d867..3b18981ce 100644
--- a/ports/devil/0002_fix-missing-mfc-includes.patch
+++ b/ports/devil/0002_fix-missing-mfc-includes.patch
@@ -1,7 +1,7 @@
-diff --git a/src-IL/msvc/IL Unicode.rc b/src-IL/msvc/IL Unicode.rc
+diff --git a/DevIL/src-IL/msvc/IL Unicode.rc b/DevIL/src-IL/msvc/IL Unicode.rc
 index 346758f..298a207 100644
---- a/src-IL/msvc/IL Unicode.rc	
-+++ b/src-IL/msvc/IL Unicode.rc	
+--- a/DevIL/src-IL/msvc/IL Unicode.rc	
++++ b/DevIL/src-IL/msvc/IL Unicode.rc	
 @@ -7,7 +7,11 @@
  //
  // Generated from the TEXTINCLUDE 2 resource.
@@ -15,10 +15,10 @@ index 346758f..298a207 100644
  /////////////////////////////////////////////////////////////////////////////
  #undef APSTUDIO_READONLY_SYMBOLS
  
-diff --git a/src-IL/msvc/IL.rc b/src-IL/msvc/IL.rc
+diff --git a/DevIL/src-IL/msvc/IL.rc b/DevIL/src-IL/msvc/IL.rc
 index 8bfadf9..0b8289f 100644
---- a/src-IL/msvc/IL.rc
-+++ b/src-IL/msvc/IL.rc
+--- a/DevIL/src-IL/msvc/IL.rc
++++ b/DevIL/src-IL/msvc/IL.rc
 @@ -7,10 +7,13 @@
  //
  // Generated from the TEXTINCLUDE 2 resource.
@@ -35,10 +35,10 @@ index 8bfadf9..0b8289f 100644
  
  /////////////////////////////////////////////////////////////////////////////
  // English (United States) resources
-diff --git a/src-IL/msvc8/IL Unicode.rc b/src-IL/msvc8/IL Unicode.rc
+diff --git a/DevIL/src-IL/msvc8/IL Unicode.rc b/DevIL/src-IL/msvc8/IL Unicode.rc
 index 026ee49..66ca4bf 100644
---- a/src-IL/msvc8/IL Unicode.rc	
-+++ b/src-IL/msvc8/IL Unicode.rc	
+--- a/DevIL/src-IL/msvc8/IL Unicode.rc	
++++ b/DevIL/src-IL/msvc8/IL Unicode.rc	
 @@ -7,7 +7,10 @@
  //
  // Generated from the TEXTINCLUDE 2 resource.
@@ -51,10 +51,10 @@ index 026ee49..66ca4bf 100644
  
  /////////////////////////////////////////////////////////////////////////////
  #undef APSTUDIO_READONLY_SYMBOLS
-diff --git a/src-IL/msvc8/IL.rc b/src-IL/msvc8/IL.rc
+diff --git a/DevIL/src-IL/msvc8/IL.rc b/DevIL/src-IL/msvc8/IL.rc
 index 9301d41..3ad52c0 100644
---- a/src-IL/msvc8/IL.rc
-+++ b/src-IL/msvc8/IL.rc
+--- a/DevIL/src-IL/msvc8/IL.rc
++++ b/DevIL/src-IL/msvc8/IL.rc
 @@ -7,7 +7,10 @@
  //
  // Generated from the TEXTINCLUDE 2 resource.
@@ -67,10 +67,10 @@ index 9301d41..3ad52c0 100644
  
  /////////////////////////////////////////////////////////////////////////////
  #undef APSTUDIO_READONLY_SYMBOLS
-diff --git a/src-IL/msvc9/IL Unicode.rc b/src-IL/msvc9/IL Unicode.rc
+diff --git a/DevIL/src-IL/msvc9/IL Unicode.rc b/DevIL/src-IL/msvc9/IL Unicode.rc
 index d0dff4f..c9cf51f 100644
---- a/src-IL/msvc9/IL Unicode.rc	
-+++ b/src-IL/msvc9/IL Unicode.rc	
+--- a/DevIL/src-IL/msvc9/IL Unicode.rc	
++++ b/DevIL/src-IL/msvc9/IL Unicode.rc	
 @@ -7,7 +7,10 @@
  //
  // Generated from the TEXTINCLUDE 2 resource.
@@ -83,10 +83,10 @@ index d0dff4f..c9cf51f 100644
  
  /////////////////////////////////////////////////////////////////////////////
  #undef APSTUDIO_READONLY_SYMBOLS
-diff --git a/src-IL/msvc9/IL.rc b/src-IL/msvc9/IL.rc
+diff --git a/DevIL/src-IL/msvc9/IL.rc b/DevIL/src-IL/msvc9/IL.rc
 index 9f5c795..6b8c891 100644
---- a/src-IL/msvc9/IL.rc
-+++ b/src-IL/msvc9/IL.rc
+--- a/DevIL/src-IL/msvc9/IL.rc
++++ b/DevIL/src-IL/msvc9/IL.rc
 @@ -7,7 +7,10 @@
  //
  // Generated from the TEXTINCLUDE 2 resource.
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/enable-static.patch b/ports/devil/enable-static.patch
index bf0cb618a..8d77c0d5e 100644
--- a/ports/devil/enable-static.patch
+++ b/ports/devil/enable-static.patch
@@ -1,7 +1,7 @@
-diff --git a/devil/src-ILU/CMakeLists.txt b/devil/src-ILU/CMakeLists.txt
+diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
 index 17a3afe..a46ab41 100644
---- a/devil/src-ILU/CMakeLists.txt
-+++ b/devil/src-ILU/CMakeLists.txt
+--- a/DevIL/src-ILU/CMakeLists.txt
++++ b/DevIL/src-ILU/CMakeLists.txt
 @@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILU_INC} )
  source_group("Resource Files" FILES ${ILU_RSRC} )
  
@@ -11,10 +11,10 @@ index 17a3afe..a46ab41 100644
  
  
  ## ILU requires IL
-diff --git a/devil/src-ILUT/CMakeLists.txt b/devil/src-ILUT/CMakeLists.txt
+diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
 index 21470cb..398d3c1 100644
---- a/devil/src-ILUT/CMakeLists.txt
-+++ b/devil/src-ILUT/CMakeLists.txt
+--- a/DevIL/src-ILUT/CMakeLists.txt
++++ b/DevIL/src-ILUT/CMakeLists.txt
 @@ -43,7 +43,7 @@ source_group("Header Files" FILES ${ILUT_INC} )
  source_group("Resource Files" FILES ${ILUT_RSRC} )
  
diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake
index 27e8d0eb0..ff4e7ee0c 100644
--- a/ports/devil/portfile.cmake
+++ b/ports/devil/portfile.cmake
@@ -1,21 +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
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}/DevIL
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001_fix-encoding.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002_fix-missing-mfc-includes.patch
-        ${CMAKE_CURRENT_LIST_DIR}/enable-static.patch
+        0001_fix-encoding.patch
+        0002_fix-missing-mfc-includes.patch
+        enable-static.patch
 )
 
 set(IL_NO_PNG 1)
@@ -24,7 +18,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()