aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/abseil/CONTROL2
-rw-r--r--ports/abseil/portfile.cmake4
-rw-r--r--ports/aws-sdk-cpp/CONTROL2
-rw-r--r--ports/aws-sdk-cpp/portfile.cmake4
-rw-r--r--ports/brynet/CONTROL2
-rw-r--r--ports/brynet/portfile.cmake4
-rw-r--r--ports/bzip2/CMakeLists.txt2
-rw-r--r--ports/bzip2/CONTROL2
-rw-r--r--ports/bzip2/portfile.cmake24
-rw-r--r--ports/catch2/CONTROL2
-rw-r--r--ports/catch2/portfile.cmake4
-rw-r--r--ports/cgal/CONTROL2
-rw-r--r--ports/cgal/portfile.cmake4
-rw-r--r--ports/cimg/CONTROL2
-rw-r--r--ports/cimg/portfile.cmake4
-rw-r--r--ports/clara/CONTROL2
-rw-r--r--ports/clara/portfile.cmake4
-rw-r--r--ports/directxmesh/CONTROL2
-rw-r--r--ports/directxmesh/portfile.cmake4
-rw-r--r--ports/directxtex/CONTROL2
-rw-r--r--ports/directxtex/portfile.cmake4
-rw-r--r--ports/directxtk/CONTROL2
-rw-r--r--ports/directxtk/portfile.cmake4
-rw-r--r--ports/entt/CONTROL2
-rw-r--r--ports/entt/portfile.cmake26
-rw-r--r--ports/exiv2/CONTROL2
-rw-r--r--ports/exiv2/portfile.cmake4
-rw-r--r--ports/fdlibm/portfile.cmake2
-rw-r--r--ports/folly/CONTROL2
-rw-r--r--ports/folly/portfile.cmake4
-rw-r--r--ports/glm/CONTROL2
-rw-r--r--ports/glm/portfile.cmake4
-rw-r--r--ports/igloo/CONTROL3
-rw-r--r--ports/igloo/portfile.cmake16
-rw-r--r--ports/jsonnet/CONTROL2
-rw-r--r--ports/jsonnet/portfile.cmake4
-rw-r--r--ports/libgd/CONTROL2
-rw-r--r--ports/libgd/no-write-source-dir.patch14
-rw-r--r--ports/libgd/portfile.cmake24
-rw-r--r--ports/libpng/CONTROL2
-rw-r--r--ports/libpng/vcpkg-cmake-wrapper.cmake2
-rw-r--r--ports/nanovg/CMakeLists.txt31
-rw-r--r--ports/nanovg/CONTROL3
-rw-r--r--ports/nanovg/nanovgConfig.cmake1
-rw-r--r--ports/nanovg/portfile.cmake41
-rw-r--r--ports/nuklear/CONTROL2
-rw-r--r--ports/nuklear/portfile.cmake4
-rw-r--r--ports/openimageio/CONTROL2
-rw-r--r--ports/openimageio/portfile.cmake4
-rw-r--r--ports/openvdb/CONTROL2
-rw-r--r--ports/opus/CONTROL2
-rw-r--r--ports/opus/portfile.cmake4
-rw-r--r--ports/pcl/CONTROL2
-rw-r--r--ports/pcl/boost_uuid_random_generator_compat.patch13
-rw-r--r--ports/pcl/cmakelists.patch25
-rw-r--r--ports/pcl/find_cuda.patch15
-rw-r--r--ports/pcl/find_flann.patch11
-rw-r--r--ports/pcl/find_openni2.patch12
-rw-r--r--ports/pcl/find_qhull.patch13
-rw-r--r--ports/pcl/pcl_config.patch (renamed from ports/pcl/config.patch)26
-rw-r--r--ports/pcl/pcl_utils.patch (renamed from ports/pcl/config_install.patch)2
-rw-r--r--ports/pcl/portfile.cmake15
-rw-r--r--ports/pcl/uuid-detail-sha1.patch13
-rw-r--r--ports/pcl/vs2017-15.4-workaround.patch41
-rw-r--r--ports/pixel/CONTROL4
-rw-r--r--ports/pixel/portfile.cmake21
-rw-r--r--ports/portaudio/CONTROL2
-rw-r--r--ports/portaudio/pa_win_waveformat.patch27
-rw-r--r--ports/portaudio/portfile.cmake2
-rw-r--r--ports/qt5-3d/CONTROL2
-rw-r--r--ports/qt5-3d/portfile.cmake2
-rw-r--r--ports/qt5-activeqt/CONTROL2
-rw-r--r--ports/qt5-activeqt/portfile.cmake4
-rw-r--r--ports/qt5-base/CONTROL2
-rw-r--r--ports/qt5-base/fix-msvc2017.patch27
-rw-r--r--ports/qt5-base/portfile.cmake5
-rw-r--r--ports/qt5-charts/CONTROL2
-rw-r--r--ports/qt5-charts/portfile.cmake2
-rw-r--r--ports/qt5-datavis3d/CONTROL2
-rw-r--r--ports/qt5-datavis3d/portfile.cmake2
-rw-r--r--ports/qt5-declarative/CONTROL2
-rw-r--r--ports/qt5-declarative/portfile.cmake2
-rw-r--r--ports/qt5-gamepad/CONTROL2
-rw-r--r--ports/qt5-gamepad/portfile.cmake2
-rw-r--r--ports/qt5-graphicaleffects/CONTROL2
-rw-r--r--ports/qt5-graphicaleffects/portfile.cmake2
-rw-r--r--ports/qt5-imageformats/CONTROL2
-rw-r--r--ports/qt5-imageformats/portfile.cmake2
-rw-r--r--ports/qt5-modularscripts/CONTROL2
-rw-r--r--ports/qt5-modularscripts/qt_modular_library.cmake2
-rw-r--r--ports/qt5-multimedia/CONTROL2
-rw-r--r--ports/qt5-multimedia/portfile.cmake2
-rw-r--r--ports/qt5-networkauth/CONTROL2
-rw-r--r--ports/qt5-networkauth/portfile.cmake2
-rw-r--r--ports/qt5-quickcontrols/CONTROL2
-rw-r--r--ports/qt5-quickcontrols/portfile.cmake2
-rw-r--r--ports/qt5-quickcontrols2/CONTROL2
-rw-r--r--ports/qt5-quickcontrols2/portfile.cmake2
-rwxr-xr-xports/qt5-script/CONTROL2
-rwxr-xr-xports/qt5-script/portfile.cmake2
-rw-r--r--ports/qt5-scxml/CONTROL2
-rw-r--r--ports/qt5-scxml/portfile.cmake2
-rw-r--r--ports/qt5-serialport/CONTROL2
-rw-r--r--ports/qt5-serialport/portfile.cmake2
-rw-r--r--ports/qt5-speech/CONTROL2
-rw-r--r--ports/qt5-speech/portfile.cmake2
-rw-r--r--ports/qt5-svg/CONTROL2
-rw-r--r--ports/qt5-svg/portfile.cmake2
-rw-r--r--ports/qt5-tools/CONTROL2
-rw-r--r--ports/qt5-tools/portfile.cmake2
-rw-r--r--ports/qt5-virtualkeyboard/CONTROL2
-rw-r--r--ports/qt5-virtualkeyboard/portfile.cmake2
-rw-r--r--ports/qt5-websockets/CONTROL2
-rw-r--r--ports/qt5-websockets/portfile.cmake2
-rw-r--r--ports/qt5-winextras/CONTROL2
-rw-r--r--ports/qt5-winextras/portfile.cmake2
-rw-r--r--ports/qt5-xmlpatterns/CONTROL2
-rw-r--r--ports/qt5-xmlpatterns/portfile.cmake2
-rw-r--r--ports/qt5/CONTROL2
-rw-r--r--ports/range-v3/CONTROL3
-rw-r--r--ports/range-v3/portfile.cmake50
-rw-r--r--ports/rapidcheck/CONTROL3
-rw-r--r--ports/rapidcheck/portfile.cmake30
-rw-r--r--ports/re2/CONTROL2
-rw-r--r--ports/re2/portfile.cmake4
-rw-r--r--ports/sdl2/CONTROL2
-rw-r--r--ports/sdl2/enable-winrt-cmake.patch381
-rw-r--r--ports/sdl2/fix-x86-windows.patch15
-rw-r--r--ports/sdl2/portfile.cmake16
-rw-r--r--ports/sdl2/vcpkg-cmake-wrapper.cmake8
-rw-r--r--ports/snowhouse/CONTROL3
-rw-r--r--ports/snowhouse/portfile.cmake14
-rw-r--r--ports/thrift/CONTROL2
-rw-r--r--ports/thrift/portfile.cmake4
-rw-r--r--ports/vtk/CONTROL2
-rw-r--r--ports/vtk/fix-find-lz4.patch20
-rw-r--r--ports/vtk/portfile.cmake1
-rw-r--r--ports/wangle/CONTROL2
-rw-r--r--ports/wangle/portfile.cmake4
-rw-r--r--ports/zeromq/CONTROL2
-rw-r--r--ports/zeromq/portfile.cmake4
-rw-r--r--scripts/buildsystems/msbuild/vcpkg.targets3
-rw-r--r--scripts/cmake/vcpkg_from_git.cmake5
-rw-r--r--scripts/vcpkgTools.xml8
-rw-r--r--toolsrc/src/vcpkg/base/downloads.cpp12
-rw-r--r--toolsrc/vcpkg.sln1
146 files changed, 663 insertions, 613 deletions
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index ada833466..867474e2e 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
Source: abseil
-Version: 2018-10-25
+Version: 2018-11-01
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 e83b1a057..c77c7dfd2 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 94c298e2a0ae409e283cab96c954a685bd865a70
- SHA512 217b903255a745613296707568f190368d7d54e0299e455369cb14226c191ba5867b1e7d68698b2f6377d4049fe900a3aa49cba8fa69acc378fd7c5c70461551
+ REF cc8dcd307b76a575d2e3e0958a4fe4c7193c2f68
+ SHA512 7f558fc27cbbcd9cabc0630cf4683cf0f0a713ef71197211d5bc73dbc404d1e47a9d61555fddaa9f840a99ff0235256af38d34b3ed076967172824f35124f348
HEAD_REF master
)
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index eda565cff..3f045567a 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,5 +1,5 @@
Source: aws-sdk-cpp
-Version: 1.6.38
+Version: 1.6.43
Description: AWS SDK for C++
Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
Default-Features: dynamodb, s3, kinesis
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 03e5526ba..c48627c7b 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
- REF 1.6.38
- SHA512 1f70b43c8fcac62fb73ced8aeab5f979266dea5ef8dc683bf4420f4a30477dc4d7223b752a1b82cf0992d19bd8e0ef044c819b85f9781931eb9af2c060d15bfd
+ REF 1.6.43
+ SHA512 aeff9d6fa67b4c468c0d14b527ba64db2e4552e8dff9943a918430cbf8f787f3871c8138dc4d88eb829a4a1a5d0dace2a81eb7fcf607e48cc4e0f1bdf1499991
HEAD_REF master
)
diff --git a/ports/brynet/CONTROL b/ports/brynet/CONTROL
index f94ec56ee..a08457902 100644
--- a/ports/brynet/CONTROL
+++ b/ports/brynet/CONTROL
@@ -1,3 +1,3 @@
Source: brynet
-Version: 0.9.0
+Version: 1.0.0
Description: A C++ cross platform high performance tcp network library, and support SSL/HTTP/Websocket.
diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake
index 7922b704c..0224eae76 100644
--- a/ports/brynet/portfile.cmake
+++ b/ports/brynet/portfile.cmake
@@ -8,8 +8,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO IronsDu/brynet
- REF v0.9.0
- SHA512 49543833be0d8eb2dce2b00a85d48087e9756b93febaae0c7cd83b7f44f9cd8d81976069f8b84344807bee2df785b80fbb65a1a93e8c6a9c942f9554063a05c1
+ REF v1.0.0
+ SHA512 f2ad0514d5b25828b38d929bf352a8a35c39816982f7a3aaca2b6d74a7e592d8a37d2af6b77d6babf2eec25063ed1bb50704e8871d18d7e5f777021d18604b9c
HEAD_REF master
)
diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt
index d79c28818..2f70c5404 100644
--- a/ports/bzip2/CMakeLists.txt
+++ b/ports/bzip2/CMakeLists.txt
@@ -36,7 +36,7 @@ install(TARGETS libbz2
if(NOT BZIP2_SKIP_TOOLS)
add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES})
add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES})
- install(TARGETS bzip2 bzip2recover DESTINATION tools)
+ install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2)
endif()
if(NOT BZIP2_SKIP_HEADERS)
diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL
index 613d3f251..fad303399 100644
--- a/ports/bzip2/CONTROL
+++ b/ports/bzip2/CONTROL
@@ -1,3 +1,3 @@
Source: bzip2
-Version: 1.0.6-2
+Version: 1.0.6-3
Description: High-quality data compressor.
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
index 00d92c90a..25e3df10f 100644
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@@ -1,26 +1,27 @@
-
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bzip2-1.0.6)
+set(BZIP2_VERSION 1.0.6)
vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/past-due/bzip2-mirror/releases/download/v1.0.6/bzip2-1.0.6.tar.gz"
- FILENAME "bzip2-1.0.6.tar.gz"
+ URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz"
+ FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF ${BZIP2_VERSION}
+ PATCHES
+ fix-import-export-macros.patch
+)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/fix-import-export-macros.patch)
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DBZIP2_SKIP_HEADERS=ON
- -DBZIP2_SKIP_TOOLS=ON)
+ -DBZIP2_SKIP_TOOLS=ON
+)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
@@ -33,7 +34,6 @@ else()
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}")
-
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)
diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
index a120bc416..de2d71c35 100644
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
Source: catch2
-Version: 2.4.1
+Version: 2.4.2
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 202ac8701..b36595d2c 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.1
- SHA512 054751959b675a4c871538f2e65b50e0efbaee8d0fafb26f0013a2b0da6fab406dbe9493dc4888c5651bce3da32ab7d7a56694dd68427377c6b0b25804657356
+ REF v2.4.2
+ SHA512 7422c5c114d93b57cac5596e573d0993ecc6db37708df3491d346bb3aad7a1ee1d1008689ae7b8ef4b0b4fa41aa66566580f807778ae2e4f278687d6fe7aa38b
HEAD_REF master
)
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
index ef39cf54e..a84c50ce1 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,5 +1,5 @@
Source: cgal
-Version: 4.13-1
+Version: 4.13-2
Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic
Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake
index bf261f66a..40475b7c2 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -45,7 +45,9 @@ endif()
file(READ ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake _contents)
string(REPLACE "CGAL_IGNORE_PRECONFIGURED_GMP" "1" _contents "${_contents}")
string(REPLACE "CGAL_IGNORE_PRECONFIGURED_MPFR" "1" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "${_contents}")
+
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "include (\$\{CMAKE_CURRENT_LIST_DIR\}/../../share/cgal/CGALConfig.cmake)")
file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/cgal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cgal/copyright)
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL
index 6170fb678..9d8704ea1 100644
--- a/ports/cimg/CONTROL
+++ b/ports/cimg/CONTROL
@@ -1,3 +1,3 @@
Source: cimg
-Version: 2.4.0
+Version: 2.4.1
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 8dd1626f6..70b397e45 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.0
+ REF v.2.4.1
HEAD_REF master
- SHA512 5aae75afcccc965e11eae6f322a15d245d2f75b7ad4914c61add3638c1bfaf5d9cf8cc52b52743cd21b149e0397ce180ab5e5f29dc09d37b443c3f3550c8a5a5)
+ SHA512 b0582a158024a13c9d6779e4e6a37487bb8c18b3e91f8fa56a6d0ee3dbaede2567f00c29432f41ca8e3845e98566375b285fb674721225705f6ade91894db081)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/clara/CONTROL b/ports/clara/CONTROL
index 4e7d58482..cce19cdf1 100644
--- a/ports/clara/CONTROL
+++ b/ports/clara/CONTROL
@@ -1,3 +1,3 @@
Source: clara
-Version: 2018-10-25
+Version: 2018-11-01
Description: A simple to use command line parser for C++ \ No newline at end of file
diff --git a/ports/clara/portfile.cmake b/ports/clara/portfile.cmake
index 441be3b6b..142b30120 100644
--- a/ports/clara/portfile.cmake
+++ b/ports/clara/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO philsquared/Clara
- REF a19db09c015f96f80d282e445ed3091ff20b4248
- SHA512 e7a9574d92ff8cc4b91094d30572bc5b36c30f5dc52c418e76ba2227c526551572f51d4a2fa29e9afab21be82e330070dd8a2118d75bdd49ac1e510755b4cdf4
+ REF a6dfbbd011a79a5f729950d6f4b72c08f9529283
+ SHA512 ec3004807c35b54b2defbec7d794817cd90dad5e442fa30c7a4ef3f72d6fcfd789302388bae8752b98d7145071d43851326e476d053b15f800f9117e1a3a0d74
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/single_include/clara.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index e625af354..728f61b5f 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,3 +1,3 @@
Source: directxmesh
-Version: aug2018
+Version: oct2018
Description: DirectXMesh geometry processing library \ No newline at end of file
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 4263b2aa8..81adb18b6 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 aug2018
- SHA512 5aaafd434024327b9ab59eab7f0247a5e0d439e5cad22929adc78edd41ac987c5da70e3ae26637beea923333651ceae3127f1ff274aad3497948508a1a8b1912
+ REF oct2018
+ SHA512 eb96fa3104932650bff3b051005e84f1eb52c135085ec1f4f56b7bbd99300ca600721cd18c3a9c8d4334e3280369df7d1d92ab6556fc82c72e1a54d04853331a
HEAD_REF master
)
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index 3196c68b1..05edc2238 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,3 +1,3 @@
Source: directxtex
-Version: aug2018b
+Version: oct2018
Description: DirectXTex texture processing library \ No newline at end of file
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index bcdeebfbd..a5d6deca5 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 aug2018b
- SHA512 51ccd4855d399db4980a0f859da25e9473cf5b4ae44f2594b13ba7813d4fd3f4c424ce750ca0b096e40999c935269522fb6bfe2b2e1910f0f8a6c6c1ea76c399
+ REF oct2018
+ SHA512 6bb395c92ca60af03fb3b86dd64542feb0a633b49386a438d0e73f108a4af60913bd695a1c90069eeb83df4ec49289e1a8ae3ac131ddca372eb6dd20d14590d7
HEAD_REF master
)
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index 1f0637c44..100f7f99a 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,3 +1,3 @@
Source: directxtk
-Version: aug2018
+Version: oct2018b
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 5ef37d1f2..2e6267bad 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 aug2018
- SHA512 9408916864900a098bb77244144c71d1786b3fe76468c50a92fbf21f71407c7f7c6834d9e69a13b4b93161362252599ccb12f6a87b6ca7a8b23d12e6e73dd166
+ REF oct2018b
+ SHA512 d9eb0d0537dd6638bfe089bbaa77ad4c4065d43c53143686e60b8c62814f1c7a0fc9a0361a418b1f0fa0881faa14c92c604fffb6670dd8c1260e67d56fea9bab
HEAD_REF master
)
diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL
index 1e0e1410f..3489f8e78 100644
--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@@ -1,3 +1,3 @@
Source: entt
-Version: cpp14
+Version: 2.7.3-1
Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. <https://github.com/skypjack/entt>
diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake
index 05462c453..e69ed624f 100644
--- a/ports/entt/portfile.cmake
+++ b/ports/entt/portfile.cmake
@@ -4,15 +4,27 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO skypjack/entt
- REF cpp14
- SHA512 aa3ced9084a0a973ed5c9384ab3950c8ed54239df7ae605600d8cd7c2774c4173d16ad5ea7442751dfbc675f881cab952844ba794fdf464710a85fc9d77a8a5d
+ REF v2.7.3
+ SHA512 ffdb26f43ebf0090eed5de589df4194282e2ab89e5014bfe4acc2670729b86c93ea85e25b4b1e72de975287b8f0aa9e72d89e1cfb649e0a0f4f72838b00e5215
+ HEAD_REF master
)
-file(INSTALL
- ${SOURCE_PATH}/src/entt
- DESTINATION ${CURRENT_PACKAGES_DIR}/include
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTING=OFF
)
-# Handle copyright/readme/package files
+vcpkg_install_cmake()
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
+ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else()
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/entt)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/entt RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/entt)
diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index 7a09655f2..afe77d9a1 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,4 +1,4 @@
Source: exiv2
-Version: 2018-10-25
+Version: 2018-11-01
Build-Depends: zlib, expat, libiconv
Description: Image metadata library and tools http://www.exiv2.org
diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake
index 44930d2fa..d884c4441 100644
--- a/ports/exiv2/portfile.cmake
+++ b/ports/exiv2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Exiv2/exiv2
- REF dc086d2ebbb04817458b214708c5038600e96095
- SHA512 8a3dc2d948a31f6355f8c23620f4730599379fe83a6cacfe1c88d45f35cfd4a2e37c6e0c36e951961b3b9083aef9b881ccee1989c6f139e699e04db1f2d9dba9
+ REF c87749a5e22d0583fd2b876701dbf1c8052004dd
+ SHA512 5c17e6100a2ca12de92e1549c9d683e45692f846e8fec4277d18593a181d0d0b39b70b676f840c232b0c04adf5301df41cfc137e95cd8a40816bd993f752c78d
HEAD_REF master
PATCHES iconv.patch
)
diff --git a/ports/fdlibm/portfile.cmake b/ports/fdlibm/portfile.cmake
index fb616db7b..6e528f368 100644
--- a/ports/fdlibm/portfile.cmake
+++ b/ports/fdlibm/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL https://android.googlesource.com/platform/external/fdlibm
REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac
- SHA512 08c16ff7cc6f24d962090bf5ab192d3c8ab33d9f60390ca510898c918cefa1b19572ad6bbf49c327bb09d8a9ab52d8341ec14c44abe169d2d319523567f1300f
+ SHA512 bc788c840a57716f996513980d31b203bd86ce9af1ac3656a187266bfdc2fbb22a9ddf88f79ffc91dd75f3f1f1e4fd3449a42b566ffe5e49e9384efd91a68613
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 8b8e6cc42..4f8007e70 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
Source: folly
-Version: 2018.10.22.00
+Version: 2018.10.29.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 a95b1baaf..a71b39067 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.10.22.00
- SHA512 ca039ee85c4269fb79ff01beb9e67a6a17220cdc997f59c5ca27514407e533f3d65c358fc5d99c5008a63d3837703db78707a04ba88093b9e63306012a5759e5
+ REF v2018.10.29.00
+ SHA512 82714564713224e1a8dcfa0d7722cf9396374da29daf6afdb7ea058d33eaedd9e41b2ed9033bc3c3cbb6a51fa0e5cd0a48fedecfa110a13a1ca308d2a7518d1b
HEAD_REF master
PATCHES
find-gflags.patch
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL
index c7c099c72..3da56cf54 100644
--- a/ports/glm/CONTROL
+++ b/ports/glm/CONTROL
@@ -1,3 +1,3 @@
Source: glm
-Version: 0.9.9.2
+Version: 0.9.9.3
Description: OpenGL Mathematics (GLM) https://glm.g-truc.net
diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake
index 90f7875fb..7eca98766 100644
--- a/ports/glm/portfile.cmake
+++ b/ports/glm/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO g-truc/glm
- REF 0.9.9.2
- SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
+ REF 0.9.9.3
+ SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
HEAD_REF master
)
diff --git a/ports/igloo/CONTROL b/ports/igloo/CONTROL
new file mode 100644
index 000000000..ffa162695
--- /dev/null
+++ b/ports/igloo/CONTROL
@@ -0,0 +1,3 @@
+Source: igloo
+Version: 1.1.1
+Description: A framework for unit testing in C++
diff --git a/ports/igloo/portfile.cmake b/ports/igloo/portfile.cmake
new file mode 100644
index 000000000..a1ab17576
--- /dev/null
+++ b/ports/igloo/portfile.cmake
@@ -0,0 +1,16 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO joakimkarlsson/igloo
+ REF igloo.1.1.1
+ SHA512 69d8edb840aa1e2c1df4529a39b94e2d33dbc9fb5869ae91a0f062d29b7fbb73d4e2180080e7696cb69fbf5126c7c53c98dddb003e0e5e796812330e1a4ba32e
+ HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/igloo DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igloo/external/snowhouse)
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/igloo/external/snowhouse/snowhouse/snowhouse.h" "#include <snowhouse/snowhouse.h>")
+
+file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/igloo)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/igloo/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/igloo/copyright) \ No newline at end of file
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index eba2463ce..3a96ceeb1 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,3 +1,3 @@
Source: jsonnet
-Version: 2018-10-25
+Version: 2018-11-01
Description: Jsonnet - The data templating language
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 09e7d92b4..6a8e0f5cb 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/jsonnet
- REF edfcffc596af4a5977891849a2b813cf31bbff5e
- SHA512 a0568fa00331ef2fe2e14c25c36b6668d15fbe3c4e92453a382832ae715c6eaff5047f0a91a98429052e0eaa16db25b850bb4544f44974abb7769125a1f4a7f2
+ REF a0876b301daf8f45e16ac5f7bb814d0617772bb0
+ SHA512 a57380ecc578b11f3a763202abb7ab703f2cc3c098ca7602d0bd199594a9e8d1cebc6d51332658edb08bf088e565d6afae0cb2faaf127fa33542a406de1ac055
HEAD_REF master
)
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL
index f86afe90f..a8373f515 100644
--- a/ports/libgd/CONTROL
+++ b/ports/libgd/CONTROL
@@ -1,4 +1,4 @@
Source: libgd
-Version: 2.2.4-3
+Version: 2.2.4-4
Description: Open source code library for the dynamic creation of images by programmers.
Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig
diff --git a/ports/libgd/no-write-source-dir.patch b/ports/libgd/no-write-source-dir.patch
new file mode 100644
index 000000000..3017e7ee4
--- /dev/null
+++ b/ports/libgd/no-write-source-dir.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b16d4a4..5126085 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -191,7 +191,8 @@ else (USE_EXT_GD)
+ CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
+ CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
+
+- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES)
++ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES)
++ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
+
+ option(BUILD_SHARED_LIBS "Build shared libs" ON)
+ option(BUILD_STATIC_LIBS "Build static libs" OFF)
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake
index 61445641e..7e8051acc 100644
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@@ -1,19 +1,15 @@
include(vcpkg_common_functions)
-set(LIBGD_VERSION 2.2.4)
-set(LIBGD_HASH 02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libgd-gd-${LIBGD_VERSION})
-
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/libgd/libgd/archive/gd-${LIBGD_VERSION}.tar.gz"
- FILENAME "gd-${LIBGD_VERSION}.tar.gz"
- SHA512 ${LIBGD_HASH})
-
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-cmake.patch")
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO libgd/libgd
+ REF gd-2.2.4
+ SHA512 02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee
+ HEAD_REF master
+ PATCHES
+ 0001-fix-cmake.patch
+ no-write-source-dir.patch
+)
#delete CMake builtins modules
file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake)
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
index d7e4b8e89..e16f6b1c8 100644
--- a/ports/libpng/CONTROL
+++ b/ports/libpng/CONTROL
@@ -1,4 +1,4 @@
Source: libpng
-Version: 1.6.35
+Version: 1.6.35-1
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/vcpkg-cmake-wrapper.cmake b/ports/libpng/vcpkg-cmake-wrapper.cmake
index 88813d68c..cb9c74f32 100644
--- a/ports/libpng/vcpkg-cmake-wrapper.cmake
+++ b/ports/libpng/vcpkg-cmake-wrapper.cmake
@@ -1,4 +1,6 @@
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a")
set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16.a" CACHE FILEPATH "")
+elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ set(PNG_LIBRARY_RELEASE "${CMAKE_CURRENT_LIST_DIR}/../../lib/libpng16${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE FILEPATH "")
endif()
_find_package(${ARGS})
diff --git a/ports/nanovg/CMakeLists.txt b/ports/nanovg/CMakeLists.txt
new file mode 100644
index 000000000..87a7d3339
--- /dev/null
+++ b/ports/nanovg/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.11)
+project(nanovg C)
+
+set(NANOVG_SOURCES src/nanovg.c)
+set(NANOVG_HEADERS src/nanovg.h src/nanovg_gl.h src/nanovg_gl_utils.h)
+add_library(nanovg STATIC ${NANOVG_SOURCES} ${NANOVG_HEADERS})
+set_target_properties(nanovg PROPERTIES PUBLIC_HEADER "${NANOVG_HEADERS}")
+target_include_directories(nanovg PRIVATE 3rdparty/nanovg/src)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ target_compile_definitions(nanovg PRIVATE DEBUG)
+else()
+ target_compile_definitions(nanovg PRIVATE NDEBUG)
+endif()
+
+install(TARGETS nanovg
+ EXPORT nanovgTargets
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+ PUBLIC_HEADER DESTINATION include)
+
+install(EXPORT nanovgTargets
+ FILE nanovgTargets.cmake
+ NAMESPACE nanovg::
+ DESTINATION share/nanovg)
+
+include(CMakePackageConfigHelpers)
+install(FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/nanovgConfig.cmake
+ DESTINATION share/nanovg)
diff --git a/ports/nanovg/CONTROL b/ports/nanovg/CONTROL
new file mode 100644
index 000000000..c074c1824
--- /dev/null
+++ b/ports/nanovg/CONTROL
@@ -0,0 +1,3 @@
+Source: nanovg
+Version: master
+Description: NanoVG is small antialiased vector graphics rendering library for OpenGL.
diff --git a/ports/nanovg/nanovgConfig.cmake b/ports/nanovg/nanovgConfig.cmake
new file mode 100644
index 000000000..e849dff11
--- /dev/null
+++ b/ports/nanovg/nanovgConfig.cmake
@@ -0,0 +1 @@
+include(${CMAKE_CURRENT_LIST_DIR}/nanovgTargets.cmake)
diff --git a/ports/nanovg/portfile.cmake b/ports/nanovg/portfile.cmake
new file mode 100644
index 000000000..39e36720e
--- /dev/null
+++ b/ports/nanovg/portfile.cmake
@@ -0,0 +1,41 @@
+# 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)
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO memononen/nanovg
+ REF f4069e6a1ad5da430fb0a9c57476d5ddc2ff89b2
+ SHA512 5f2313be939478d40e52c74e3935cbae91277be5c0e466a6d303e8d80e7bf0781288cb319b2e8cec5c7d6fc991be16bec6e0f5228153895ff7fe3abdffe5320e
+ HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/nanovgConfig.cmake DESTINATION ${SOURCE_PATH})
+
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA # Disable this option if project cannot be built with Ninja
+ # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+ # OPTIONS_RELEASE -DOPTIMIZE=1
+ # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
+ ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
+ file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/nanovg RENAME copyright)
diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL
index 15f605ebc..f7d01c295 100644
--- a/ports/nuklear/CONTROL
+++ b/ports/nuklear/CONTROL
@@ -1,3 +1,3 @@
Source: nuklear
-Version: 2018-10-25
+Version: 2018-11-01
Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain
diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake
index d7570987f..b7e6bfff8 100644
--- a/ports/nuklear/portfile.cmake
+++ b/ports/nuklear/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vurtun/nuklear
- REF 19c14bb777ebccf93fc9ed8a8b295f4a62cb32c9
- SHA512 ff9d9fcbba41b602e13060445dd67a6c07322fce4b9b210cde72e4ba9bb5f3805fec5aad66e2c9aeca191d0fdd4e9b747021e5e8aa62175f927fa39a91847b1a
+ REF 181cfd86c47ae83eceabaf4e640587b844e613b6
+ SHA512 33f6200d046c96b8d42ff851ba788bf4f57d8aa99591b866e8691204378f23d5dce06343521834cd10ffaecc42566d97ce2c3becf48caaadf0cdc270cf69bdbb
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index 6f3687ca6..86ae5bd55 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
Source: openimageio
-Version: 1.8.15-1
+Version: 1.8.16
Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index 7997a6105..93b04e627 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OpenImageIO/oiio
- REF Release-1.8.15
- SHA512 e022e5c7e300d3dd952bcf3476e1b676a8931f67ba6b3959b26c75b9709907ac1c1b99de651f5876045f9a333e325a161b0d5159cb5bf385eb4f9f90a04707c7
+ REF Release-1.8.16
+ SHA512 a919341df7d9625a869cad266d8434881b63a47f3da8daccf4bbab6675d45bd121ff780dd911a7447450fee44cd7bdd42d73aec59a99b667d6d98e79682db2c7
HEAD_REF master
PATCHES
# fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES'
diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL
index 7576ff790..22c216b5c 100644
--- a/ports/openvdb/CONTROL
+++ b/ports/openvdb/CONTROL
@@ -5,4 +5,4 @@ Description: Sparse volume data structure and tools
Feature: tools
Description: OpenVDB utilities: view, print and render
-Build-Depends: glew, glfw3
+Build-Depends: glew, glfw3, boost-ptr-container
diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL
index e5c715bba..dd92faea5 100644
--- a/ports/opus/CONTROL
+++ b/ports/opus/CONTROL
@@ -1,3 +1,3 @@
Source: opus
-Version: 1.2.1-1
+Version: 1.3
Description: Totally open, royalty-free, highly versatile audio codec
diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake
index ed2ed092e..d15be61f1 100644
--- a/ports/opus/portfile.cmake
+++ b/ports/opus/portfile.cmake
@@ -6,8 +6,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xiph/opus
- REF v1.2.1
- SHA512 fdc64b43875dd07dc9eb1c37e9a61d1c10e3095de62ed9597d51b93445136958c9f5fee78c33ae7f90c72a20200083cdc727d8e79f2f9e580ad4e2f8c50cccb4
+ REF v1.3
+ SHA512 5ac067514b6471432fcd027b912dcaa765e2bdc986ea289a2aeb57660d18fa1460a0a697b9736d8e2b65eb7b72ad4fa36b9b213389fe1e64335db8e9ad51b750
HEAD_REF master
PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-main.patch"
)
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index b1b20fe06..0a12f78c8 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
Source: pcl
-Version: 1.8.1-12
+Version: 1.9.0-1
Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio
diff --git a/ports/pcl/boost_uuid_random_generator_compat.patch b/ports/pcl/boost_uuid_random_generator_compat.patch
deleted file mode 100644
index 891890b46..000000000
--- a/ports/pcl/boost_uuid_random_generator_compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0405dca2..00e5238e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -168,6 +168,8 @@ if(CMAKE_COMPILER_IS_MSVC)
- endif()
- endif()
-
-+add_definitions(-DBOOST_UUID_RANDOM_GENERATOR_COMPAT)
-+
- if(CMAKE_COMPILER_IS_PATHSCALE)
- if("${CMAKE_CXX_FLAGS}" STREQUAL "")
- SET(CMAKE_CXX_FLAGS "-Wno-uninitialized -zerouv -pthread -mp")
diff --git a/ports/pcl/cmakelists.patch b/ports/pcl/cmakelists.patch
deleted file mode 100644
index d385fd291..000000000
--- a/ports/pcl/cmakelists.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d36a581fb..b68962e97 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -258,7 +258,7 @@ if(OPENMP_FOUND)
- set(OPENMP_DLL VCOMP120)
- elseif(MSVC_VERSION EQUAL 1900)
- set(OPENMP_DLL VCOMP140)
-- elseif(MSVC_VERSION EQUAL 1910)
-+ elseif(MSVC_VERSION MATCHES "^191[0-9]$")
- set(OPENMP_DLL VCOMP140)
- endif()
- if(OPENMP_DLL)
-@@ -327,9 +327,9 @@ endif(WITH_PNG)
- # Qhull
- option(WITH_QHULL "Include convex-hull operations" TRUE)
- if(WITH_QHULL)
-- if(NOT PCL_SHARED_LIBS OR WIN32)
-+ if(NOT PCL_SHARED_LIBS)
- set(QHULL_USE_STATIC ON)
-- endif(NOT PCL_SHARED_LIBS OR WIN32)
-+ endif(NOT PCL_SHARED_LIBS)
- find_package(Qhull)
- if(QHULL_FOUND)
- include_directories(${QHULL_INCLUDE_DIRS})
diff --git a/ports/pcl/find_cuda.patch b/ports/pcl/find_cuda.patch
deleted file mode 100644
index 6e872cdab..000000000
--- a/ports/pcl/find_cuda.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/pcl_find_cuda.cmake b/cmake/pcl_find_cuda.cmake
-index fd9cfa9..ae9e612 100644
---- a/cmake/pcl_find_cuda.cmake
-+++ b/cmake/pcl_find_cuda.cmake
-@@ -43,7 +43,9 @@ if(CUDA_FOUND)
-
- # Find a complete list for CUDA compute capabilities at http://developer.nvidia.com/cuda-gpus
-
-- if(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0")
-+ if(NOT ${CUDA_VERSION_STRING} VERSION_LESS "9.0")
-+ set(__cuda_arch_bin "3.0 3.5 5.0 5.2 5.3 6.0 6.1 7.0")
-+ elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0")
- set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2 5.3 6.0 6.1")
- elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "6.5")
- set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2")
diff --git a/ports/pcl/find_flann.patch b/ports/pcl/find_flann.patch
index e9760e502..263be2926 100644
--- a/ports/pcl/find_flann.patch
+++ b/ports/pcl/find_flann.patch
@@ -1,5 +1,5 @@
diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
-index b5739dc95..d2c3fd07e 100644
+index 1cecacfa9..3169d6d7b 100644
--- a/cmake/Modules/FindFLANN.cmake
+++ b/cmake/Modules/FindFLANN.cmake
@@ -10,8 +10,8 @@
@@ -13,12 +13,3 @@ index b5739dc95..d2c3fd07e 100644
else(FLANN_USE_STATIC)
set(FLANN_RELEASE_NAME flann_cpp)
set(FLANN_DEBUG_NAME flann_cpp-gd)
-@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG
- NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME}
- HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
- PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann"
-- PATH_SUFFIXES lib)
-+ PATH_SUFFIXES lib debug/lib)
-
- if(NOT FLANN_LIBRARY_DEBUG)
- set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY})
diff --git a/ports/pcl/find_openni2.patch b/ports/pcl/find_openni2.patch
deleted file mode 100644
index 4bd3e0799..000000000
--- a/ports/pcl/find_openni2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
-index 713099a14..f31de96a6 100644
---- a/cmake/Modules/FindOpenNI2.cmake
-+++ b/cmake/Modules/FindOpenNI2.cmake
-@@ -51,6 +51,7 @@ find_path(OPENNI2_INCLUDE_DIRS OpenNI.h
- PATHS
- "$ENV{OPENNI2_INCLUDE${OPENNI2_SUFFIX}}" # Win64 needs '64' suffix
- /usr/include/openni2 # common path for deb packages
-+ PATH_SUFFIXES include/openni2
- )
-
- find_library(OPENNI2_LIBRARY
diff --git a/ports/pcl/find_qhull.patch b/ports/pcl/find_qhull.patch
deleted file mode 100644
index e845293be..000000000
--- a/ports/pcl/find_qhull.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/Modules/FindQhull.cmake b/cmake/Modules/FindQhull.cmake
-index 698bd151b..44c1d5d8d 100644
---- a/cmake/Modules/FindQhull.cmake
-+++ b/cmake/Modules/FindQhull.cmake
-@@ -55,7 +55,7 @@ find_library(QHULL_LIBRARY_DEBUG
- NAMES ${QHULL_DEBUG_NAME} ${QHULL_RELEASE_NAME}
- HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
- PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull"
-- PATH_SUFFIXES project build bin lib)
-+ PATH_SUFFIXES project build bin lib debug/lib)
-
- if(NOT QHULL_LIBRARY_DEBUG)
- set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY})
diff --git a/ports/pcl/config.patch b/ports/pcl/pcl_config.patch
index 1b46ab7ce..17af6cfb6 100644
--- a/ports/pcl/config.patch
+++ b/ports/pcl/pcl_config.patch
@@ -1,26 +1,8 @@
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
-index f4ef6a0ff..3a2c259dc 100644
+index 7ec40baa0..837d78c82 100644
--- a/PCLConfig.cmake.in
+++ b/PCLConfig.cmake.in
-@@ -155,7 +155,7 @@ macro(find_qhull)
- NAMES "@QHULL_LIBRARY_DEBUG_NAME@"
- HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
- PATHS "$ENV{PROGRAMFILES}/qhull" "$ENV{PROGRAMW6432}/qhull"
-- PATH_SUFFIXES project build bin lib)
-+ PATH_SUFFIXES project build bin lib debug/lib)
-
- find_package_handle_standard_args(qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIRS)
-
-@@ -443,7 +443,7 @@ macro(find_flann)
- HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
- PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9"
- "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
-- PATH_SUFFIXES lib)
-+ PATH_SUFFIXES lib debug/lib)
-
- find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS)
- if(FLANN_FOUND)
-@@ -715,25 +715,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
+@@ -388,25 +388,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
if(WIN32 AND NOT MINGW)
# PCLConfig.cmake is installed to PCL_ROOT/cmake
get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
@@ -49,13 +31,13 @@ index f4ef6a0ff..3a2c259dc 100644
if(EXISTS "${PCL_ROOT}/3rdParty")
set(PCL_ALL_IN_ONE_INSTALLER ON)
endif(EXISTS "${PCL_ROOT}/3rdParty")
-@@ -743,9 +736,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
+@@ -416,9 +409,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
set(PCL_INCLUDE_DIRS "${PCL_DIR}/include") # for pcl_config.h
set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
-else(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
+else(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
- pcl_report_not_found("PCL can not be found on this machine")
+ pcl_report_not_found("PCL can not be found on this machine")
-endif(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
+endif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
diff --git a/ports/pcl/config_install.patch b/ports/pcl/pcl_utils.patch
index ae5e8257b..3f266cdfd 100644
--- a/ports/pcl/config_install.patch
+++ b/ports/pcl/pcl_utils.patch
@@ -1,5 +1,5 @@
diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
-index 69f1e76a4..37305815e 100644
+index 41a64a269..a12718339 100644
--- a/cmake/pcl_utils.cmake
+++ b/cmake/pcl_utils.cmake
@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index dc4619ed3..650e6de1a 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -3,19 +3,12 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PointCloudLibrary/pcl
- REF pcl-1.8.1
- SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
+ REF pcl-1.9.0
+ SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc
HEAD_REF master
- PATCHES cmakelists.patch
- config.patch
- config_install.patch
+ PATCHES pcl_utils.patch
+ pcl_config.patch
find_flann.patch
- find_qhull.patch
- find_openni2.patch
- find_cuda.patch
- vs2017-15.4-workaround.patch
- boost_uuid_random_generator_compat.patch
- uuid-detail-sha1.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS)
diff --git a/ports/pcl/uuid-detail-sha1.patch b/ports/pcl/uuid-detail-sha1.patch
deleted file mode 100644
index 8c2536cab..000000000
--- a/ports/pcl/uuid-detail-sha1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
-index 5b12331..b83f320 100644
---- a/visualization/src/pcl_visualizer.cpp
-+++ b/visualization/src/pcl_visualizer.cpp
-@@ -100,7 +100,7 @@
- #include <pcl/visualization/pcl_visualizer.h>
- #include <pcl/visualization/common/common.h>
- #include <pcl/common/time.h>
--#include <boost/uuid/sha1.hpp>
-+#include <boost/uuid/detail/sha1.hpp>
- #include <boost/filesystem.hpp>
- #include <pcl/console/parse.h>
-
diff --git a/ports/pcl/vs2017-15.4-workaround.patch b/ports/pcl/vs2017-15.4-workaround.patch
deleted file mode 100644
index 5600c9dc8..000000000
--- a/ports/pcl/vs2017-15.4-workaround.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/io/include/pcl/io/ply/ply_parser.h b/io/include/pcl/io/ply/ply_parser.h
-index 649d19a..45709a8 100644
---- a/io/include/pcl/io/ply/ply_parser.h
-+++ b/io/include/pcl/io/ply/ply_parser.h
-@@ -115,7 +115,7 @@ namespace pcl
-
- class scalar_property_definition_callbacks_type
- {
-- private:
-+ public:
- template <typename T>
- struct callbacks_element
- {
-@@ -123,7 +123,8 @@ namespace pcl
- typedef T scalar_type;
- typename scalar_property_definition_callback_type<scalar_type>::type callback;
- };
--
-+
-+ private:
- typedef boost::mpl::inherit_linearly<
- scalar_types,
- boost::mpl::inherit<
-@@ -218,6 +219,7 @@ namespace pcl
- boost::mpl::_1,boost::mpl::transform<Sequence2, pair_with<boost::mpl::_2> > > >
- {};
-
-+ public:
- template <typename T>
- struct callbacks_element
- {
-@@ -225,7 +227,8 @@ namespace pcl
- typedef typename T::second scalar_type;
- typename list_property_definition_callback_type<size_type, scalar_type>::type callback;
- };
--
-+
-+ private:
- typedef boost::mpl::inherit_linearly<sequence_product<size_types, scalar_types>::type, boost::mpl::inherit<boost::mpl::_1, callbacks_element<boost::mpl::_2> > >::type callbacks;
- callbacks callbacks_;
-
diff --git a/ports/pixel/CONTROL b/ports/pixel/CONTROL
new file mode 100644
index 000000000..50b1bd0a8
--- /dev/null
+++ b/ports/pixel/CONTROL
@@ -0,0 +1,4 @@
+Source: pixel
+Version: 0.3
+Description: Simple 2D Graphics based on standard and portable OpenGL.
+Build-Depends: glew, opengl, sdl2
diff --git a/ports/pixel/portfile.cmake b/ports/pixel/portfile.cmake
new file mode 100644
index 000000000..4e2e9d7ac
--- /dev/null
+++ b/ports/pixel/portfile.cmake
@@ -0,0 +1,21 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO dascandy/pixel
+ REF v0.3
+ SHA512 d7d622679195d0eb30c8ed411333711369b108e2171d1e4b0a93c7ae3bd1fb36a25fbe1f5771c858615c07ee139412e5353b8cb5489cb409dd94829253c18a7b
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+vcpkg_copy_pdbs()
diff --git a/ports/portaudio/CONTROL b/ports/portaudio/CONTROL
index 8b74bfd6f..ceeec644c 100644
--- a/ports/portaudio/CONTROL
+++ b/ports/portaudio/CONTROL
@@ -1,3 +1,3 @@
Source: portaudio
-Version: 19.0.6.00-3
+Version: 19.0.6.00-4
Description: PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.
diff --git a/ports/portaudio/pa_win_waveformat.patch b/ports/portaudio/pa_win_waveformat.patch
new file mode 100644
index 000000000..cba073947
--- /dev/null
+++ b/ports/portaudio/pa_win_waveformat.patch
@@ -0,0 +1,27 @@
+From fa727918e9e56c2a18dbdcfd276c60ac616c56ba Mon Sep 17 00:00:00 2001
+From: Etienne Dechamps <etienne@edechamps.fr>
+Date: Sat, 27 Oct 2018 15:14:27 +0100
+Subject: [PATCH] Add pa_win_waveformat.h to public includes.
+
+pa_win_wasapi.h includes pa_win_waveformat.h, so it has to be
+distributed for pa_win_wasapi.h to be usable.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 789671a..6a3ed8e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,7 +210,7 @@ IF(WIN32)
+ IF(PA_USE_WASAPI)
+ SET(PA_WASAPI_SOURCES src/hostapi/wasapi/pa_win_wasapi.c)
+ SOURCE_GROUP("hostapi\\wasapi" FILES ${PA_WASAPI_SOURCES})
+- SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h)
++ SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h include/pa_win_waveformat.h)
+ SET(PA_SOURCES ${PA_SOURCES} ${PA_WASAPI_SOURCES})
+ SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid)
+ IF(NOT MSVC)
+--
+2.14.1.windows.1
+
diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake
index 236cb2cea..503b08048 100644
--- a/ports/portaudio/portfile.cmake
+++ b/ports/portaudio/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
find_dsound.patch
wasapi_support.patch
crt_linkage_build_config.patch
+ pa_win_waveformat.patch
)
# NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided
@@ -25,6 +26,7 @@ vcpkg_configure_cmake(
-DPA_USE_WASAPI=ON
-DPA_USE_WDMKS=ON
-DPA_USE_WMME=ON
+ -DPA_ENABLE_DEBUG_OUTPUT:BOOL=ON
)
vcpkg_install_cmake()
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
index 37041854f..bcf523665 100644
--- a/ports/qt5-3d/CONTROL
+++ b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-3d
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake
index fde84f741..e98d4da83 100644
--- a/ports/qt5-3d/portfile.cmake
+++ b/ports/qt5-3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qt3d d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a)
+qt_modular_library(qt3d 706aa7e9a43d50823e8cd1e4838417a44761d6391ca3f8bae54d371742789ee63ba36e219c0a66ad3957ae0d68ed8e58c13f56a5f151b2d09e2c99e986aea4fe)
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
index a84f32cf4..2df390330 100644
--- a/ports/qt5-activeqt/CONTROL
+++ b/ports/qt5-activeqt/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-activeqt
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 ActiveQt Module - ActiveX components
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake
index 25f7df0a3..6f2e479a9 100644
--- a/ports/qt5-activeqt/portfile.cmake
+++ b/ports/qt5-activeqt/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtactiveqt a6fb4a3a53f5965e0913276a784f2fce81351a9c54cc190f15b431a497e04a4b823a8cec132713e382dc4e3ab2edef967e920c7aaa7392a72d7b12263c9f4876)
+qt_modular_library(qtactiveqt 50027f3429a4e9f140e259f228ea46420284a9632bba3ed92b9b44fbc1c168b6b2d039986d6a07e17ae1afff4f0aec3ccfe8a660322449a3258ab251c1910135)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)
+#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 4eb7e3842..820137710 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-base
-Version: 5.11.1-5
+Version: 5.11.2-1
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
diff --git a/ports/qt5-base/fix-msvc2017.patch b/ports/qt5-base/fix-msvc2017.patch
deleted file mode 100644
index c1f9254ff..000000000
--- a/ports/qt5-base/fix-msvc2017.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
---- a/mkspecs/common/msvc-version.conf 2018-06-15 03:29:31.000000000 -0400
-+++ b/mkspecs/common/msvc-version.conf 2018-08-23 00:26:46.436806400 -0400
-@@ -112,4 +112,11 @@
- COMPAT_MKSPEC =
- }
-
-+
-+# MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without
-+# this flag since the fix breaks binary compatibility.
-+greaterThan(QMAKE_MSC_VER, 1914) {
-+ DEFINES += _ENABLE_EXTENDED_ALIGNED_STORAGE
-+}
-+
- !isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC
-diff -Naur a/qmake/Makefile.win32 b/qmake/Makefile.win32
---- a/qmake/Makefile.win32 2018-06-15 03:29:31.000000000 -0400
-+++ b/qmake/Makefile.win32 2018-08-23 00:27:45.764849600 -0400
-@@ -39,7 +39,7 @@
- -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS \
- -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \
- -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
-- -DQT_NO_FOREACH -DUNICODE
-+ -DQT_NO_FOREACH -DUNICODE -D_ENABLE_EXTENDED_ALIGNED_STORAGE
- CFLAGS = $(CFLAGS_PCH) $(CFLAGS_BARE) $(CFLAGS)
-
- CXXFLAGS_BARE = $(CFLAGS_BARE)
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index b58fe326e..b6d140f88 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -12,13 +12,13 @@ include(configure_qt)
include(install_qt)
set(MAJOR_MINOR 5.11)
-set(FULL_VERSION ${MAJOR_MINOR}.1)
+set(FULL_VERSION ${MAJOR_MINOR}.2)
set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
vcpkg_download_distfile(ARCHIVE_FILE
URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
FILENAME ${ARCHIVE_NAME}
- SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
+ SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
@@ -28,7 +28,6 @@ vcpkg_extract_source_archive_ex(
fix-system-freetype.patch
fix-system-pcre2.patch
fix-system-pcre2-linux.patch
- fix-msvc2017.patch
)
# Remove vendored dependencies to ensure they are not picked up by the build
diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL
index a5bc1b33e..4a73bcdc4 100644
--- a/ports/qt5-charts/CONTROL
+++ b/ports/qt5-charts/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-charts
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake
index 85f923df5..fdf59fe17 100644
--- a/ports/qt5-charts/portfile.cmake
+++ b/ports/qt5-charts/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtcharts e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b)
+qt_modular_library(qtcharts 19a9a0d78cba75d7ed237647c04237797b6002f9c6a4a08f4d4a90426bd44bdbde3f4ffc78dfafab3abb56faaef458a2577f5249200ad89e125e86049aafb85d)
diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL
index ccffcfb13..34842f14d 100644
--- a/ports/qt5-datavis3d/CONTROL
+++ b/ports/qt5-datavis3d/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-datavis3d
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake
index 73986d089..a74f82cd7 100644
--- a/ports/qt5-datavis3d/portfile.cmake
+++ b/ports/qt5-datavis3d/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtdatavis3d e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd)
+qt_modular_library(qtdatavis3d ec5599d95e30a9d6b4fbed53087aed4607a4ad5f8322610ec785c970a0c65b215344ec842c6c21791f27ec015610fca47e6af2608f2682ac2e6d114b0f0b80a8)
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL
index e2d9e280c..9de065478 100644
--- a/ports/qt5-declarative/CONTROL
+++ b/ports/qt5-declarative/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-declarative
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake
index 1bb2b866c..7949ba8f8 100644
--- a/ports/qt5-declarative/portfile.cmake
+++ b/ports/qt5-declarative/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtdeclarative d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053)
+qt_modular_library(qtdeclarative 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts) \ No newline at end of file
diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL
index 3123faa51..68927e58c 100644
--- a/ports/qt5-gamepad/CONTROL
+++ b/ports/qt5-gamepad/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-gamepad
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake
index 6c101a040..9e97d17ea 100644
--- a/ports/qt5-gamepad/portfile.cmake
+++ b/ports/qt5-gamepad/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtgamepad 47dfe1fdd693300520f9710d0a161936d8f1805b4558d6f692ed204f8d6784d45adb73bd472fb255deed792a610c94b35a72143deb0d8f227b8a9996dd1703cc)
+qt_modular_library(qtgamepad 65200780a7a27ca6fd6bd624b38c6568eacc2209816b3214ac2b63b5e510613cd492f846b5f67922aa5605eab1064e3e6ff060b610519e0546a0005736f55274)
diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL
index 25af45fd7..f8c7d27cd 100644
--- a/ports/qt5-graphicaleffects/CONTROL
+++ b/ports/qt5-graphicaleffects/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-graphicaleffects
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 GraphicalEffects Module.
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake
index f92175512..3b765d796 100644
--- a/ports/qt5-graphicaleffects/portfile.cmake
+++ b/ports/qt5-graphicaleffects/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtgraphicaleffects 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297)
+qt_modular_library(qtgraphicaleffects a76bc46e6442fb66d0f99056c527593ff6df1336f24644fc6d265f21c5be3ff9329cdebb8b677b8b29e3a49fc98b90c9a5838a991ae998b81cda21028826071f)
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL
index 1a5a5d1db..f8cb675b9 100644
--- a/ports/qt5-imageformats/CONTROL
+++ b/ports/qt5-imageformats/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-imageformats
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake
index 37eae1e2e..b87bebaee 100644
--- a/ports/qt5-imageformats/portfile.cmake
+++ b/ports/qt5-imageformats/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtimageformats 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d)
+qt_modular_library(qtimageformats 9de3fa9ff8b985a89806ad33ed276454429aada01119d8f36b7d571f01d23c42afd588353fe62d80cf6b9b83b6c91d53ccbf61ed1ec4d66ddc0ce4f5719bdca1)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL
index 2186d94e0..09e07dd08 100644
--- a/ports/qt5-modularscripts/CONTROL
+++ b/ports/qt5-modularscripts/CONTROL
@@ -1,3 +1,3 @@
Source: qt5-modularscripts
-Version: 2018-09-10-2
+Version: 2018-11-01-1
Description: Vcpkg helpers to package qt5 modules
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake
index 22859c8e1..4066a6b51 100644
--- a/ports/qt5-modularscripts/qt_modular_library.cmake
+++ b/ports/qt5-modularscripts/qt_modular_library.cmake
@@ -9,7 +9,7 @@ function(qt_modular_library NAME HASH)
endif()
set(MAJOR_MINOR 5.11)
- set(FULL_VERSION ${MAJOR_MINOR}.1)
+ set(FULL_VERSION ${MAJOR_MINOR}.2)
set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")
vcpkg_download_distfile(ARCHIVE_FILE
diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL
index 04fc5a057..7c910ee27 100644
--- a/ports/qt5-multimedia/CONTROL
+++ b/ports/qt5-multimedia/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-multimedia
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake
index b5b31cd8d..f03f71183 100644
--- a/ports/qt5-multimedia/portfile.cmake
+++ b/ports/qt5-multimedia/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtmultimedia cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c)
+qt_modular_library(qtmultimedia f83c57ad35b713118d1d0ba27f78687aefa8f1ccd850be9b78a9c3477e0e9bb5f9a66bf39c2505f81987f0ca7d07dbc3f471d5efb4b9e4c21e41b308fc83040f)
diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL
index 803649af6..bf8b15e0c 100644
--- a/ports/qt5-networkauth/CONTROL
+++ b/ports/qt5-networkauth/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-networkauth
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Network Authorization Module
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake
index 13e2c289e..2a27d21e9 100644
--- a/ports/qt5-networkauth/portfile.cmake
+++ b/ports/qt5-networkauth/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtnetworkauth 1f2b55870d61027f4af00d54507baf4953f162ca63a4e571a9c6f4095daa0235c2a93f67515cac627ff0a6655d94b01a3b3ba759bbbf75f9b108efbf12777c0d) \ No newline at end of file
+qt_modular_library(qtnetworkauth f723e8af1ab511f090d1830bf42899ec51b4a027a91c58c46179c16c9e635a3c3f51c13faf943936074ad768407824e57161e28d872868daaed6254c15fc852d)
diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL
index 513a36083..fc4fb902b 100644
--- a/ports/qt5-quickcontrols/CONTROL
+++ b/ports/qt5-quickcontrols/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-quickcontrols
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 QuickControls Module.
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake
index 3a9251a81..6b8983cf7 100644
--- a/ports/qt5-quickcontrols/portfile.cmake
+++ b/ports/qt5-quickcontrols/portfile.cmake
@@ -4,4 +4,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtquickcontrols d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c)
+qt_modular_library(qtquickcontrols 621101df5966d74232edfe0ab1130968cf311a73e020604a4b329b412062599ab5a0f4f95a4d4c2bb6c2f91143485cd760dd6efac573dbd74f787361a99d5d25)
diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL
index 79483beed..f13d9df72 100644
--- a/ports/qt5-quickcontrols2/CONTROL
+++ b/ports/qt5-quickcontrols2/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-quickcontrols2
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 QuickControls2 Module.
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake
index db6fbd957..7f96cf5a3 100644
--- a/ports/qt5-quickcontrols2/portfile.cmake
+++ b/ports/qt5-quickcontrols2/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtquickcontrols2 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68)
+qt_modular_library(qtquickcontrols2 94e8113feb222b85fa890fc65c59a371e29eb6838c2221b12d795d9809a605478f1c0b35a75b06bc67a02b3827dbb6bc4c4bf3fdd7485ee518cd0e5c409061a6)
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL
index adcc055c8..2b49490c9 100755
--- a/ports/qt5-script/CONTROL
+++ b/ports/qt5-script/CONTROL
@@ -1,3 +1,3 @@
Source: qt5-script
-Version: 5.9.2
+Version: 5.11.2
Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake
index 9e6f5f338..9999ad6cf 100755
--- a/ports/qt5-script/portfile.cmake
+++ b/ports/qt5-script/portfile.cmake
@@ -2,4 +2,4 @@
include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtscript 3ce2e57a0a6b2382614f689edca0deed87afe944c1c41decb3b9f420449fa59f2b79e6330e78e01a950761a95903113eaa7fbf261886361114acf5015d93254c)
+qt_modular_library(qtscript b0b4badc78cdebb3b42fe91104d112afd3bf9d4ead962c58ececa1db3db7fae6d5368f94d940195e2791ebfd09c5d6d5d892e9c4e48d64ec77dd366eddb1ab00)
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL
index 202592db6..a00542c74 100644
--- a/ports/qt5-scxml/CONTROL
+++ b/ports/qt5-scxml/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-scxml
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake
index e89fe3213..7680b6eb0 100644
--- a/ports/qt5-scxml/portfile.cmake
+++ b/ports/qt5-scxml/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtscxml d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689)
+qt_modular_library(qtscxml 4175d02224654a6a6b220f52937a22093be8b06e737f5575d4227b9038cb7c227f37eb17b7bb6878c16a34eae342c06e33cb2c356a389137e9f7d15886aa30ab)
diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL
index 8d0fd79dd..af03e1254 100644
--- a/ports/qt5-serialport/CONTROL
+++ b/ports/qt5-serialport/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-serialport
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake
index 31efd0155..daf037cdb 100644
--- a/ports/qt5-serialport/portfile.cmake
+++ b/ports/qt5-serialport/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtserialport 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404)
+qt_modular_library(qtserialport babf89583fc025de511601f608300a01453e06c2eebe51c0d3cad3eb9c8179fa9cf9982690306ffaf7ce0a0abb7174ae0078a1fd36f6a34a2d5277bff9d4ea9d)
diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL
index bd87a987b..1f4c2420c 100644
--- a/ports/qt5-speech/CONTROL
+++ b/ports/qt5-speech/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-speech
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Speech Module
Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows)
diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake
index 7700ee57c..b1d36265b 100644
--- a/ports/qt5-speech/portfile.cmake
+++ b/ports/qt5-speech/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtspeech d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51)
+qt_modular_library(qtspeech b3e433b308c6c3454e40e7e19a075d1bd181a33ecea9c8f970852251488c12d1227e0b92aaeb6f7f75ac0efcb04bbe22c49562c594d8b9773528a2aaf73f8d02)
diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL
index a95e3aa73..d88bb1742 100644
--- a/ports/qt5-svg/CONTROL
+++ b/ports/qt5-svg/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-svg
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake
index 02b081c30..0de3de3fd 100644
--- a/ports/qt5-svg/portfile.cmake
+++ b/ports/qt5-svg/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtsvg 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39)
+qt_modular_library(qtsvg d6b83bc0c4b348f65890fbb4cd4df81828fb1ef88192c13b06dca695fe499d65da6a52ba57ca289aa31f035309f10af90593cd9ee17362219cfd1337cc801c57)
diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index 6a512e1b7..81df69267 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-tools
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake
index d4eaab82b..8c7d0c047 100644
--- a/ports/qt5-tools/portfile.cmake
+++ b/ports/qt5-tools/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qttools cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482)
+qt_modular_library(qttools a950a3c1d8e6e92ba200e6834d1f88b8b98b91e3ab2e238aa4d229248f19103e38a06f0a81304ebdae70b96a60c87fdea8caae0181d2114da3e20e9148d08be5)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts) \ No newline at end of file
diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL
index e21b0e2e2..ebdb27623 100644
--- a/ports/qt5-virtualkeyboard/CONTROL
+++ b/ports/qt5-virtualkeyboard/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-virtualkeyboard
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake
index ad969ae2e..210997bfc 100644
--- a/ports/qt5-virtualkeyboard/portfile.cmake
+++ b/ports/qt5-virtualkeyboard/portfile.cmake
@@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtvirtualkeyboard e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0)
+qt_modular_library(qtvirtualkeyboard 1a471a719771c3a07b8d7b524692bdd085eae1787b8e91f523b224c260bc950b514ce88d885bbbe90c1556619bae15c59debfb221ec01042885d71443e046912)
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL
index b2af643ab..e10c241d0 100644
--- a/ports/qt5-websockets/CONTROL
+++ b/ports/qt5-websockets/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-websockets
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake
index b117e619c..67ea215f3 100644
--- a/ports/qt5-websockets/portfile.cmake
+++ b/ports/qt5-websockets/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtwebsockets 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc)
+qt_modular_library(qtwebsockets 28fb4442a5e00c1aad8f7d3e9c6828030a76d7e396b1ecc7743925fb3981a2d900df9c25cbeecf3247d8d6a54a11083d979681cff1171bb0b680584e954e8fc3)
diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL
index 12dcadb9b..5b9377077 100644
--- a/ports/qt5-winextras/CONTROL
+++ b/ports/qt5-winextras/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-winextras
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
Build-Depends: qt5-modularscripts, qt5-base, atlmfc
diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake
index 1ec503a0b..adc3bdbe1 100644
--- a/ports/qt5-winextras/portfile.cmake
+++ b/ports/qt5-winextras/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtwinextras 6ba1ddb6ff467fc413bf6a3d111e449215b696949dcfb399c17de9eb6d2ca20f867dd0c57d467e2924452e1d3d429fcc3dd119cc7d8bbfbcf0feeb9f6ca92918)
+qt_modular_library(qtwinextras ac9ca4d188f7dadbdd124321cba39fb159f9225c23ab955c06ff3939080065a5e8f176f34504c59ae5fee602328550487187ed0648e7896dcd6bed698a6b45d8)
diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL
index 874644acd..21e0069ab 100644
--- a/ports/qt5-xmlpatterns/CONTROL
+++ b/ports/qt5-xmlpatterns/CONTROL
@@ -1,4 +1,4 @@
Source: qt5-xmlpatterns
-Version: 5.11.1
+Version: 5.11.2
Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake
index ca064eec0..6484f4610 100644
--- a/ports/qt5-xmlpatterns/portfile.cmake
+++ b/ports/qt5-xmlpatterns/portfile.cmake
@@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtxmlpatterns 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066)
+qt_modular_library(qtxmlpatterns f659de3da93f83a215914a35b32dcd7d585cabae30044e8d512cbf2a29514043b18ad512e18e6de5b99546ddee2475d807f42e51baa46f15488841314372b26f)
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index dc34eee95..9f3ea3778 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
Source: qt5
-Version: 5.9.2-1
+Version: 5.11.2
Description: Qt5 Application Framework
Build-Depends: qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-multimedia, qt5-networkauth, qt5-quickcontrols, qt5-quickcontrols2, qt5-scxml, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-websockets, qt5-3d, qt5-winextras, qt5-xmlpatterns \ No newline at end of file
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL
index ee21c16c9..1ed4dc94c 100644
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@@ -1,4 +1,3 @@
Source: range-v3
-Version: 0.3.5
-Build-Depends: range-v3-vs2015 (windows), range-v3-vs2015 (uwp)
+Version: 0.4.0-01ccd0e
Description: Range library for C++11/14/17.
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index cbeb38bf0..f1d78711b 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -1,36 +1,30 @@
include(vcpkg_common_functions)
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
- message("The current range-v3 releases are not compatible with the current MSVC releases.")
- message("The latest available range-v3 fork compatible with MSVC will be used instead.")
- set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-else()
- vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO ericniebler/range-v3
- REF 0.3.5
- SHA512 0b8b97c32760f19e7a3f35b0f28b0c15c7735fbd1aa54f685c58faf50bf2cf112aed4ac7cfa9154b9caf7047400a6c7fd5c33d978f2e3cec6bc392a758aeabad
- HEAD_REF master
- )
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO ericniebler/range-v3
+ REF 01ccd0e552860efe00e4e3e55bf823be445aabb4
+ SHA512 5e6c3e597dc40128ae0642ca43340c88654c25d9239e6929edda44035f23b7dec3735baecd486ca3b161b453c8fe826f82124ced24da66e288e0e93fa5d51c54
+ HEAD_REF master
+)
- vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS
- -DRANGE_V3_NO_TESTING=ON
- -DRANGE_V3_NO_EXAMPLE=ON
- -DRANGE_V3_NO_PERF=ON
- -DRANGE_V3_NO_HEADER_CHECK=ON
- )
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DRANGE_V3_TESTS=OFF
+ -DRANGE_V3_EXAMPLES=OFF
+ -DRANGE_V3_PERF=OFF
+ -DRANGE_V3_HEADER_CHECKS=OFF
+)
- vcpkg_install_cmake()
+vcpkg_install_cmake()
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/range-v3)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/range-v3)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
- vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()
- file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3)
- file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright)
-endif()
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright)
diff --git a/ports/rapidcheck/CONTROL b/ports/rapidcheck/CONTROL
new file mode 100644
index 000000000..67c82313c
--- /dev/null
+++ b/ports/rapidcheck/CONTROL
@@ -0,0 +1,3 @@
+Source: rapidcheck
+Version: 2018-11-05-1
+Description: A property-based testing library for C++ (a la QuickCheck) with the goal of being simple to use with as little boilerplate as possible.
diff --git a/ports/rapidcheck/portfile.cmake b/ports/rapidcheck/portfile.cmake
new file mode 100644
index 000000000..bdebdb656
--- /dev/null
+++ b/ports/rapidcheck/portfile.cmake
@@ -0,0 +1,30 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO emil-e/rapidcheck
+ REF cf9e0d8bd8c94e9dc00dc0ab302352bfaf1a3ac5
+ SHA512 6cef62edbda391c3527d63db350842f669841ad2c751a64773250cd40bb65f26c2c394b107ef5530c2d3bd15b7079148fa9778d68a7346225bbb15227b1553c5
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DRC_INSTALL_ALL_EXTRAS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/rapidcheck/cmake)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/rapidcheck/copyright COPYONLY)
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME rapidcheck)
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL
index 5b1fbb005..c2482bcfb 100644
--- a/ports/re2/CONTROL
+++ b/ports/re2/CONTROL
@@ -1,3 +1,3 @@
Source: re2
-Version: 2018-10-25
+Version: 2018-11-01
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 983894037..eb14b12b3 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 89528a380a7e9722dbf7b5a817251049eab355fb
- SHA512 7654a41ea42e816e7ecd80e554e6e5ab11e7d2f4d2c547a3083f990500668c74ae74870fe5a6390521b44edc2be8ce11d86a187600229e3d8b9d8b3114cfa4e8
+ REF d9cebde0175aa1ffd38aab9a395a038464d55ce7
+ SHA512 820ebc96f6cc583e50bdd637b8bf6b4e8ef6be5a74a49174bf845d037f0dd21ee3b1fbc220bc3cbbd6987205195b6c0990040f43da723f90038a20690a7553ff
HEAD_REF master
)
diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL
index 6f39484dd..18e867b7c 100644
--- a/ports/sdl2/CONTROL
+++ b/ports/sdl2/CONTROL
@@ -1,3 +1,3 @@
Source: sdl2
-Version: 2.0.8-1
+Version: 2.0.9-1
Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.
diff --git a/ports/sdl2/enable-winrt-cmake.patch b/ports/sdl2/enable-winrt-cmake.patch
index dcd2afa67..858c7d460 100644
--- a/ports/sdl2/enable-winrt-cmake.patch
+++ b/ports/sdl2/enable-winrt-cmake.patch
@@ -1,206 +1,175 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 73d9407..082fbc5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,7 +3,11 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
- endif()
-
- cmake_minimum_required(VERSION 2.8.11)
--project(SDL2 C)
-+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+ project(SDL2 C CXX)
-+else()
-+ project(SDL2 C)
-+endif()
-
- # !!! FIXME: this should probably do "MACOSX_RPATH ON" as a target property
- # !!! FIXME: for the SDL2 shared library (so you get an
-@@ -358,7 +362,6 @@ file(GLOB SOURCE_FILES
- ${SDL2_SOURCE_DIR}/src/timer/*.c
- ${SDL2_SOURCE_DIR}/src/video/*.c)
-
--
- if(ASSERTIONS STREQUAL "auto")
- # Do nada - use optimization settings to determine the assertion level
- elseif(ASSERTIONS STREQUAL "disabled")
-@@ -1132,6 +1135,22 @@ elseif(WINDOWS)
- file(GLOB CORE_SOURCES ${SDL2_SOURCE_DIR}/src/core/windows/*.c)
- set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES})
-
-+ if(WINDOWS_STORE)
-+ cmake_minimum_required(VERSION 3.0)
-+ add_definitions(-DSDL_BUILDING_WINRT=1 -ZW)
-+ link_libraries(
-+ -nodefaultlib:vccorlib$<$<CONFIG:Debug>:d>
-+ -nodefaultlib:msvcrt$<$<CONFIG:Debug>:d>
-+ vccorlib$<$<CONFIG:Debug>:d>.lib
-+ msvcrt$<$<CONFIG:Debug>:d>.lib
-+ )
-+ endif()
-+
-+ if(WINDOWS_STORE)
-+ file(GLOB WINRT_SOURCE_FILES ${SDL2_SOURCE_DIR}/src/core/winrt/*.c ${SDL2_SOURCE_DIR}/src/core/winrt/*.cpp)
-+ set(SOURCE_FILES ${SOURCE_FILES} ${WINRT_SOURCE_FILES})
-+ endif()
-+
- if(MSVC)
- # Prevent codegen that would use the VC runtime libraries.
- set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/GS-")
-@@ -1176,7 +1195,11 @@ elseif(WINDOWS)
- check_include_file(d3d11_1.h HAVE_D3D11_H)
- check_include_file(ddraw.h HAVE_DDRAW_H)
- check_include_file(dsound.h HAVE_DSOUND_H)
-- check_include_file(dinput.h HAVE_DINPUT_H)
-+ if(WINDOWS_STORE)
-+ set(HAVE_DINPUT_H 0)
-+ else()
-+ check_include_file(dinput.h HAVE_DINPUT_H)
-+ endif()
- check_include_file(xaudio2.h HAVE_XAUDIO2_H)
- check_include_file(mmdeviceapi.h HAVE_MMDEVICEAPI_H)
- check_include_file(audioclient.h HAVE_AUDIOCLIENT_H)
-@@ -1193,12 +1216,14 @@ elseif(WINDOWS)
- endif()
-
- if(SDL_AUDIO)
-- set(SDL_AUDIO_DRIVER_WINMM 1)
-- file(GLOB WINMM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/winmm/*.c)
-- set(SOURCE_FILES ${SOURCE_FILES} ${WINMM_AUDIO_SOURCES})
-- set(HAVE_SDL_AUDIO TRUE)
-+ if(NOT WINDOWS_STORE)
-+ set(SDL_AUDIO_DRIVER_WINMM 1)
-+ file(GLOB WINMM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/winmm/*.c)
-+ set(SOURCE_FILES ${SOURCE_FILES} ${WINMM_AUDIO_SOURCES})
-+ set(HAVE_SDL_AUDIO TRUE)
-+ endif()
-
-- if(HAVE_DSOUND_H)
-+ if(HAVE_DSOUND_H AND NOT WINDOWS_STORE)
- set(SDL_AUDIO_DRIVER_DSOUND 1)
- file(GLOB DSOUND_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/directsound/*.c)
- set(SOURCE_FILES ${SOURCE_FILES} ${DSOUND_AUDIO_SOURCES})
-@@ -1208,9 +1233,10 @@ elseif(WINDOWS)
- set(SDL_AUDIO_DRIVER_XAUDIO2 1)
- file(GLOB XAUDIO2_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/xaudio2/*.c)
- set(SOURCE_FILES ${SOURCE_FILES} ${XAUDIO2_AUDIO_SOURCES})
-+ set(HAVE_SDL_AUDIO TRUE)
- endif()
-
-- if(HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H)
-+ if(HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H AND NOT WINDOWS_STORE)
- set(SDL_AUDIO_DRIVER_WASAPI 1)
- file(GLOB WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/*.c)
- set(SOURCE_FILES ${SOURCE_FILES} ${WASAPI_AUDIO_SOURCES})
-@@ -1222,11 +1248,20 @@ elseif(WINDOWS)
- if(NOT SDL_LOADSO)
- message_error("SDL_VIDEO requires SDL_LOADSO, which is not enabled")
- endif()
-- set(SDL_VIDEO_DRIVER_WINDOWS 1)
-- file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c)
-+ if(WINDOWS_STORE)
-+ set(SDL_VIDEO_DRIVER_WINRT 1)
-+ file(GLOB WIN_VIDEO_SOURCES
-+ ${SDL2_SOURCE_DIR}/src/video/winrt/*.c
-+ ${SDL2_SOURCE_DIR}/src/video/winrt/*.cpp
-+ ${SDL2_SOURCE_DIR}/src/render/direct3d11/*.cpp
-+ )
-+ else()
-+ set(SDL_VIDEO_DRIVER_WINDOWS 1)
-+ file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c)
-+ endif()
- set(SOURCE_FILES ${SOURCE_FILES} ${WIN_VIDEO_SOURCES})
-
-- if(RENDER_D3D AND HAVE_D3D_H)
-+ if(RENDER_D3D AND HAVE_D3D_H AND NOT WINDOWS_STORE)
- set(SDL_VIDEO_RENDER_D3D 1)
- set(HAVE_RENDER_D3D TRUE)
- endif()
-@@ -1249,20 +1284,31 @@ elseif(WINDOWS)
- endif()
-
- if(SDL_POWER)
-- set(SDL_POWER_WINDOWS 1)
-- set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/windows/SDL_syspower.c)
-+ if(WINDOWS_STORE)
-+ set(SDL_POWER_WINRT 1)
-+ set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/winrt/SDL_syspower.cpp)
-+ else()
-+ set(SDL_POWER_WINDOWS 1)
-+ set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/windows/SDL_syspower.c)
-+ endif()
- set(HAVE_SDL_POWER TRUE)
- endif()
-
- if(SDL_FILESYSTEM)
- set(SDL_FILESYSTEM_WINDOWS 1)
-- file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/windows/*.c)
-+ if(WINDOWS_STORE)
-+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/winrt/*.cpp)
-+ else()
-+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/windows/*.c)
-+ endif()
- set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
- set(HAVE_SDL_FILESYSTEM TRUE)
- endif()
-
- # Libraries for Win32 native and MinGW
-- list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid)
-+ if(NOT WINDOWS_STORE)
-+ list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid)
-+ endif()
-
- # TODO: in configure.in the check for timers is set on
- # cygwin | mingw32* - does this include mingw32CE?
-@@ -1284,7 +1330,7 @@ elseif(WINDOWS)
- set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES})
-
- if(SDL_VIDEO)
-- if(VIDEO_OPENGL)
-+ if(VIDEO_OPENGL AND NOT WINDOWS_STORE)
- set(SDL_VIDEO_OPENGL 1)
- set(SDL_VIDEO_OPENGL_WGL 1)
- set(SDL_VIDEO_RENDER_OGL 1)
-@@ -1688,9 +1734,11 @@ endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
- # Always build SDLmain
--add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
--target_include_directories(SDL2main PUBLIC $<INSTALL_INTERFACE:include>)
--set(_INSTALL_LIBS "SDL2main")
-+if(NOT WINDOWS_STORE)
-+ add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
-+ target_include_directories(SDL2main PUBLIC $<INSTALL_INTERFACE:include>)
-+ set(_INSTALL_LIBS "SDL2main")
-+endif()
-
- if(SDL_SHARED)
- add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES})
-diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake
-index 9b20398..7ae6e35 100644
---- a/include/SDL_config.h.cmake
-+++ b/include/SDL_config.h.cmake
-@@ -298,6 +298,7 @@
- #cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@
- #cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@
- #cmakedefine SDL_VIDEO_DRIVER_WINDOWS @SDL_VIDEO_DRIVER_WINDOWS@
-+#cmakedefine SDL_VIDEO_DRIVER_WINRT @SDL_VIDEO_DRIVER_WINRT@
- #cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@
- #cmakedefine SDL_VIDEO_DRIVER_RPI @SDL_VIDEO_DRIVER_RPI@
- #cmakedefine SDL_VIDEO_DRIVER_VIVANTE @SDL_VIDEO_DRIVER_VIVANTE@
-@@ -365,6 +366,7 @@
- #cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@
- #cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@
- #cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@
-+#cmakedefine SDL_POWER_WINRT @SDL_POWER_WINRT@
- #cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@
- #cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@
- #cmakedefine SDL_POWER_EMSCRIPTEN @SDL_POWER_EMSCRIPTEN@
-@@ -387,7 +389,7 @@
- #cmakedefine SDL_LIBSAMPLERATE_DYNAMIC @SDL_LIBSAMPLERATE_DYNAMIC@
-
- /* Platform specific definitions */
--#if !defined(__WIN32__)
-+#if !defined(__WIN32__) && !defined(__WINRT__)
- # if !defined(_STDINT_H_) && !defined(_STDINT_H) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H)
- typedef unsigned int size_t;
- typedef signed char int8_t;
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0128c7a..bd534e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,18 @@ endif()
+ cmake_minimum_required(VERSION 2.8.11)
+ project(SDL2 C)
+
++if(WINDOWS_STORE)
++ enable_language(CXX)
++ cmake_minimum_required(VERSION 3.11)
++ add_definitions(-DSDL_BUILDING_WINRT=1 -ZW)
++ link_libraries(
++ -nodefaultlib:vccorlib$<$<CONFIG:Debug>:d>
++ -nodefaultlib:msvcrt$<$<CONFIG:Debug>:d>
++ vccorlib$<$<CONFIG:Debug>:d>.lib
++ msvcrt$<$<CONFIG:Debug>:d>.lib
++ )
++endif()
++
+ # !!! FIXME: this should probably do "MACOSX_RPATH ON" as a target property
+ # !!! FIXME: for the SDL2 shared library (so you get an
+ # !!! FIXME: install_name ("soname") of "@rpath/libSDL-whatever.dylib"
+@@ -1166,6 +1178,11 @@ elseif(WINDOWS)
+ file(GLOB CORE_SOURCES ${SDL2_SOURCE_DIR}/src/core/windows/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES})
+
++ if(WINDOWS_STORE)
++ file(GLOB WINRT_SOURCE_FILES ${SDL2_SOURCE_DIR}/src/core/winrt/*.c ${SDL2_SOURCE_DIR}/src/core/winrt/*.cpp)
++ list(APPEND SOURCE_FILES ${WINRT_SOURCE_FILES})
++ endif()
++
+ if(MSVC)
+ # Prevent codegen that would use the VC runtime libraries.
+ set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/GS-")
+@@ -1211,6 +1228,9 @@ elseif(WINDOWS)
+ check_include_file(ddraw.h HAVE_DDRAW_H)
+ check_include_file(dsound.h HAVE_DSOUND_H)
+ check_include_file(dinput.h HAVE_DINPUT_H)
++ if(WINDOWS_STORE)
++ set(HAVE_DINPUT_H 0)
++ endif()
+ check_include_file(dxgi.h HAVE_DXGI_H)
+ if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H)
+ set(HAVE_DIRECTX TRUE)
+@@ -1229,18 +1249,20 @@ elseif(WINDOWS)
+ check_include_file(endpointvolume.h HAVE_ENDPOINTVOLUME_H)
+
+ if(SDL_AUDIO)
++ if(NOT WINDOWS_STORE)
+ set(SDL_AUDIO_DRIVER_WINMM 1)
+ file(GLOB WINMM_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/winmm/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${WINMM_AUDIO_SOURCES})
++ endif()
+ set(HAVE_SDL_AUDIO TRUE)
+
+- if(HAVE_DSOUND_H)
++ if(HAVE_DSOUND_H AND NOT WINDOWS_STORE)
+ set(SDL_AUDIO_DRIVER_DSOUND 1)
+ file(GLOB DSOUND_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/directsound/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${DSOUND_AUDIO_SOURCES})
+ endif()
+
+- if(WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H)
++ if(WASAPI AND HAVE_AUDIOCLIENT_H AND HAVE_MMDEVICEAPI_H AND NOT WINDOWS_STORE)
+ set(SDL_AUDIO_DRIVER_WASAPI 1)
+ file(GLOB WASAPI_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/wasapi/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${WASAPI_AUDIO_SOURCES})
+@@ -1252,11 +1274,20 @@ elseif(WINDOWS)
+ if(NOT SDL_LOADSO)
+ message_error("SDL_VIDEO requires SDL_LOADSO, which is not enabled")
+ endif()
++ if(WINDOWS_STORE)
++ set(SDL_VIDEO_DRIVER_WINRT 1)
++ file(GLOB WIN_VIDEO_SOURCES
++ ${SDL2_SOURCE_DIR}/src/video/winrt/*.c
++ ${SDL2_SOURCE_DIR}/src/video/winrt/*.cpp
++ ${SDL2_SOURCE_DIR}/src/render/direct3d11/*.cpp
++ )
++ else()
+ set(SDL_VIDEO_DRIVER_WINDOWS 1)
+ file(GLOB WIN_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/windows/*.c)
++ endif()
+ set(SOURCE_FILES ${SOURCE_FILES} ${WIN_VIDEO_SOURCES})
+
+- if(RENDER_D3D AND HAVE_D3D_H)
++ if(RENDER_D3D AND HAVE_D3D_H AND NOT WINDOWS_STORE)
+ set(SDL_VIDEO_RENDER_D3D 1)
+ set(HAVE_RENDER_D3D TRUE)
+ endif()
+@@ -1279,20 +1310,31 @@ elseif(WINDOWS)
+ endif()
+
+ if(SDL_POWER)
++ if(WINDOWS_STORE)
++ set(SDL_POWER_WINRT 1)
++ set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/winrt/SDL_syspower.cpp)
++ else()
+ set(SDL_POWER_WINDOWS 1)
+ set(SOURCE_FILES ${SOURCE_FILES} ${SDL2_SOURCE_DIR}/src/power/windows/SDL_syspower.c)
++ endif()
+ set(HAVE_SDL_POWER TRUE)
+ endif()
+
+ if(SDL_FILESYSTEM)
+ set(SDL_FILESYSTEM_WINDOWS 1)
++ if(WINDOWS_STORE)
++ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/winrt/*.cpp)
++ else()
+ file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/windows/*.c)
++ endif()
+ set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
+ set(HAVE_SDL_FILESYSTEM TRUE)
+ endif()
+
+ # Libraries for Win32 native and MinGW
++ if(NOT WINDOWS_STORE)
+ list(APPEND EXTRA_LIBS user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 shell32)
++ endif()
+
+ # TODO: in configure.in the check for timers is set on
+ # cygwin | mingw32* - does this include mingw32CE?
+@@ -1314,7 +1356,7 @@ elseif(WINDOWS)
+ set(SOURCE_FILES ${SOURCE_FILES} ${CORE_SOURCES})
+
+ if(SDL_VIDEO)
+- if(VIDEO_OPENGL)
++ if(VIDEO_OPENGL AND NOT WINDOWS_STORE)
+ set(SDL_VIDEO_OPENGL 1)
+ set(SDL_VIDEO_OPENGL_WGL 1)
+ set(SDL_VIDEO_RENDER_OGL 1)
+@@ -1731,12 +1773,14 @@ endif()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+
+ # Always build SDLmain
++if(NOT WINDOWS_STORE)
+ add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
+ target_include_directories(SDL2main PUBLIC "$<BUILD_INTERFACE:${SDL2_SOURCE_DIR}/include>" $<INSTALL_INTERFACE:include/SDL2>)
+ set(_INSTALL_LIBS "SDL2main")
+ if (NOT ANDROID)
+ set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
+ endif()
++endif()
+
+ if(SDL_SHARED)
+ add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES})
+diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake
+index 48dd2d4..0c4fa28 100644
+--- a/include/SDL_config.h.cmake
++++ b/include/SDL_config.h.cmake
+@@ -324,6 +324,7 @@
+ #cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@
+ #cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@
+ #cmakedefine SDL_VIDEO_DRIVER_WINDOWS @SDL_VIDEO_DRIVER_WINDOWS@
++#cmakedefine SDL_VIDEO_DRIVER_WINRT @SDL_VIDEO_DRIVER_WINRT@
+ #cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@
+ #cmakedefine SDL_VIDEO_DRIVER_RPI @SDL_VIDEO_DRIVER_RPI@
+ #cmakedefine SDL_VIDEO_DRIVER_VIVANTE @SDL_VIDEO_DRIVER_VIVANTE@
+@@ -392,6 +393,7 @@
+ #cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@
+ #cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@
+ #cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@
++#cmakedefine SDL_POWER_WINRT @SDL_POWER_WINRT@
+ #cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@
+ #cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@
+ #cmakedefine SDL_POWER_EMSCRIPTEN @SDL_POWER_EMSCRIPTEN@
+@@ -414,7 +416,7 @@
+ #cmakedefine SDL_LIBSAMPLERATE_DYNAMIC @SDL_LIBSAMPLERATE_DYNAMIC@
+
+ /* Platform specific definitions */
+-#if !defined(__WIN32__)
++#if !defined(__WIN32__) && !defined(__WINRT__)
+ # if !defined(_STDINT_H_) && !defined(_STDINT_H) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H)
+ typedef unsigned int size_t;
+ typedef signed char int8_t;
diff --git a/ports/sdl2/fix-x86-windows.patch b/ports/sdl2/fix-x86-windows.patch
new file mode 100644
index 000000000..853b68722
--- /dev/null
+++ b/ports/sdl2/fix-x86-windows.patch
@@ -0,0 +1,15 @@
+diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
+index ff23c5e..fc90bba 100644
+--- a/src/events/SDL_mouse.c
++++ b/src/events/SDL_mouse.c
+@@ -20,6 +20,10 @@
+ */
+ #include "../SDL_internal.h"
+
++#ifdef __WIN32__
++#include "../core/windows/SDL_windows.h"
++#endif
++
+ /* General mouse handling code for SDL */
+
+ #include "SDL_assert.h"
diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
index 5d7ac5314..4bcfa5a9a 100644
--- a/ports/sdl2/portfile.cmake
+++ b/ports/sdl2/portfile.cmake
@@ -3,16 +3,13 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SDL-Mirror/SDL
- REF release-2.0.8
- SHA512 5922dbeb14bb22991160251664b417d3f846867c18b5ecc1bd19c328ffd69b16252b7d45b9a317bafd1207fdb66d93a022dfb239e02447db9babd941956b6b37
+ REF release-2.0.9
+ SHA512 444c906c0baa720c86ca72d1b4cd66fdf6f516d5d2a9836169081a2997a5aebaaf9caa687ec060fa02292d79cfa4a62442333e00f90a0239edd1601529f6b056
HEAD_REF master
-)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/export-symbols-only-in-shared-build.patch
- ${CMAKE_CURRENT_LIST_DIR}/enable-winrt-cmake.patch
+ export-symbols-only-in-shared-build.patch
+ fix-x86-windows.patch
+ enable-winrt-cmake.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC)
@@ -75,5 +72,6 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
endforeach()
endif()
-file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2 RENAME copyright)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2)
+configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2/copyright COPYONLY)
vcpkg_copy_pdbs()
diff --git a/ports/sdl2/vcpkg-cmake-wrapper.cmake b/ports/sdl2/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..c99178db1
--- /dev/null
+++ b/ports/sdl2/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,8 @@
+_find_package(${ARGS})
+if(TARGET SDL2::SDL2 AND NOT TARGET SDL2::SDL2-static)
+ add_library( SDL2::SDL2-static INTERFACE IMPORTED)
+ set_target_properties(SDL2::SDL2-static PROPERTIES INTERFACE_LINK_LIBRARIES "SDL2::SDL2")
+elseif(TARGET SDL2::SDL2-static AND NOT TARGET SDL2::SDL2)
+ add_library( SDL2::SDL2 INTERFACE IMPORTED)
+ set_target_properties(SDL2::SDL2 PROPERTIES INTERFACE_LINK_LIBRARIES "SDL2::SDL2-static")
+endif()
diff --git a/ports/snowhouse/CONTROL b/ports/snowhouse/CONTROL
new file mode 100644
index 000000000..b376f4639
--- /dev/null
+++ b/ports/snowhouse/CONTROL
@@ -0,0 +1,3 @@
+Source: snowhouse
+Version: 3.0.1
+Description: An assertion library for C++
diff --git a/ports/snowhouse/portfile.cmake b/ports/snowhouse/portfile.cmake
new file mode 100644
index 000000000..229a6e5d5
--- /dev/null
+++ b/ports/snowhouse/portfile.cmake
@@ -0,0 +1,14 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO banditcpp/snowhouse
+ REF v3.0.1
+ SHA512 b20a703e79a2821bdc43b2a235ed7634499f877f9e96bd0d39eb563ce5c94d4577449cc15dc850176a1b44eb55cf3425885cb4d46a92444a7aa3001ce5d0a3eb
+ HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h)
+
+file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/snowhouse)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/snowhouse/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/snowhouse/copyright) \ No newline at end of file
diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index f01ffbbaf..d52f25eba 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,4 +1,4 @@
Source: thrift
-Version: 2018-10-25
+Version: 2018-11-01
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 a69291ee4..9fb495c84 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 cd829a0b9a5c66203b63350fa029589669ec43f6
- SHA512 e8a9879c580f0a1450a023945555a2f8e042c11f04085ea1700fa7a4e8f4b2ac53a461530cf4106803472c040d3742c2c31173366a28571aa273f093c8d4bc39
+ REF 92be4f312b88eac0a4ac450eda29fd20de11b1f0
+ SHA512 0c1c7eb30fc63efa483cd9970305b5285c7d6f57151a9e0f602ff757b05cede3adb13688c5d1436c05ffd4bd142ca7676db8e35cbf4d38e9112033f6a2e77ff4
HEAD_REF master
)
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index e75795e74..d06f16331 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
Source: vtk
-Version: 8.1.0-2
+Version: 8.1.0-3
Description: Software system for 3D computer graphics, image processing, and visualization
Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora
diff --git a/ports/vtk/fix-find-lz4.patch b/ports/vtk/fix-find-lz4.patch
new file mode 100644
index 000000000..7389a24f4
--- /dev/null
+++ b/ports/vtk/fix-find-lz4.patch
@@ -0,0 +1,20 @@
+diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake
+index 07343e1f79..b43a9af2c7 100644
+--- a/CMake/FindLZ4.cmake
++++ b/CMake/FindLZ4.cmake
+@@ -1,7 +1,13 @@
+-
+-find_library(LZ4_LIBRARIES NAMES lz4)
++find_library(LZ4_LIBRARY NAMES lz4 PATH_SUFFIXES lib)
++find_library(LZ4_LIBRARY_DEBUG NAME lz4d PATH_SUFFIXES debug/lib)
+ find_path(LZ4_INCLUDE_DIRS NAMES lz4.h)
+
++if(NOT LZ4_LIBRARY_DEBUG)
++ set(LZ4_LIBRARY_DEBUG ${LZ4_LIBRARY})
++endif(NOT LZ4_LIBRARY_DEBUG)
++
++set(LZ4_LIBRARIES optimized ${LZ4_LIBRARY} debug ${LZ4_LIBRARY_DEBUG})
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(LZ4
+ DEFAULT_MSG
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index c547929ce..edb245eb0 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -67,6 +67,7 @@ vcpkg_from_github(
fix-find-libharu.patch
fix-find-mysql.patch
fix-find-odbc.patch
+ fix-find-lz4.patch
)
# Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK,
diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL
index 566d6acbf..ba204005d 100644
--- a/ports/wangle/CONTROL
+++ b/ports/wangle/CONTROL
@@ -1,4 +1,4 @@
Source: wangle
-Version: 2018.10.22.00
+Version: 2018.10.29.00
Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion
Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake
index 2e3daf795..1ecec2f4f 100644
--- a/ports/wangle/portfile.cmake
+++ b/ports/wangle/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle
- REF v2018.10.22.00
- SHA512 cfaf783362989c67dad54d6bd15c3b2f710fd1c1e858cf549367033a50718b69f78fc58001e6202bf8cc84fbb0e9752c433a03dd2d91800bfe2645c7b5519fca
+ REF v2018.10.29.00
+ SHA512 28363960b8437882eca67ed3a6de34dcce6323bc42bb12505334e79c5ea1004c1cc37565b88629531441024914253d8d2e6f0a0cb7eeee88b71d8ff35516abe3
HEAD_REF master
PATCHES
build.patch
diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL
index a4a6dd37d..84b0ad93c 100644
--- a/ports/zeromq/CONTROL
+++ b/ports/zeromq/CONTROL
@@ -1,3 +1,3 @@
Source: zeromq
-Version: 2018-10-11
+Version: 2018-11-01
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 b19d2821a..ebff91236 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 cfc9d5f5198e611d8d3ad4482d57cf6bb5b6bf59
- SHA512 1917bb9838798d6d977171cc03477ac909cbcf999527a0019efac9a31176f5becba5eef269569777121288dbd2d601c0c579e83cfe1cb1aa6eb093f74adcc955
+ REF efc9a3021fb61ca92b9869f0ad8308d29a3ebfa3
+ SHA512 04c2d94c497a0398243c1fc8c5e1bdcc3a9da873ccf688a9345db334d12e562c8131e7976fa2123fb8f760cc450bd0cfe33a486d1f31880b7d69379e10be7caa
HEAD_REF master
)
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 456783f4d..8807befd8 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -55,6 +55,9 @@
<VcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release</VcpkgNormalizedConfiguration>
<VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\</VcpkgRoot>
<VcpkgApplocalDeps Condition="'$(VcpkgApplocalDeps)' == ''">true</VcpkgApplocalDeps>
+ <!-- Deactivate Autolinking if lld is used as a linker. (Until a better way to solve the problem is found!).
+ Tried to add /lib as a parameter to the linker call but was unable to find a way to pass it as the first parameter. -->
+ <VcpkgAutoLink Condition="'$(UseLldLink)' == 'true' and '$(VcpkgAutoLink)' == ''">false</VcpkgAutoLink>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">
diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake
index 5f6930412..2fc66b279 100644
--- a/scripts/cmake/vcpkg_from_git.cmake
+++ b/scripts/cmake/vcpkg_from_git.cmake
@@ -65,9 +65,10 @@ function(vcpkg_from_git)
message(FATAL_ERROR "vcpkg_from_git requires a SHA512 argument. If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.")
endif()
+ # using .tar.gz instead of .zip because the hash of the latter is affected by timezone.
string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}")
- set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.zip")
- set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.zip")
+ set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.tar.gz")
+ set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.tar.gz")
set(TEMP_SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SANITIZED_REF}")
function(test_hash FILE_PATH FILE_KIND CUSTOM_ERROR_ADVICE)
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index c2045433d..747963c07 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -60,7 +60,7 @@
<archiveName>QtInstallerFramework-win-x86.zip</archiveName>
</tool>
<tool name="7zip" os="windows">
- <version>18.01.0</version>
+ <version>18.1.0</version>
<exeRelativePath>7-Zip.CommandLine.18.1.0\tools\7za.exe</exeRelativePath>
<url>https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0</url>
<sha512>8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b2571305b3ae3f4e2b85fc4a290aeda63d1a13b8</sha512>
@@ -78,20 +78,20 @@
<exeRelativePath>ninja.exe</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip</url>
<sha512>9b9ce248240665fcd6404b989f3b3c27ed9682838225e6dc9b67b551774f251e4ff8a207504f941e7c811e7a8be1945e7bcb94472a335ef15e23a0200a32e6d5</sha512>
- <archiveName>ninja-win.zip</archiveName>
+ <archiveName>ninja-win-1.8.2.zip</archiveName>
</tool>
<tool name="ninja" os="linux">
<version>1.8.2</version>
<exeRelativePath>ninja</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip</url>
<sha512>38fcb68e745c1f15b4b50f20069ffe686b1ef5baf93b74958e132ea5d30d155cf6970d6dc1b095aafd421ebd8bcc63acf4f64e305c496266b5182f99b815cca5</sha512>
- <archiveName>ninja-linux.zip</archiveName>
+ <archiveName>ninja-linux-1.8.2.zip</archiveName>
</tool>
<tool name="ninja" os="osx">
<version>1.8.2</version>
<exeRelativePath>ninja</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip</url>
<sha512>acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3</sha512>
- <archiveName>ninja-mac.zip</archiveName>
+ <archiveName>ninja-mac-1.8.2.zip</archiveName>
</tool>
</tools>
diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp
index 1d7b3527d..fad3ff119 100644
--- a/toolsrc/src/vcpkg/base/downloads.cpp
+++ b/toolsrc/src/vcpkg/base/downloads.cpp
@@ -102,7 +102,17 @@ namespace vcpkg::Downloads
const fs::path& path,
const std::string& sha512)
{
- const std::string actual_hash = vcpkg::Hash::get_file_hash(fs, path, "SHA512");
+ std::string actual_hash = vcpkg::Hash::get_file_hash(fs, path, "SHA512");
+
+ // <HACK to handle NuGet.org changing nupkg hashes.>
+ // This is the NEW hash for 7zip
+ if (actual_hash == "a9dfaaafd15d98a2ac83682867ec5766720acf6e99d40d1a00d480692752603bf3f3742623f0ea85647a92374df"
+ "405f331afd6021c5cf36af43ee8db198129c0")
+ // This is the OLD hash for 7zip
+ actual_hash = "8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b257"
+ "1305b3ae3f4e2b85fc4a290aeda63d1a13b8";
+ // </HACK>
+
Checks::check_exit(VCPKG_LINE_INFO,
sha512 == actual_hash,
"File does not have the expected hash:\n"
diff --git a/toolsrc/vcpkg.sln b/toolsrc/vcpkg.sln
index 6b92c973b..8d0c849c6 100644
--- a/toolsrc/vcpkg.sln
+++ b/toolsrc/vcpkg.sln
@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{F589
..\scripts\get_triplet_environment.cmake = ..\scripts\get_triplet_environment.cmake
..\scripts\internalCI.ps1 = ..\scripts\internalCI.ps1
..\scripts\ports.cmake = ..\scripts\ports.cmake
+ ..\scripts\vcpkgTools.xml = ..\scripts\vcpkgTools.xml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cmake", "cmake", "{A0122231-04D5-420B-81CA-7960946E5E65}"