Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ports/libtorrent/CONTROL
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Source: libtorrent
Version: 1.2.10
Port-Version: 1
Version: 2.0.0
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, boost-pool, boost-variant
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, boost-logic, boost-multi-index, boost-pool, boost-variant
Supports: !uwp&!(windows&arm)

Feature: deprfun
Expand Down
16 changes: 0 additions & 16 deletions ports/libtorrent/add-datetime-to-boost-libs.patch

This file was deleted.

35 changes: 0 additions & 35 deletions ports/libtorrent/fix_find_iconv.patch

This file was deleted.

130 changes: 0 additions & 130 deletions ports/libtorrent/fix_python_cmake.patch

This file was deleted.

31 changes: 0 additions & 31 deletions ports/libtorrent/no_use_iconv.patch

This file was deleted.

34 changes: 21 additions & 13 deletions ports/libtorrent/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "The python feature is currently broken on Windows")
endif()

if("iconv" IN_LIST FEATURES)
set(ICONV_PATCH "fix_find_iconv.patch")
else()
# prevent picking up libiconv if it happens to already be installed
set(ICONV_PATCH "no_use_iconv.patch")
endif()

if(VCPKG_CRT_LINKAGE STREQUAL "static")
set(_static_runtime ON)
endif()
Expand All @@ -39,15 +32,30 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arvidn/libtorrent
REF libtorrent-1.2.10
SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
REF 0f0afec8c8025cb55dfd2f36612d4bf61a29ff8a #v 2.0.0
SHA512 251ee5a2c555103a127b8b08995914639a2b9d448a87708edb08a2a11444ef999cd8a3abcf223acfc66ca6371f0e1b076589343ade73974aa87f50814431a875
HEAD_REF RC_1_2
PATCHES
add-datetime-to-boost-libs.patch
fix_python_cmake.patch
${ICONV_PATCH}
)

set(COMMIT_HASH 2a99893f92b29a5948569cba1e16fd259dbc2016)

# Get try_signal for libtorrent
vcpkg_from_github(
OUT_SOURCE_PATH TRY_SIGNAL_SOURCE_PATH
REPO arvidn/try_signal
REF 2a99893f92b29a5948569cba1e16fd259dbc2016
SHA512 b62b3176980c31c9faa0c5cdd14832e9864a6d86af02ae6d5ef510fade2daf649819bc928c12037fa0ef551813745b347d4927cb4b67b34beb822a707c03d870
)

# Copy try_signal sources
foreach(SOURCE_FILE ${SOURCE_PATH})
file(COPY ${TRY_SIGNAL_SOURCE_PATH} DESTINATION "${SOURCE_PATH}/deps")
endforeach()

file(REMOVE_RECURSE ${SOURCE_PATH}/deps/try_signal)
file(RENAME ${SOURCE_PATH}/deps/259dbc2016-bb7f150248.clean ${SOURCE_PATH}/deps/try_signal)
file(REMOVE_RECURSE ${TRY_SIGNAL_SOURCE_PATH})

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
Expand Down
59 changes: 0 additions & 59 deletions ports/lua/portfile.cmake

This file was deleted.