microsoft · n4z4m3 · Mar 2, 2021 · Mar 30, 2021 · Mar 30, 2021 · Mar 30, 2021
diff --git a/docs/README.md b/docs/README.md
@@ -28,6 +28,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too
 - [Manifest files - vcpkg.json](maintainers/manifest-files.md)
 - [Control files](maintainers/control-files.md)
 - [Portfile functions](maintainers/portfile-functions.md)
+- [Common CMake definitions](maintainers/vcpkg_common_definitions.md)
 - [Maintainer Guidelines](maintainers/maintainer-guide.md)
 
 ### [Vcpkg-Tool](https://github.com/microsoft/vcpkg-tool) Maintainer Help

diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md
@@ -73,3 +73,7 @@
 ### [vcpkg-cmake-config](ports/vcpkg-cmake-config.md)
 
 - [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md)
+
+### [vcpkg-pkgconfig-get-modules](ports/vcpkg-pkgconfig-get-modules.md)
+
+- [x\_vcpkg\_pkgconfig\_get\_modules](ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md)
diff --git a/docs/maintainers/ports/vcpkg-pkgconfig-get-modules.md b/docs/maintainers/ports/vcpkg-pkgconfig-get-modules.md
@@ -0,0 +1,6 @@
+# vcpkg-pkgconfig-get-modules
+
+**Experimental: will change or be removed at any time**
+
+`vcpkg-pkgconfig-get-modules` provides `x_vcpkg_pkgconfig_get_modules()`, a function which simplifies calling
+`pkg-config` in portfiles in order to gather dependencies for exotic buildsystems.
diff --git a/.../maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md b/.../maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md
@@ -0,0 +1,44 @@
+# x_vcpkg_pkgconfig_get_modules
+
+The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md).
+
+Experimental
+Retrieve required module information from pkgconfig modules
+
+## Usage
+```cmake
+x_vcpkg_pkgconfig_get_modules(
+    PREFIX <prefix>
+    MODULES <pkgconfig_modules>...
+    [LIBS]
+    [LIBRARIES]
+    [LIBRARIES_DIRS]
+    [INCLUDE_DIRS]
+)
+```
+## Parameters
+
+### PREFIX
+Used variable prefix to use
+
+### MODULES
+List of pkgconfig modules to retrieve information for.
+
+### LIBS
+Returns `"${PKGCONFIG}" --libs` in <prefix>_LIBS_(DEBUG|RELEASE)
+
+### LIBRARIES
+Returns `"${PKGCONFIG}" --libs-only-l` in <prefix>_LIBRARIES_(DEBUG|RELEASE)
+
+### LIBRARIES_DIRS
+Returns `"${PKGCONFIG}" --libs-only-L` in <prefix>_LIBRARIES_DIRS_(DEBUG|RELEASE)
+
+### INCLUDE_DIRS
+Returns `"${PKGCONFIG}"  --cflags-only-I` in <prefix>_INCLUDE_DIRS_(DEBUG|RELEASE)
+
+## Examples
+
+* [qt5-base](https://github.com/microsoft/vcpkg/blob/master/ports/qt5-base/portfile.cmake)
+
+## Source
+[ports/vcpkg-pkgconfig-get-modules/x\_vcpkg\_pkgconfig\_get\_modules.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake)
diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md
@@ -23,6 +23,7 @@ TARGET_TRIPLET                           the name of the current triplet to buil
 CURRENT_INSTALLED_DIR                    the absolute path to the installed files for the current triplet
 HOST_TRIPLET                             the name of the triplet corresponding to the host
 CURRENT_HOST_INSTALLED_DIR               the absolute path to the installed files for the host triplet
+VCPKG_CROSSCOMPILING                     Whether vcpkg is cross-compiling: in other words, whether TARGET_TRIPLET and HOST_TRIPLET are different
 ```
 
 CMAKE_STATIC_LIBRARY_(PREFIX|SUFFIX), CMAKE_SHARED_LIBRARY_(PREFIX|SUFFIX) and CMAKE_IMPORT_LIBRARY_(PREFIX|SUFFIX) are defined for the target

diff --git a/docs/maintainers/vcpkg_copy_tools.md b/docs/maintainers/vcpkg_copy_tools.md
@@ -9,6 +9,7 @@ Copy tools and all their DLL dependencies into the `tools` folder.
 vcpkg_copy_tools(
     TOOL_NAMES <tool1>...
     [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>]
+    [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>]
     [AUTO_CLEAN]
 )
 ```
@@ -19,6 +20,9 @@ A list of tool filenames without extension.
 ### SEARCH_DIR
 The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/bin` if ommited.
 
+### DESTINATION
+Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if ommited.
+
 ### AUTO_CLEAN
 Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`.
 

diff --git a/docs/maintainers/vcpkg_fixup_cmake_targets.md b/docs/maintainers/vcpkg_fixup_cmake_targets.md
@@ -10,7 +10,10 @@ Additionally corrects common issues with targets, such as absolute paths and inc
 
 ## Usage
 ```cmake
-vcpkg_fixup_cmake_targets([CONFIG_PATH <share/${PORT}>] [TARGET_PATH <share/${PORT}>] [DO_NOT_DELETE_PARENT_CONFIG_PATH])
+vcpkg_fixup_cmake_targets([CONFIG_PATH <share/${PORT}>] 
+                          [TARGET_PATH <share/${PORT}>] 
+                          [TOOLS_PATH <tools/${PORT}>]
+                          [DO_NOT_DELETE_PARENT_CONFIG_PATH])
 ```
 
 ## Parameters
@@ -36,12 +39,15 @@ Disables the correction of_IMPORT_PREFIX done by vcpkg due to moving the targets
 Currently the correction does not take into account how the files are moved and applies
 I rather simply correction which in some cases will yield the wrong results.
 
+### TOOLS_PATH
+Define the base path to tools. Default: `tools/<PORT>`
+
 ## Notes
 Transform all `/debug/<CONFIG_PATH>/*targets-debug.cmake` files and move them to `/<TARGET_PATH>`.
 Removes all `/debug/<CONFIG_PATH>/*targets.cmake` and `/debug/<CONFIG_PATH>/*config.cmake`.
 
-Transform all references matching `/bin/*.exe` to `/tools/<port>/*.exe` on Windows.
-Transform all references matching `/bin/*` to `/tools/<port>/*` on other platforms.
+Transform all references matching `/bin/*.exe` to `/${TOOLS_PATH}/*.exe` on Windows.
+Transform all references matching `/bin/*` to `/${TOOLS_PATH}/*`  on other platforms.
 
 Fix `${_IMPORT_PREFIX}` in auto generated targets to be one folder deeper.
 Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets.

diff --git a/docs/maintainers/vcpkg_install_meson.md b/docs/maintainers/vcpkg_install_meson.md
@@ -6,9 +6,13 @@ Builds a meson project previously configured with `vcpkg_configure_meson()`.
 
 ## Usage
 ```cmake
-vcpkg_install_meson()
+vcpkg_install_meson([ADD_BIN_TO_PATH])
 ```
 
+## Parameters:
+### ADD_BIN_TO_PATH
+Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs.
+
 ## Examples
 
 * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake)

diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1
@@ -26,6 +26,7 @@ class CMakeDocumentation {
 [String[]]$cmakeScriptsPorts = @(
     'vcpkg-cmake'
     'vcpkg-cmake-config'
+    'vcpkg-pkgconfig-get-modules'
 )
 
 [CMakeDocumentation[]]$tableOfContents = @()

diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL
@@ -1,6 +1,5 @@
 Source: antlr4
-Version: 4.8
-Port-Version: 1
+Version: 4.9.1
 Homepage: https://www.antlr.org
 Description: ANother Tool for Language Recognition
 Build-Depends: libuuid (!uwp&!windows&!osx)

diff --git a/ports/antlr4/fix_utfcpp_dependency.patch b/ports/antlr4/fix_utfcpp_dependency.patch
@@ -0,0 +1,45 @@
+diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
+index a8503bb61..e7b01b7cb 100644
+--- a/runtime/CMakeLists.txt
++++ b/runtime/CMakeLists.txt
+@@ -1,17 +1,3 @@
+-
+-include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+-
+-set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty)
+-set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp)
+-ExternalProject_Add(
+-  utfcpp
+-  GIT_REPOSITORY        "git://github.com/nemtrif/utfcpp"
+-  GIT_TAG               "v3.1.1"
+-  SOURCE_DIR            ${UTFCPP_DIR}
+-  UPDATE_DISCONNECTED   1
+-  CMAKE_ARGS            -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON
+-  TEST_AFTER_INSTALL    1
+-  STEP_TARGETS          build)
+
+
+ include_directories(
+@@ -23,8 +13,6 @@ include_directories(
+   ${PROJECT_SOURCE_DIR}/runtime/src/tree
+   ${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern
+   ${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath
+-  ${UTFCPP_DIR}/install/include/utf8cpp
+-  ${UTFCPP_DIR}/install/include/utf8cpp/utf8
+ )
+
+
+@@ -131,13 +119,6 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
+         FILES_MATCHING PATTERN "*.h"
+         )
+
+-install(FILES "${UTFCPP_DIR}/source/utf8.h"
+-        DESTINATION "include/antlr4-runtime")
+-install(DIRECTORY "${UTFCPP_DIR}/source/utf8"
+-        DESTINATION "include/antlr4-runtime"
+-        COMPONENT dev
+-        FILES_MATCHING PATTERN "*.h"
+-        )
+
+
+
diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_fail_port_install(ON_TARGET "uwp")
 
-set(VERSION 4.8)
+set(VERSION 4.9.1)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip"
     FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip"
-    SHA512 df76a724e8acf29018ad122d909e1d43e7c8842e1c0df8022a3e8c840cb2b99de49cc148f75fef519b65ece9bd27b92cf0067c9099b664c127e80559c6492322
+    SHA512 fe33005f73f8d408fcea8ebab62c0def119bbe0c075f04a66404d0df258126eb6caf0a8bbac34d5c4c9e79d4aa8896f32698a560d4be7d71a32dcc3457245cee
 )
 
 # license not exist in antlr folder.
@@ -20,9 +20,11 @@ vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     NO_REMOVE_ONE_LEVEL
     REF ${VERSION}
-    PATCHES fixed_build.patch
-            uuid_discovery_fix.patch
-            export_guid.patch
+    PATCHES 
+        fixed_build.patch
+        uuid_discovery_fix.patch
+        export_guid.patch
+        fix_utfcpp_dependency.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/boost-di/portfile.cmake → ports/bext-di/portfile.cmake b/ports/boost-di/portfile.cmake → ports/bext-di/portfile.cmake
@@ -11,7 +11,7 @@ file(INSTALL ${SOURCE_PATH}/include/boost
 
 vcpkg_download_distfile(LICENSE
     URLS http://www.boost.org/LICENSE_1_0.txt
-    FILENAME "boost-di-copyright"
+    FILENAME "di-copyright"
     SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
 )
 file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/boost-di/vcpkg.json → ports/bext-di/vcpkg.json b/ports/boost-di/vcpkg.json → ports/bext-di/vcpkg.json
@@ -1,5 +1,5 @@
 {
-  "name": "boost-di",
+  "name": "bext-di",
   "version-string": "1.2.0",
   "description": "C++14 Dependency Injection Library.",
   "homepage": "https://github.com/boost-ext/di"

diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL
@@ -1,4 +1,4 @@
 Source: celero
-Version: 2.7.2
+Version: 2.8.2
 Homepage: https://github.com/DigitalInBlue/Celero
 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.
diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DigitalInBlue/Celero
-    REF b9bbe63ebc464f799676cd4c696b376296178d63 #2.7.2
-    SHA512 00a93c433b99a2c918741350c3fbfad67e4fe239948497de33fea2f13c8666e4fe37caf9f0e92d3c04dcb8b5c5e12501b199de3e69bbcf4f321c57a7c086e228
+    REF 6208b63dcd4baeea6817d3e84f79fb04ad99c720 #2.8.2
+    SHA512 13a486dafba394cc3e072292008d00e8a3e1b12b4fe7c82cf2ce43b3d24629d08b5762494c19da0a12b186a70114cba101553ed1b4cea90d090514307b06dec8
     HEAD_REF master
 )
 
@@ -24,7 +24,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/celero/Export.h "ifdef CELERO_STATIC" "if 1")
 endif()
 

diff --git a/ports/ceres/0004_fix_lib_path_linux.patch b/ports/ceres/0004_fix_lib_path_linux.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f24ce30..8e5759b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -192,7 +192,7 @@ endif()
+ # install native libraries to lib64 rather than lib. Most distros seem to
+ # follow this convention with a couple notable exceptions (Debian-based and
+ # Arch-based distros) which we try to detect here.
+-if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND
++if (0 AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND
+     NOT DEFINED LIB_SUFFIX AND
+     NOT CMAKE_CROSSCOMPILING AND
+     CMAKE_SIZEOF_VOID_P EQUAL "8" AND
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_from_github(
         0001_cmakelists_fixes.patch
         0002_use_glog_target.patch
         0003_fix_exported_ceres_config.patch
+        0004_fix_lib_path_linux.patch
         find-package-required.patch
 )
 

diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ceres",
   "version-semver": "2.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "non-linear optimization package",
   "homepage": "https://github.com/ceres-solver/ceres-solver",
   "dependencies": [

diff --git a/ports/dav1d/portfile.cmake b/ports/dav1d/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_from_gitlab(
     GITLAB_URL https://code.videolan.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO videolan/dav1d
-    REF 0.8.1
-    SHA512 dd40b82b65e4be37a27ab11e7116f7a244b0da4469915ead3922ac31724fb6da3910a78629a32a669031fe08d4323ab135174afb7462f6ea4adf96c111841c1c
+    REF 0.8.2
+    SHA512 2f48c88fdbe627f089eb378f43b8f18e1c5cff4645148ee7e14b8f3f8e9d690b28e58fc9cb466e7a9a4c147f06b0d34c47c132070acefbd01abe23cd3c6047d8
     PATCHES
         "patch_underscore_prefix.patch"
 )

diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "dav1d",
-  "version-string": "0.8.1",
+  "version-semver": "0.8.2",
   "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.",
   "homepage": "https://code.videolan.org/videolan/dav1d",
   "supports": "!(uwp | arm | x86)",

diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL
@@ -1,4 +1,4 @@
 Source: entt
-Version: 3.6.0
+Version: 3.7.0
 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more.
 Homepage: https://github.com/skypjack/entt
diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO skypjack/entt
-    REF 7a949dd32849e8230b15a5ff8ad1104c7f748c2a  #v3.6.0
-    SHA512 fe1fcac31f174fb878da5c1737ff1261be0c26e896c858f32fa524db45f70f17d7c7b67f8ebdeabe21f6c977fad7642ff9f6fd6a865b645a4f93e13c7812b922
+    REF 1e07b981f0b305400f854084c61c4efe2fd36206
+    SHA512 0a61d293b8f6d9eec07711f9ac87c185e158b42da7ca1f91c1ab189a573686a79efa0d15cc76d8e7a2770c6b625df20b8bce1aa16147c0af07cd722a3d32d583
     HEAD_REF master
 )
 

diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL
diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(ON_TARGET "linux")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eProsima/Fast-CDR
@@ -35,4 +33,4 @@ else()
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/fastcdr/config.h "${FASTCDR_H}")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/fastcdr/vcpkg.json b/ports/fastcdr/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "fastcdr",
+  "version-semver": "1.0.15",
+  "port-version": 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.",
+  "homepage": "https://github.com/eProsima/Fast-CDR"
+}
diff --git a/ports/fdk-aac/CONTROL b/ports/fdk-aac/CONTROL
@@ -1,4 +1,6 @@
 Source: fdk-aac
-Version: 2018-07-08-2
+Version: 2018-07-08
+Port-Version: 3
 Homepage: https://github.com/mstorsjo/fdk-aac
 Description: A standalone library of the Fraunhofer FDK AAC code
+Supports: !(uwp | arm)
diff --git a/ports/ffmpeg/0011-Fix-x265-detection.patch b/ports/ffmpeg/0011-Fix-x265-detection.patch
@@ -2,13 +2,14 @@ diff --git a/configure b/configure
 index 34a2e644c4..0ea64bd306 100755
 --- a/configure
 +++ b/configure
-@@ -6447,7 +6447,9 @@ enabled libx264           && { check_pkg_config libx264 x264 "stdint.h x264.h" x
+@@ -6447,7 +6447,10 @@ enabled libx264           && { check_pkg_config libx264 x264 "stdint.h x264.h" x
                                   warn "using libx264 without pkg-config"; } } &&
                               require_cpp_condition libx264 x264.h "X264_BUILD >= 118" &&
                               check_cpp_condition libx262 x264.h "X264_MPEG2"
 -enabled libx265           && require_pkg_config libx265 x265 x265.h x265_api_get &&
 +enabled libx265           && { check_pkg_config libx265 x265 x265.h x265_api_get ||
-+                               { require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" &&
++                               { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" ||
++                               require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } &&
 +                                 warn "using libx265 without pkg-config"; } } &&
                               require_cpp_condition libx265 x265.h "X265_BUILD >= 70"
  enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"