Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_libraqm

2024-12-31 05:03:22 +08:00 · 2019-06-12 11:37:19 -07:00 · 2019-06-12 11:37:19 -07:00 · 9244439314
commit 9244439314
parent 874eadc574 59a8a9c624
260 changed files with 1669 additions and 1454 deletions
--- a/README.md
+++ b/README.md
@ -37,7 +37,7 @@ The best way to use installed libraries with CMake is via the toolchain file `sc

 In Visual Studio, you can create a New Project (or open an existing one). All installed libraries are immediately ready to be `#include`'d and used in your project without additional configuration.

-For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics.
+For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics. If your library is not present in vcpkg catalog, you can open an [issue on the GitHub repo](https://github.com/microsoft/vcpkg/issues) where the dev team and the community can see it and potentially create the port file for this library.

 Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/).

--- a/docs/maintainers/control-files.md
+++ b/docs/maintainers/control-files.md
@ -56,7 +56,7 @@ Version: 2019-3-21
 ```

 #### Description
-A description of the library
+A description of the library.

 By convention the first line of the description is a summary of the library.  An optional detailed description follows.  The detailed description can be multiple lines, all starting with whitespace.

@ -70,6 +70,14 @@ Description: Mosquitto is an open source message broker that implements the MQ T
  to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
 ````

+#### Homepage
+The URL of the homepage for the library where a user is able to find additional documentation or the original source code.
+
+Example:
+```no-highlight
+Homepage: https://github.com/Microsoft/vcpkg
+```
+
 #### Build-Depends
 Comma separated list of vcpkg ports the library has a dependency on.

--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@ -1,4 +1,5 @@
 Source: alembic
 Version: 1.7.11
 Build-Depends: ilmbase, hdf5
-Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/
+Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
+Homepage: http://alembic.io/
--- a/ports/anax/CONTROL
+++ b/ports/anax/CONTROL
@ -1,3 +1,4 @@
 Source: anax
 Version: 2.1.0-5
-Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>
+Description: An open source C++ entity system.
+Homepage: https://github.com/miguelmartin75/anax
--- a/ports/autobahn/CONTROL
+++ b/ports/autobahn/CONTROL
@ -1,4 +1,5 @@
 Source: autobahn
 Version: 18.4.1
 Build-Depends: websocketpp, msgpack, boost-asio, boost-thread
-Description: WAMP for C++ in Boost/Asio https://crossbar.io/autobahn
+Description: WAMP for C++ in Boost/Asio 
+Homepage: https://crossbar.io/autobahn
--- a/ports/avro-c/CONTROL
+++ b/ports/avro-c/CONTROL
@ -1,4 +1,4 @@
 Source: avro-c
-Version: 1.8.2-1
+Version: 1.8.2-2
 Description: Apache Avro is a data serialization system
 Build-Depends: jansson, liblzma, zlib
--- a/ports/avro-c/fix-build-error.patch
+++ b/ports/avro-c/fix-build-error.patch
@ -0,0 +1,20 @@
+diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt
+index c21f1ce..accb0e3 100644
+--- a/lang/c/src/CMakeLists.txt
+++ b/lang/c/src/CMakeLists.txt
+@@ -85,13 +85,13 @@ source_group(Avro FILES ${AVRO_SRC})
+ string(REPLACE ":" "." LIBAVRO_DOT_VERSION ${LIBAVRO_VERSION})
+ 
+ add_library(avro-static STATIC ${AVRO_SRC})
+-target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+target_link_libraries(avro-static jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+ set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro)
+ 
+ if (NOT WIN32)
+ # TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL
+ add_library(avro-shared SHARED ${AVRO_SRC})
+-target_link_libraries(avro-shared ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+target_link_libraries(avro-shared jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+ set_target_properties(avro-shared PROPERTIES
+         OUTPUT_NAME avro
+         SOVERSION ${LIBAVRO_DOT_VERSION})
--- a/ports/avro-c/portfile.cmake
+++ b/ports/avro-c/portfile.cmake
@ -13,14 +13,12 @@ vcpkg_from_github(
  REF release-1.8.2
  SHA512 a48cc353aadd45ad2c8593bf89ec3f1ddb0fcd364b79dd002a60a54d49cab714b46eee8bd6dc47b13588b9eead49c754dfe05f6aff735752fca8d2cd35ae8649
  HEAD_REF master
+  PATCHES
+        avro.patch
+        avro-pr-217.patch
+        fix-build-error.patch # Since jansson updated, use jansson::jansson instead of the macro ${JANSSON_LIBRARIES}
 )

-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/avro.patch
-        ${CMAKE_CURRENT_LIST_DIR}/avro-pr-217.patch)
-
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}/lang/c
    PREFER_NINJA
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@ -1,3 +1,3 @@
 Source: aws-c-common
-Version: 0.3.0
+Version: 0.3.11
 Description: AWS common library for C
--- a/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@ -0,0 +1,20 @@
+diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
+index 5ceb11c..9d0aa12 100644
+--- a/cmake/AwsCFlags.cmake
+++ b/cmake/AwsCFlags.cmake
+@@ -38,15 +38,6 @@ function(aws_set_common_properties target)
+         # Disable unknown pragma warnings
+         list(APPEND AWS_C_FLAGS /wd4068)
+ 
+-        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
+-        if(STATIC_CRT)
+-            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        else()
+-            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        endif()
+-        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
+-        list(APPEND AWS_C_FLAGS "${_FLAGS}")
+-
+     else()
+         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+ 
--- a/ports/aws-c-common/fix-dependencey-build-error.patch
+++ b/ports/aws-c-common/fix-dependencey-build-error.patch
@ -0,0 +1,13 @@
+diff --git a/include/aws/common/byte_buf.h b/include/aws/common/byte_buf.h
+index 545b06d..c579c82 100644
+--- a/include/aws/common/byte_buf.h
+++ b/include/aws/common/byte_buf.h
+@@ -21,6 +21,8 @@
+ 
+ #include <string.h>
+ 
+#pragma warning(disable: 4068)
+
+ /**
+  * Represents a length-delimited binary string or buffer. If byte buffer points
+  * to constant memory or memory that should otherwise not be freed by this
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@ -3,9 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-c-common
-    REF v0.3.0
-    SHA512 604b4289f19be662f15dc5ba80c20b78856975332b485796f979580e45f8d778eb8ce0cc2c02dcbaf27bc1159f473e02676cd951b674b7c8478ed26438a04541
+    REF v0.3.11
+    SHA512 da845f748aecfff61209f542f4eac8d46738af52ce980d5c8315397f859429dfd9e4bf989ddf2fbe938d1efb33dce9c531c92cbe53388b1d1082d5caa97e8750
    HEAD_REF master
+    PATCHES
+        fix-dependencey-build-error.patch # This patch fixes dependency port compilation failure
+        disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
 )

 vcpkg_configure_cmake(
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 2019-05-16
+Version: 2019-05-16.1
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c

--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-c-shared-utility
-        REF bc83cba1230e98988ae5cd2328f4dcf8c49d5866
-        SHA512 48947709f9c07c8a910d40066a52b746f9ab15543837f44207b787674efd2b11e7a7eb849c88e20984f0e2141e5611f6d6edea39c8b82687f371c08ab274bd7b
+        REF f0642196af85aeb4f2717d9cc11176290f321fb8
+        SHA512 fd8ee6e2be11c13f7388e57eb9c98397b6cb026ca370131db55b6118908701cdff2a1eaabb89bfe84591d6ee17163d06b7b86ad615216203bcbf0c8595d45452
        HEAD_REF master
        PATCHES no-double-expand-cmake.patch
    )
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-iot-sdk-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 

--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-iot-sdk-c
-        REF 68d9964daa3e6754f6f8d98bbbd637b0967d4d29
-        SHA512 5492ab06ae3686c7a167d63620d6ca00024dd52d46627d7958569f1ec0cfca1b56151d54b8c7975f127f655018c10e830747ef84a0cdc66a44e903e25b2dc985
+        REF f3f9538960d9b29033e52522dd63e985ba970504
+        SHA512 f8ce98d62425da4bec1c9e99b7b662a615d90a9407e03f7ce31a56fb8848f6bda1a39156bbabf351383e490dc3438d842136220dcf08efb1560e21d9ac76a0ba
        HEAD_REF public-preview
        PATCHES improve-external-deps.patch
    )
--- a/ports/azure-macro-utils-c/CONTROL
+++ b/ports/azure-macro-utils-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-macro-utils-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Description: A library of macros for the Azure IoT SDK Suite
 Build-Depends: 

--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@ -2,4 +2,5 @@ Source: azure-storage-cpp
 Version: 6.1.0
 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
 Description: Microsoft Azure Storage Client SDK for C++
-  A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
+  A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.
+Homepage: http://blogs.msdn.com/b/windowsazurestorage/
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-uamqp-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: AMQP library for C

--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-uamqp-c
-        REF 13f009ddd50a2837f651b0237de17db5f24c3af9
-        SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984
+        REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af
+        SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75
        HEAD_REF master
    )
 else()
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-uhttp-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: Azure HTTP Library written in C

--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-uhttp-c
-        REF 43dce924b32818f8ab851f972cffebc204edc5c4
-        SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70
+        REF b8976adff02e543fc00e7db59eae9ce78dd014fe
+        SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec
        HEAD_REF master
    )
 else()
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@ -1,5 +1,5 @@
 Source: azure-umqtt-c
-Version: 2019-05-16
+Version: 2019-05-16.1
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: General purpose library for communication over the mqtt protocol

--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
    vcpkg_from_github(
        OUT_SOURCE_PATH SOURCE_PATH
        REPO Azure/azure-umqtt-c
-        REF ea9f6112d002bdff55c94df327bc7effc8393c78
-        SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f
+        REF c37883fbb05218fd940b87899a116af240f90c40
+        SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3
        HEAD_REF master
    )
 else()
--- a/ports/berkeleydb/CONTROL
+++ b/ports/berkeleydb/CONTROL
@ -1,3 +1,3 @@
 Source: berkeleydb
 Version: 4.8.30-2
-Description: A high-performance embedded database for key/value data.
+Description: BDB - A high-performance embedded database for key/value data.
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@ -1,5 +1,6 @@
 Source: bond
 Maintainer: bond@microsoft.com
 Version: 7.0.2-2
-Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond>
+Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
+Homepage: https://github.com/Microsoft/bond
 Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
--- a/ports/boost-thread/CONTROL
+++ b/ports/boost-thread/CONTROL
@ -1,5 +1,5 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-thread
-Version: 1.70.0
+Version: 1.70.0-1
 Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
 Description: Boost thread module
--- a/ports/boost-thread/avoid-winapi.patch
+++ b/ports/boost-thread/avoid-winapi.patch
@ -1,13 +1,13 @@
-diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
-index 5e378f7..6144621 100644
--- a/include/boost/thread/win32/thread_primitives.hpp
-+++ b/include/boost/thread/win32/thread_primitives.hpp
-@@ -70,7 +70,7 @@ namespace boost
-     {
-         namespace win32
-         {
-            namespace detail { typedef ticks_type (WINAPI *gettickcount64_t)(); }
-+            namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
-             extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
- 
-             enum event_type
+diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
+index e075140..d60ab36 100644
+--- a/include/boost/thread/win32/thread_primitives.hpp
+++ b/include/boost/thread/win32/thread_primitives.hpp
+@@ -70,7 +70,7 @@ namespace boost
+     {
+         namespace win32
+         {
+-            namespace detail { typedef ticks_type (BOOST_WINAPI_WINAPI_CC *gettickcount64_t)(); }
+			namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
+             extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
+ 
+             enum event_type
--- a/ports/box2d/CONTROL
+++ b/ports/box2d/CONTROL
@ -1,3 +1,4 @@
 Source: box2d
 Version: 2.3.1-374664b-2
-Description: Box2D (http://box2d.org) is an open source C++ engine for simulating rigid bodies in 2D.
+Description: An open source C++ engine for simulating rigid bodies in 2D.
+Homepage: http://box2d.org
--- a/ports/capnproto/CONTROL
+++ b/ports/capnproto/CONTROL
@ -1,4 +1,5 @@
 Source: capnproto
 Version: 0.7.0-1
-Description: Data interchange format and capability-based RPC system https://capnproto.org/
+Description: Data interchange format and capability-based RPC system
+Homepage: https://capnproto.org/
 Build-Depends: zlib
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@ -1,4 +1,4 @@
 Source: catch2
 Version: 2.7.2
 Description: A modern, header-only test framework for unit testing.
-  Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2
+Homepage: https://github.com/catchorg/Catch2
--- a/ports/celero/CONTROL
+++ b/ports/celero/CONTROL
@ -1,3 +1,3 @@
 Source: celero
-Version: 2.4.0-1
+Version: 2.5.0-1
 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.
--- a/ports/celero/portfile.cmake
+++ b/ports/celero/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO DigitalInBlue/Celero
-    REF 9f41c21e35b04d7d65dcb0aff4c962f6e5f2cbc3
-    SHA512 62a4803e61cf9e876c09cc68be07d4bfa31f291d3ced23e092347bf43b48086b3ba7862fc454082f42263d9ec0c260e8ba58da5c0c461ebff9c871209784e2a7
+    REF 6f24a1d98db4fee41ddd2f615cf490a5b514795a
+    SHA512 7dc8cecd2aac7bd312bfa01013f290fbfac8a43d07cc0d884e9b446c29a6c233e800f9bd3d03551f6e3b1ee2424cf90571f16590b23fc9333900fcc82143d048
    HEAD_REF master
 )

--- a/ports/cli11/CONTROL
+++ b/ports/cli11/CONTROL
@ -1,3 +1,4 @@
 Source: cli11
 Version: 1.8.0
-Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. <https://github.com/CLIUtils/CLI11>
+Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.
+Homepage: https://github.com/CLIUtils/CLI11
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@ -1,6 +1,7 @@
 Source: corrade
 Version: 2019.01-1
-Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/
+Description: C++11/C++14 multiplatform utility library
+Homepage: http://magnum.graphics/corrade/
 Default-Features: interconnect, pluginmanager, testsuite, utility

 Feature: interconnect
--- a/ports/cppcms/CONTROL
+++ b/ports/cppcms/CONTROL
@ -1,4 +1,4 @@
 Source: cppcms
-Version: 1.1.0-2
+Version: 1.2.1
 Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development
 Build-Depends: icu, pcre, openssl, zlib
--- a/ports/cppcms/portfile.cmake
+++ b/ports/cppcms/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO artyom-beilis/cppcms
-    REF v1.1.0
-	SHA512 cfc77f28ddee05b8a350fff1dbd7c09adcf008b8662d4f977b203dee50b5fadae97df499a655ebb48263a7448e0bdca514c8ac52ea805bf33e48612dabaa69f4
+    REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4
+	SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df
 )

 vcpkg_find_acquire_program(PYTHON2)
@ -27,5 +27,5 @@ file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
 file(REMOVE ${EXE_FILES})

 # Handle copyright
-file(COPY ${SOURCE_PATH}/LGPLv3.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/LGPLv3.txt ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright)
+file(COPY ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/MIT.TXT ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright)
--- a/ports/cryptopp/CONTROL
+++ b/ports/cryptopp/CONTROL
@ -1,3 +1,3 @@
 Source: cryptopp
-Version: 8.1.0
+Version: 8.1.0-1
 Description: Crypto++ is a free C++ class library of cryptographic schemes.
--- a/ports/cryptopp/portfile.cmake
+++ b/ports/cryptopp/portfile.cmake
@ -26,6 +26,14 @@ vcpkg_from_github(
 file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

+# disable assembly on OSX to fix broken build
+if(APPLE)
+    set(CRYPTOPP_DISABLE_ASM "ON")
+else()
+    set(CRYPTOPP_DISABLE_ASM "OFF")
+endif()
+
+
 # Dynamic linking should be avoided for Crypto++ to reduce the attack surface,
 # so generate a static lib for both dynamic and static vcpkg targets.
 # See also:
@ -40,6 +48,7 @@ vcpkg_configure_cmake(
        -DBUILD_STATIC=ON
        -DBUILD_TESTING=OFF
        -DBUILD_DOCUMENTATION=OFF
+        -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM}
 )

 vcpkg_install_cmake()
--- a/ports/dcmtk/CONTROL
+++ b/ports/dcmtk/CONTROL
@ -1,3 +1,3 @@
 Source: dcmtk
-Version: 3.6.3-1
+Version: 3.6.4
 Description: This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.
--- a/ports/dcmtk/dcmtk.patch
+++ b/ports/dcmtk/dcmtk.patch
@ -1,15 +1,16 @@
-diff --git "a/CMake/dcmtkPrepare.cmake" "b/CMake/dcmtkPrepare.cmake"
--- a/CMake/dcmtkPrepare.cmake	2018-02-05 12:58:13.000000000 -0500
-+++ b/CMake/dcmtkPrepare.cmake	2018-04-25 15:07:12.927851000 -0400
-@@ -192,9 +192,9 @@
+diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
+index e9f77b5..4f7ebe3 100644
+--- a/CMake/dcmtkPrepare.cmake
+++ b/CMake/dcmtkPrepare.cmake
+@@ -192,9 +192,9 @@ include(GNUInstallDirs)
 # CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed
 # to different installation paths under Unix- and Windows-based systems
- IF(UNIX)
-  SET(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
+ if(UNIX)
+-  set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
 +  SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
- ELSEIF(WIN32)
-  SET(DCMTK_INSTALL_CMKDIR "cmake")
+ elseif(WIN32)
+-  set(DCMTK_INSTALL_CMKDIR "cmake")
 +  SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
- ENDIF(UNIX)
+ endif()
 
 #-----------------------------------------------------------------------------
--- a/ports/dcmtk/portfile.cmake
+++ b/ports/dcmtk/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO DCMTK/dcmtk
-    REF DCMTK-3.6.3
-    SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d
+    REF 1967b13134308f311e6a827e616958c6a4da5bc9
+    SHA512 a63a773e339081720adb0f3260a3b21ee11cde8009b321c3f45eeb40402ff29bd580926fb44f0dd784ba8369e2597933196bdaa324517d91fa5201b11b7504c0
    HEAD_REF master
    PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
 )
--- a/ports/draco/CONTROL
+++ b/ports/draco/CONTROL
@ -1,4 +1,4 @@
 Source: draco
-Version: 1.3.3-2
+Version: 1.3.5
 Description: A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
 Build-Depends:
--- a/ports/draco/fix-compile-error-uwp.patch
+++ b/ports/draco/fix-compile-error-uwp.patch
@ -1,30 +1,15 @@
-diff --git a/src/draco/core/symbol_coding_utils.h b/src/draco/core/symbol_coding_utils.h
-index be2183d..eaaca00 100644
--- a/src/draco/core/symbol_coding_utils.h
-+++ b/src/draco/core/symbol_coding_utils.h
-@@ -41,7 +41,9 @@ typename std::make_unsigned<IntTypeT>::type ConvertSignedIntToSymbol(
-   if (val >= 0) {
-     return static_cast<UnsignedType>(val) << 1;
-   }
-  val = -(val + 1);  // Map -1 to 0, -2 to -1, etc..
-+  // Map -1 to 0, -2 to -1, etc..
-+  val += 1;
-+  val *= -1;
-   UnsignedType ret = static_cast<UnsignedType>(val);
-   ret <<= 1;
-   ret |= 1;
-diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
-index 1aa52cc..cfbbdbd 100644
--- a/src/draco/io/parser_utils.cc
-+++ b/src/draco/io/parser_utils.cc
-@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
-   uint32_t v;
-   if (!ParseUnsignedInt(buffer, &v))
-     return false;
-  *value = (sign < 0) ? -v : v;
-+  if (sign < 0)
-+    v *= -1;
-+  *value = v;
-   return true;
- }
- 
+diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
+index 0a22ba1..9862949 100644
+--- a/src/draco/io/parser_utils.cc
+++ b/src/draco/io/parser_utils.cc
+@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
+   uint32_t v;
+   if (!ParseUnsignedInt(buffer, &v))
+     return false;
+-  *value = (sign < 0) ? -v : v;
+  if (sign < 0)
+    v *= -1;
+  *value = v;
+   return true;
+ }
+ 
--- a/ports/draco/fix-uwperror.patch
+++ b/ports/draco/fix-uwperror.patch
@ -0,0 +1,13 @@
+diff --git a/src/draco/core/bit_utils.h b/src/draco/core/bit_utils.h
+index f63cd07..0f6baaf 100644
+--- a/src/draco/core/bit_utils.h
+++ b/src/draco/core/bit_utils.h
+@@ -26,6 +26,8 @@
+ #include <intrin.h>
+ #endif  // defined(_MSC_VER)
+ 
+#pragma warning(disable:4146)
+
+ namespace draco {
+ 
+ // Returns the number of '1' bits within the input 32 bit integer.
--- a/ports/draco/portfile.cmake
+++ b/ports/draco/portfile.cmake
@ -5,11 +5,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/draco
-    REF 1.3.3
-    SHA512 80ed5a623046822f5bb26b2454c8ee8cc93ffe9eb3012e8461cefdfc577b26d69a92ea0f0c5e14f5f48c1ef99f9a7263b01710df376792e74358ae14e49c3897
+    REF 1.3.5
+    SHA512 f99fcbec60fbd1683d8aacc35ff8ad9ee1c84374132ad4cc8c0f56662f5d33f940f89028cf3e577cde3314fd0766c124f61798121e4127e888f302e9efe1a004
    HEAD_REF master
    PATCHES
        fix-compile-error-uwp.patch
+		fix-uwperror.patch
 )

 vcpkg_configure_cmake(
--- a/ports/ensmallen/CONTROL
+++ b/ports/ensmallen/CONTROL
@ -1,4 +1,5 @@
 Source: ensmallen
-Version: 1.15.0-1
+Version: 1.15.1
 Description: A header-only C++ library for mathematical optimization.
 Build-Depends: openblas (!osx), clapack (!osx), armadillo
+
--- a/ports/ensmallen/portfile.cmake
+++ b/ports/ensmallen/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO mlpack/ensmallen
-    REF ensmallen-1.15.0
-    SHA512 4264bbba856e8fd4fb00d8a4e5f90d93b853d5358cea0ab7231f38d22af3b1e22b238af03edf292086937c16fe7575549d0a1e4fba1d49c85452ec1d3cc9f31a
+    REF 8bea8d214b40be3cb42e817328c0791541fbcd6c
+    SHA512 b075b763c136c1d2d5088c533a8557e3d425da7bcfeb3748063c1e3225e58969eddfc5bd786cb02f29f71ea5e3288327481a0961f64b1d2ff1251a0f59c07779
    HEAD_REF master
 	PATCHES
 		disable_tests.patch
--- a/ports/entityx/CONTROL
+++ b/ports/entityx/CONTROL
@ -1,3 +1,4 @@
 Source: entityx
 Version: 1.3.0-1
-Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx>
+Description: EntityX - A fast, type-safe C++ Entity-Component system.
+Homepage: https://github.com/alecthomas/entityx
--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@ -1,3 +1,4 @@
 Source: entt
 Version: 3.0.0-1
-Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. <https://github.com/skypjack/entt>
+Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more.
+Homepage: https://github.com/skypjack/entt
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@ -1,7 +1,8 @@
 Source: exiv2
 Version: 0.27
 Build-Depends: zlib, expat, libiconv, gettext
-Description: Image metadata library and tools http://www.exiv2.org
+Description: Image metadata library and tools
+Homepage: http://www.exiv2.org

 Feature: unicode
 Description: Compile with unicode support on windows
--- a/ports/fastcdr/CONTROL
+++ b/ports/fastcdr/CONTROL
@ -1,3 +1,3 @@
 Source: fastcdr
-Version: 1.0.6-2
+Version: 1.0.9-1
 Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.
--- a/ports/fastcdr/install-cmake.patch
+++ b/ports/fastcdr/install-cmake.patch
@ -1,26 +1,13 @@
 diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 46d6f20..5d73ec5 100644
+index 14747c9..65c3ddb 100644
 --- a/src/cpp/CMakeLists.txt
 +++ b/src/cpp/CMakeLists.txt
-@@ -139,7 +139,12 @@ if(MSVC OR MSVC_IDE)
-             set(DIR_EXTENSION "/${MSVC_ARCH}")
-         endif()
+@@ -155,7 +155,7 @@ elseif(NOT EPROSIMA_INSTALLER)
+         COMPONENT cmake
+         )
 
-        install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
-+        if(BUILD_SHARED_LIBS)
-+            set(PROJECT_TARGETS ${PROJECT_NAME})
-+        else()
-+            set(PROJECT_TARGETS ${PROJECT_NAME}_static)
-+        endif()
-+        install(TARGETS ${PROJECT_TARGETS}
-             EXPORT ${PROJECT_NAME}Targets
-             RUNTIME DESTINATION ${BIN_INSTALL_DIR}${DIR_EXTENSION}
-             LIBRARY DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}
-@@ -147,7 +152,6 @@ if(MSVC OR MSVC_IDE)
-             COMPONENT libraries_${MSVC_ARCH}
-             )
- 
-        export(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static FILE ${PROJECT_BINARY_DIR}/cmake/config/${PROJECT_NAME}Targets.cmake)
-         install(EXPORT ${PROJECT_NAME}Targets
-             DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}/${PROJECT_NAME}/cmake
-             COMPONENT cmake
+-    if(MSVC OR MSVC_IDE)
+    if(MSVC OR MSVC_IDE AND 0)
+         if(TARGET_TYPE STREQUAL "SHARED_LIBRARY")
+             # Install pdb files
+             install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug/
--- a/ports/fastcdr/portfile.cmake
+++ b/ports/fastcdr/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO eProsima/Fast-CDR
-    REF v1.0.6
-    SHA512 80861ff6a0283e1398306e081fe70d7d185f980e5714ae51864cae012b8f79719efa24e7f41025b2bfb2052cb2a3098436c75a38407f8f5a331593cb91868fb2
+    REF v1.0.9
+    SHA512 2825e61fc4736c9364fc3130f649798cec11fcb56dc5e202c17731121ad8a2795f0fbf8acb5d8d662181bc470e7a3e95a5027283872714be505bb2562c2e2312
    HEAD_REF master
    PATCHES install-cmake.patch
 )
@ -19,17 +19,16 @@ vcpkg_configure_cmake(

 vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastcdr/cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastcdr/cmake)

-file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" _contents)
-string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdrTargets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdrTargets.cmake)" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" "${_contents}")
+file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" _contents)
+string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdr-targets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdr-targets.cmake)" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" "${_contents}")

 vcpkg_copy_pdbs()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr)

-# always build static and share library default
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    file(READ ${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h EPROSIMA_AUTO_LINK_H)
    string(REPLACE "#define EPROSIMA_LIB_PREFIX \"lib\"" "#define EPROSIMA_LIB_PREFIX" EPROSIMA_AUTO_LINK_H "${EPROSIMA_AUTO_LINK_H}")
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.1-5
+Version: 4.1-6
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
  FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.

@ -27,6 +27,10 @@ Feature: bzip2
 Build-Depends: bzip2
 Description: bzip2 support in ffmpeg

+Feature: vpx
+Build-Depends: libvpx
+Description: WebM VP8/VP9 support in ffmpeg
+
 Feature: x264
 Build-Depends: x264, ffmpeg[gpl]
 Description: x264 support in ffmpeg
--- a/ports/ffmpeg/fix_libvpx_windows_linking.patch
+++ b/ports/ffmpeg/fix_libvpx_windows_linking.patch
@ -0,0 +1,55 @@
+diff --git "a/configure" "b/configure"
+index c8be177..2fef830 100644
+--- "a/configure"
+++ "b/configure"
+@@ -5098,6 +5098,8 @@ case "$arch" in
+     ;;
+ esac
+ 
+libvpx_name=vpx
+
+ # OS specific
+ case $target_os in
+     aix)
+@@ -5269,6 +5271,15 @@ case $target_os in
+         enabled x86_64 && objformat="win64" || objformat="win32"
+         ranlib=:
+         enable dos_paths
+        if [ -z "${extra_cflags##*-MDd*}" ]; then
+            libvpx_name=vpxmdd
+        elif [ -z "${extra_cflags##*-MD*}" ]; then
+            libvpx_name=vpxmd
+        elif [ -z "${extra_cflags##*-MTd*}" ]; then
+            libvpx_name=vpxmtd
+        elif [ -z "${extra_cflags##*-MT*}" ]; then
+            libvpx_name=vpxmt
+        fi
+         ;;
+     cygwin*)
+         target_os=cygwin
+@@ -6153,21 +6164,21 @@ enabled libvorbis         && require_pkg_config libvorbis vorbis vorbis/codec.h
+ enabled libvpx            && {
+     enabled libvpx_vp8_decoder && {
+         check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
+-            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
+            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name ||
+                 die "ERROR: libvpx decoder version must be >=1.4.0";
+     }
+     enabled libvpx_vp8_encoder && {
+         check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
+-            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
+            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name ||
+                 die "ERROR: libvpx encoder version must be >=1.4.0";
+     }
+     enabled libvpx_vp9_decoder && {
+         check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
+-            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
+            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs"
+     }
+     enabled libvpx_vp9_encoder && {
+         check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
+-            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs"
+            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs"
+     }
+     if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
+         die "libvpx enabled but no supported decoders found"
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@ -15,6 +15,7 @@ vcpkg_extract_source_archive_ex(
        configure_opencv.patch
        fix_windowsinclude-in-ffmpegexe-1.patch
        fix_windowsinclude-in-ffmpegexe-2.patch
+        fix_libvpx_windows_linking.patch
 )

 if (${SOURCE_PATH} MATCHES " ")
@ -94,6 +95,12 @@ else()
    set(OPTIONS "${OPTIONS} --disable-ffprobe")
 endif()

+if("vpx" IN_LIST FEATURES)
+    set(OPTIONS "${OPTIONS} --enable-libvpx")
+else()
+    set(OPTIONS "${OPTIONS} --disable-libvpx")
+endif()
+
 if("x264" IN_LIST FEATURES)
    set(OPTIONS "${OPTIONS} --enable-libx264")
 else()
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@ -1,4 +1,4 @@
 Source: fizz
-Version: 2019.05.13.00
+Version: 2019.05.20.00
 Build-Depends: folly, openssl, libsodium, zlib
 Description: a TLS 1.3 implementation by Facebook
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebookincubator/fizz
-    REF v2019.05.13.00
-    SHA512 f1ce2a74ad0c06fb29b37bf02dce832ffc6581723e92f11bfde075307cb0d0e2000e686e48f2f77f07a8abc425a61c2621b7d1211551ee93867cb042f1100598
+    REF 6d26a1be8d7a20d8d89c374ee3dc5c452d18c18d
+    SHA512 bc6aa17a97fdfc53d0a247b876cbd1fea8214608b7e463dcf21e34df65015fe77e617c5a6c6bfa84b87e60e56b6aeb89aa2d8d774f97fc1f76f415869948a48a
    HEAD_REF master
    PATCHES find-zlib.patch
 )
--- a/ports/flatbuffers/CONTROL
+++ b/ports/flatbuffers/CONTROL
@ -1,4 +1,5 @@
 Source: flatbuffers
-Version: 1.10.0-1
-Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/
+Version: 1.11.0
+Description: Memory Efficient Serialization Library
 FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility.
+Homepage:  http://google.github.io/flatbuffers/
--- a/ports/flatbuffers/fix-uwp-build.patch
+++ b/ports/flatbuffers/fix-uwp-build.patch
@ -0,0 +1,20 @@
+diff --git a/src/util.cpp b/src/util.cpp
+index c1bb197..658e116 100644
+--- a/src/util.cpp
+++ b/src/util.cpp
+@@ -239,9 +239,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
+   #ifdef _MSC_VER
+   __pragma(warning(disable : 4996)); // _CRT_SECURE_NO_WARNINGS
+   #endif
+#if _WIN32_WINNT < 0x0A00 
+   auto env_str = std::getenv(var_name);
+   if (!env_str) return false;
+   if (_value) *_value = std::string(env_str);
+#else
+  //There is no support for environment variables in UWP
+  var_name; // Do nothing
+  *_value = std::string("");
+#endif
+   return true;
+ }
+ 
--- a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
+++ b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3388dd..699ea3b 100644
+index 119855a..945085a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -104,7 +104,7 @@ set(FlatBuffers_GRPCTest_SRCS
+@@ -155,7 +155,7 @@ set(FlatBuffers_GRPCTest_SRCS
 # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
 # source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
 
@ -10,4 +10,4 @@ index a3388dd..699ea3b 100644
 +if(EXISTS "${CMAKE_TOOLCHAIN_FILE}" AND NOT DEFINED VCPKG_TOOLCHAIN)
   # do not apply any global settings if the toolchain
   # is being configured externally
- elseif(APPLE)
+   message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.")
--- a/ports/flatbuffers/no-werror.patch
+++ b/ports/flatbuffers/no-werror.patch
@ -1,17 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3388dd..f0626e5 100644
+index 119855a..6269362 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -119,12 +119,16 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
+@@ -172,13 +172,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
       "${CMAKE_CXX_FLAGS} -std=c++0x")
   endif(CYGWIN)
   set(CMAKE_CXX_FLAGS
 -    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
-+    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
+	"${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
+   set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
     if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
       set(CMAKE_CXX_FLAGS
-         "${CMAKE_CXX_FLAGS} -faligned-new")
+         "${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2")
     endif()
 +    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
 +      set(CMAKE_CXX_FLAGS
@ -20,4 +21,3 @@ index a3388dd..f0626e5 100644
     set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter")
   endif()
-
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@ -5,12 +5,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/flatbuffers
-    REF v1.10.0
-    SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2
+    REF v1.11.0
+    SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
    HEAD_REF master
    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch
-        ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch
+        ignore_use_of_cmake_toolchain_file.patch
+        no-werror.patch
+		fix-uwp-build.patch
 )

 set(OPTIONS)
--- a/ports/fmilib/CONTROL
+++ b/ports/fmilib/CONTROL
@ -1,3 +1,4 @@
 Source: fmilib
 Version: 2.0.3-1
-Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/
+Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.
+Homepage: http://www.fmi-standard.org/
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@ -1,5 +1,5 @@
 Source: folly
-Version: 2019.05.13.00
+Version: 2019.05.20.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, boost-smart-ptr
 Default-Features: zlib
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@ -14,8 +14,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/folly
-    REF v2019.05.13.00
-    SHA512 5dfeef0c2845b15e32a29119921d65e349a7ae9bcfa25c406d42d8df1614d2542153cd0ad8d0cf22592045b24272375a7839af91579d6be685cb8a3512586689
+    REF 354223ec1602913667c52cee1ce0782a82cb0cad
+    SHA512 53dd401e5fe8aebf35bec7c1b49e45a7abf152ad12f7392f31653f9e644207d0926424948ad2d7974bf3e5eabaa97e3e9113f1318883bfc99b968b3700b19023
    HEAD_REF master
    PATCHES
        missing-include-atomic.patch
--- a/ports/forge/CONTROL
+++ b/ports/forge/CONTROL
@ -1,4 +1,4 @@
 Source: forge
-Version: 1.0.3-1
+Version: 1.0.4-1
 Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
 Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
--- a/ports/forge/fix-static_build.patch
+++ b/ports/forge/fix-static_build.patch
@ -0,0 +1,28 @@
+diff --git a/extern/glad/CMakeLists.txt b/extern/glad/CMakeLists.txt
+index c8c8d86..27adf86 100644
+--- a/extern/glad/CMakeLists.txt
+++ b/extern/glad/CMakeLists.txt
+@@ -2,15 +2,19 @@ add_library(forge_glad_interface INTERFACE)
+ 
+ target_include_directories(forge_glad_interface
+     INTERFACE
+-    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+     )
+ 
+ target_sources(forge_glad_interface
+     INTERFACE
+-    ${CMAKE_CURRENT_SOURCE_DIR}/src/glad.c
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/glad.c>
+     )
+ 
+ target_link_libraries(forge_glad_interface
+     INTERFACE
+-    ${CMAKE_DL_LIBS}
+    $<BUILD_INTERFACE:${CMAKE_DL_LIBS}>
+     )
+
+if (NOT BUILD_SHARED_LIBS)
+    install(TARGETS forge_glad_interface EXPORT ForgeTargets)
+endif ()
+\ No newline at end of file
--- a/ports/forge/forge_targets_fix.patch
+++ b/ports/forge/forge_targets_fix.patch
@ -1,115 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c7236a6..b4b910a 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,64 +110,63 @@ install(DIRECTORY include/
-     PATTERN "*.h"
-     PATTERN "*.hpp"
-     PATTERN ".gitignore" EXCLUDE)
-# The Forge version header is generated and thus need to be
-# included explicitly
-+
- install(FILES ${Forge_BINARY_DIR}/include/fg/version.h
-     DESTINATION "${FG_INSTALL_INC_DIR}/fg/"
-     COMPONENT headers)
- 
-install(EXPORT ForgeTargets
-    NAMESPACE Forge::
-    DESTINATION ${FG_INSTALL_CMAKE_DIR}
-    COMPONENT forge)
-
-export(EXPORT ForgeTargets
-    NAMESPACE Forge::
-    FILE cmake/ForgeTargets.cmake)
-+# install the examples irrespective of the FG_BUILD_EXAMPLES value
-+# only the examples source files are installed, so the installation of these
-+# source files does not depend on FG_BUILD_EXAMPLES
-+# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without
-+# building the example executables
-+install(DIRECTORY examples/ #NOTE The slash at the end is important
-+    DESTINATION ${FG_INSTALL_EXAMPLE_DIR}
-+    COMPONENT examples)
- 
- include(CMakePackageConfigHelpers)
- write_basic_package_version_file(
-    "${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake"
-+    "${Forge_BINARY_DIR}/ForgeConfigVersion.cmake"
-     COMPATIBILITY SameMajorVersion)
- 
-# This config file will be installed so we need to set the install_destination
-# path relative to the install path
-+
-+# export install config file
- set(INCLUDE_DIRS include)
- set(CMAKE_DIR ${FG_INSTALL_CMAKE_DIR})
- configure_package_config_file(
-  "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
-  "cmake/install/ForgeConfig.cmake"
-  INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}"
-  PATH_VARS INCLUDE_DIRS CMAKE_DIR)
-
-install(FILES ${Forge_BINARY_DIR}/cmake/install/ForgeConfig.cmake
-    ${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake
-+    "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
-+    "cmake_install/ForgeConfig.cmake"
-+    INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}"
-+    PATH_VARS INCLUDE_DIRS CMAKE_DIR
-+)
-+install(FILES ${Forge_BINARY_DIR}/cmake_install/ForgeConfig.cmake
-+    ${Forge_BINARY_DIR}/ForgeConfigVersion.cmake
-     DESTINATION ${FG_INSTALL_CMAKE_DIR}
-    COMPONENT cmake)
-+    COMPONENT cmake
-+)
-+install(EXPORT ForgeTargets
-+    NAMESPACE Forge::
-+    DESTINATION ${FG_INSTALL_CMAKE_DIR}
-+    COMPONENT forge
-+)
- 
-# Following file will be used to create the config file for the build directory.
-# These config files will be used by the examples to find the Forge
-# libraries
-+
-+# export build tree targets config file
- set(INCLUDE_DIRS "${Forge_SOURCE_DIR}/include" "${Forge_BINARY_DIR}/include")
-set(CMAKE_DIR "${Forge_BINARY_DIR}/cmake")
-+set(CMAKE_DIR "${Forge_BINARY_DIR}")
- configure_package_config_file(
-  "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
-  "cmake/ForgeConfig.cmake"
-  INSTALL_DESTINATION "${Forge_BINARY_DIR}/cmake"
-  PATH_VARS INCLUDE_DIRS CMAKE_DIR
-  INSTALL_PREFIX "${Forge_BINARY_DIR}")
-+    "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in"
-+    "ForgeConfig.cmake"
-+    INSTALL_DESTINATION "${Forge_BINARY_DIR}"
-+    PATH_VARS INCLUDE_DIRS CMAKE_DIR
-+    INSTALL_PREFIX "${Forge_BINARY_DIR}"
-+)
-+export(EXPORT ForgeTargets
-+    NAMESPACE Forge::
-+    FILE ForgeTargets.cmake
-+)
-+#export(PACKAGE Forge)
- 
-#--------------------------------------------------------------------
-# Install examples
-#--------------------------------------------------------------------
-# install the examples irrespective of the FG_BUILD_EXAMPLES value
-# only the examples source files are installed, so the installation of these
-# source files does not depend on FG_BUILD_EXAMPLES
-# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without
-# building the example executables
-install(DIRECTORY examples/ #NOTE The slash at the end is important
-    DESTINATION ${FG_INSTALL_EXAMPLE_DIR}
-    COMPONENT examples)
- 
- include(CPackConfig)
- 
-@@ -177,4 +176,4 @@ conditional_directory(FG_BUILD_EXAMPLES examples)
- mark_as_advanced(
-     pkgcfg_lib_FontConfigPkg_freetype
-     pkgcfg_lib_FontConfigPkg_fontconfig
-    )
-+)
--- a/ports/forge/portfile.cmake
+++ b/ports/forge/portfile.cmake
@ -4,18 +4,13 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
    message(FATAL_ERROR "This port currently only supports x64 architecture")
 endif()

-set(PATCHES forge_targets_fix.patch)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    list(APPEND PATCHES static_build.patch)
-endif()
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO arrayfire/forge
-    REF v1.0.3
-    SHA512 e1a7688c1c3ab4659401463c5d025917b6e5766129446aefbebe0d580756cd2cc07256ddda9b20899690765220e5467b9209e00476c80ea6a51a1a0c0e9da616
+    REF 650bf611de102a2cc0c32dba7646f8128f0300c8
+    SHA512 2093464db0f3a7f0178f65bed37986a4df1117f1d7ad65157d525584490cdf234475f01ed1a2003a9e54bdc3b9e2e450808044a264c2284d67b8c2a353400027
    HEAD_REF master
-    PATCHES ${PATCHES}
+	PATCHES fix-static_build.patch
 )

 vcpkg_configure_cmake(
@ -41,4 +36,4 @@ file(REMOVE_RECURSE
    ${DLLS}
 )

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/.github/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
--- a/ports/forge/static_build.patch
+++ b/ports/forge/static_build.patch
@ -1,39 +0,0 @@
-diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
-index 1aeec1e..52eff05 100755
--- a/src/backend/opengl/CMakeLists.txt
-+++ b/src/backend/opengl/CMakeLists.txt
-@@ -142,7 +142,7 @@ install(TARGETS forge
-     INCLUDES DESTINATION ${FG_INSTALL_INC_DIR})
- 
- # install dependencies
-if (WIN32)
-+if (WIN32 AND BUILD_SHARED_LIBS)
-     if (FG_WITH_FREEIMAGE AND NOT FG_USE_STATIC_FREEIMAGE)
-         install(FILES $<TARGET_FILE:FreeImage::FreeImage>
-             DESTINATION ${FG_INSTALL_BIN_DIR}
-diff --git a/src/backend/opengl/glfw/CMakeLists.txt b/src/backend/opengl/glfw/CMakeLists.txt
-index caf4913..3c8d71c 100644
--- a/src/backend/opengl/glfw/CMakeLists.txt
-+++ b/src/backend/opengl/glfw/CMakeLists.txt
-@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS)
-     install(TARGETS forge_wtk_interface EXPORT ForgeTargets)
- endif ()
- 
-if (WIN32)
-+if (WIN32 AND BUILD_SHARED_LIBS)
-     install(FILES $<TARGET_FILE:glfw>
-     DESTINATION ${FG_INSTALL_BIN_DIR}
-     COMPONENT dependencies)
-diff --git a/src/backend/opengl/sdl/CMakeLists.txt b/src/backend/opengl/sdl/CMakeLists.txt
-index d8cd312..d55f27d 100644
--- a/src/backend/opengl/sdl/CMakeLists.txt
-+++ b/src/backend/opengl/sdl/CMakeLists.txt
-@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS)
-     install(TARGETS forge_wtk_interface EXPORT ForgeTargets)
- endif ()
- 
-if (WIN32)
-+if (WIN32 AND BUILD_SHARED_LIBS)
-     install(FILES $<TARGET_FILE:SDL2::SDL2>
-     DESTINATION ${FG_INSTALL_BIN_DIR}
-     COMPONENT dependencies)
--- a/ports/freetype/CONTROL
+++ b/ports/freetype/CONTROL
@ -1,4 +1,4 @@
 Source: freetype
-Version: 2.9.1-1
+Version: 2.9.1-2
 Build-Depends: zlib, bzip2, libpng
 Description: A library to render fonts.
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@ -70,7 +70,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
 else() #if(VCPKG_BUILD_TYPE STREQUAL "release")
    file(READ ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config.cmake CONFIG_MODULE)
 endif()
-string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include/freetype" CONFIG_MODULE "${CONFIG_MODULE}")
+string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include;\${_IMPORT_PREFIX}/include/freetype" CONFIG_MODULE "${CONFIG_MODULE}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config.cmake "${CONFIG_MODULE}")

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
--- a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch
+++ b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch
@ -1,26 +0,0 @@
-From b56270d28a59297518e91f85333a2e1a7fecdc9e Mon Sep 17 00:00:00 2001
-From: Juha Sointusalo <juha.sointusalo@gmail.com>
-Date: Thu, 13 Dec 2018 21:38:23 +0200
-Subject: [PATCH] fix building DLL on Windows
-
-Without FTGL_LIBRARY all symbols are declared to be imported instead of
-exported and linking the library fails.
---
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d6c5a57..6b230ce 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,6 +27,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
- OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" ON)
- IF(BUILD_SHARED_LIBS)
-  	SET(LIB_TYPE SHARED)
-+	ADD_DEFINITIONS(-DFTGL_LIBRARY)
- ELSE(BUILD_SHARED_LIBS)
- 	SET(LIB_TYPE STATIC)
- 	ADD_DEFINITIONS(-D FTGL_LIBRARY_STATIC)
-- 
-2.18.0.windows.1
-
--- a/ports/ftgl/CONTROL
+++ b/ports/ftgl/CONTROL
@ -1,5 +1,5 @@
 Source: ftgl
-Version: 2.3.1
+Version: 2.4.0-1
 Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.
  Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.
  FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering.
--- a/ports/ftgl/Fix-headersFilePath.patch
+++ b/ports/ftgl/Fix-headersFilePath.patch
@ -0,0 +1,23 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 693e49f..c47ff3c 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -1,9 +1,5 @@
+-
+-
+-
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cmake)
+ 
+-
+ ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}")
+ 
+ IF(WIN32)
+@@ -26,7 +22,7 @@ SET(libftgl_la_SOURCES
+     FTGlyphContainer.h
+     FTInternals.h
+     FTLibrary.cpp
+-    FTLibrary.h
+    FTGL/FTLibrary.h
+     FTList.h
+     FTPoint.cpp
+     FTSize.cpp
--- a/ports/ftgl/portfile.cmake
+++ b/ports/ftgl/portfile.cmake
@ -1,12 +1,13 @@
 include(vcpkg_common_functions)
+vcpkg_find_acquire_program(DOXYGEN)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO frankheckenbach/ftgl
-    REF 2.3.1
-    SHA512 4c3c92e79371aa9048a0de6c27bd008036be19fe6179bce472f36ced359026aaeaa5b63c83f90ffc1d425dd2e587479efc700dc1082c2ed0189d16ea87838c9a
+    REF 483639219095ad080538e07ceb5996de901d4e74
+    SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f
    HEAD_REF master
-    PATCHES "0001-fix-building-DLL-on-Windows.patch"
+    PATCHES Fix-headersFilePath.patch
 )

 vcpkg_configure_cmake(
--- a/ports/g2o/CONTROL
+++ b/ports/g2o/CONTROL
@ -1,4 +1,5 @@
 Source: g2o
 Version: 20170730_git-4
 Build-Depends: suitesparse, eigen3, clapack (!osx), ceres
-Description: g2o: A General Framework for Graph Optimization http://openslam.org/g2o.html
+Description: g2o: A General Framework for Graph Optimization
+Homepage: http://openslam.org/g2o.html
--- a/ports/getopt-win32/CONTROL
+++ b/ports/getopt-win32/CONTROL
@ -1,3 +1,4 @@
 Source: getopt-win32
 Version: 0.1
-Description: An implementation of getopt provided by https://github.com/libimobiledevice-win32
+Description: An implementation of getopt.
+Homepage: https://github.com/libimobiledevice-win32
--- a/ports/gherkin-c/CONTROL
+++ b/ports/gherkin-c/CONTROL
@ -1,3 +1,3 @@
 Source: gherkin-c
-Version: c-libs-e63e83104b
+Version: 4.1.2
 Description: Gherkin parser/compiler in C 
--- a/ports/gherkin-c/portfile.cmake
+++ b/ports/gherkin-c/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO c-libs/gherkin-c
-    REF e63e83104b835e217140e9dc77d9ce2bb50f234e
-    SHA512 a99b3f695257b45df8ff7b8ec46bff28991cf2b9bc51a25247550471c724bd14ee64340db684f096131f47d7f4ff278d23dda546e7dfe29134bbc1dbccaf0d1e
+    REF 8f31c2ff6a7b58196a061c8847508563679f67b3
+    SHA512 f78a1f9da7ff38fe2546e0db9ed33a2e25e12aa8a407ce827933a379ce083e6f872b39eb2321ff8c35199015c3c2299e46567171c5edfeff07600765f3f0a6ec
    HEAD_REF master
 )

--- a/ports/glad/CONTROL
+++ b/ports/glad/CONTROL
@ -1,4 +1,4 @@
 Source: glad
-Version: 0.1.29
+Version: 0.1.30
 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.
 Build-Depends: egl-registry, opengl-registry
--- a/ports/glad/portfile.cmake
+++ b/ports/glad/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Dav1dde/glad
-    REF v0.1.29
-    SHA512 056c0439b673d86bd10fe733873d4b82cf70861818980f08b3ec23f7b478750064a6d53925cc2cf9445e570cece5f21e12d7af6f1927b64af05d8d1f2afdedcb
+    REF v0.1.30
+    SHA512 2db0f75e5859be039bf4dcbea239dd6d35bdc92e69912e807dfacdb01581c73b6a5eb0f0889f2ffcd705415abe5f28cf204b4010d08f5477b51c0ce3ae6a35b5
    HEAD_REF master
 )

--- a/ports/gli/CONTROL
+++ b/ports/gli/CONTROL
@ -1,4 +1,5 @@
 Source: gli
 Version: dd17acf
 Build-Depends: glm
-Description: OpenGL Image (GLI) https://gli.g-truc.net
+Description: OpenGL Image (GLI)
+Homepage: https://gli.g-truc.net
--- a/ports/glibmm/CONTROL
+++ b/ports/glibmm/CONTROL
@ -1,4 +1,5 @@
 Source: glibmm
 Version: 2.52.1-9
-Description: This is glibmm, a C++ API for parts of glib that are useful for C++. See http://www.gtkmm.org.
+Description: This is glibmm, a C++ API for parts of glib that are useful for C++.
+Homepage: http://www.gtkmm.org.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
--- a/ports/glm/CONTROL
+++ b/ports/glm/CONTROL
@ -1,3 +1,4 @@
 Source: glm
 Version: 0.9.9.5-3
-Description: OpenGL Mathematics (GLM) https://glm.g-truc.net
+Description: OpenGL Mathematics (GLM)
+Homepage: https://glm.g-truc.net
--- a/ports/globjects/CONTROL
+++ b/ports/globjects/CONTROL
@ -2,4 +2,5 @@ Source: globjects
 Maintainer: mattias@mattiascibien.net
 Version: 1.1.0-2018-09-19-1
 Build-Depends: glbinding, glm
-Description: C++ library strictly wrapping OpenGL objects. <https://github.com/cginternals/globjects>
+Description: C++ library strictly wrapping OpenGL objects.
+Homepage: https://github.com/cginternals/globjects
--- a/ports/grpc/00003-undef-base64-macro.patch
+++ b/ports/grpc/00003-undef-base64-macro.patch
@ -1,13 +1,13 @@
-diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
-index 09306110c6..eb0ad96a7a 100644
--- a/src/core/lib/transport/transport.cc
-+++ b/src/core/lib/transport/transport.cc
-@@ -134,6 +134,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
-   refcount->slice_refcount.sub_refcount = &refcount->slice_refcount;
- }
- 
-+#undef move64
-+
- static void move64(uint64_t* from, uint64_t* to) {
-   *to += *from;
-   *from = 0;
+diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
+index 29c1e56..29de9d8 100644
+--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
+@@ -96,6 +96,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
+       refcount, &refcount->slice_refcount);
+ }
+ 
+#undef move64
+
+ static void move64(uint64_t* from, uint64_t* to) {
+   *to += *from;
+   *from = 0;
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@ -1,4 +1,4 @@
 Source: grpc
-Version: 1.20.1-1
+Version: 1.21.1
 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
 Description: An RPC library and framework
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@ -13,8 +13,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO grpc/grpc
-    REF v1.20.1
-    SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
+    REF 75475f090875e737ad6909a6057c59577f0c79b1
+    SHA512 db9ff82dee38cb0f4ba10874d10bf6cb20c8a4d49e7dd24bcd9f71388c54c782ee12fda6f1bfedd79ad988b0275d3f96df4686217465acfafcfb5e4c30093a5b
    HEAD_REF master
    PATCHES 
        00001-fix-uwp.patch
--- a/ports/hdf5/CONTROL
+++ b/ports/hdf5/CONTROL
@ -1,5 +1,5 @@
 Source: hdf5
-Version: 1.10.5-5
+Version: 1.10.5-6
 Description: HDF5 is a data model, library, and file format for storing and managing data
 Build-Depends: zlib, szip

--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@ -33,6 +33,7 @@ endif()
 #Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)

+file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip 
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    DISABLE_PARALLEL_CONFIGURE
@ -50,6 +51,7 @@ vcpkg_configure_cmake(
        -DHDF5_INSTALL_CMAKE_DIR=share
 )

+
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()

--- a/ports/hdf5/vcpkg-cmake-wrapper.cmake
+++ b/ports/hdf5/vcpkg-cmake-wrapper.cmake
@ -6,8 +6,10 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
        # The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
        if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
            set(HDF5_USE_STATIC_LIBRARIES ON)
+            add_compile_definitions(H5_BUILT_AS_STATIC_LIB)
        else()
            set(HDF5_USE_STATIC_LIBRARIES OFF)
+            add_compile_definitions(H5_BUILT_AS_DYNAMIC_LIB)
        endif()
    endif()
    cmake_policy(POP)
--- a/ports/hedley/CONTROL
+++ b/ports/hedley/CONTROL
@ -0,0 +1,3 @@
+Source: hedley
+Version: 2019-05-08-1
+Description: A C/C++ header to help move #ifdefs out of your code
--- a/ports/hedley/portfile.cmake
+++ b/ports/hedley/portfile.cmake
@ -0,0 +1,19 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nemequ/hedley
+    REF 1b74d9bc892137b3f006d04ff905098b900116d0
+    SHA512 8f3e4fc081fb33cc3a3d637eb09863e80fa94b5e46ecf6507aabe6a5b0648881a96c8cf2ef01b4146ecd3a14908ef87f3204960514af6c91d00c93bea18eda41
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/hedley.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+file(STRINGS ${SOURCE_PATH}/hedley.h SOURCE_LINES)
+# Capture more lines than required to handle future license file changes
+list(SUBLIST SOURCE_LINES 0 30 SOURCE_LINES)
+list(JOIN SOURCE_LINES "\n" _contents)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}")
--- a/ports/immer/CONTROL
+++ b/ports/immer/CONTROL
@ -0,0 +1,3 @@
+Source: immer
+Version: 2019-06-07
+Description: Postmodern immutable and persistent data structures for C++
--- a/ports/immer/portfile.cmake
+++ b/ports/immer/portfile.cmake
@ -0,0 +1,29 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO arximboldi/immer
+    REF fe1d5151f8e62a97a953664f8de39b05ac0d2031
+    SHA512 2f78c2d85a24b2bcb69bbbf8b038c8bacb5a841e0f0ce7e4e521d369423c7d44f803a1c766a77d0955246a1b22476de15fa708a3786f05c41a3b705a574bbb71
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DENABLE_PYTHON=OFF
+        -DENABLE_GUILE=OFF
+        -DENABLE_BOOST_COROUTINE=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Immer)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
--- a/ports/inih/CONTROL
+++ b/ports/inih/CONTROL
@ -1,3 +1,3 @@
 Source: inih
-Version: 43
+Version: 44
 Description: Simple .INI file parser
--- a/ports/inih/portfile.cmake
+++ b/ports/inih/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO benhoyt/inih
-    REF r43
-    SHA512 4ad87d69b033886d170257174f0dd97c475f86e311b875bbaf6835e5c4c5c0d98d788702b3880a0befb304f5440ee61de3ea1948f1432198949265013f4146e4
+    REF b1dbff4b0bd1e1f40d237e21011f6dee0ec2fa69
+    SHA512 b250a7d2a9a1a18793a5f7421d444cbf92c21f1aca5f767781221e2e64b0ba5e0804e82c3f8e4f2c0e08516f4ddbf1533e4d254c557bfb38d9a0da879b98cffb
    HEAD_REF master
 )

--- a/Show More
+++ b/Show More