From 40245cde8cde51897d8f79971b2b8c917dab399d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Tassoux?= <rt2@rt2.fr>
Date: Sat, 23 Dec 2017 15:51:17 +0100
Subject: [PATCH] [directxtk] Update to the last version (dec2017)

---
 ports/directxtk/CONTROL        |  2 +-
 ports/directxtk/portfile.cmake | 38 +++++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index 97f97ecd9..4e565f799 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtk
-Version: dec2016-1
+Version: dec2017
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index 5a751446c..31fa82011 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -1,20 +1,34 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+include(vcpkg_common_functions)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     message(STATUS "Warning: Dynamic building not supported yet. Building static.")
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
 
 if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-  message(FATAL_ERROR "DirectXTk only supports dynamic CRT linkage")
+  message(FATAL_ERROR "DirectXTK only supports dynamic CRT linkage")
 endif()
 
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK-dec2016)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/DirectXTK/archive/dec2016.tar.gz"
-    FILENAME "DirectXTK-dec2016.tar.gz"
-    SHA512 efb8a98d0872bf1835b274ba88615e88c4a58ab753c5ebef5a407c54d5f9a2197d1521f14651c60ea16c047918db6f54bf2ac58a6eb7330490b9bae619e8dad3
+set(DIRECTXTK_VERSION dec2017)
+set(DIRECTXTK_ARCHIVE_HASH 30df95c17d6d61bdeb372d3ba112995ad76753e23ddaf7fb104d2384e3b26e22a383355d2a411fdfce866d4a98205e4ed039a8f34a9e1d9bc1ee90b4064bcd15)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/DirectXTK
+    REF ${DIRECTXTK_VERSION}
+    SHA512 ${DIRECTXTK_ARCHIVE_HASH}
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
 	SET(BUILD_ARCH "Win32")
@@ -23,16 +37,16 @@ ELSE()
 ENDIF()
 
 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2015.sln
+    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2017.sln
 	PLATFORM ${BUILD_ARCH}
 )
 
 file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXTK.lib
+	${SOURCE_PATH}/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXTK.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
 file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXTK.lib
+	${SOURCE_PATH}/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXTK.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 
 set(DXTK_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtk)
@@ -43,7 +57,7 @@ file(INSTALL
 	DESTINATION ${DXTK_TOOL_PATH})
 
 file(INSTALL
-	${SOURCE_PATH}/XWBTool/Bin/Desktop_2015/${BUILD_ARCH}/Release/XWBTool.exe 
+	${SOURCE_PATH}/XWBTool/Bin/Desktop_2017/${BUILD_ARCH}/Release/XWBTool.exe 
 	DESTINATION ${DXTK_TOOL_PATH})
 
 file(INSTALL