diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-16 18:33:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 18:33:32 -0700 |
| commit | 9d473a69545ac648b9ea2067c007b57dfad7462b (patch) | |
| tree | b22899ab0422bed99fd9c39e9d119a65aafe7325 /ports/libtorrent | |
| parent | 208bb8eefcc13ab7aa6122b91f38ffec0b378e13 (diff) | |
| download | vcpkg-9d473a69545ac648b9ea2067c007b57dfad7462b.tar.gz vcpkg-9d473a69545ac648b9ea2067c007b57dfad7462b.zip | |
[boost] Update to 1.70.0 (#6141)
* [boost] Update to 1.70.0
* [boost-build] Update to 1.70.0
* [folly][freeopcua][libtorrent][websocketpp] Upgrades/patches to handle boost 1.70
* [boost-variant] Revert to 1.69 due to regression
[fizz][folly] Update and fix for boost 1.70
[libsodium] Use CMake buildsystem replacement to enable non-Windows
* [wangle] Update. [folly] Avoid linking debug libs in release.
* [pcl] Fix compatibility with boost 1.70
* [fizz] Handle merge regression
* [arrow] Modernize and fix cmake targets
* [boost-type-traits] Update patches for arm64-windows
* [boost-locale] Add boost-system and boost-thread as arm64 dependencies
* [ompl] Add missing boost-timer dependency
Diffstat (limited to 'ports/libtorrent')
| -rw-r--r-- | ports/libtorrent/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libtorrent/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/libtorrent/windows-boost-1.70.patch | 13 |
3 files changed, 19 insertions, 4 deletions
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 519d08553..7712808c0 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,4 +1,4 @@ Source: libtorrent -Version: 1.2.0-1 +Version: 2019-04-19 Description: An efficient feature complete C++ BitTorrent implementation Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index fb84c9794..bc05d14c7 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -3,10 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF libtorrent_1_2_0 - SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518 + REF 76c2794923c4c101ff715be11d794f7fefc6c524 + SHA512 3e154857bb56318ebe725326e1832aa387dc85840be80ebe76c0265e8fded43bc3006d528784c8805e30c3fba41b4108ccf81170870d1686dc499048367563ea HEAD_REF master - PATCHES add-datetime-to-boost-libs.patch + PATCHES + add-datetime-to-boost-libs.patch + windows-boost-1.70.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED) diff --git a/ports/libtorrent/windows-boost-1.70.patch b/ports/libtorrent/windows-boost-1.70.patch new file mode 100644 index 000000000..b0bf1f642 --- /dev/null +++ b/ports/libtorrent/windows-boost-1.70.patch @@ -0,0 +1,13 @@ +diff --git a/src/ip_notifier.cpp b/src/ip_notifier.cpp
+index 37e5623..daa25f8 100644
+--- a/src/ip_notifier.cpp
++++ b/src/ip_notifier.cpp
+@@ -380,7 +380,7 @@ struct ip_change_notifier_impl final : ip_change_notifier
+ }
+ else
+ {
+- m_hnd.get_io_service().post([cb, err]()
++ lt::get_io_service(m_hnd).post([cb, err]()
+ { cb(error_code(err, system_category())); });
+ }
+ }
|