longhuan2018 · longhuan2018 · Apr 2, 2020 · Mar 23, 2020 · Mar 24, 2020 · Mar 24, 2020
diff --git a/docs/maintainers/vcpkg_from_git.md b/docs/maintainers/vcpkg_from_git.md
@@ -19,7 +19,7 @@ Specifies the out-variable that will contain the extracted location.
 This should be set to `SOURCE_PATH` by convention.
 
 ### URL
-The url of the git repository.  Must start with `https`.
+The url of the git repository.
 
 ### REF
 The git sha of the commit to download.

diff --git a/docs/users/triplets.md b/docs/users/triplets.md
@@ -125,6 +125,10 @@ Valid settings:
 * The Visual Studio 2017 platform toolset is `v141`.
 * The Visual Studio 2015 platform toolset is `v140`.
 
+### VCPKG_LOAD_VCVARS_ENV
+If `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` is used, VCPKG will not setup the Visual Studio environment. 
+Setting `VCPKG_LOAD_VCVARS_ENV` to (true|1|on) changes this behavior so that the Visual Studio environment is setup following the same rules as if `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` was not set.
+
 ## MacOS Variables
 
 ### VCPKG_INSTALL_NAME_DIR

diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
@@ -1,7 +1,10 @@
 Source: abseil
-Version: 2020-03-03
+Version: 2020-03-03-1
 Homepage: https://github.com/abseil/abseil-cpp
 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.
-  Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
+  Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
+
+Feature: c++17
+Description: Enable compiler C++17.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
@@ -11,9 +11,16 @@ vcpkg_from_github(
         fix-uwp-build.patch
 )
 
+set(CMAKE_CXX_STANDARD  )
+if("c++17" IN_LIST FEATURES)
+    set(CMAKE_CXX_STANDARD 17)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
 )
 
 vcpkg_install_cmake()

diff --git a/ports/bfgroup-lyra/CONTROL b/ports/bfgroup-lyra/CONTROL
@@ -1,4 +1,4 @@
 Source: bfgroup-lyra
-Version: 1.1
+Version: 1.3
 Homepage: https://bfgroup.github.io/Lyra/
 Description: A simple to use, composable, command line parser for C++ 11 and beyond
diff --git a/ports/bfgroup-lyra/portfile.cmake b/ports/bfgroup-lyra/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bfgroup/Lyra
-    REF 1.1
-    SHA512 afb1f97a3c72697a8739019e132758db270a9271b4be8f7e593f43155761550606d63795c657c586fb885bb61d78ad0fe1517537b8338c5e05ba74be5a8dc208
+    REF 9e31b213ffd8c66414623f0b26614326a5e12853 # 1.3
+    SHA512 03ff1bfa19bd4dfb00cb864fac5275b075bc0b3c817d2598338b7b957d571799e531cd851cd451d2896ed920dc3037edd22dc14826b343ff6f76bfa2a7982589
     HEAD_REF master
 )
 

diff --git a/ports/blitz/CONTROL b/ports/blitz/CONTROL
@@ -1,4 +1,5 @@
 Source: blitz
-Version: 2019-09-26
+Version: 2020-03-25
 Homepage: https://github.com/blitzpp/blitz
-Description: Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.
+Description: Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.
+Supports: !(arm|arm64|uwp)
diff --git a/ports/blitz/portfile.cmake b/ports/blitz/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO blitzpp/blitz
-    REF 0e373f7c3478b10bd8ad8d699a291c57d9cb1e72
-    SHA512 9ea0ba652b93fb3b159340b25bdef10c05662b2da23a3bd2e29ddd12d394b96513c0e5d9f348c0cc8fc767890f52d122a1b0fb8ac6adb77f1a8b4bc2beeac5d7
+    REF 839fc5e0f35b1c38a01cfd7a94e83de81e8a6b55
+    SHA512 efb6b19691e23c95cf6abd59607bce299b0c02a12ce6be105a35ad8509ab564b8dac8d6363f048e547d199e117d2bdd0e4ef3046d3c411f669c0a453a0b75627
     HEAD_REF master
 )
 
@@ -14,13 +14,21 @@ vcpkg_add_to_path(${PYTHON2_DIR})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA   
+    PREFER_NINJA
+        -DBUILD_DOC=OFF
+        -DBUILD_TESTING=OFF    
 )
 
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+vcpkg_copy_pdbs()
+
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
 
 # Handle copyright

diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL
@@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-process
-Version: 1.72.0
+Version: 1.72.0-1
 Build-Depends: boost-algorithm, boost-asio, boost-config, boost-core, boost-filesystem (!uwp), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi
 Homepage: https://github.com/boostorg/process
 Description: Boost process module
diff --git a/ports/boost-process/async_pipe_header.patch b/ports/boost-process/async_pipe_header.patch
@@ -0,0 +1,37 @@
+diff --git a/include/boost/process/async_pipe.hpp b/include/boost/process/async_pipe.hpp
+index 101fe1d59..a562432c0 100644
+--- a/include/boost/process/async_pipe.hpp
++++ b/include/boost/process/async_pipe.hpp
+@@ -47,6 +47,8 @@ class async_pipe
+      */
+     typedef platform_specific handle_type;
+
++    typedef typename handle_type::executor_type executor_type;
++
+     /** Construct a new async_pipe, does automatically open the pipe.
+      * Initializes source and sink with the same io_context.
+      * @note Windows creates a named pipe here, where the name is automatically generated.
+diff --git a/include/boost/process/detail/posix/async_pipe.hpp b/include/boost/process/detail/posix/async_pipe.hpp
+index 725a07890..a82c057b9 100644
+--- a/include/boost/process/detail/posix/async_pipe.hpp
++++ b/include/boost/process/detail/posix/async_pipe.hpp
+@@ -23,6 +23,7 @@ class async_pipe
+ public:
+     typedef int native_handle_type;
+     typedef ::boost::asio::posix::stream_descriptor handle_type;
++    typedef typename handle_type::executor_type executor_type;
+
+     inline async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios) {}
+
+diff --git a/include/boost/process/detail/windows/async_pipe.hpp b/include/boost/process/detail/windows/async_pipe.hpp
+index 06d5f2d85..0b447f9b8 100644
+--- a/include/boost/process/detail/windows/async_pipe.hpp
++++ b/include/boost/process/detail/windows/async_pipe.hpp
+@@ -48,6 +48,7 @@ class async_pipe
+ public:
+     typedef ::boost::winapi::HANDLE_ native_handle_type;
+     typedef ::boost::asio::windows::stream_handle   handle_type;
++    typedef typename handle_type::executor_type executor_type;
+
+     async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios, make_pipe_name(), true) {}
+     async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink)
diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     REF boost-1.72.0
     SHA512 bc881bcfa817e848151d90a0837683b9833395a7f7b76de76c40c96615bb1da7d10c0dae84f6b70b47fdf762a62869cb1700730a74fe123901803128f9194a52
     HEAD_REF master
+    PATCHES async_pipe_header.patch
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)

diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL
@@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.11.1
+Version: 2.11.3
 Description: A modern, header-only test framework for unit testing.
 Homepage: https://github.com/catchorg/Catch2
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF d10b9bd02e098476670f5eb0527d2c7281476e8a #v2.11.1
-    SHA512 c4a2f6bac4eb7abf8ad79aa1421b8b2ea623be3c946b02b9287fa2f95952b281a454eb56b80224fc1824e4d8c67317bc657eec4b4e65fb9709031602371e13b3
+    REF 255aa5f2afe1a622c97422f65ace6ca915be0d8d # v2.11.3
+    SHA512 e46d14105928fb43cd041bd4d797d255233d302d87f06823f7ae49f95b1e9a2fae321de4812f6e9ce3028a904cbd668cdf0ad3e6673bc5297f29d1fb1c46f130
     HEAD_REF master
 )
 

diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL
@@ -1,4 +1,8 @@
 Source: civetweb
-Version: 2019-07-05
+Version: 2019-07-05-1
 Description: Easy to use, powerful, C/C++ embeddable web server.
-Supports: !uwp
+Supports: !uwp
+
+Feature: ssl
+Build-Depends: openssl
+Description: Enable SSL support
diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake
@@ -14,6 +14,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    ssl CIVETWEB_ENABLE_SSL
+)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -23,8 +27,9 @@ vcpkg_configure_cmake(
         -DCIVETWEB_ENABLE_CXX=ON
         -DCIVETWEB_ENABLE_IPV6=ON
         -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF
-        -DCIVETWEB_ENABLE_SSL=OFF
+        -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF
         -DCIVETWEB_ENABLE_WEBSOCKETS=ON
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()

diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL
@@ -1,5 +1,5 @@
 Source: corrade
-Version: 2019.10
+Version: 2019.10-1
 Description: C++11/C++14 multiplatform utility library
 Homepage: https://magnum.graphics/corrade/
 Default-Features: interconnect, pluginmanager, testsuite, utility

diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
@@ -25,16 +25,6 @@ foreach(_feature IN LISTS ALL_FEATURES)
     endif()
 endforeach()
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-  # building for Windows desktop
-  if (VCPKG_PLATFORM_TOOLSET STREQUAL "v142" AND NOT VCPKG_USE_HEAD_VERSION)
-    message("**********")
-    message("WARNING: Visual Studio 2019 is not official supported by Corrade/Magnum team. Please use --head version if you intend to have upstream support.")
-    message("**********")
-    set(_CUSTOM_BUILD_FLAGS "-DCORRADE_MSVC2017_COMPATIBILITY=ON")
-  endif()
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja

diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
@@ -1,5 +1,5 @@
 Source: cppgraphqlgen
-Version: 3.1.1
+Version: 3.2.0
 Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson
 Description: C++ GraphQL schema service generator
 Homepage: https://github.com/microsoft/cppgraphqlgen
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/cppgraphqlgen
-    REF v3.1.1
-    SHA512 c6ebffcfd6f563b2a4ba1822ca173c73fd41b6f1dfbd4f94e64bee4bff626c64d88b2a35fa4c38189ba16852945f53d1f60dd68dc0ea85eb036ec31c94e7bdf4
+    REF 82763064a0551be86fa63f320206e863beef47c0 # v3.2.0
+    SHA512 7c88cf95c0aa09eed18c8a807e4ee3ae7a74958e0bb95714f6e725d54bf4fadbce5438150e653d142aadcbeb2f167d5faad94b90728fd13c3fe54730fec559f0
     HEAD_REF master
 )
 
@@ -22,4 +22,6 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
 
 vcpkg_copy_pdbs()
 
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen/copyright COPYONLY)
+file(INSTALL ${SOURCE_PATH}/LICENSE
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+    RENAME copyright)
diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL
@@ -1,4 +1,4 @@
 Source: exprtk
-Version: 2019-07-11
-Homepage: https://github.com/ArashPartow/exprtk
+Version: 2020-01-01
+Homepage: http://www.partow.net/programming/exprtk/index.html
 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.
diff --git a/ports/exprtk/copyright b/ports/exprtk/copyright
@@ -1,4 +1,4 @@
-Copyright 1999-2018 Arash Partow
+Copyright 1999-2020 Arash Partow
 http://www.partow.net/programming/exprtk/index.html
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

diff --git a/ports/exprtk/portfile.cmake b/ports/exprtk/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ArashPartow/exprtk
-    REF 7ccb123e9e79bc3df30a66c0bffe921d195702d7
-    SHA512 75b6adaa254060053f56e3978be3e10847c9dae22f675eae728cb0c7fd9a5e6fee8c8278764826e0e0be3bcb2cfd2288e091d0f965ac2e331403683f15764b92
+    REF 15b77a667b06d5bd82db01e0f4c773dd7cce9a97
+    SHA512 14fdc2420ab8cb0c1552d91251822f873fe7485a2fbf49376261638c6b0a4d2b24ceeeff0692d2cc8e8b78efb13ab886d65f0bebe1efc2348a95c6dc19c98f73
 )
 
 file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)

diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.2-6
+Version: 4.2-7
 Build-Depends: zlib
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
@@ -53,3 +53,7 @@ Description: upgrade (L)GPL to version 3
 
 Feature: avresample
 Description: Libav audio resampling library support in ffmpeg
+
+Feature: nvcodec
+Build-Depends: ffnvcodec, cuda
+Description: Hardware accelerated codecs
diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in
@@ -33,7 +33,7 @@ set(FFMPEG_VERSION "4.2")
 
 find_dependency(Threads)
 if(UNIX)
-  list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -pthread -lvdpau -lX11)
+  list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -pthread -lX11)
 endif()
 
 if(@ENABLE_BZIP2@)

diff --git a/ports/ffmpeg/build.sh b/ports/ffmpeg/build.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 set -e
 export PATH=/usr/bin:$PATH
+export PKG_CONFIG_PATH="`cygpath -p ${PKG_CONFIG_PATH}`"
 # Export HTTP(S)_PROXY as http(s)_proxy:
 if [ "$HTTP_PROXY" ]; then
     export http_proxy=$HTTP_PROXY

diff --git a/ports/ffmpeg/build_linux.sh b/ports/ffmpeg/build_linux.sh
@@ -16,6 +16,7 @@ PATH_TO_PACKAGE_DIR=$3
 
 cd "$PATH_TO_BUILD_DIR"
 echo "=== CONFIGURING ==="
+chmod a+x "$PATH_TO_SRC_DIR/configure"
 "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" $4
 echo "=== BUILDING ==="
 make -j6