aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis J Bezault <curtbezault@gmail.com>2019-08-15 16:36:53 -0700
committerGitHub <noreply@github.com>2019-08-15 16:36:53 -0700
commit22e787f9448a25dae734ca06c80e7e5af5fb6537 (patch)
tree9583a6c8e12515c893627e5690ae0cb245b84dfa
parent513e28ee57fee3d3670055bccefbc68727c84279 (diff)
parent063b6878b08a10e84efed1dc5521d238e6224eab (diff)
downloadvcpkg-22e787f9448a25dae734ca06c80e7e5af5fb6537.tar.gz
vcpkg-22e787f9448a25dae734ca06c80e7e5af5fb6537.zip
Merge pull request #7708 from denis-gz/libtorrent-update
[libtorrent] Update to 1.2.1-bcb26fd6
-rw-r--r--ports/libtorrent/CONTROL2
-rw-r--r--ports/libtorrent/portfile.cmake5
-rw-r--r--ports/libtorrent/windows-boost-1.70.patch13
3 files changed, 3 insertions, 17 deletions
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
index 2fe8e85ed..ef6da1321 100644
--- a/ports/libtorrent/CONTROL
+++ b/ports/libtorrent/CONTROL
@@ -1,5 +1,5 @@
Source: libtorrent
-Version: 2019-04-19
+Version: 1.2.1-bcb26fd6
Homepage: https://github.com/arvidn/libtorrent
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 bc05d14c7..df31dbe93 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -3,12 +3,11 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arvidn/libtorrent
- REF 76c2794923c4c101ff715be11d794f7fefc6c524
- SHA512 3e154857bb56318ebe725326e1832aa387dc85840be80ebe76c0265e8fded43bc3006d528784c8805e30c3fba41b4108ccf81170870d1686dc499048367563ea
+ REF bcb26fd638bd8c543cd3cc42837b120ff86d44b1
+ SHA512 af897d2daca6e67efe777724147b1047624df9df938222fe967d380263d88ccb3c081e1a24a6c790bf1b35f46385ef08b46d8e46d0922f945cd28c59dd0d35a7
HEAD_REF master
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
deleted file mode 100644
index b0bf1f642..000000000
--- a/ports/libtorrent/windows-boost-1.70.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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())); });
- }
- }