[libtorrent] Update to latest 1.2.x commit (#17166)

* [libtorrent] Update to latest 1.2.x commit

- Update to 1.2.13 plus some additional fixes (allows dropping existing
patches)
- Build with libiconv by default on all platforms
- Fix deprecated usage of `vcpkg_check_features` without the `FEATURES`
keyword
- Migrate to vcpkg.json manifest files

* [libtorrent] Update versioning information

Co-authored-by: Francisco Pombal <FranciscoPombal@users.noreply.github.com>

7 files changed, 71 insertions, 101 deletions

diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
deleted file mode 100644
index 5dd5dcf0a..000000000
--- a/ports/libtorrent/CONTROL
+++ /dev/null
@@ -1,26 +0,0 @@
-Source: libtorrent
-Version: 1.2.12
-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
-Supports: !uwp&!(windows&arm)
-
-Feature: deprfun
-Description: build with deprecated functions enabled
-
-Feature: examples
-Description: build the examples in the examples directory
-
-Feature: iconv
-Build-Depends: libiconv (windows)
-Description: build with libiconv on Windows
-
-Feature: python
-Build-Depends: boost-python
-Description: build the python bindings in bindings/python directory
-
-Feature: test
-Description: build the libtorrent tests
-
-Feature: tools
-Description: build the tools in the tools directory
diff --git a/ports/libtorrent/fix-AppleClang-test.patch b/ports/libtorrent/fix-AppleClang-test.patch
deleted file mode 100644
index 048e8d409..000000000
--- a/ports/libtorrent/fix-AppleClang-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 92592ec..8bfcd60 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -644,7 +644,9 @@ if (NOT Windows)

- 		}

- 	]=])

- 	string(REPLACE "std::atomic<int>" "std::atomic<std::int64_t>" ATOMICS64_TEST_SOURCE "${ATOMICS_TEST_SOURCE}")

--

-+    if(APPLE)

-+        set(CMAKE_REQUIRED_FLAGS "-std=c++11")

-+    endif()

- 	check_cxx_source_compiles("${ATOMICS_TEST_SOURCE}" HAVE_CXX_ATOMICS_WITHOUT_LIB)

- 	check_cxx_source_compiles("${ATOMICS64_TEST_SOURCE}" HAVE_CXX_ATOMICS64_WITHOUT_LIB)

- 	if((NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) OR (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB))

-@@ -659,6 +661,9 @@ if (NOT Windows)

- 			target_link_libraries(torrent-rasterbar PUBLIC atomic)

- 		endif()

- 	endif()

-+    if(APPLE)

-+        unset(CMAKE_REQUIRED_FLAGS)

-+    endif()

- endif()

- 

- feature_option(build_tests "build tests" OFF)

diff --git a/ports/libtorrent/no_use_iconv.patch b/ports/libtorrent/no_use_iconv.patch
deleted file mode 100644
index 3f275299a..000000000
--- a/ports/libtorrent/no_use_iconv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9efd451fb..05066be82 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -643,26 +643,6 @@ target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME mutabl
- target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME streaming DEFAULT ON
- 	DESCRIPTION "Enables support for piece deadline" DISABLED TORRENT_DISABLE_STREAMING)
- 
--find_public_dependency(Iconv)
--if(MSVC)
--	set(iconv_package_type OPTIONAL)
--else()
--	set(iconv_package_type RECOMMENDED)
--endif()
--
--set_package_properties(Iconv
--	PROPERTIES
--		URL "https://www.gnu.org/software/libiconv/"
--		DESCRIPTION "GNU encoding conversion library"
--		TYPE ${iconv_package_type}
--		PURPOSE "Convert strings between various encodings"
--)
--
--if(Iconv_FOUND)
--	target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_USE_ICONV)
--	target_link_libraries(torrent-rasterbar PRIVATE Iconv::Iconv)
--endif()
--
- find_public_dependency(OpenSSL)
- set_package_properties(OpenSSL
- 	PROPERTIES
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index 346a426cf..85632b199 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -5,23 +5,20 @@ if(VCPKG_TARGET_IS_WINDOWS)
     if("python" IN_LIST FEATURES)
         message(FATAL_ERROR "The python feature is currently broken on Windows")
     endif()
-
-    if(NOT "iconv" IN_LIST FEATURES)
-        # 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()
 endif()
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    deprfun     deprecated-functions
-    examples    build_examples
-    python      python-bindings
-    test        build_tests
-    tools       build_tools
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        deprfun     deprecated-functions
+        examples    build_examples
+        iconv       iconv
+        python      python-bindings
+        test        build_tests
+        tools       build_tools
 )
 
 # Note: the python feature currently requires `python3-dev` and `python3-setuptools` installed on the system
@@ -37,17 +34,14 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arvidn/libtorrent
-    REF e3f2b016dcd37a9a6e8a94006c7befcf2cb7bfac #v1.2.12
-    SHA512 5d58ce1d942d2bbcc423a307e70cfb714b102e029c50c7e214e6b46b7a1311564c7b094d895d99f400ecdb0272b66c94c2f21fa414d4565582784f1dc5c7ec97
+    REF b7996402966a44b87200b973b2c756900b648ed2 # 1.2.13 + a few additional commits
+    SHA512 37b1f1eaa7ba18c44612d500776065e9376493d0cf4f05f620d264a2368287bfb093ce2258d3bb72667e9748593e309e200cc8c1a09799c8ecc287b3ed1baee7
     HEAD_REF RC_1_2
-    PATCHES
-        ${ICONV_PATCH}
-        fix-AppleClang-test.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    PREFER_NINJA
     OPTIONS
         ${FEATURE_OPTIONS}
         -Dboost-python-module-name=${_boost-python-module-name}
diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json
new file mode 100644
index 000000000..672e78b8d
--- /dev/null
+++ b/ports/libtorrent/vcpkg.json
@@ -0,0 +1,53 @@
+{
+  "name": "libtorrent",
+  "version-string": "1.2.13-b799640",
+  "maintainers": "Arvid Norberg <arvid.norberg@gmail.com>",
+  "description": "An efficient feature complete C++ BitTorrent implementation",
+  "homepage": "https://libtorrent.org",
+  "documentation": "https://libtorrent.org/reference.html",
+  "supports": "!uwp & !(windows & arm)",
+  "dependencies": [
+    "boost-asio",
+    "boost-chrono",
+    "boost-config",
+    "boost-crc",
+    "boost-date-time",
+    "boost-iterator",
+    "boost-multiprecision",
+    "boost-pool",
+    "boost-random",
+    "boost-scope-exit",
+    "boost-system",
+    "boost-variant",
+    "openssl"
+  ],
+  "default-features": [
+    "iconv"
+  ],
+  "features": {
+    "deprfun": {
+      "description": "build with deprecated functions enabled"
+    },
+    "examples": {
+      "description": "build the examples in the examples directory"
+    },
+    "iconv": {
+      "description": "build with libiconv",
+      "dependencies": [
+        "libiconv"
+      ]
+    },
+    "python": {
+      "description": "build the python bindings in bindings/python directory",
+      "dependencies": [
+        "boost-python"
+      ]
+    },
+    "test": {
+      "description": "build the libtorrent tests"
+    },
+    "tools": {
+      "description": "build the tools in the tools directory"
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 36efdcb3a..70e73edaf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3561,7 +3561,7 @@
       "port-version": 0
     },
     "libtorrent": {
-      "baseline": "1.2.12",
+      "baseline": "1.2.13-b799640",
       "port-version": 0
     },
     "libu2f-server": {
diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json
index ac282a58f..f3f07ac98 100644
--- a/versions/l-/libtorrent.json
+++ b/versions/l-/libtorrent.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "cefe40e87e8a190462a748b1a230cedac39e8395",
+      "version-string": "1.2.13-b799640",
+      "port-version": 0
+    },
+    {
       "git-tree": "6bd8c71880f419aa740153f9cd01cdf26453794e",
       "version-string": "1.2.12",
       "port-version": 0