From 63b7bcd8b94721cb6fcf90bd33d45812f6e0bf05 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:00 +0100
Subject: [directxtex] Update to the last version (dec2017)

---
 ports/directxtex/CONTROL        |  2 +-
 ports/directxtex/portfile.cmake | 43 ++++++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index b11daa8d4..57de4eea1 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,3 +1,3 @@
 Source: directxtex
-Version: dec2016
+Version: dec2017
 Description: DirectXTex texture processing library
\ No newline at end of file
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 392290c06..c1127fea7 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -1,10 +1,16 @@
 # Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   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)
@@ -14,14 +20,15 @@ if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
   message(FATAL_ERROR "DirectXTex only supports dynamic CRT linkage")
 endif()
 
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/directxtex-dec2016)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/DirectXTex/archive/dec2016.tar.gz"
-    FILENAME "directxtex-dec2016.tar.gz"
-    SHA512 87797340c40a98a7b11b6eb7da17d0b93bc01ba48deed50e99ce74e0e33387cac2ec18f2f14d0148c2a79f97ca98d6b2a228dad2f16010b6dcf03c0d24a79d20
+set(DIRECTXTEX_VERSION dec2017)
+set(DIRECTXTEX_ARCHIVE_HASH f4154c820059893ce0a42a1224d14adc0f8b54f36aa7f687f29aba0358488da9eb83cbdbf682499c5b210e99607d74209595153d4ed86eb30c43b775c5d8a72f)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/DirectXTex
+    REF ${DIRECTXTEX_VERSION}
+    SHA512 ${DIRECTXTEX_ARCHIVE_HASH}
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
     SET(BUILD_ARCH "Win32")
@@ -30,7 +37,7 @@ ELSE()
 ENDIF()
 
 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_Desktop_2015.sln
+    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_Desktop_2017.sln
     PLATFORM ${BUILD_ARCH}
 )
 
@@ -40,22 +47,22 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )
 file(INSTALL
-    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXTex.lib
+    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2017/${BUILD_ARCH}/Debug/DirectXTex.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 file(INSTALL
-    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXTex.lib
+    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2017/${BUILD_ARCH}/Release/DirectXTex.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
 set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)
 file(MAKE_DIRECTORY ${TOOL_PATH})
 file(INSTALL
-    ${SOURCE_PATH}/Texdiag/Bin/Desktop_2015/${BUILD_ARCH}/Release/texdiag.exe
+    ${SOURCE_PATH}/Texdiag/Bin/Desktop_2017/${BUILD_ARCH}/Release/texdiag.exe
     DESTINATION ${TOOL_PATH})
 file(INSTALL
-    ${SOURCE_PATH}/Texconv/Bin/Desktop_2015/${BUILD_ARCH}/Release/Texconv.exe
+    ${SOURCE_PATH}/Texconv/Bin/Desktop_2017/${BUILD_ARCH}/Release/Texconv.exe
     DESTINATION ${TOOL_PATH})
 file(INSTALL
-    ${SOURCE_PATH}/Texassemble/Bin/Desktop_2015/${BUILD_ARCH}/Release/Texassemble.exe
+    ${SOURCE_PATH}/Texassemble/Bin/Desktop_2017/${BUILD_ARCH}/Release/Texassemble.exe
     DESTINATION ${TOOL_PATH})
 
 # Handle copyright
-- 
cgit v1.2.3