diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
| commit | 6f66ad14fe9da11d4bf50f5b25b4da86ed971c53 (patch) | |
| tree | 0f5dbcd1719cd6a8e486c4058cfefd607d58aa6c /ports/libtorrent | |
| parent | d502f061bb3ee0258d6453acbf258b9e5d93d564 (diff) | |
| parent | d808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff) | |
| download | vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.tar.gz vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'ports/libtorrent')
| -rw-r--r-- | ports/libtorrent/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libtorrent/add-executor_type.patch | 14 | ||||
| -rw-r--r-- | ports/libtorrent/portfile.cmake | 14 |
3 files changed, 22 insertions, 8 deletions
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 3c3f3ec2b..08964ba96 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,5 +1,5 @@ Source: libtorrent -Version: 1.2.2 +Version: 1.2.2-1 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/add-executor_type.patch b/ports/libtorrent/add-executor_type.patch new file mode 100644 index 000000000..2d2a36c49 --- /dev/null +++ b/ports/libtorrent/add-executor_type.patch @@ -0,0 +1,14 @@ +diff --git a/include/libtorrent/aux_/socket_type.hpp b/include/libtorrent/aux_/socket_type.hpp +index 1342d39ad..364ec1e8f 100644 +--- a/include/libtorrent/aux_/socket_type.hpp ++++ b/include/libtorrent/aux_/socket_type.hpp +@@ -184,6 +184,9 @@ namespace aux { + using receive_buffer_size = tcp::socket::receive_buffer_size; + using send_buffer_size = tcp::socket::send_buffer_size; + ++#if BOOST_VERSION >= 106600 ++ using executor_type = tcp::socket::executor_type; ++#endif + explicit socket_type(io_service& ios): m_io_service(ios), m_type(0) {} + ~socket_type(); + diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index a9b88fe89..3dbf7750e 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -8,26 +8,26 @@ vcpkg_from_github( HEAD_REF master PATCHES add-datetime-to-boost-libs.patch + add-executor_type.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS - -Dshared=${LIBTORRENT_SHARED} -Ddeprecated-functions=off ) vcpkg_install_cmake() +file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp EXPORT_H) +string(REPLACE "defined TORRENT_BUILDING_SHARED" "0" EXPORT_H "${EXPORT_H}") if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - # Defines for shared lib - file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp EXPORT_H) - string(REPLACE "defined TORRENT_BUILDING_SHARED" "1" EXPORT_H "${EXPORT_H}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp "${EXPORT_H}") + string(REPLACE "defined TORRENT_LINKING_SHARED" "1" EXPORT_H "${EXPORT_H}") +else() + string(REPLACE "defined TORRENT_LINKING_SHARED" "0" EXPORT_H "${EXPORT_H}") endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp "${EXPORT_H}") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibtorrentRasterbar TARGET_PATH share/libtorrentrasterbar) |