[libtorrent] update to 1.2.12 (#15620)

* [libtorrent] update to 1.2.12 * update version * fix AppleClang test * update version
microsoft · Mar 11, 2021 · eb41906 · eb41906
1 parent 939c215
commit eb41906
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
@@ -1,5 +1,5 @@
 Source: libtorrent
-Version: 1.2.11
+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

diff --git a/ports/libtorrent/fix-AppleClang-test.patch b/ports/libtorrent/fix-AppleClang-test.patch
@@ -0,0 +1,25 @@
+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/portfile.cmake b/ports/libtorrent/portfile.cmake
@@ -37,11 +37,12 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arvidn/libtorrent
-    REF v1.2.11
-    SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62
+    REF e3f2b016dcd37a9a6e8a94006c7befcf2cb7bfac #v1.2.12
+    SHA512 5d58ce1d942d2bbcc423a307e70cfb714b102e029c50c7e214e6b46b7a1311564c7b094d895d99f400ecdb0272b66c94c2f21fa414d4565582784f1dc5c7ec97
     HEAD_REF RC_1_2
     PATCHES
         ${ICONV_PATCH}
+        fix-AppleClang-test.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3465,7 +3465,7 @@
       "port-version": 0
     },
     "libtorrent": {
-      "baseline": "1.2.11",
+      "baseline": "1.2.12",
       "port-version": 0
     },
     "libu2f-server": {

diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6bd8c71880f419aa740153f9cd01cdf26453794e",
+      "version-string": "1.2.12",
+      "port-version": 0
+    },
     {
       "git-tree": "ffa53a6b67da728e6ae5ec3dfc4aca172cb39ea6",
       "version-string": "1.2.11",