diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-04-26 10:27:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 10:27:45 -0700 |
| commit | a9b27ed5dffbf70b135eddb0c4729f3ca87f106c (patch) | |
| tree | cc562b219c82e40567925a48248cbc17b2cc2b59 /ports/libdatachannel | |
| parent | 84e5852cfaa8e7875027e79a29a5534bb5d4a475 (diff) | |
| download | vcpkg-a9b27ed5dffbf70b135eddb0c4729f3ca87f106c.tar.gz vcpkg-a9b27ed5dffbf70b135eddb0c4729f3ca87f106c.zip | |
Update VMs, CMake to 3.20.1, CUDA to 11.3, and pwsh to 7.1.3 (#17331)
* Update to CUDA 11.3 on Windows.
* Update PowerShell to 7.1.3.
* Update CUDA to 11.3 on Linux.
* "Explode" VM provisioning scripts for more consistent feedback during deploy. This resolves the deployment script often hanging with no feedback as to why.
* [libdatachannel] Fix use of deprecated result_type typedef.
Submitted upstream as https://github.com/paullouisageneau/libdatachannel/pull/413
* [libvpx] Get the libvpx outputs from the correct place.
(Perhaps VS2019 version 16.10 moved where these are placed? I've been defensive and left an attempt to find from the old location in place.)
* [chromaprint] Support implementations where lrintf is an intrinsic.
* Add provision-entire-image script.
* [cudnn] Disable download-on-the-fly due to licensing concerns.
* Add libnccl to Linux VMs.
* [wangle] Disable x64-windows due to an ICE.
* [cmake] Update cmake to 3.20.1 to avoid https://gitlab.kitware.com/cmake/cmake/-/issues/21571 race
* [libudis86] Fix passing a bogus working directory which fails on CMake 3.20.x
* [dartsim] Disable unit tests, examples, and tutorials, some of which have CMake authoring errors rejected by 3.20.1.
* Add thrust to the cuda installees.
* [tensorflow] Put .bzl in CURRENT_BUILDTREES_DIR to avoid running out of disk space in CI and to respect --clean-after-build.
* [dimcli] Skip port broken by changes in VS2019 project system.
* [upb] Disable an additional warning.
* [libhv] Fix typo DISABLE_PARALLEL => DISABLE_PARALLEL_CONFIGURE
* Update pools
Diffstat (limited to 'ports/libdatachannel')
| -rw-r--r-- | ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch | 25 | ||||
| -rw-r--r-- | ports/libdatachannel/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/libdatachannel/vcpkg.json | 2 |
3 files changed, 29 insertions, 3 deletions
diff --git a/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch b/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch new file mode 100644 index 000000000..f41945c28 --- /dev/null +++ b/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch @@ -0,0 +1,25 @@ +diff --git a/include/rtc/utils.hpp b/include/rtc/utils.hpp +index f1a82acb..e882042c 100644 +--- a/include/rtc/utils.hpp ++++ b/include/rtc/utils.hpp +@@ -25,6 +25,7 @@ + #include <functional> + #include <memory> + #include <mutex> ++#include <utility> + + namespace rtc { + +@@ -34,11 +35,10 @@ template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>; + // weak_ptr bind helper + template <typename F, typename T, typename... Args> auto weak_bind(F &&f, T *t, Args &&..._args) { + return [bound = std::bind(f, t, _args...), weak_this = t->weak_from_this()](auto &&...args) { +- using result_type = typename decltype(bound)::result_type; + if (auto shared_this = weak_this.lock()) + return bound(args...); + else +- return static_cast<result_type>(false); ++ return static_cast<decltype(bound(args...))>(false); + }; + } + diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 8b1a6c3a9..563224524 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO paullouisageneau/libdatachannel
- REF v0.12.0
- SHA512 878d0461255620c21597a6b7132ac0c9d1bcba19e32809cdd007039041eacc1f30a73b1c11c43b8b57a82ca1efeae2090822e6c5e13bd98f5afa086ec147e6e7
+ REF 655175d21e58281031c940a94042d5d1fd46efb3 # v 0.12.2
+ SHA512 e1e228bf720ef57130fbb9cc33310cebbdbd16c001455cd56e8746b6ee41bac56da5e5a90235e0a826b52711dc3c95b9d9f56d9e406999f9fd384aee2892578d
HEAD_REF master
PATCHES
fix-for-vcpkg.patch
+ CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch # submitted upstream as https://github.com/paullouisageneau/libdatachannel/pull/413
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 6dddc4dc7..7ba32db68 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.12.0", + "version-semver": "0.12.2", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ |