From 2d7469f8e9793fb9b9d7da9eb70ebcbeb4648d52 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Tue, 23 May 2023 06:24:09 +0000 Subject: [PATCH] Update to 2.0.9 --- ...r-on-Windows-ARM64-by-add-new-define.patch | 45 ------------------- ports/libtorrent/portfile.cmake | 8 ++-- ports/libtorrent/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtorrent.json | 5 +++ 5 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch diff --git a/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch b/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch deleted file mode 100644 index bc72079ec56558..00000000000000 --- a/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 24b9c178ed316b39236e62dd655c85f3405e147a Mon Sep 17 00:00:00 2001 -From: David Liu -Date: Mon, 13 Feb 2023 18:03:58 +0800 -Subject: [PATCH] fix build error on Windows ARM64 by add new define - -fix build error on Windows ARM64 by add new define ---- - src/assert.cpp | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/assert.cpp b/src/assert.cpp -index d623605b5..482345451 100644 ---- a/src/assert.cpp -+++ b/src/assert.cpp -@@ -190,16 +190,21 @@ TORRENT_EXPORT void print_backtrace(char* out, int len, int max_depth - std::array stack; - - STACKFRAME64 stack_frame = {}; --#if defined(_WIN64) -- int const machine_type = IMAGE_FILE_MACHINE_AMD64; -- stack_frame.AddrPC.Offset = context_record.Rip; -- stack_frame.AddrFrame.Offset = context_record.Rbp; -- stack_frame.AddrStack.Offset = context_record.Rsp; --#else -+#if defined(_M_IX86) - int const machine_type = IMAGE_FILE_MACHINE_I386; - stack_frame.AddrPC.Offset = context_record.Eip; - stack_frame.AddrFrame.Offset = context_record.Ebp; - stack_frame.AddrStack.Offset = context_record.Esp; -+#elif defined(_M_X64) -+ int const machine_type = IMAGE_FILE_MACHINE_AMD64; -+ stack_frame.AddrPC.Offset = context_record.Rip; -+ stack_frame.AddrFrame.Offset = context_record.Rbp; -+ stack_frame.AddrStack.Offset = context_record.Rsp; -+#elif defined(_M_ARM64) -+ int const machine_type = IMAGE_FILE_MACHINE_ARM64; -+ stack_frame.AddrPC.Offset = context_record.Pc; -+ stack_frame.AddrFrame.Offset = context_record.Fp; -+ stack_frame.AddrStack.Offset = context_record.Sp; - #endif - stack_frame.AddrPC.Mode = AddrModeFlat; - stack_frame.AddrFrame.Mode = AddrModeFlat; --- -2.39.1.windows.1 - diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index ce9de31d2311c8..5dc86b3ba18a9c 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -30,11 +30,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF 64817e0e8793d0875fc10245de52ffb2540a223d # v2.0.8 - SHA512 607172e6a806d78bb34443101bd384ac7a42e0edc3e7c4a2cf5c3ab5f2be64f84557726dce16c2fbaaa2ba254529a8871b3123b0e79fe87cd5bf26021ecb59da + REF "v${VERSION}" + SHA512 cc9c0d9ae66bd7c7df7487e33e8d452ba7b5756987be35a3309038a1dec576e91de5fbabe9d05e58bea9c82d83aad33c607804eeefaf3113a51354bef1a25340 HEAD_REF RC_2_0 - PATCHES - 0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch ) vcpkg_from_github( @@ -80,7 +78,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME LibtorrentRasterbar CONFIG_PATH lib/cmake/LibtorrentRasterbar) # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # Do not duplicate include files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/cmake") diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index f4cd3f0d0ac041..36c64f84032f9e 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtorrent", - "version": "2.0.8", + "version": "2.0.9", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/versions/baseline.json b/versions/baseline.json index 192ca2d1a3d375..d7dd65f96ab85c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4613,7 +4613,7 @@ "port-version": 3 }, "libtorrent": { - "baseline": "2.0.8", + "baseline": "2.0.9", "port-version": 0 }, "libu2f-server": { diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index f95abca5191aaf..9078366a261118 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "659f86cfa8b1e0f62ba1d7c6376ec5d7f292fb7c", + "version": "2.0.9", + "port-version": 0 + }, { "git-tree": "884acf58813237198df4d1265661ad93b6b57955", "version": "2.0.8",