diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-05 13:29:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 13:29:59 +0200 |
| commit | 7f193624e3101b8cd761bb165a8d9460e6e626a3 (patch) | |
| tree | 72130953eff081f70e89c905a525cddf18368cbd | |
| parent | 5214c206a5392b8d1f609834ce6e143a88b94c3d (diff) | |
| parent | ab881e91e46da02f03a2ee3dd98df7dea86be7f6 (diff) | |
| download | vcpkg-7f193624e3101b8cd761bb165a8d9460e6e626a3.tar.gz vcpkg-7f193624e3101b8cd761bb165a8d9460e6e626a3.zip | |
Merge pull request #2515 from procxx/update_libtorrent
[libtorrent] Update to 1.1.6
| -rw-r--r-- | ports/libtorrent/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libtorrent/add-dbghelp-to-win32-libs.patch | 13 | ||||
| -rw-r--r-- | ports/libtorrent/portfile.cmake | 5 |
3 files changed, 3 insertions, 17 deletions
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index f6dde66ee..e0de70962 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,4 +1,4 @@ Source: libtorrent -Version: 94f4e88e05f92a1 +Version: 1.1.6 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 diff --git a/ports/libtorrent/add-dbghelp-to-win32-libs.patch b/ports/libtorrent/add-dbghelp-to-win32-libs.patch deleted file mode 100644 index 35df3bc2b..000000000 --- a/ports/libtorrent/add-dbghelp-to-win32-libs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1963d90..99698a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -267,7 +267,7 @@ target_link_libraries(torrent-rasterbar ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_I - #add_definitions(-DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -D__USE_W32_SOCKETS -DWIN32_LEAN_AND_MEAN ) - - if (WIN32) -- target_link_libraries(torrent-rasterbar wsock32 ws2_32 Iphlpapi) -+ target_link_libraries(torrent-rasterbar wsock32 ws2_32 Iphlpapi dbghelp) - add_definitions(-D_WIN32_WINNT=0x0600) - # prevent winsock1 to be included - add_definitions(-DWIN32_LEAN_AND_MEAN) diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index 3101bab29..bf0d851b9 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -3,15 +3,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF 94f4e88e05f92a1b07551598a4bedb2c16af0f2f - SHA512 1b4876a471a62813c97519ebf54fc06286b7ee43005e436c7139c6a6ac39fd40fefd5c9b7424e65509ec8deb95dfe1427544b686b6b9cd51cf3d3f133ba7a701 + REF libtorrent-1_1_6 + SHA512 528034e63330d3c6910ab9db34a2a543618961c0095ecb8f865065516c341d063cba92aed2904b80aa0d0ef65df1b91c400f69d16defad787ff1ffb5edd09e37 HEAD_REF master ) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-datetime-to-boost-libs.patch - ${CMAKE_CURRENT_LIST_DIR}/add-dbghelp-to-win32-libs.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED) |