aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Tassoux <contact@rt2.fr>2020-11-17 23:45:32 +0100
committerGitHub <noreply@github.com>2020-11-17 14:45:32 -0800
commit32c13c7ce883c2d07dad88c1ac8ada475acda474 (patch)
tree90e4ee87c306a5730c58d947530c7718bfc615e7
parent0b7e8c9e8ef7ce025ff19c92a0f80e2c48b5e855 (diff)
downloadvcpkg-32c13c7ce883c2d07dad88c1ac8ada475acda474.tar.gz
vcpkg-32c13c7ce883c2d07dad88c1ac8ada475acda474.zip
[directxtk][directxtk12][directxtex][directxmesh] Update to latest version (#14539)
* [directxtk][directxtk12][directxtex][directxmesh] Update to latest version https://github.com/microsoft/DirectXTK/releases/tag/nov2020 https://github.com/microsoft/DirectXTK12/releases/tag/nov2020 https://github.com/microsoft/DirectXTex/releases/tag/nov2020 https://github.com/microsoft/DirectXMesh/releases/tag/nov2020 * [directxlibs] Fix wrong port version
-rw-r--r--ports/directxmesh/CONTROL3
-rw-r--r--ports/directxmesh/portfile.cmake4
-rw-r--r--ports/directxtex/CONTROL3
-rw-r--r--ports/directxtex/enable_openexr_support.patch4
-rw-r--r--ports/directxtex/portfile.cmake4
-rw-r--r--ports/directxtk/CONTROL3
-rw-r--r--ports/directxtk/portfile.cmake4
-rw-r--r--ports/directxtk12/CONTROL3
-rw-r--r--ports/directxtk12/portfile.cmake4
9 files changed, 14 insertions, 18 deletions
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index b72a514eb..42c70287d 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,6 +1,5 @@
Source: directxmesh
-Version: aug2020
-Port-Version: 1
+Version: nov2020
Homepage: https://walbourn.github.io/directxmesh
Description: DirectXMesh geometry processing library
Build-Depends: directxmesh[core,dx12](arm64|uwp)
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 3017d39e6..b9c3227b0 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh
- REF aug2020
- SHA512 4a116b6266070a075aca523d9439eeab878b5406ffe5f94f7c008d659842750eab17b11c027c7f1da1ed12a0b8a43ab53dc5aaea8477a0bb029654cd477b5424
+ REF nov2020
+ SHA512 07bf8acba1f15f1b74d864ac624c7e0bfbdf5927c3e66f94ef78ab447e757daa01351ca8e1c8e8652dbb7008cee13c30247922af2d1712e61bc50bdb55cedf42
HEAD_REF master
)
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index eb5865def..06ec4ac5a 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,6 +1,5 @@
Source: directxtex
-Version: sept2020
-Port-Version: 2
+Version: nov2020
Homepage: https://walbourn.github.io/directxtex
Description: DirectXTex texture processing library
Build-Depends: directxtex[core,dx12](arm64|uwp)
diff --git a/ports/directxtex/enable_openexr_support.patch b/ports/directxtex/enable_openexr_support.patch
index def2700d1..c5ec406a3 100644
--- a/ports/directxtex/enable_openexr_support.patch
+++ b/ports/directxtex/enable_openexr_support.patch
@@ -52,8 +52,8 @@ index 53b41a3..84867f3 100644
target_compile_options(texassemble PRIVATE /fp:fast)
@@ -140,6 +160,12 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
target_compile_options(texassemble PRIVATE ${WarningsEXE})
- target_compile_options(texconv PRIVATE ${WarningsEXE})
- target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion" )
+ target_compile_options(texconv PRIVATE ${WarningsEXE} "-Wno-global-constructors")
+ target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion")
+
+ if(ENABLE_OPENEXR_SUPPORT)
+ target_compile_options(texassemble PRIVATE -DUSE_OPENEXR)
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index a3791d6d0..b8871ea31 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTex
- REF sept2020
- SHA512 f6b5b07817c05c64a5281b0006b182f2ebd110d79f10332801b51a185486fd7426e18c454e66995e9f88c92d7b8cf0c03ae590aa040d92314bdd3d4989784156
+ REF nov2020
+ SHA512 a3f4abc2729c6e98b8cd29ff1d410410bced2eaa2dc62563f18344dbb33f30d7ce32c11cafe85f91786e80610d8a2030dab48919f5bf9ccf92ceba2c5ed4db13
HEAD_REF master
)
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index f9e7a8efb..42068aa10 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,6 +1,5 @@
Source: directxtk
-Version: sept2020
-Port-Version: 1
+Version: nov2020
Homepage: https://walbourn.github.io/directxtk
Description: A collection of helper classes for writing DirectX 11.x code in C++.
Build-Depends: directxtk[core,xaudio2-9](arm64|uwp)
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index 6311aac22..f10da7b84 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTK
- REF sept2020
- SHA512 fcb98ffee960494f4ba9a3edd802dce7eacf8e0d9a17f712ea971cdf6c13d9ee4e403deecbcd2c8a4555301316334e6f987d6b051b7cb87e2ae76e41f213e91e
+ REF nov2020
+ SHA512 9d10a851f37deb428c16166cdecf38ffba28a4ab836f9753f071bccc570fcb22ce98271c6bbad9fa1380dddd1fa6602156a7aa1607d347139bda1860fc2210ce
HEAD_REF master
)
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL
index c5c30e5f0..4551b56c5 100644
--- a/ports/directxtk12/CONTROL
+++ b/ports/directxtk12/CONTROL
@@ -1,5 +1,4 @@
Source: directxtk12
-Version: sept2020
-Port-Version: 1
+Version: nov2020
Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12
Description: A collection of helper classes for writing DirectX 12 code in C++.
diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake
index 01efa2aa3..825cdae2a 100644
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTK12
- REF sept2020
- SHA512 25963234068700944d29f93e376d3e9dcb27689ae953f790b53f931d5776d33ae047dc340464894805ce13be469efacc3c73e731691e66cdb2c7624b14dc25ff
+ REF nov2020
+ SHA512 fd49bd8f124ac5c9808f8da09a955599234712b74525fd27739135f9044883b65f4c570048a9fe335f6aa82c8d49de1e6c0e81c904696ade3cd63b1982cf4d68
HEAD_REF master
)