diff options
| author | Victor Romero <viromer@microsoft.com> | 2019-01-10 09:54:02 -0800 |
|---|---|---|
| committer | Victor Romero <viromer@microsoft.com> | 2019-01-10 09:54:02 -0800 |
| commit | f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af (patch) | |
| tree | 652e6b64bb2e47ac124fd4b73e97cea2e92abbeb | |
| parent | 67ca08e9d3d0fb8097da84bc593a805f7169095f (diff) | |
| parent | 7578a485b181ded330b87cc72726f01e38ff7ed6 (diff) | |
| download | vcpkg-f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af.tar.gz vcpkg-f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/viromer/5019
117 files changed, 320 insertions, 381 deletions
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 95191fcf0..e6a265d6b 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil
-Version: 2018-11-08-1 +Version: 2018-12-14
Description: an open-source collection designed to augment the C++ standard library.
Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index cc70f7250..2e2488845 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
- REF 070f6e47b33a2909d039e620c873204f78809492 - SHA512 84bc7b17519d3cae471f0e2602ed32111e99d20abfdff26f1e36fd712ff9013b9768b3d37b9179dc40cb1b4a350da1b6955a881c5300ea9b608f97a3101c2762
+ REF 389ec3f906f018661a5308458d623d01f96d7b23 + SHA512 20d2cc8d23eb729607692d861049dccbd6b4af56fc4ed7733492348e3fe879d7acc6316f0d6e1c683f98188f028d460a40cab35667856cf334aa5f00fc830911
HEAD_REF master
)
diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL index 295b01db8..6ba9e4318 100644 --- a/ports/asio/CONTROL +++ b/ports/asio/CONTROL @@ -1,3 +1,3 @@ Source: asio
-Version: 1.12.1-1
+Version: 1.12.2
Description: Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.
diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 60d329ed8..bd5f5af2a 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-12-1 - SHA512 e335eea05c27a72faae95dd5d5ca997ac8bb144cd5fb68e5538129ea6afb3b4d88e2be1c31a1effdbbbe4c93e07ee274a7e5817453c29faf56abf9ab692b2dd6 + REF asio-1-12-2 + SHA512 7c2e213ff154bb2e5776b37906d437a62206f973316c94706e6d42e3c2f0866e7d97f3e40225ab5f28bf2c4a33fa0b38a4b75421aef86ddf9f2da0811caa2d00 HEAD_REF master ) diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL index f4a9931f8..0c64640ca 100644 --- a/ports/asmjit/CONTROL +++ b/ports/asmjit/CONTROL @@ -1,3 +1,3 @@ Source: asmjit -Version: 2018-11-08 +Version: 2018-12-14 Description: Complete x86/x64 JIT and Remote Assembler for C++ diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index 5d2e7b230..cfd1ed034 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF 771d66b301e60ebc3ffa69b11765622c547df6ab - SHA512 02ae822a33d50810fc0833b647bd6c29851b147ae4e388fd29d54567e6ed928173b961d3f3f323b243719092c2947bd6f374bc5d6051817e8153688868473830 + REF 3092065f148d951df281d3f0f1b4922e580b3930 + SHA512 4557bcbbe5b49e2303cfccc2ef9acdb59281a13fe9efe28ac49711736dd45db856f9f67aa9ebcf841e631fc83b8b7e14eee08e3a56d6f982fcc24e23b70b7cc5 HEAD_REF master ) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index c5e51adaf..51efe3f6f 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,4 +1,4 @@ Source: azure-c-shared-utility -Version: 1.1.11-1 +Version: 1.1.11-3 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/no-double-expand-cmake.patch b/ports/azure-c-shared-utility/no-double-expand-cmake.patch new file mode 100644 index 000000000..3775ad6b5 --- /dev/null +++ b/ports/azure-c-shared-utility/no-double-expand-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 190ea87..a434cee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -264,7 +264,7 @@ if(${use_applessl})
+ include_directories(./pal/ios-osx/)
+ endif()
+
+-if (WIN32 AND (${CMAKE_SYSTEM_VERSION} VERSION_EQUAL "10.0.17763.0" OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.17763.0"))
++if (WIN32 AND (CMAKE_SYSTEM_VERSION VERSION_EQUAL "10.0.17763.0" OR CMAKE_SYSTEM_VERSION VERSION_GREATER "10.0.17763.0"))
+ # Windows added support for UNIX domain sockets to the OS and SDK
+ # in the Oct 2018 update (10.0.17763.0, aka RS5)
+ add_definitions(-DAF_UNIX_ON_WINDOWS)
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 838528ce4..cc4514dfe 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3 - SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1 + REF 1d622902d7842f94193fc394987f2b4e978bb700 + SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84 HEAD_REF master + PATCHES no-double-expand-cmake.patch ) vcpkg_configure_cmake( diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 9c9410bfe..0164d44a0 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-iot-sdk-c -Version: 1.2.11-1 +Version: 1.2.12-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 6ec8ba3eb..2b1ef492c 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF acff8b1677150cb165a7b111745144cf8fab76cc - SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28 + REF 350b51f5abaedc975dae5419ad1fa4add7635fd2 + SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb HEAD_REF master PATCHES improve-external-deps.patch ) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 8f5f63c08..062c02bef 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uamqp-c -Version: 1.2.11-1 +Version: 1.2.11-2 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 0f7591099..b7ee41625 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa - SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58 + REF f29401ab5eb3853390d5f573d8fb37c0c96dba16 + SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73 HEAD_REF master ) diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index de34ba4dd..64834510d 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF ed7d104c4ab96aaa68e429066953874f12be70eb - SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f + REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed + SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30 HEAD_REF master ) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 9a5f5e030..407844601 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-umqtt-c -Version: 1.1.11-1 +Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index cb14cfaa8..6bfb77f89 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF ff05514c9b4742ae8d7785719a399a7fe6eac09b - SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081 + REF 3205eb26401e9c6639100934e8fb75b75275760d + SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c HEAD_REF master ) diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index bf704304e..999c3553e 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -13,11 +13,11 @@ vcpkg_from_github( ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(CARES_STATIC ON) - set(CARES_SHARED OFF) + set(CARES_STATIC 1) + set(CARES_SHARED 0) else() - set(CARES_STATIC OFF) - set(CARES_SHARED ON) + set(CARES_STATIC 0) + set(CARES_SHARED 1) endif() vcpkg_configure_cmake( diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index de2d71c35..15a9da60a 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.4.2 +Version: 2.5.0 Description: A modern, header-only test framework for unit testing. Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index b36595d2c..f6ed65251 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.4.2 - SHA512 7422c5c114d93b57cac5596e573d0993ecc6db37708df3491d346bb3aad7a1ee1d1008689ae7b8ef4b0b4fa41aa66566580f807778ae2e4f278687d6fe7aa38b + REF v2.5.0 + SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8 HEAD_REF master ) diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index 005059909..7277d6832 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.11.2 +Version: 1.11.4 Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 43bb1606c..aff3cb1ca 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore - REF v1.11.2 - SHA512 6261a7028bf398703a610d9ad42b6bde7c6309d2997c7cfaa785c1fbcf582adbbbe60756bbe411af1d6e1d26ac9acca5cbe734608885d8b5f2881819477292b7 + REF v1.11.4 + SHA512 903336fae63573991c539fd1652dd2a61c580845aca21253bce76efd884fb7d575c8bb1d91818112a6ba7c69cdcb1847175d9f09080cdc599c0afb3d36f474e2 HEAD_REF master ) diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 9d8704ea1..8a04a83bf 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,3 @@ Source: cimg -Version: 2.4.1 +Version: 2.4.2 Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake index 70b397e45..3baed452d 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.4.1 + REF v.2.4.2 HEAD_REF master - SHA512 b0582a158024a13c9d6779e4e6a37487bb8c18b3e91f8fa56a6d0ee3dbaede2567f00c29432f41ca8e3845e98566375b285fb674721225705f6ade91894db081) + SHA512 dc27e7c0b06cd619c4270a91d830dbd3e0dfea851e04d7aab46fe9f2131e4b3717f73ac53bc4d70497ff2efe3bee1ae693e621d993cd63735d00368a362833f3) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL index 5174d7037..1e75d2a70 100644 --- a/ports/cli11/CONTROL +++ b/ports/cli11/CONTROL @@ -1,3 +1,3 @@ Source: cli11 -Version: 1.6.1 +Version: 1.6.2 Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. <https://github.com/CLIUtils/CLI11> diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index bda9fa2b3..08fb83dc9 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v1.6.1 - SHA512 df12510bb78823908535a68af65fb8ea0b8b33b362e0b5f2cfa91223db7ebd9e71a55dfe31902c5d10e29c02a9bb59be58f8c69da7a9b4ab456ace64f200ac93 + REF v1.6.2 + SHA512 0160323a7a87ecdf5cff081a4270a30977b87f0592041d8fde84ec655b28cdbc40813567f95df375a4f6f953b60a638deacfb3cc5dec562c4d348dcc532f0ab7 HEAD_REF master ) diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index 7eaa3d6be..5e51572cc 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen
-Version: 0.6
+Version: 1.0.0
Build-Depends: pegtl, rapidjson
Description: C++ GraphQL schema service generator
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 70ff81070..926a4ecd2 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,17 +3,17 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/cppgraphqlgen
- REF v0.6
- SHA512 cc2596f5cd975377fcc9432eee11973e2ff044c244c3ac13c3f45549874c2fe0ac5c48bccb96813b48a1b7c940bb54decc194d9eb358c6ae39d1288b9ce58b01
+ REF v1.0.0
+ SHA512 3756c31063dc86d1c37d3cb709221b2b6e7dda5f3405d7586e4f395fd4915b1088c0305b116164c615846413042857fd688e61ef36c5c2aab218cfab8f16370c
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA # Disable this option if project cannot be built with Ninja
+ PREFER_NINJA
OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF
- # OPTIONS_RELEASE -DOPTIMIZE=1
- # OPTIONS_DEBUG -DDEBUGGABLE=1
+ OPTIONS_RELEASE -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen
+ OPTIONS_DEBUG -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/debug/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/debug/tools/cppgraphqlgen
)
vcpkg_install_cmake()
diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index b1526996e..e9d17c122 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,3 +1,3 @@ Source: dimcli -Version: 4.0.1-1 +Version: 4.1.0 Description: C++ command line parser toolkit diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index f66120c5e..6362aa987 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gknowles/dimcli - REF v4.0.1 - SHA512 e36008eed42997c467ef7f4780cacd7eb8acebeb48be56445914c0ae125c5dbf29a172e1fb2f9490a6f21db8f6de5fa0420f499aff996ee148ec3a5bef0adba5 + REF v4.1.0 + SHA512 5de010b5abfda9e6996bba8c621e03ae0cf81dbc2f69cd859e2ebf7b1706c451f7f8e142299784646d89ca3c3e5803e8711215680b8bdb8eb663158bff3b4f3d HEAD_REF master ) set(staticCrt OFF) diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 728f61b5f..d8e03d986 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,3 +1,3 @@ Source: directxmesh -Version: oct2018 +Version: nov2018 Description: DirectXMesh geometry processing library
\ No newline at end of file diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 81adb18b6..31b74abea 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh
- REF oct2018 - SHA512 eb96fa3104932650bff3b051005e84f1eb52c135085ec1f4f56b7bbd99300ca600721cd18c3a9c8d4334e3280369df7d1d92ab6556fc82c72e1a54d04853331a
+ REF nov2018 + SHA512 b1abeabd81c7d6c12adfea1ca8d563aa7c22ba1a64aa7a49b7839c0788922cec604a041dddbd3aca6a3b7c8412b1117dfee9c1163862de10757a7747669017ed
HEAD_REF master
)
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index 05edc2238..d86662ef2 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,3 +1,3 @@ Source: directxtex
-Version: oct2018 +Version: nov2018 Description: DirectXTex texture processing library
\ No newline at end of file diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index a5d6deca5..93eb8d6d1 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTex
- REF oct2018 - SHA512 6bb395c92ca60af03fb3b86dd64542feb0a633b49386a438d0e73f108a4af60913bd695a1c90069eeb83df4ec49289e1a8ae3ac131ddca372eb6dd20d14590d7
+ REF nov2018 + SHA512 bcf721820e0a4069b7b1daac44d776b2c69a6ebdc0a817fb2e1fcd94938df8b3fbabc1827c28050d0db4b26cc42a011987f50b7db04487a7075741b34ddb58a8
HEAD_REF master
)
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 100f7f99a..c3e9b194c 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,3 +1,3 @@ Source: directxtk -Version: oct2018b +Version: nov2018 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 2e6267bad..16828462e 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -12,8 +12,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF oct2018b - SHA512 d9eb0d0537dd6638bfe089bbaa77ad4c4065d43c53143686e60b8c62814f1c7a0fc9a0361a418b1f0fa0881faa14c92c604fffb6670dd8c1260e67d56fea9bab + REF nov2018 + SHA512 ee696245c914c1ede99c12d301e15f3d70ae7a0375b6c6f94afcbb1fd1a80844d1cd053a87f66c2008394a1b8f1165db0e835344a0311f0a8418c32aff9f592a HEAD_REF master ) diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index b6af1dc98..e4d98f524 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,4 +1,4 @@ Source: discord-rpc -Version: 3.3.0-2 +Version: 3.4.0 Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. Build-Depends: rapidjson diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index 1dd6d3001..b4d191bf8 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO discordapp/discord-rpc - REF v3.3.0 - SHA512 8bb2674edefabf75670ceca29364d69e2002152bff9fe55757f4cda03544b4d827ff33595d98e6d8acdc73ca61cef8ab8054ad0a1ffc905cb26496068b15025f + REF v3.4.0 + SHA512 ca981b833aff5f21fd629a704deadd8e3fb5423d959ddb75e381313f6462d984c567671b10c8f031905c08d85792ddbe2dddc402ba2613c42de9e80fc68d0d51 HEAD_REF master PATCHES disable-downloading.patch ) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 07885a75d..65ac705dd 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,3 @@ Source: doctest -Version: 2.0.1 +Version: 2.2.0 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index a84d9a21d..fffe1bb30 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.0.1 - SHA512 bbd676c8485d9bee4be3f2f6bdd0f72bced09767427533c8de3ea46b298182acaeff64e42683a4283512edd81bb444880b229e65f3296bb4afc8b5b93c03b970 + REF 2.2.0 + SHA512 edf35be338194c7abfb991e6bcc766fe9badc1cc0f21dd7147a6a42ecf451ef6a4eaa1e63b46337fb14a8ed9b107fd381e1b3b502039d7d23476b3f52b12d89c HEAD_REF master ) diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 5674e0345..cb7704c8a 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,4 @@ Source: eastl
-Version: 3.12.04 +Version: 3.12.07 Description: Electronic Arts Standard Template Library.
It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index c090f0fa8..4d61ff01f 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,8 +8,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EASTL
- REF 3.12.04 - SHA512 99e8fdc5fb589410187f3538b6f491bc6f988babcb29b74be90a938ba6c94ad1b16d55ff62ddcf5ae539c67f473d43a6af581278b8b39d0d8686b0161dd0e5cf
+ REF 3.12.07 + SHA512 d7ae29661ef8dbf13f9b8d195c5088992f23d3ca4751249385e8068f034dd687e178b2aac0f228b354e9019f0ea69f377a7b20aacb5d2b23a98b8032437f9f25
HEAD_REF master
)
diff --git a/ports/ebml/CMakeLists.txt b/ports/ebml/CMakeLists.txt deleted file mode 100644 index 7d99a13a4..000000000 --- a/ports/ebml/CMakeLists.txt +++ /dev/null @@ -1,132 +0,0 @@ -cmake_minimum_required(VERSION 3.1.2) - -project(ebml VERSION 1.3.5) - -option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF) -option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF) - -include(GNUInstallDirs) - -set(libebml_SOURCES - src/Debug.cpp - src/EbmlBinary.cpp - src/EbmlContexts.cpp - src/EbmlCrc32.cpp - src/EbmlDate.cpp - src/EbmlDummy.cpp - src/EbmlElement.cpp - src/EbmlFloat.cpp - src/EbmlHead.cpp - src/EbmlMaster.cpp - src/EbmlSInteger.cpp - src/EbmlStream.cpp - src/EbmlString.cpp - src/EbmlSubHead.cpp - src/EbmlUInteger.cpp - src/EbmlUnicodeString.cpp - src/EbmlVersion.cpp - src/EbmlVoid.cpp - src/IOCallback.cpp - src/MemIOCallback.cpp - src/MemReadIOCallback.cpp - src/SafeReadIOCallback.cpp - src/StdIOCallback.cpp) - -set(libebml_PUBLIC_HEADERS - ebml/Debug.h - ebml/EbmlBinary.h - ebml/EbmlConfig.h - ebml/EbmlContexts.h - ebml/EbmlCrc32.h - ebml/EbmlDate.h - ebml/EbmlDummy.h - ebml/EbmlElement.h - ebml/EbmlEndian.h - ebml/EbmlFloat.h - ebml/EbmlHead.h - ebml/EbmlId.h - ebml/EbmlMaster.h - ebml/EbmlSInteger.h - ebml/EbmlStream.h - ebml/EbmlString.h - ebml/EbmlSubHead.h - ebml/EbmlTypes.h - ebml/EbmlUInteger.h - ebml/EbmlUnicodeString.h - ebml/EbmlVersion.h - ebml/EbmlVoid.h - ebml/IOCallback.h - ebml/MemIOCallback.h - ebml/MemReadIOCallback.h - ebml/SafeReadIOCallback.h - ebml/StdIOCallback.h) -if(WIN32) - list(APPEND libebml_SOURCES - src/platform/win32/WinIOCallback.cpp) - list(APPEND libebml_PUBLIC_HEADERS - src/platform/win32/WinIOCallback.h) -endif() - -set(libebml_C_PUBLIC_HEADERS ebml/c/libebml_t.h) - -add_library(ebml ${libebml_SOURCES} ${libebml_PUBLIC_HEADERS} ${libebml_C_PUBLIC_HEADERS}) -if(WIN32) - include(CheckIncludeFile) - check_include_file(winapifamily.h HAVE_WINAPIFAMILY_H) - if(HAVE_WINAPIFAMILY_H) - target_compile_definitions(ebml PUBLIC HAVE_WINAPIFAMILY_H) - endif() -endif() -set_target_properties(ebml PROPERTIES - VERSION 4.0.0 - SOVERSION 4) -target_include_directories(ebml PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) -if(MSVC) - target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS) -endif() -if(BUILD_SHARED_LIBS) - set_target_properties(ebml - PROPERTIES - DEFINE_SYMBOL "EBML_DLL_EXPORT" - C_VISIBILITY_PRESET hidden - VISIBILITY_INLINES_HIDDEN 1) - target_compile_definitions(ebml - PUBLIC EBML_DLL - PRIVATE EBML_DLL_EXPORT) -endif() - -install(TARGETS ebml - EXPORT EbmlTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -install(FILES ${libebml_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ebml) -install(FILES ${libebml_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ebml/c) - -if(NOT DISABLE_PKGCONFIG) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\$\{prefix\}") - set(libdir "\$\{prefix\}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") - set(PACKAGE_VERSION ${PROJECT_VERSION}) - configure_file(libebml.pc.in libebml.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libebml.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -endif() - -if(NOT DISABLE_CMAKE_CONFIG) - if(WIN32) - set(CMAKE_INSTALL_PACKAGEDIR cmake) - else() - set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - endif() - include(CMakePackageConfigHelpers) - write_basic_package_version_file(EbmlConfigVersion.cmake COMPATIBILITY SameMajorVersion) - install(EXPORT EbmlTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) - install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/EbmlConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/EbmlConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) -endif() diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL index e4872dd6a..1b3ec442a 100644 --- a/ports/ebml/CONTROL +++ b/ports/ebml/CONTROL @@ -1,3 +1,3 @@ -Source: ebml -Version: 1.3.5-1 -Description: a C++ libary to parse EBML files +Source: ebml
+Version: 1.3.6-1
+Description: a C++ libary to parse EBML files
diff --git a/ports/ebml/EbmlConfig.cmake b/ports/ebml/EbmlConfig.cmake deleted file mode 100644 index 5752fa632..000000000 --- a/ports/ebml/EbmlConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/EbmlTargets.cmake) diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index 4b92f37bb..573801fb6 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -1,52 +1,30 @@ -# 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_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Matroska-Org/libebml - REF release-1.3.5 - SHA512 ccfa58aebb8685b2dbbab7038ab7f7e0788dba2fc391abafad5a0e05c71c8f02c7e1e3521e1c59076057f9643737c2d96a4fffdeb7991214234f2db80c78254b - HEAD_REF master -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/EbmlConfig.cmake DESTINATION ${SOURCE_PATH}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/export-endofstreamx.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DDISABLE_PKGCONFIG=1 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/ebml RENAME copyright) +include(vcpkg_common_functions)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO Matroska-Org/libebml
+ REF release-1.3.6
+ SHA512 249ff2e9b381d827311eaec910962685243a3b65335c7bd404a35e11cd204c63bc7ea69787f0e27ea9c9144024e45867fd4ae7d30688a3695cd45fee1ce89ec9
+ HEAD_REF master
+ PATCHES export-endofstreamx.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS -DDISABLE_PKGCONFIG=1
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/ebml RENAME copyright)
diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index f3efca4b8..9ba268350 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF OPTIONS_RELEASE -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3 OPTIONS_DEBUG diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL index dacd86ee9..16dbcfc32 100644 --- a/ports/entityx/CONTROL +++ b/ports/entityx/CONTROL @@ -1,3 +1,3 @@ Source: entityx -Version: 1.2.0-2 +Version: 1.2.0-3 Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx> diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index 5df7da6cd..bc6afccc3 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DENTITYX_BUILD_TESTING=false + -DENTITYX_BUILD_SHARED=0 ) vcpkg_install_cmake() diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL index d00c2aaae..2ba795fa7 100644 --- a/ports/exprtk/CONTROL +++ b/ports/exprtk/CONTROL @@ -1,3 +1,3 @@ Source: exprtk -Version: 2018-10-11 +Version: 2018-12-14 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine. diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake index a863941af..dea82b4d5 100644 --- a/ports/exprtk/portfile.cmake +++ b/ports/exprtk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArashPartow/exprtk - REF 9836f21d07b1bf799e6877324268708f61c01f73 - SHA512 44acb6e835dc215d4338ff4c2b3444373a93475ece15b3f1bfdc0781f7c28992af7c289644bf9557d041f78c7435f5907e4ba606321aab17faee6f4a70562065 + REF d89d2f5f46fbd33372c81e8ad4b997fa84569fae + SHA512 bad42b83a0f1d8142ceafac862ec62dafc040fa8293bfbca29e49afdc8dca1000fc43537a5cf28d1dae00f5e86516899bd37f996975fbbccdd6a8298d1adb359 ) file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL index 859098e30..aa6b868d5 100644 --- a/ports/fmilib/CONTROL +++ b/ports/fmilib/CONTROL @@ -1,3 +1,3 @@ Source: fmilib
-Version: 2.0.3
+Version: 2.0.3-1
Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/
diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index df72dd7ee..5692b7d12 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -69,6 +69,36 @@ SET(OPTIONS file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR})
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR})
+if (WIN32)
+
+ if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ set(GENERATOR "Visual Studio 12 2013")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ set(GENERATOR "Visual Studio 12 2013 Win64")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ set(GENERATOR "Visual Studio 12 2013 ARM")
+
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+ set(GENERATOR "Visual Studio 14 2015")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+ set(GENERATOR "Visual Studio 14 2015 Win64")
+ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+ set(GENERATOR "Visual Studio 14 2015 ARM")
+
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017")
+ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017 Win64")
+ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017 ARM")
+ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ set(GENERATOR "Visual Studio 15 2017")
+ else()
+ message(FATAL_ERROR "Unable to determine appropriate generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")
+ endif()
+
+endif()
+
foreach(BUILDTYPE "rel" "dbg")
message("Building ${TARGET_TRIPLET}-${BUILDTYPE}...")
@@ -81,10 +111,12 @@ foreach(BUILDTYPE "rel" "dbg") file(REMOVE_RECURSE ${BUILD_DIR})
file(MAKE_DIRECTORY ${BUILD_DIR})
- if(RELEASE_BUILD)
- SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR})
- else()
- SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}/debug)
+ SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR})
+ if(WIN32)
+ SET(OPTIONS ${OPTIONS} -G ${GENERATOR})
+ endif()
+ if(NOT RELEASE_BUILD)
+ STRING(APPEND FMILIB_INSTALL_PREFIX "/debug")
endif()
# Step 1: Configure
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 1711bda03..89862610c 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.11.26.00 +Version: 2018.12.10.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index c66599f7e..aab53792b 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.11.26.00 - SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac + REF v2018.12.10.00 + SHA512 d571c08f764a7670b8313336d52c02190d001085385ce92073823887fe435945a821f623b8009e846435e3461bed2dbc58427bd3960a90469461d38386bb76b9 HEAD_REF master PATCHES find-gflags.patch diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL index ceae2bbda..05a8bd84e 100644 --- a/ports/forest/CONTROL +++ b/ports/forest/CONTROL @@ -1,3 +1,3 @@ Source: forest -Version: 9.0.6 +Version: 10.1.1 Description: Template library of tree data structures diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake index c1f0db881..b618233f5 100644 --- a/ports/forest/portfile.cmake +++ b/ports/forest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xorz57/forest - REF 9.0.6 - SHA512 7cb6f25226bbd543332599d5ad2b8e13df6f06342ea12b58ed123ffd81d1362e10c2e01ff95132f7b25431a3ae984bee5cfb86852aa222e1fad1f4e6928f76bc + REF 10.1.1 + SHA512 145f60bc202c7a0ab0dad514e08606ace45780855f71d9ba6a9461c5242b751a3fefa25101387f797ecc53198cd792859927b6bd2c2aa4a1f114a311d0b74e26 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 5689f78bb..8be4a8c33 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp
-Version: 0.4.0
+Version: 0.5.0
Build-Depends: grpc, gtest, curl, crc32c
Description: C++ Client Libraries for Google Cloud Platform APIs.
diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch deleted file mode 100644 index d0e3529c7..000000000 --- a/ports/google-cloud-cpp/include-protobuf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:56:34.029389338 -0500 -+++ a/google/cloud/bigtable/CMakeLists.txt 2018-11-09 10:57:18.461259917 -0500 -@@ -53,6 +53,10 @@ - # Configure the location of proto files, particulary the googleapis protos. - list(APPEND PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" - "${PROJECT_SOURCE_DIR}") -+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto) -+if(PROTO_INCLUDE_DIR) -+ list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}") -+endif() - - # Include the functions to compile proto files. - include(CompileProtos) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 54fa6d483..94e227c4f 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -1,17 +1,13 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.4.0 - SHA512 2198a7e055c37c2a0d782e2226c2cfb4009e01c36783fe23a0a32b10c7800c1998fbaea17281cb831e7b58975d1bcdb1b2bfec0a5e4fd9d08f25299b96e8893a + REF v0.5.0 + SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5 HEAD_REF master - PATCHES include-protobuf.patch ) set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97) @@ -29,7 +25,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=vcpkg + -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF ) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 7de4cac0e..4b84ecc5f 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -10,7 +10,7 @@ include(vcpkg_common_functions) set(LIBICONV_VERSION 1.15) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" + URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz" SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a ) @@ -43,4 +43,4 @@ vcpkg_copy_pdbs() file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright) -vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv)
\ No newline at end of file +vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv) diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index e16f6b1c8..7f3de459d 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,4 @@ Source: libpng -Version: 1.6.35-1 +Version: 1.6.36 Build-Depends: zlib Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index ef82635af..01edce90d 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glennrp/libpng - REF v1.6.35 - SHA512 1b6e2664bd80726e8f6ef7ea4f23d311a883841086a4a60700dfd11621130808c24487c744c8a942219980eb29b244e81965aebfc4ab7f637693f537f4e8e148 + REF v1.6.36 + SHA512 aeb00b48347c9e84d31995b3fe7e40580029734aa8103d774eee5745f5ca1fd1fd91a15f32d492277ab94346e4e7f731ee9bfea1783f930094f9f87eb3d9397d HEAD_REF master ) diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index ff473b525..29e6d1f9d 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -22,18 +22,20 @@ else() set(LIBSODIUM_DEBUG_CONFIGURATION Debug) endif() -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj - RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} -) - IF(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") SET(BUILD_ARCH "Win32") ELSE() SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) ENDIF() +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/libsodium.vcxproj + RELEASE_CONFIGURATION ${LIBSODIUM_RELEASE_CONFIGURATION} + DEBUG_CONFIGURATION ${LIBSODIUM_DEBUG_CONFIGURATION} + OPTIONS + /p:ForceImportBeforeCppTargets=${SOURCE_PATH}/builds/msvc/properties/${BUILD_ARCH}.props +) + file(INSTALL ${SOURCE_PATH}/src/libsodium/include/sodium.h DESTINATION ${CURRENT_PACKAGES_DIR}/include @@ -45,6 +47,12 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/include/sodium ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ ${CURRENT_PACKAGES_DIR}/include/sodium/export.h _contents) + string(REPLACE "#ifdef SODIUM_STATIC" "#if 1 //#ifdef SODIUM_STATIC" _contents "${_contents}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/sodium/export.h "${_contents}") +endif () + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(INSTALL ${SOURCE_PATH}/Build/${LIBSODIUM_RELEASE_CONFIGURATION}/${BUILD_ARCH}/libsodium.dll diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL index fdc4e7a55..449b34fc5 100644 --- a/ports/libwebsockets/CONTROL +++ b/ports/libwebsockets/CONTROL @@ -1,4 +1,4 @@ Source: libwebsockets -Version: 3.0.1 +Version: 3.1.0 Build-Depends: zlib, openssl Description: Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server. diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 7d95b5add..b869fcc2a 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets - REF v3.0.1 - SHA512 ba96af918dc53e5fe15792985892e726154ec6cd8b0e6b71ec133e1ac53792c42276fd6ae2c48c274acf4163579d8326e403201a8090fc58be29518c9c5b4304 + REF v3.1.0 + SHA512 e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c HEAD_REF master PATCHES 0001-Fix-UWP.patch diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL index cd688d697..04feb0dd4 100644 --- a/ports/matroska/CONTROL +++ b/ports/matroska/CONTROL @@ -1,4 +1,4 @@ Source: matroska -Version: 1.4.8 +Version: 1.4.9 Description: a C++ libary to parse Matroska files (.mkv and .mka) Build-Depends: ebml diff --git a/ports/matroska/MatroskaConfig.cmake b/ports/matroska/MatroskaConfig.cmake deleted file mode 100644 index e9a88bd49..000000000 --- a/ports/matroska/MatroskaConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${CMAKE_CURRENT_LIST_DIR}/MatroskaTargets.cmake) diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake index fd3624584..b89a1cb6e 100644 --- a/ports/matroska/portfile.cmake +++ b/ports/matroska/portfile.cmake @@ -19,14 +19,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libmatroska - REF release-1.4.8 - SHA512 3591508674ff69a185d143b4ce5c34a4c9913ad806ad94c6a96b694752f3e67b029037573564ab3bf5d9303a4b6c5fdd55865f140ab0d26df53b051b71957d0a + REF release-1.4.9 + SHA512 0c2e7324d62e1fc28b00a899f1d2fda88a3de474ea25c51624d716b869db72b4645b64cc434a0bdb7cefdd63b354de59920d4011889554f95a2905020b139fb1 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/MatroskaConfig.cmake DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 04cb1003c..0a4183cb7 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -1,3 +1,3 @@ Source: mbedtls -Version: 2.13.1 +Version: 2.15.1 Description: An open source, portable, easy to use, readable and flexible SSL library diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 59d067f11..fa87630a4 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -5,8 +5,8 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF mbedtls-2.13.1 - SHA512 1a70446b533534c075de38ce0839f7947077ffdddffa57172594b8f8a3c4a3fbdfa9b06d13c198008abad33633e509f06abe5362f603f63850d9ec44734b3c0b + REF mbedtls-2.15.1 + SHA512 361bac49bc179c020855a59140a3e9e31ec9e89ebde9d630e9f3491cdfdf466c8dc2313276d6b257a7728784f5478bdcfd14d26e81f90d432bad2e9a94151fc2 HEAD_REF master ) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index 8d6d02147..c782ee097 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,3 @@ Source: ms-gsl -Version: 2018-11-08 +Version: 2018-12-14 Description: Microsoft implementation of the Guidelines Support Library
\ No newline at end of file diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake index a130f9a35..1b0711977 100644 --- a/ports/ms-gsl/portfile.cmake +++ b/ports/ms-gsl/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF c02ddae4bcff82b17826fe3127e835f5aa54b485 - SHA512 5fcb67d410a46a4e202c367bae59b1dd4f4220ac2b75a70bc34503612a616b2792e74a18b50901656d18a031cc32cf42da8673d3412ccfe8a236daa54eae44c7 + REF 0f68d133fa6fd2973951b8aaab481e34bbfd2cf4 + SHA512 1aa8116a75dd6ffd3a879dcf52f804e1d67e03bac3788559441ddebe2db6fd43a362bfa5ddac36954848555ba1e7fccb2d26b6060a9e171a04497ea551402b42 HEAD_REF master ) diff --git a/ports/openvdb/AddLinkageAndToolsChoice.patch b/ports/openvdb/AddLinkageAndToolsChoice.patch index 3d155cbe4..57078be15 100644 --- a/ports/openvdb/AddLinkageAndToolsChoice.patch +++ b/ports/openvdb/AddLinkageAndToolsChoice.patch @@ -73,7 +73,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) - +IF ( OPENVDB_STATIC ) @@ -130,7 +130,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_PRINT_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) +IF ( OPENVDB_BUILD_TOOLS ) @@ -142,7 +142,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) ADD_EXECUTABLE ( vdb_render ${VDB_RENDER_SOURCE_FILES} @@ -151,7 +151,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) -IF (NOT WIN32) ADD_EXECUTABLE ( vdb_view diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index 22c216b5c..e822bf04c 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,5 +1,5 @@ Source: openvdb -Version: 5.0.0-1 +Version: 5.0.0-2 Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess Description: Sparse volume data structure and tools diff --git a/ports/parson/CONTROL b/ports/parson/CONTROL index 1210c7e2e..614ff7243 100644 --- a/ports/parson/CONTROL +++ b/ports/parson/CONTROL @@ -1,3 +1,3 @@ Source: parson -Version: 2018-09-18 +Version: 2018-12-14 Description: a lighweight json library written in C diff --git a/ports/parson/portfile.cmake b/ports/parson/portfile.cmake index cfc1d861e..16c5578f1 100644 --- a/ports/parson/portfile.cmake +++ b/ports/parson/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kgabis/parson - REF 0a1896939faff5f69e179637fc49f678ff0128ba - SHA512 cb982ce7dbbe0b5a4d08a28a459e9dce5347f90d75b0a37c56698f5b79ad37aa0bd22fe6b6d5c8a6fda2dd83b072605486581360b8ed3591012ebaa1e1518fc6 + REF 302fba9cbb31ffc523bf10a1ce705040194c289d + SHA512 ecc1594fe6e27b8919ccdaf3c7e082d0d47aa5e20aec52235762b9cab8e371adec5a1760f4ea36405bf97cfb587d2bcbd81221f97a9d39290673e2ce61f5a49f HEAD_REF master ) diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index c2be8e0f3..88bc7d3ee 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.6.1-4 +Version: 3.6.1.3-1 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 1dc7e6cf5..32e8ccd91 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -3,12 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/protobuf - REF v3.6.1 - SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 + REF v3.6.1.3 + SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e HEAD_REF master PATCHES fix-uwp.patch disable-lite.patch + version-rc-msvc.patch ) if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") @@ -105,9 +106,12 @@ if(CMAKE_HOST_WIN32) protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe) endif() else() + file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*) + foreach(E IN LISTS EXECUTABLES) + file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ) + endforeach() protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ) protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin) endif() diff --git a/ports/protobuf/version-rc-msvc.patch b/ports/protobuf/version-rc-msvc.patch new file mode 100644 index 000000000..b24a862d9 --- /dev/null +++ b/ports/protobuf/version-rc-msvc.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/protoc.cmake b/cmake/protoc.cmake
+index 9bf6f5a..b58a12a 100644
+--- a/cmake/protoc.cmake
++++ b/cmake/protoc.cmake
+@@ -2,9 +2,11 @@ set(protoc_files
+ ${protobuf_source_dir}/src/google/protobuf/compiler/main.cc
+ )
+
++if(MSVC)
+ set(protoc_rc_files
+ ${CMAKE_CURRENT_BINARY_DIR}/version.rc
+ )
++endif()
+
+ add_executable(protoc ${protoc_files} ${protoc_rc_files})
+ target_link_libraries(protoc libprotobuf libprotoc)
diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt index 7ae6bcc34..70317b460 100644 --- a/ports/pthreads/CMakeLists.txt +++ b/ports/pthreads/CMakeLists.txt @@ -28,6 +28,7 @@ set(PTHREAD_SHARED_SOURCES sync.c tsd.c attr.C + version.rc ) set(PTHREAD_STATIC_SOURCES autostatic.c @@ -169,8 +170,7 @@ set(PTHREAD_STATIC_SOURCES -option(PTW32_ARCH "x32") -add_definitions(-DPTW32_ARCH=${PTW32_ARCH} -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED) +add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED) if(BUILD_SHARED_LIBS) set(PTHREAD_SOURCES ${PTHREAD_SHARED_SOURCES}) diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL index ab02fb415..53b710f2a 100644 --- a/ports/pthreads/CONTROL +++ b/ports/pthreads/CONTROL @@ -1,3 +1,3 @@ Source: pthreads -Version: 2.9.1-2 +Version: 2.9.1-3 Description: pthreads for windows diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index 67fdaea5d..880d6c3b7 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,4 +1,4 @@ Source: pybind11 -Version: 2.2.3-1 +Version: 2.2.4 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. Build-Depends: python3 (windows)
\ No newline at end of file diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 16a9b9726..55cfb1fa1 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.2.3 - SHA512 3a43b43f44ae4a6453fe3b875384acc868310177216938cb564536e6b73c56002743137e5f61cf4ecbd6c56e3b39476ebf06aea33d460581fc7d8ba7b2a22a67 + REF v2.2.4 + SHA512 6bddf5c885ff92a3e373bcedc6574dfefe8be9ebb6176c6c96d475457466c76bfb982c6df4066cb0fbead4b867f87dbc4fbc1605c80852635016f614330ce041 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/aliastemplates.patch diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 6e82bc86e..4a92b4835 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,3 @@ Source: re2 -Version: 2018-11-01-1 +Version: 2018-12-14 Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.
\ No newline at end of file diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index b5689944b..b1ecb3f0e 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/re2
- REF d9cebde0175aa1ffd38aab9a395a038464d55ce7 - SHA512 820ebc96f6cc583e50bdd637b8bf6b4e8ef6be5a74a49174bf845d037f0dd21ee3b1fbc220bc3cbbd6987205195b6c0990040f43da723f90038a20690a7553ff
+ REF e7c832772ec55f495927bfa4526d2fc17f0381be + SHA512 d79b5f5a5b97cc1f305abcf3799b00e335ba74c7c73b347b231e4796f45821398f952336dc94011fd8347de8c0e5af78b6cfa61387df002c1ba5e34954ec64c9
HEAD_REF master
)
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 9f70efb78..94bcc35fd 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,5 @@ Source: rocksdb -Version: 5.15.10 +Version: 5.17.2 Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 0d124361b..2b2013190 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v5.15.10 - SHA512 3faef43cc343c20e044f92af7cd9eae9783612d888bfe17b7d0ae6812090088f43a128e5686600ec56f5a88c100eaa893b2551f8c32df793a4ccd94330c07037 + REF v5.17.2 + SHA512 c9f9bff747d0d2c97f8adb71d6a3bd5dc206c2fc567a47d0400abac61fec7f2a386d16cda5447bcf592cca006fd6d4c5ae1a68d122e2e2a03d3ebcc002dae147 HEAD_REF master PATCHES 0001-disable-gtest.patch diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 564b25807..34eaa31db 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,4 @@ Source: rs-core-lib -Version: 2018-10-25 +Version: 2018-12-14 Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index a3eddc38d..13f0b9ed2 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF 5e2e7bb8663d078957a2f6994d9f1e3d4cf50601 - SHA512 d159b11c650572e486ce8376c03e688b5448fdf00d956edf141106d2e1173d86faf0eda843da69687a6f79eb443017dfe0fb1d9f70284444bfda7006d78aee38 + REF 23ed1ddc676c74f19c333ebbe5dafe68ad3118f3 + SHA512 2b1b0ddb13ba258ce82cb659ca989cb96e9a72ba242df01de7963de50671d6ac6ab93b0e8bb05fa030970e7efb7b894fa4daa7778d77ebb930cba96da3a55317 HEAD_REF master ) diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL index 41bed72c8..e40d92945 100644 --- a/ports/so5extra/CONTROL +++ b/ports/so5extra/CONTROL @@ -1,4 +1,4 @@ Source: so5extra -Version: 1.2.1 +Version: 1.2.2 Description: A set of additional tools for SObjectizer framework. Build-Depends: sobjectizer diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index 3d21def42..6fdc213d7 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 1.2.1) +set(VERSION 1.2.2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so_5_extra-${VERSION}/dev/so_5_extra) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/so_5_extra/so_5_extra-${VERSION}.zip/download" FILENAME "so_5_extra-${VERSION}.zip" - SHA512 84294839c800571e98e5599a16609c955296bb10ad90261c5600d3eb13fd1dfc08a7a895e89ad48b3547c9ebe28cd49c944158849a4f1d8e693d8d2259e94100 + SHA512 957b8953f172cc2ea996fe1bd4e4979b0e3fd5fe8d2abff810ff3800c061e4bf5e2935e6bf190d0385621a182a7a623598959716451d9ad5a8f0f14faed725e2 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index ca08ad3a4..33dee9141 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,3 @@ Source: sobjectizer -Version: 5.5.23 +Version: 5.5.24 Description: SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels. diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 5ca178ef5..c79f5adfa 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.23) +set(VERSION 5.5.24) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 61c2b9e42d88eafef67b38a1b517af7cbda131835d8ae60c914bd89d21e84801278292064c7ad823c0b31a376b0db68f1ee4a7e87892c2f166c39e8068d86122 + SHA512 d33b5660fb6d7b1182d68069bb86782dd7632071723762875d88dd6d67353f6913b25e0574d87e06b86f472608631f59c3e26dc9c67cda9f8223454ae758b524 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 8aa6dee78..94126c5e7 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,3 @@ Source: tbb -Version: 2018_U6 +Version: 2019_U3 Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index a4e912742..09398ae92 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO 01org/tbb - REF 2018_U6 - SHA512 efcd020a24fa41e07ff9232098cecce42ceec5882849bc30edc29ead1694fcc8820a0defb307e0a065c1db1d649a731e13d8cb6fd6f927b4bd3bdc46de0d1709 + REF 2019_U3 + SHA512 b6eaaea95658c4d49e6894811eb9ca38541820462bf1b606db16ca697af4329a94627d8ae01a73f2b07567280865b3ea92ca0ce091fa95dd3551cebbdd35976d HEAD_REF tbb_2018 ) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index d52f25eba..076c7dbfa 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,4 @@ Source: thrift -Version: 2018-11-01 +Version: 2018-12-14 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 9fb495c84..1635579b8 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 92be4f312b88eac0a4ac450eda29fd20de11b1f0 - SHA512 0c1c7eb30fc63efa483cd9970305b5285c7d6f57151a9e0f602ff757b05cede3adb13688c5d1436c05ffd4bd142ca7676db8e35cbf4d38e9112033f6a2e77ff4 + REF 2b7365c54f823013cc6a4760798051b22743c103 + SHA512 439d4860f029e083c2f9da5b87f3b6119f34da085fb8000020b4bb17195838f6ea029157ce8537176024a9dec6c163ba5495b59e66eefc344fbbb4b323d2f334 HEAD_REF master ) diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index 29f822e70..c6ecb0a3f 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,4 @@ Source: unicorn-lib -Version: 2018-10-25 +Version: 2018-12-14 Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index 009d54cbe..76e9ccb9b 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 40da6ff4c2af8a393674513285f00ada5960e79c - SHA512 39657646ea04777fb083a049d4fa8e48a57808817d718f0f7f942d3c19da1249341f9010ab00466a33d64d5a196ff35a8bd5f8ffe24230903b3c7e83b4273c59 + REF a4015d502f462ad5ba1003a51edcbd07400c14d2 + SHA512 bfdfe4062c17a5d0d1971f1482ddbc28f4d041c7bcc173350e5b2210ad466c2e5496d3a548e31fa1e1f83c12bd8d646e766cf3b8388d13d3782af50a189fb47d HEAD_REF master ) diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index bd863c73e..ab167b4da 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,3 @@ Source: unicorn -Version: 2018-10-25 +Version: 2018-12-14 Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index 849726575..f734e1386 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -14,8 +14,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF 873fffc505b29c6179a8aece18b7e331e5f879e8 - SHA512 7fce35aaee00871ee7ab0517a51ef65f7e748252ac2a97a07ee18a04dcc733b5470fd6de8e0bc433c4bbecd47b8269b33871ba7df64975600d52b3ece15715ea + REF 536c4e77c4350fac3e5c2b9b57d8c16f69b934d3 + SHA512 295a88381fbb765d3ffb6a8e58a85c9385a978e49957ad35db828952c0144e392abab77f529ea12aa62b7e495e75df8f02b032f8fd8b87502517d7e46b889e3c HEAD_REF master ) diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL index 0b967f459..9e53e9b2f 100644 --- a/ports/urdfdom-headers/CONTROL +++ b/ports/urdfdom-headers/CONTROL @@ -1,3 +1,3 @@ Source: urdfdom-headers -Version: 1.0.0-2 +Version: 1.0.2 Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF. diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake index eb2c9020e..7d11936ec 100644 --- a/ports/urdfdom-headers/portfile.cmake +++ b/ports/urdfdom-headers/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom_headers - REF 1.0.0 - SHA512 b1f63c1a13f062c987d6be4fcea5eea903577a710d44fdce077722b70d72eb65a265131beac1fdeba576bde189ebf51ac0eb19b2b06a34b0f9fb9dcbd437291a + REF 1.0.2 + SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867 HEAD_REF master ) diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL index 4777fe8e9..d14b93ded 100644 --- a/ports/uriparser/CONTROL +++ b/ports/uriparser/CONTROL @@ -1,3 +1,3 @@ Source: uriparser -Version: 0.9.0 +Version: 0.9.1 Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index 8061a6221..342269c78 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uriparser/uriparser - REF uriparser-0.9.0 - SHA512 d0a317fa55531f75b0e7ec712ea36f8e36a8cf72fdb4f959f3df7cc7c519d09752b194579a4f288bcea56d7be105da3d79dd8323960e74daff93f1dad2b5085d + REF uriparser-0.9.1 + SHA512 5a553bc503b345bd81ad8bcfa25ab1e0f0ea0a0446a0c4beba9129d128d24de418efd10f04f8814b4f8864f6e219b5b9b938934edea76e78c0235428e5062636 HEAD_REF master ) diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index a66c39f42..5db330a5c 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,4 +1,4 @@ Source: wt -Version: 4.0.4-2 +Version: 4.0.5 Description: Wt is a C++ library for developing web applications Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 0ac9fef61..3c2e70962 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF 4.0.4 - SHA512 7f9fee9b1c145adb610bf9b0860867a2f09699a1c914418938955c5648b3207db361ec48b3afe9e6faa6cc0b5874bedd44481fdd8adb8fc558cfc3dc17369ee7 + REF 4.0.5 + SHA512 5513b428bfd3e778726c947606677f3e0774b38e640e61cd94906a2e0c75d204a68072b54ddeb3614a7ba08f5668e6eb3a96d9c8df3744b09dc36ad9be12d924 HEAD_REF master PATCHES 0001-boost-1.66.patch diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index af985fa67..b922c1a24 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.1-2 +Version: 3.1.2-1 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 062238946..7319f9749 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -2,12 +2,17 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets - REF v3.1.1 - SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95 + REF v3.1.2 + SHA512 c6f8a6065e837e145633ddbd0e10910f32009900e1f7155abe0ef53b6fc83dceb9eaf6c56369d13b6526e4b8bd6073bbcbdb790d667c0dab381b67ec5d567f6f HEAD_REF master PATCHES disable-platform-lib-dir.patch ) +set(OPTIONS) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -20,10 +25,13 @@ vcpkg_configure_cmake( -DwxUSE_LIBTIFF=sys -DwxUSE_STL=ON -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON + ${OPTIONS} ) vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index 84b0ad93c..ae33c6f68 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,3 +1,3 @@ Source: zeromq -Version: 2018-11-01 +Version: 2018-12-14 Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index ebff91236..2ae912e07 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF efc9a3021fb61ca92b9869f0ad8308d29a3ebfa3 - SHA512 04c2d94c497a0398243c1fc8c5e1bdcc3a9da873ccf688a9345db334d12e562c8131e7976fa2123fb8f760cc450bd0cfe33a486d1f31880b7d69379e10be7caa + REF ed8ed727c6f532f1a7d7bdf14b72aa83e2a4f0e9 + SHA512 32034fac0bc9f2d0c40e0d9e999200af43146b015ea3663da2d1f58e47da38f292fc03284e39e6c3e30311cd80f4787492e7d993e4d36fa1031e62a8d3dd3c35 HEAD_REF master ) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4bb428668..7a1b2777b 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -123,6 +123,8 @@ fetchTool() os="linux" elif [ "$UNAME" = "Darwin" ]; then os="osx" + elif [ "$UNAME" = "FreeBSD" ]; then + os="freebsd" else echo "Unknown uname: $UNAME" return 1 diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 617fe1a0f..cf3fc7861 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -170,6 +170,8 @@ function(vcpkg_configure_cmake) list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/android.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake") + elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/freebsd.cmake") endif() list(APPEND _csc_OPTIONS diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index b6cfc4aab..0c3a9bca2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -123,6 +123,8 @@ function(vcpkg_find_acquire_program VAR) set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx") + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd") else() set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux") endif() diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 9378c7832..18ca741c2 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -21,6 +21,13 @@ <sha512>ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f</sha512> <archiveName>cmake-3.12.4-Linux-x86_64.tar.gz</archiveName> </tool> + <tool name="cmake" os="freebsd"> + <version>3.12.4</version> + <exeRelativePath>cmake-3.12.4-FreeBSD-x86_64/bin/cmake</exeRelativePath> + <url>https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz</url> + <sha512>b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479</sha512> + <archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName> + </tool> <tool name="git" os="windows"> <version>2.20.0</version> <exeRelativePath>cmd\git.exe</exeRelativePath> @@ -40,6 +47,12 @@ <url></url> <sha512></sha512> </tool> + <tool name="git" os="freebsd"> + <version>2.7.4</version> + <exeRelativePath></exeRelativePath> + <url></url> + <sha512></sha512> + </tool> <tool name="vswhere" os="windows"> <version>2.4.1</version> <exeRelativePath>vswhere.exe</exeRelativePath> @@ -94,4 +107,11 @@ <sha512>acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3</sha512> <archiveName>ninja-mac-1.8.2.zip</archiveName> </tool> + <tool name="ninja" os="freebsd"> + <version>1.8.2</version> + <exeRelativePath>ninja</exeRelativePath> + <url>https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip</url> + <sha512>56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86</sha512> + <archiveName>ninja-freebsd-1.8.2.zip</archiveName> + </tool> </tools> diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 2a73dba89..c34f30974 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -220,6 +220,8 @@ namespace vcpkg::Metrics "OSX", #elif defined(__linux__) "Linux", +#elif defined(__FreeBSD__) + "FreeBSD", #elif defined(__unix__) "Unix", #else diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 365271872..b713b2752 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -52,11 +52,13 @@ namespace vcpkg static constexpr StringLiteral OS_STRING = "osx"; #elif defined(__linux__) static constexpr StringLiteral OS_STRING = "linux"; +#elif defined(__FreeBSD__) + static constexpr StringLiteral OS_STRING = "freebsd"; #else return std::string("operating system is unknown"); #endif -#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) +#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) static const std::string XML_VERSION = "2"; static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml"; static const std::regex XML_VERSION_REGEX {R"###(<tools[\s]+version="([^"]+)">)###"}; |
