From 1ac50ccd85afd25a0877ed5dd7bf9ae53b474dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 3 Mar 2022 06:50:21 +0800 Subject: [PATCH 01/64] [mpir] Fix download REF and HASH (#23330) * [mpir] Fix download REF and HASH * version * Unify repo under all architectures, format code * version * change to version-date * version --- ports/mpir/portfile.cmake | 105 ++++++++++++++++---------------------- ports/mpir/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/m-/mpir.json | 5 ++ 4 files changed, 53 insertions(+), 65 deletions(-) diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index d23db9f343cc8b..1b8e188c32d80b 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -6,31 +6,25 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynam message(FATAL_ERROR "${PORT} currently can only be built using the dynamic CRT when building DLLs") endif() -set(MPIR_VERSION 3.0.0) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wbhart/mpir + REF cdd444aedfcbb190f00328526ef278428702d56e # 3.0.0 + SHA512 f46e45bdba27c9f89953ba23186b694486fd3010bd370ea2de71a4649a2816e716a6520c9baa96936f1884437ef03f92b21c0b1fb5b757beba5a05fed30b2bfc + HEAD_REF master + PATCHES enable-runtimelibrary-toggle.patch +) if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - vcpkg_download_distfile( - ARCHIVE - URLS "http://mpir.org/mpir-${MPIR_VERSION}.tar.bz2" - FILENAME mpir-${MPIR_VERSION}.tar.bz2 - SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e - ) - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${MPIR_VERSION} - ) - vcpkg_find_acquire_program(YASM) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SHARED_STATIC --enable-static --disable-shared) + set(SHARED_STATIC "--enable-static --disable-shared") else() - set(SHARED_STATIC --disable-static --enable-shared) + set(SHARED_STATIC "--disable-static --enable-shared") endif() - set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) + set(OPTIONS "--disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}") string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") @@ -41,7 +35,7 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ${AUTOCONFIG} OPTIONS ${OPTIONS} ) @@ -49,22 +43,11 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_install_make() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() - configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - elseif(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO wbhart/mpir - REF mpir-${MPIR_VERSION} - SHA512 7d37f60645c533a6638dde5d9c48f5535022fa0ea02bafd5b714649c70814e88c5e5e3b0bef4c5a749aaf8772531de89c331716ee00ba1c2f9521c2cc8f3c61b - HEAD_REF master - PATCHES enable-runtimelibrary-toggle.patch - ) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(MSVC_VERSION 15) else() @@ -83,69 +66,69 @@ elseif(VCPKG_TARGET_IS_WINDOWS) set(RuntimeLibraryExt "DLL") endif() - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) - file(GLOB FILES ${SOURCE_PATH}/*) - file(COPY ${FILES} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(GLOB FILES "${SOURCE_PATH}/*") + file(COPY ${FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj + PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj" OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj + PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj" OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" ) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB REL_LIBS_CXX ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.lib) + file(GLOB REL_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB DBG_LIBS_CXX ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.lib) + file(GLOB DBG_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.lib") endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(GLOB HEADERS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmp.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmpxx.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.h + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmp.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmpxx.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.h" ) - file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(GLOB REL_DLLS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.dll) - file(GLOB REL_LIBS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.lib) - list(APPEND REL_LIBS ${REL_LIBS_CXX}) + file(GLOB REL_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.dll") + file(GLOB REL_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.lib") + list(APPEND REL_LIBS ${REL_LIBS_CXX}) - file(INSTALL ${REL_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${REL_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL ${REL_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL ${REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(GLOB HEADERS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmp.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmpxx.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.h + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmp.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmpxx.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.h" ) - file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(GLOB DBG_DLLS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.dll) - file(GLOB DBG_LIBS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.lib) + file(GLOB DBG_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.dll") + file(GLOB DBG_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.lib") list(APPEND DBG_LIBS ${DBG_LIBS_CXX}) - file(INSTALL ${DBG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${DBG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL ${DBG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL ${DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endif() vcpkg_copy_pdbs() - - file(INSTALL ${SOURCE_PATH}/COPYING.lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mpir/vcpkg.json b/ports/mpir/vcpkg.json index 958d3a4faafc96..3d5a05a43ed122 100644 --- a/ports/mpir/vcpkg.json +++ b/ports/mpir/vcpkg.json @@ -1,8 +1,8 @@ { "name": "mpir", - "version": "3.0.0", - "port-version": 11, + "version-date": "2022-03-02", "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", + "license": "GPL-3.0-only", "supports": "!(uwp | arm)" } diff --git a/versions/baseline.json b/versions/baseline.json index 42f478a8289265..e64529d49dd8d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4581,8 +4581,8 @@ "port-version": 2 }, "mpir": { - "baseline": "3.0.0", - "port-version": 11 + "baseline": "2022-03-02", + "port-version": 0 }, "mpmcqueue": { "baseline": "2019-07-26", diff --git a/versions/m-/mpir.json b/versions/m-/mpir.json index 060661e3d98ce4..ff850fbcd28ccd 100644 --- a/versions/m-/mpir.json +++ b/versions/m-/mpir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5358d4a724061eab499969ae3b56f8abbdea3347", + "version-date": "2022-03-02", + "port-version": 0 + }, { "git-tree": "8aabcec72d2006d0a338159fac489aae1da57220", "version": "3.0.0", From 3c5592beeba0a68b3bbd72ff84a548c353572ce5 Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Wed, 2 Mar 2022 14:50:51 -0800 Subject: [PATCH 02/64] [pegtl] Update from v3.2.2 to v3.2.5 (#23344) * Bump version to 3.2.5 for fix with recent MSVC * Run vcpkg x-add-version --all --- ports/pegtl/portfile.cmake | 8 ++++---- ports/pegtl/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/pegtl.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index c6c99ee784005f..4183a10107b017 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.2.2 - SHA512 7ad055e38b362d6b90a49d5deb400948febfbcc30898e05548424bc758f38ffb3f69ca0db41e4480697f8916c90bdb3e48927a4db0caa7a20c8012b1a6d1fe08 - HEAD_REF master + REF 3.2.5 + SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14 + HEAD_REF main ) vcpkg_cmake_configure( @@ -22,4 +22,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/pegtl/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index 95a4f011a5e893..b173e2ba83b201 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pegtl", - "version-semver": "3.2.2", + "version-semver": "3.2.5", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", "homepage": "https://github.com/taocpp/PEGTL", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index e64529d49dd8d6..f098ff53c5b3ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5289,7 +5289,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.2", + "baseline": "3.2.5", "port-version": 0 }, "pegtl-2": { diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index 8e6ca64f091608..dae6a54d3cd697 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43adc8ee136a8dd0ea88b54a6a7fdc7325cf7327", + "version-semver": "3.2.5", + "port-version": 0 + }, { "git-tree": "9e9bdd7c1860ebc540ca2df7ab8451e596dfff3a", "version-semver": "3.2.2", From 15cd55874a589451be9757d5ee7e0bcc29ccd25b Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 2 Mar 2022 17:51:21 -0500 Subject: [PATCH 03/64] [google-cloud-cpp] update to latest release (v1.37.0) (#23342) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/support_absl_cxx17.patch | 2 +- ports/google-cloud-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 33c1f3fab82a7d..1b33de172e566a 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.36.0 - SHA512 a9885f9e0726de64eaee0376f3d1ed3a00c32919f2b9a911479206f2965a62eea5ff292b459f61eae97d5d2fe336c410c615296fcb0c7506faf45c57bd6f8871 + REF v1.37.0 + SHA512 4174bfa7d911b8f09411962af53607d3536f2eaa0af8bce02b847e7fee87df9fd46683f4314d2df0cea23994e094845ead485314387814791cd39647cac0c546 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/support_absl_cxx17.patch b/ports/google-cloud-cpp/support_absl_cxx17.patch index c3a692d735ed30..7addced4d6a07c 100644 --- a/ports/google-cloud-cpp/support_absl_cxx17.patch +++ b/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -3,7 +3,7 @@ index 0e2b703..7097f06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,13 @@ project( - VERSION 1.36.0 + VERSION 1.37.0 LANGUAGES CXX C) -# Allow applications to override the CMAKE_CXX_STANDARD, but if not set use 11. diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 8ef190a965bbc1..75bc283e877fab 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.36.0", - "port-version": 1, + "version": "1.37.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f098ff53c5b3ee..0e8628d4052c55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2541,8 +2541,8 @@ "port-version": 1 }, "google-cloud-cpp": { - "baseline": "1.36.0", - "port-version": 1 + "baseline": "1.37.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 93b76f568c03ec..eec2c886e22470 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b986c9bce793574d2a4936c1b23e705aa8b29abc", + "version": "1.37.0", + "port-version": 0 + }, { "git-tree": "15cf3b112010a1f5c8ec0948f135a5e1863a2246", "version": "1.36.0", From f9f18a0d0325be221ce6f2462593acb20574e758 Mon Sep 17 00:00:00 2001 From: acidicoala <67734819+acidicoala@users.noreply.github.com> Date: Thu, 3 Mar 2022 00:52:16 +0200 Subject: [PATCH 04/64] [polyhook2] Update to latest (2022-03-01) (#23338) --- ports/polyhook2/portfile.cmake | 4 ++-- ports/polyhook2/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/polyhook2.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index cf4ba4307b8cdd..25ae5978621bc2 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF 0d41d78cf3e7a07b7fa3765969834d80b16abd75 - SHA512 12ebaaff0a1f178e8e565ab7a105e424af45553fb63773653afb83fc879575a819cf78c491f03803fcf044451ab1ba71f8fdd347323a725d4b259e5e0100e816 + REF 750e78f8d7ebfc291e1c0dce3a0763c3a4b86737 + SHA512 c542288cfde258bcb54960593f2b596b6a967cf128a691e4b8ad699127567c58dc55ce2bbf21f4d3ccbaa2d794bcacd3540503b039ee58c614a854f13d51d30e HEAD_REF master ) diff --git a/ports/polyhook2/vcpkg.json b/ports/polyhook2/vcpkg.json index 49a6ee3b04cb15..3e1c552d81338b 100644 --- a/ports/polyhook2/vcpkg.json +++ b/ports/polyhook2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "polyhook2", - "version-date": "2022-02-21", + "version-date": "2022-03-01", "description": "C++17, x86/x64 Hooking Library v2.0", "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", + "license": "MIT", "supports": "!(arm | uwp | linux | osx)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 0e8628d4052c55..7f1b835cd7f761 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5425,7 +5425,7 @@ "port-version": 10 }, "polyhook2": { - "baseline": "2022-02-21", + "baseline": "2022-03-01", "port-version": 0 }, "polymorphic-value": { diff --git a/versions/p-/polyhook2.json b/versions/p-/polyhook2.json index d45de07401f4eb..33d7a2951854ac 100644 --- a/versions/p-/polyhook2.json +++ b/versions/p-/polyhook2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd2324e09d967fab5a098f0c2d42682abf5b4113", + "version-date": "2022-03-01", + "port-version": 0 + }, { "git-tree": "106988bbbfbb0402ee0263e7d71753b4df830a5d", "version-date": "2022-02-21", From 45346012195355162ffb26a43690b6c76d8bf3b9 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 3 Mar 2022 06:53:33 +0800 Subject: [PATCH 05/64] fix invalid command (#23335) --- ports/fmt/fix-invalid-command.patch | 11 +++++++++++ ports/fmt/portfile.cmake | 1 + ports/fmt/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ports/fmt/fix-invalid-command.patch diff --git a/ports/fmt/fix-invalid-command.patch b/ports/fmt/fix-invalid-command.patch new file mode 100644 index 00000000000000..c554188bddf62a --- /dev/null +++ b/ports/fmt/fix-invalid-command.patch @@ -0,0 +1,11 @@ +diff --git a/include/fmt/locale.h b/include/fmt/locale.h +index 7571b52..0a34eb4 100644 +--- a/include/fmt/locale.h ++++ b/include/fmt/locale.h +@@ -1,2 +1,6 @@ + #include "xchar.h" ++#ifdef _WIN32 ++#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead") ++#else + #warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead ++#endif diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index c3cbeeba459b6a..10362875e530c7 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-write-batch.patch + fix-invalid-command.patch ) vcpkg_cmake_configure( diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index d43aa8162f8783..7386b40b6620d9 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fmt", "version": "8.1.1", + "port-version": 1, "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7f1b835cd7f761..5e147ab2f6b563 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2230,7 +2230,7 @@ }, "fmt": { "baseline": "8.1.1", - "port-version": 0 + "port-version": 1 }, "folly": { "baseline": "2022.01.31.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 493747ed697ef7..c016f90d17241c 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "602d9743b7957c9e82a06d0e81d58637c6df5222", + "version": "8.1.1", + "port-version": 1 + }, { "git-tree": "9748716da169977423d02b3c3f0de7b7f274e34e", "version": "8.1.1", From ac392a1ed06a19425097b9e9c43bb7174df47773 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 2 Mar 2022 14:58:20 -0800 Subject: [PATCH 06/64] [directxmath, directxtex, directxmesh, directxtk, directxtk12, uvatlas] ports updated (#23332) * [directxmath, directxmesh, directxtex, directxtk, directxtk12, uvatlas] ports updated to February 2022 release * Update baseline * Updated directxmath to use non-deprecated functions * Refresh baseline * Updated for master-to-main rename * Refresh baseline * Remove en-us specific doc link * Refresh version baseline --- ports/directxmath/portfile.cmake | 16 ++++--- ports/directxmath/vcpkg.json | 17 ++++++-- ports/directxmesh/portfile.cmake | 14 +++---- ports/directxmesh/vcpkg.json | 3 +- ports/directxtex/enable_openexr_support.patch | 6 +-- ports/directxtex/portfile.cmake | 42 +++++++++---------- ports/directxtex/vcpkg.json | 3 +- ports/directxtk/portfile.cmake | 22 +++++----- ports/directxtk/vcpkg.json | 3 +- ports/directxtk12/portfile.cmake | 22 +++++----- ports/directxtk12/vcpkg.json | 3 +- ports/uvatlas/portfile.cmake | 14 +++---- ports/uvatlas/vcpkg.json | 3 +- versions/baseline.json | 24 +++++------ versions/d-/directxmath.json | 5 +++ versions/d-/directxmesh.json | 5 +++ versions/d-/directxtex.json | 5 +++ versions/d-/directxtk.json | 5 +++ versions/d-/directxtk12.json | 5 +++ versions/u-/uvatlas.json | 5 +++ 20 files changed, 127 insertions(+), 95 deletions(-) diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake index b9a509edafcf5e..f3f336669da183 100644 --- a/ports/directxmath/portfile.cmake +++ b/ports/directxmath/portfile.cmake @@ -1,19 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMath - REF jan2021 - SHA512 8288f9e4d30b4947e98122f298ca25b8e2f82091c1257d3a0fd4d8de44c4c9a97d4549c105b388afbefad11ad6f30429e875e3e70eb4aa7865be6d4c08d6d1f3 - HEAD_REF master - FILE_DISAMBIGUATOR 2 + REF jan2022 + SHA512 8defaa693c8b8aed05791c83b99fa73aac2fc18475b0d51337a81f7d9807b53e426fdf530ed6f1d2d0ebd259e87cc42ac881bdb168387d883998f58a5c0a4886 + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile( diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json index e0ffe0e44029fe..e41e6c6c20fd1b 100644 --- a/ports/directxmath/vcpkg.json +++ b/ports/directxmath/vcpkg.json @@ -1,9 +1,18 @@ { "name": "directxmath", - "version-string": "jan2021", - "port-version": 1, + "version-date": "2022-01-18", "description": "DirectXMath SIMD C++ math library", "homepage": "https://github.com/Microsoft/DirectXMath", - "documentation": "https://docs.microsoft.com/en-us/windows/win32/dxmath/directxmath-portal", - "license": "MIT" + "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index d3551412de1c23..aaee42dc10e0dd 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF nov2021b - SHA512 be2137c02c7a5973eaf91eaacfc9174148ec6dc68b163507d8146beb87c1ffff512e2593f7fd000ea7be440529ed2deda415e0dacd53e4c7d9679e97c6440d3d - HEAD_REF master + REF feb2022 + SHA512 7a34ff8a484e5693efbc3e3f1ecb32978b32d71c6d795c0de14ee29fc61230213448039ac30f74d9836e1703cbcd6026b285e85984f0e30d8005c034d5419809 + HEAD_REF main ) vcpkg_check_features( @@ -35,9 +35,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/nov2021/meshconvert.exe" - FILENAME "meshconvert-nov2021.exe" - SHA512 0f97ac49ce292b1cb90372884f1d6a4fc10eb3e92125a854ee9b7030fd9d0564536cdd88199aa4838832ae2a1e9c2df2c9e32c106705b6b06f156994b9476360 + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/feb2022/meshconvert.exe" + FILENAME "meshconvert-feb2022.exe" + SHA512 687bec9c9f6c5fc08fc86370bb5b247f751c96fbbf047293364c75c43ec63a769ad737898a3b36acd95f7c3f6b0e97c756043d7a7ccdf750090594e1e2b97271 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -46,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-nov2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-feb2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 4d035305f09e66..42cb9610bb5e3e 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxmesh", - "version-date": "2021-11-08", - "port-version": 1, + "version-date": "2022-02-28", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxtex/enable_openexr_support.patch b/ports/directxtex/enable_openexr_support.patch index 2fef1f9d7dfefe..2a7141371152a5 100644 --- a/ports/directxtex/enable_openexr_support.patch +++ b/ports/directxtex/enable_openexr_support.patch @@ -1,5 +1,5 @@ diff --git a/DirectXTexEXR.cpp b/DirectXTexEXR.cpp -index 9ac601f..204bde2 100644 +index 17bd171..825cfe4 100644 --- a/DirectXTex/DirectXTexEXR.cpp +++ b/DirectXTex/DirectXTexEXR.cpp @@ -8,7 +8,7 @@ @@ -11,7 +11,7 @@ index 9ac601f..204bde2 100644 #include "DirectXTexEXR.h" -@@ -56,7 +56,7 @@ using namespace DirectX; +@@ -57,7 +57,7 @@ using namespace DirectX; using PackedVector::XMHALF4; // Comment out this first anonymous namespace if you add the include of DirectXTexP.h above @@ -19,4 +19,4 @@ index 9ac601f..204bde2 100644 +#if 0 namespace { - struct handle_closer { void operator()(HANDLE h) { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; + struct handle_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index d2ee8e803cb4ef..1a69224b023223 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -3,30 +3,30 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF nov2021b - SHA512 7f9b17e265836933c02b98c613e7c0503a74a6c3c1d97552bfbaf2f060b500019c74def80694f5e2ad6250f8bcceeac17677f264f677ff46851a9020ab604353 - HEAD_REF master + REF feb2022 + SHA512 7e30e38f97e944e49f5d2a6d3035d201016ac7ec5ca1042475485f7cbac165d66f4c5a2c84f2a47dad755c59b3f8947e1251b00b3e577fbc3e58f1957d8a224e + HEAD_REF main ) if("openexr" IN_LIST FEATURES) vcpkg_download_distfile( DIRECTXTEX_EXR_HEADER URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.h" - FILENAME "DirectXTexEXR-2.h" - SHA512 54163820996f7f3c47d0e34da7d717ba51a4363458d77e8f3750d2b6b38bcf803f199b913b4fd7b8dcdd3f520cd0c2bb42a9f79d30f5805fccdece6af368dd12 + FILENAME "DirectXTexEXR-3.h" + SHA512 b4c75fa0e3365d63beba0ba471f0ded124b2f0e20f2c11cef76a88e6af1582889abcf5aa2ec74270d7b9bde7f7b4bc36fd17f030357b4139d8c83c35060344be ) vcpkg_download_distfile( DIRECTXTEX_EXR_SOURCE URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.cpp" - FILENAME "DirectXTexEXR-2.cpp" - SHA512 fbf5a330961f3ac80e4425e8451e9a696240cd89fabca744a19f1f110ae188bae7d8eb5b058aaf66015066d919d4f581b14494d78d280147b23355d8a32745b9 + FILENAME "DirectXTexEXR-3.cpp" + SHA512 9192cfea01654b1537b444cc6e3369de2f721959ad749551ad06ba92a12fa61e12f2169cf412788b0156220bb8bacf531160f924a4744e43e875163463586620 ) file(COPY ${DIRECTXTEX_EXR_HEADER} DESTINATION "${SOURCE_PATH}/DirectXTex") file(COPY ${DIRECTXTEX_EXR_SOURCE} DESTINATION "${SOURCE_PATH}/DirectXTex") - file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") - file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}" PATCHES enable_openexr_support.patch) endif() @@ -62,23 +62,23 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texassemble.exe" - FILENAME "texassemble-nov2021.exe" - SHA512 a31151d368d41f50b58b417e8d27987fe0e3caa2c4e0d0abe7bef472db51429526277b0c554df2825c6892bb2021111f59d3d8f321ad68c71c0a153852d2c81f + URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texassemble.exe" + FILENAME "texassemble-feb2022.exe" + SHA512 ea1f9fff62a5ebc9c33221852a843063d58405be7529f663e4567b138bca79e73e47b1e0fb6054c4e024a630323c72aba505eee35414cf14970c331afa9ff43f ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texconv.exe" - FILENAME "texconv-nov2021.exe" - SHA512 7cb70b3cbf46c78b99aa18c28b043fc5930b6b254729efd447868fcf8cb8b77987d41b570082bdfb3bab01452e67d17e81b966bf2534036a3415fa918ddc2956 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texconv.exe" + FILENAME "texconv-feb2022.exe" + SHA512 1565f5a4bd08de88e01ece59df6658975bfd8551a912d65ac03c0ddd5ab536c8794811d3e49d14e8fe4c61fa2a6c9d50994d372f5d3efab7d9aeb6f3f92d56c9 ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texdiag.exe" - FILENAME "texdiag-nov2021.exe" - SHA512 7826c594fa42978da8a15bd771fafe4d4f5b97d611ce62a806ddff77204cabf63eea6ac24e3409c2720631681260b7e3fa6ad5f33b2162d2266457462e6b13c9 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texdiag.exe" + FILENAME "texdiag-feb2022.exe" + SHA512 5dd93da696eff959b5c93ba8ac763ff6df52fbfc6ca3a3adf1b9da0121beaea2c16008e097f74d562b7a69ed20ada50fd5d35d47311338e6c819e3483bc54ee3 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -89,9 +89,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index c8a1a1096143ea..0bf007aa309625 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxtex", - "version-date": "2021-11-08", - "port-version": 1, + "version-date": "2022-02-28", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index cb54fcddd94df3..701d0abc59ba44 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF nov2021b - SHA512 d1c99cc7d1a95939b4dc28ee5c757e3b4eae2b7f923031b44f988b1ca93838e765d702f125a9a9fb38e6f5304721f88843e961b6ba9591066b511b530aad5280 - HEAD_REF master + REF feb2022 + SHA512 18105ccf037b96b198fae086b17e678063efbed38c4212bc0c224090e7b6cd8c4197ae514f22c4b8da78f6a3e5cf6a6cd7437a79ff363baa740f01e3b1eed89b + HEAD_REF main ) vcpkg_check_features( @@ -33,16 +33,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/MakeSpriteFont.exe" - FILENAME "makespritefont-nov2021.exe" - SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/feb2022/MakeSpriteFont.exe" + FILENAME "makespritefont-feb2022.exe" + SHA512 d3454c679db269a29e845382f5cd9cceab2452aa91486238e38f79e71666718ea5d9fa1e676ffbe6875ee69310e17018690998dfb741530ea068fb0616fa4886 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/XWBTool.exe" - FILENAME "xwbtool-nov2021.exe" - SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e + URLS "https://github.com/Microsoft/DirectXTK/releases/download/feb2022/XWBTool.exe" + FILENAME "xwbtool-feb2022.exe" + SHA512 f27170227be1268591757caaccda65d46ad81a2ac38ab1772d9e2d5c722a1d094a9b891f66fc6673d96a6b980a45c8fde501e2d9681f557039f8084ddf648aea ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -52,8 +52,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index d9f9f98d18199f..24cc30972c5dda 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxtk", - "version-date": "2021-11-08", - "port-version": 1, + "version-date": "2022-02-28", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 7442e11863377f..05defae6f0f53c 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF nov2021b - SHA512 32afd3e3e6c122c80a4b1980482b6092e2723c2d691657385d699a01a6edb8339efd482f1c20ae32c5c6d3619f48ea749d5826b730952c619a6b053e6b780596 - HEAD_REF master + REF feb2022 + SHA512 e61acd191b9ee5c7d76293f2feb158207f9e63d8f3d5a30144c04367c15d0c1d6a17d6905843d2ca80e9af713a83fa2ab2f52c206569993943997653ae6ad729 + HEAD_REF main ) vcpkg_cmake_configure( @@ -19,16 +19,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/MakeSpriteFont.exe" - FILENAME "makespritefont-nov2021.exe" - SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/feb2022/MakeSpriteFont.exe" + FILENAME "makespritefont-feb2022.exe" + SHA512 d3454c679db269a29e845382f5cd9cceab2452aa91486238e38f79e71666718ea5d9fa1e676ffbe6875ee69310e17018690998dfb741530ea068fb0616fa4886 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/XWBTool.exe" - FILENAME "xwbtool-nov2021.exe" - SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/feb2022/XWBTool.exe" + FILENAME "xwbtool-feb2022.exe" + SHA512 f27170227be1268591757caaccda65d46ad81a2ac38ab1772d9e2d5c722a1d094a9b891f66fc6673d96a6b980a45c8fde501e2d9681f557039f8084ddf648aea ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -38,8 +38,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index e190067b258d38..e1db3a877a4de9 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxtk12", - "version-date": "2021-11-08", - "port-version": 1, + "version-date": "2022-02-28", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index f3fb140c1c966d..78b8cbab4d85b8 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF nov2021b - SHA512 14227447265c138359f3d189adde04daded386d061ad43128a97759e862005840e89b140f8a8f330808fa90035d8fdc2aa18437ac5447d2f849d8426f32b9cbb - HEAD_REF master + REF feb2022 + SHA512 20f9c38dd68edfca8179d26ab7f772b3190e843c01442ae3d7c7c1cd9a5a21a68455c124f0e8aab7efd3aacc9f6fb5907591b35a6a901683dad2a2f91d785106 + HEAD_REF main ) if (VCPKG_HOST_IS_LINUX) @@ -35,9 +35,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/nov2021/uvatlastool.exe" - FILENAME "uvatlastool-nov2021.exe" - SHA512 84de6bc74901f3ab888b90126cc1ac64de564eb33c605fffe37b2199ad132a53b01271f1f551fcc067c144c599380764b9e50884ce5df32f43b2c58777da0722 + URLS "https://github.com/Microsoft/UVAtlas/releases/download/feb2022/uvatlastool.exe" + FILENAME "uvatlastool-feb2022.exe" + SHA512 bc7e00b67e9f7adda52882fdd6b0e54d3a34eb11164f189d5423efcbc7ee0dce5b2c0fbadce592e10917ab215f5d6c380bbc70597ac1001ea169364d563dff5f ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -46,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-nov2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-feb2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 23f367155982c8..532df10c73fed7 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "uvatlas", - "version-date": "2021-11-08", - "port-version": 1, + "version-date": "2022-02-28", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index 5e147ab2f6b563..72fc465aba92cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1833,28 +1833,28 @@ "port-version": 1 }, "directxmath": { - "baseline": "jan2021", - "port-version": 1 + "baseline": "2022-01-18", + "port-version": 0 }, "directxmesh": { - "baseline": "2021-11-08", - "port-version": 1 + "baseline": "2022-02-28", + "port-version": 0 }, "directxsdk": { "baseline": "jun10", "port-version": 5 }, "directxtex": { - "baseline": "2021-11-08", - "port-version": 1 + "baseline": "2022-02-28", + "port-version": 0 }, "directxtk": { - "baseline": "2021-11-08", - "port-version": 1 + "baseline": "2022-02-28", + "port-version": 0 }, "directxtk12": { - "baseline": "2021-11-08", - "port-version": 1 + "baseline": "2022-02-28", + "port-version": 0 }, "dirent": { "baseline": "1.23.2", @@ -7169,8 +7169,8 @@ "port-version": 1 }, "uvatlas": { - "baseline": "2021-11-08", - "port-version": 1 + "baseline": "2022-02-28", + "port-version": 0 }, "uvw": { "baseline": "2.7.0", diff --git a/versions/d-/directxmath.json b/versions/d-/directxmath.json index 44477eae718b15..0bd805c40d8bf5 100644 --- a/versions/d-/directxmath.json +++ b/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebf69755284c5ea16a26b4dbfa4534af962c96a0", + "version-date": "2022-01-18", + "port-version": 0 + }, { "git-tree": "d02145b6ed0cbe882bfb75291f832a11ab0582ce", "version-string": "jan2021", diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index f5d9f40d691d17..d22dbc28242776 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aef77bf208f6e95c682fd8d41590c5b0516f1f0f", + "version-date": "2022-02-28", + "port-version": 0 + }, { "git-tree": "a8cbbe307c2ac5a241a6ec4b1e76e121a1ffb2db", "version-date": "2021-11-08", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index af61e995bf9013..613d5345c2b74f 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "424610ae5719fee5f738756146719d13d1483879", + "version-date": "2022-02-28", + "port-version": 0 + }, { "git-tree": "ec03f6fb3941d00726655dae315f09b6eb47d9ce", "version-date": "2021-11-08", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 0da2066195e314..347b73c7e84381 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64937ca8d8ec8cc57bfdea9fea74bd39cd0ea507", + "version-date": "2022-02-28", + "port-version": 0 + }, { "git-tree": "34ecf07435420320f41c8aa7405926dc300359b2", "version-date": "2021-11-08", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 9f287cd7ab6281..a7f248db1a4f61 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e324f5499354e15e49fa1c591ab864b114518e74", + "version-date": "2022-02-28", + "port-version": 0 + }, { "git-tree": "2019efd91b858e5075651d1ebbfa45dc1961aa2d", "version-date": "2021-11-08", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 4a22bb9c3191d2..b523cbb8d89b2b 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe5522a95b1f9ef72d43c019948fd94055b42410", + "version-date": "2022-02-28", + "port-version": 0 + }, { "git-tree": "4f353fc6ad423c0a9d95c7b2d2f6c7a150e43b25", "version-date": "2021-11-08", From 188617d8734c002309a597d2f75f8be7b23d62f2 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 3 Mar 2022 07:00:06 +0800 Subject: [PATCH 07/64] [vamp-sdk] install pkgconfig files (#23331) * install pkgconfig files * remove useless commands --- ports/vamp-sdk/CMakeLists.txt | 6 ++++++ ports/vamp-sdk/portfile.cmake | 7 ++++--- ports/vamp-sdk/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/v-/vamp-sdk.json | 5 +++++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ports/vamp-sdk/CMakeLists.txt b/ports/vamp-sdk/CMakeLists.txt index a3d98073dba784..c5e29d9220f28d 100644 --- a/ports/vamp-sdk/CMakeLists.txt +++ b/ports/vamp-sdk/CMakeLists.txt @@ -81,6 +81,12 @@ target_link_libraries(vamp-hostsdk PUBLIC SndFile::sndfile) target_link_libraries(vamp-sdk PUBLIC SndFile::sndfile) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp.pc" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp-hostsdk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp-hostsdk.pc" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp-sdk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp-sdk.pc" @ONLY) +file(GLOB PKGCONFIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/*.pc") +install(FILES ${PKGCONFIG_FILES} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install( TARGETS vamp-hostsdk vamp-sdk RUNTIME DESTINATION bin diff --git a/ports/vamp-sdk/portfile.cmake b/ports/vamp-sdk/portfile.cmake index 890f68e4a7ed8b..83c60e6fa1ca18 100644 --- a/ports/vamp-sdk/portfile.cmake +++ b/ports/vamp-sdk/portfile.cmake @@ -7,12 +7,13 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/vamp-sdk/vcpkg.json b/ports/vamp-sdk/vcpkg.json index 2e6b1fea4fc92e..1c2156b5117022 100644 --- a/ports/vamp-sdk/vcpkg.json +++ b/ports/vamp-sdk/vcpkg.json @@ -2,11 +2,19 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", "version": "2.10", - "port-version": 1, + "port-version": 2, "description": "Library for Vamp plugins", "homepage": "https://www.vamp-plugins.org/develop.html", "supports": "!uwp", "dependencies": [ - "libsndfile" + "libsndfile", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 72fc465aba92cc..c66f79d155ea6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7198,7 +7198,7 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 1 + "port-version": 2 }, "variant-lite": { "baseline": "2.0.0", diff --git a/versions/v-/vamp-sdk.json b/versions/v-/vamp-sdk.json index d43b514319b7a6..153a9e1f0a314a 100644 --- a/versions/v-/vamp-sdk.json +++ b/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d2b2ab057b4e31d833668e82f95283c7afbc551", + "version": "2.10", + "port-version": 2 + }, { "git-tree": "1c71927e1997998f40a9d051d65ba4e5760f4257", "version": "2.10", From 293faeebb131691cf3aa525f9c46221f01d21406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 3 Mar 2022 07:00:38 +0800 Subject: [PATCH 08/64] [python3] Remove static libraries belonging to python3 executable (#23318) * [python3] Remove static libraries belonging to python3 executable * version * Apply suggestions * version --- ports/python3/portfile.cmake | 14 ++++++++++++++ ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index eb37ed5e7bd6b7..f9326117369a9e 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -197,6 +197,20 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_fixup_pkgconfig() vcpkg_clean_msbuild() + + # Remove static library belonging to executable + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/python.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/python.lib" + "${CURRENT_PACKAGES_DIR}/lib/manual-link/python.lib") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/python_d.lib") + endif() + endif() else() set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 474921e2e47d37..dd6dd537f48437 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-semver": "3.10.1", - "port-version": 7, + "port-version": 8, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index c66f79d155ea6d..e11428e6199c1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5558,7 +5558,7 @@ }, "python3": { "baseline": "3.10.1", - "port-version": 7 + "port-version": 8 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 1e98afe51f7aa5..e06b54fbcdaed0 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce4fddbb41412be06577c61632e8e9ef0a67901c", + "version-semver": "3.10.1", + "port-version": 8 + }, { "git-tree": "31155fa7fa6cfa0fd2554e89584c92a2135bce19", "version-semver": "3.10.1", From ec7b21c3f8ac5159be74a3c92154e6afdd51c70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 3 Mar 2022 00:30:25 +0100 Subject: [PATCH 09/64] [winsparkle] Intitial commit with binary copy (#23194) * [winsparkle] Intitial commit * [winsparkle] set VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY * [winsparkle] Update version database --- ports/winsparkle/portfile.cmake | 46 +++++++++++++++++++++++++++++++++ ports/winsparkle/vcpkg.json | 8 ++++++ versions/baseline.json | 4 +++ versions/w-/winsparkle.json | 9 +++++++ 4 files changed, 67 insertions(+) create mode 100644 ports/winsparkle/portfile.cmake create mode 100644 ports/winsparkle/vcpkg.json create mode 100644 versions/w-/winsparkle.json diff --git a/ports/winsparkle/portfile.cmake b/ports/winsparkle/portfile.cmake new file mode 100644 index 00000000000000..ca90f074323ddf --- /dev/null +++ b/ports/winsparkle/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip" + FILENAME "winsparkle-070.zip" + SHA512 c2cf29e1880534c170110f8e5a966939aecc9a9e05afc87868400074f1492fcac949b61e2ce4636eadd2f127caad3660e0f763476e9523aad3834d673f6edd77 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") +file(INSTALL "${SOURCE_PATH}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" FILES_MATCHING PATTERN "*.bat") + + +# Note: It is an explicit design goal for WinSparkle to be a single +# self-contained DLL with no external dependencies (to the point that +# it even links to static CRT!). This matters for e.g. in-app delta updates +# or re-launching the app after update. It is not statically linked even if a +# static linking is used for everything else. +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/lib") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/lib") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/winsparkle/vcpkg.json b/ports/winsparkle/vcpkg.json new file mode 100644 index 00000000000000..f7c289514275ee --- /dev/null +++ b/ports/winsparkle/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "winsparkle", + "version": "0.7.0", + "description": "WinSparkle is an easy-to-use software update library for Windows developers.", + "homepage": "https://winsparkle.org", + "license": "MIT", + "supports": "windows & !(arm | uwp)" +} diff --git a/versions/baseline.json b/versions/baseline.json index e11428e6199c1f..eebb1a2bf8b894 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7364,6 +7364,10 @@ "baseline": "0.0", "port-version": 4 }, + "winsparkle": { + "baseline": "0.7.0", + "port-version": 0 + }, "wintoast": { "baseline": "1.2.0", "port-version": 2 diff --git a/versions/w-/winsparkle.json b/versions/w-/winsparkle.json new file mode 100644 index 00000000000000..49297b7f6e97df --- /dev/null +++ b/versions/w-/winsparkle.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0d756f506e6a79a2a79706f9080c05b45e7df882", + "version": "0.7.0", + "port-version": 0 + } + ] +} From b196dacc2f63f37bb75504c36c349042336749cb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 3 Mar 2022 19:14:45 +0100 Subject: [PATCH 10/64] [vtk] use interface target instead of alias for lz4 (#23352) * [vtk] use interface target instead of alias * update version Co-authored-by: Alexander Neumann --- ports/vtk/FindLZ4.patch | 4 ++-- ports/vtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/vtk/FindLZ4.patch b/ports/vtk/FindLZ4.patch index 7f65de529cd788..635d0261b5c0ab 100644 --- a/ports/vtk/FindLZ4.patch +++ b/ports/vtk/FindLZ4.patch @@ -42,8 +42,8 @@ index 8c94e3bcd..ade3f9451 100644 - endif () -endif () +find_package(LZ4 CONFIG REQUIRED) -+set_target_properties(lz4::lz4 PROPERTIES IMPORTED_GLOBAL TRUE) +if(NOT TARGET LZ4::LZ4) -+add_library(LZ4::LZ4 ALIAS lz4::lz4) ++ add_library(LZ4::LZ4 INTERFACE IMPORTED) ++ target_link_libraries(LZ4::LZ4 INTERFACE lz4::lz4) +endif() \ No newline at end of file diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 5a4e70d4b26ed3..edc48ba75db0af 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 7, + "port-version": 8, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index eebb1a2bf8b894..eb316255bf354c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7274,7 +7274,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 7 + "port-version": 8 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 13477950f3eeb4..994e3899bd57c7 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "585d1bca8e71d950c6d12ceb6ad720825ecbd704", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 8 + }, { "git-tree": "4ba3d3d0db6e98e9a47d8c5c86790da3ef9af25b", "version-semver": "9.0.3-pv5.9.1", From 0bf2f4e517a970e587779231e6934e176c83ddc6 Mon Sep 17 00:00:00 2001 From: Mollie Munoz Date: Thu, 3 Mar 2022 12:24:47 -0800 Subject: [PATCH 11/64] [Azure IoT C SDK] Public-preview install fix (#23343) * update public-preview install and cleanup patches * Update port-versions * Update deprecated functions * Add license info * bot instructions * Fix updated function arguments * Update CONFIG_PATH. in progress. * Fix uamqp dependency issue, update public preview patches * Fix versions * update preview patch * bot instructions Co-authored-by: Mollie Munoz --- .../fix-install-location-preview.patch | 13 ++ .../improve-dependencies-preview.patch | 68 +++++++++++ ports/azure-c-shared-utility/portfile.cmake | 6 +- ports/azure-c-shared-utility/vcpkg.json | 3 +- .../improve-external-deps-preview.patch | 112 ++++++++++++++++++ .../improve-external-deps.patch | 2 +- ports/azure-iot-sdk-c/portfile.cmake | 9 +- ports/azure-iot-sdk-c/remove-werror.patch | 16 --- ports/azure-iot-sdk-c/vcpkg.json | 3 +- ports/azure-uamqp-c/portfile.cmake | 2 + ports/azure-uamqp-c/vcpkg.json | 2 + .../azure-uhttp-c/fix-install-location.patch | 15 --- .../package-location-fix-preview.patch | 13 ++ ports/azure-uhttp-c/portfile.cmake | 19 ++- ports/azure-uhttp-c/vcpkg.json | 12 +- ...tch => package-location-fix-preview.patch} | 6 +- ports/azure-umqtt-c/portfile.cmake | 17 ++- ports/azure-umqtt-c/vcpkg.json | 12 +- versions/a-/azure-c-shared-utility.json | 5 + versions/a-/azure-iot-sdk-c.json | 5 + versions/a-/azure-uamqp-c.json | 5 + versions/a-/azure-uhttp-c.json | 5 + versions/a-/azure-umqtt-c.json | 5 + versions/baseline.json | 10 +- 24 files changed, 295 insertions(+), 70 deletions(-) create mode 100644 ports/azure-c-shared-utility/fix-install-location-preview.patch create mode 100644 ports/azure-c-shared-utility/improve-dependencies-preview.patch create mode 100644 ports/azure-iot-sdk-c/improve-external-deps-preview.patch delete mode 100644 ports/azure-iot-sdk-c/remove-werror.patch delete mode 100644 ports/azure-uhttp-c/fix-install-location.patch create mode 100644 ports/azure-uhttp-c/package-location-fix-preview.patch rename ports/azure-umqtt-c/{fix-install-location.patch => package-location-fix-preview.patch} (64%) diff --git a/ports/azure-c-shared-utility/fix-install-location-preview.patch b/ports/azure-c-shared-utility/fix-install-location-preview.patch new file mode 100644 index 00000000000000..41162fd2eed101 --- /dev/null +++ b/ports/azure-c-shared-utility/fix-install-location-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25bbf383..31ca2da2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -678,7 +678,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") + endif() + +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(${build_as_dynamic}) + set(targets aziotsharedutil aziotsharedutil_dll) diff --git a/ports/azure-c-shared-utility/improve-dependencies-preview.patch b/ports/azure-c-shared-utility/improve-dependencies-preview.patch new file mode 100644 index 00000000000000..42fe1e6583671b --- /dev/null +++ b/ports/azure-c-shared-utility/improve-dependencies-preview.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46334c1..aaeea20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,6 @@ if(${use_openssl}) + if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) + find_package(OpenSSL REQUIRED) + endif() +- include_directories(${OPENSSL_INCLUDE_DIR}) + endif() + + if(${use_applessl}) +@@ -521,8 +520,7 @@ if(${use_http}) + set(CURL_FIND_REQUIRED 1) + find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) + +- include_directories(${CURL_INCLUDE_DIRS}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) + endif(NOT use_builtin_httpapi) + endif() + endif(${use_http}) +@@ -561,7 +559,7 @@ if(${use_bearssl}) + endif() + + if(${use_openssl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) + if (WIN32) + set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) + endif() +@@ -703,7 +701,7 @@ write_basic_package_version_file( + + configure_file("configs/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY ++ @ONLY + ) + + install(EXPORT aziotsharedutilTargets +@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets + + install( + FILES +- "configs/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" + "configs/${PROJECT_NAME}Functions.cmake" + "configs/azure_iot_build_rules.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake +index 52f2c7e1..11e9332b 100644 +--- a/configs/azure_c_shared_utilityConfig.cmake ++++ b/configs/azure_c_shared_utilityConfig.cmake +@@ -1,6 +1,14 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + ++include(CMakeFindDependencyMacro) ++if("@use_openssl@") ++ find_dependency(OpenSSL) ++endif() ++if(UNIX AND NOT "@use_builtin_httpapi@") ++ find_dependency(CURL) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake") + + get_target_property(AZURE_C_SHARED_UTILITY_INCLUDES aziotsharedutil INTERFACE_INCLUDE_DIRECTORIES) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index d5a924212ac1ff..674f6156faa709 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -8,10 +8,10 @@ if("public-preview" IN_LIST FEATURES) SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789 HEAD_REF master PATCHES - fix-install-location.patch + fix-install-location-preview.patch fix-utilityFunctions-conditions-preview.patch disable-error.patch - improve-dependencies.patch + improve-dependencies-preview.patch ) else() vcpkg_from_github( @@ -35,6 +35,8 @@ vcpkg_cmake_configure( -Duse_installed_dependencies=ON -Duse_default_uuid=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) vcpkg_cmake_install() diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index 57317f32de284c..547d08ee976b41 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,9 +1,10 @@ { "name": "azure-c-shared-utility", "version-date": "2022-01-21", - "port-version": 1, + "port-version": 2, "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", + "license": "MIT", "supports": "!uwp", "dependencies": [ "azure-macro-utils-c", diff --git a/ports/azure-iot-sdk-c/improve-external-deps-preview.patch b/ports/azure-iot-sdk-c/improve-external-deps-preview.patch new file mode 100644 index 00000000000000..8526cd6eb4d3fb --- /dev/null +++ b/ports/azure-iot-sdk-c/improve-external-deps-preview.patch @@ -0,0 +1,112 @@ +diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake +index b9c62e8..edf5847 100644 +--- a/configs/azure_iot_sdksConfig.cmake ++++ b/configs/azure_iot_sdksConfig.cmake +@@ -1,5 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. ++include(CMakeFindDependencyMacro) ++find_dependency(unofficial-parson) ++find_dependency(uamqp) ++find_dependency(uhttp) ++find_dependency(umqtt) ++find_dependency(azure_c_shared_utility) + + include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") + +diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +index 33b5b8709..45ef7b87a 100644 +--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +index d05d654..5872c8d 100644 +--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba2f8e016..19885c8b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -179,17 +179,6 @@ endif() + # Use solution folders. + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +-# build the parson library for json parsing +-add_library(parson +- ./deps/parson/parson.c +- ./deps/parson/parson.h +-) +-if (MSVC) +- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") +-endif() +-set(parson_h_install_files ./deps/parson/parson.h) +-set(parson_install_libs parson) +- + if (IN_OPENWRT) + ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") + INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") +@@ -407,7 +396,7 @@ endif() + + if (${use_installed_dependencies}) + # Install azure_iot_sdks +- set(package_location "cmake") ++ set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + include(CMakePackageConfigHelpers) + +@@ -422,14 +411,10 @@ if (${use_installed_dependencies}) + COPYONLY + ) + +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) +- install(TARGETS ${parson_install_libs} EXPORT azure_iot_sdksTargets +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + + install(EXPORT azure_iot_sdksTargets + FILE +@@ -446,11 +431,5 @@ if (${use_installed_dependencies}) + DESTINATION + ${package_location} + ) +-else() +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) +- install(TARGETS ${parson_install_libs} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + diff --git a/ports/azure-iot-sdk-c/improve-external-deps.patch b/ports/azure-iot-sdk-c/improve-external-deps.patch index c66b53a0b7463b..8f616807816962 100644 --- a/ports/azure-iot-sdk-c/improve-external-deps.patch +++ b/ports/azure-iot-sdk-c/improve-external-deps.patch @@ -34,7 +34,7 @@ diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/i index d05d654..5872c8d 100644 --- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt -@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files +@@ -22,12 +22,10 @@ set(${theseTestsName}_nuget_c_files set(${theseTestsName}_c_files ../../../certs/certs.c diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 785e6efcafa783..8edad368853e4e 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -8,10 +8,7 @@ if("public-preview" IN_LIST FEATURES) SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b HEAD_REF public-preview PATCHES - fix-install-location.patch - improve-external-deps.patch - remove-werror.patch - fix-iothubclient-includes.patch + improve-external-deps-preview.patch ) else() vcpkg_from_github( @@ -23,7 +20,6 @@ else() PATCHES fix-install-location.patch improve-external-deps.patch - remove-werror.patch fix-iothubclient-includes.patch ) endif() @@ -46,6 +42,9 @@ vcpkg_cmake_configure( -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON -Dwarnings_as_errors=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic + warnings_as_errors ) vcpkg_cmake_install() diff --git a/ports/azure-iot-sdk-c/remove-werror.patch b/ports/azure-iot-sdk-c/remove-werror.patch deleted file mode 100644 index 5b5333118f9c33..00000000000000 --- a/ports/azure-iot-sdk-c/remove-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b72bd41ed..e916728a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -123,11 +123,8 @@ if (${warnings_as_errors}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232") - # Make warning as error -- add_definitions(/WX) - else() - # Make warning as error -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - endif() - endif() - diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index ea11a6aece333d..eb8d7405f982c8 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -1,9 +1,10 @@ { "name": "azure-iot-sdk-c", "version-date": "2022-01-21", - "port-version": 1, + "port-version": 2, "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index cb8c613a10209f..8e296ff0ac8efe 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -27,6 +27,8 @@ vcpkg_configure_cmake( -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) vcpkg_install_cmake() diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json index f0559c21bea779..40c1177fd8b817 100644 --- a/ports/azure-uamqp-c/vcpkg.json +++ b/ports/azure-uamqp-c/vcpkg.json @@ -1,8 +1,10 @@ { "name": "azure-uamqp-c", "version-date": "2022-01-21", + "port-version": 1, "description": "AMQP library for C", "homepage": "https://github.com/Azure/azure-uamqp-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", diff --git a/ports/azure-uhttp-c/fix-install-location.patch b/ports/azure-uhttp-c/fix-install-location.patch deleted file mode 100644 index 4daa4885104d39..00000000000000 --- a/ports/azure-uhttp-c/fix-install-location.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c63adc0..9ba6007 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,8 +145,8 @@ endif() - # Set CMAKE_INSTALL_LIBDIR if not defined - include(GNUInstallDirs) - --# Install umqtt --set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") -+# Install uhttp -+set(package_location "cmake") - - if(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/ports/azure-uhttp-c/package-location-fix-preview.patch b/ports/azure-uhttp-c/package-location-fix-preview.patch new file mode 100644 index 00000000000000..8544ae63b982de --- /dev/null +++ b/ports/azure-uhttp-c/package-location-fix-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27eae0b..ef87ec0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ if (NOT ${skip_samples}) + endif() + + # Install uhttp +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 263926b65b4e89..0478c7174375f6 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -8,7 +8,7 @@ if("public-preview" IN_LIST FEATURES) SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6 HEAD_REF master PATCHES - fix-install-location.patch + package-location-fix-preview.patch ) else() vcpkg_from_github( @@ -17,29 +17,28 @@ else() REF 1cc70f4d21ad69768cafb9551b1b512118fba995 SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26 HEAD_REF master - PATCHES - fix-install-location.patch ) endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF -DCMAKE_INSTALL_INCLUDEDIR=include + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uhttp) +vcpkg_cmake_config_fixup(PACKAGE_NAME uhttp CONFIG_PATH "lib/cmake/uhttp") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json index 41a9d3f3bfc3fd..ff97c54e3c98b2 100644 --- a/ports/azure-uhttp-c/vcpkg.json +++ b/ports/azure-uhttp-c/vcpkg.json @@ -1,12 +1,22 @@ { "name": "azure-uhttp-c", "version-date": "2022-01-21", + "port-version": 1, "description": "Azure HTTP Library written in C", "homepage": "https://github.com/Azure/azure-uhttp-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/ports/azure-umqtt-c/fix-install-location.patch b/ports/azure-umqtt-c/package-location-fix-preview.patch similarity index 64% rename from ports/azure-umqtt-c/fix-install-location.patch rename to ports/azure-umqtt-c/package-location-fix-preview.patch index f2bb134d9c3443..ec837b7c018cb2 100644 --- a/ports/azure-umqtt-c/fix-install-location.patch +++ b/ports/azure-umqtt-c/package-location-fix-preview.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0dcf186..1d9bc8a 100755 +index 8fd08f0..c228519 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,7 +155,7 @@ endif () include(GNUInstallDirs) # Install umqtt --set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") -+set(package_location "cmake") +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") if(NOT DEFINED CMAKE_INSTALL_LIBDIR) set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 87dd21257036c7..e9e65434ff5693 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -8,7 +8,7 @@ if("public-preview" IN_LIST FEATURES) SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40 HEAD_REF master PATCHES - fix-install-location.patch + package-location-fix-preview.patch ) else() vcpkg_from_github( @@ -17,28 +17,27 @@ else() REF 09558f380a314ea89b28f406cc810f47718cea49 SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548 HEAD_REF master - PATCHES - fix-install-location.patch ) endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umqtt) +vcpkg_cmake_config_fixup(PACKAGE_NAME umqtt CONFIG_PATH "lib/cmake/umqtt") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json index c1fc532fc6a753..ec223bd03ba980 100644 --- a/ports/azure-umqtt-c/vcpkg.json +++ b/ports/azure-umqtt-c/vcpkg.json @@ -1,12 +1,22 @@ { "name": "azure-umqtt-c", "version-date": "2022-01-21", + "port-version": 1, "description": "General purpose library for communication over the mqtt protocol", "homepage": "https://github.com/Azure/azure-umqtt-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index e443d47c4671e5..aab35215bede94 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42be8335b113cba6ca88b9f9789b29fc7be280b4", + "version-date": "2022-01-21", + "port-version": 2 + }, { "git-tree": "aceee8533b4eeea6eb87371c4d37ae82859cefc7", "version-date": "2022-01-21", diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index be183cd3a174d1..3953986f7d4d00 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6", + "version-date": "2022-01-21", + "port-version": 2 + }, { "git-tree": "0570fa462646f08bb3ed9a34ecb693082def3d3b", "version-date": "2022-01-21", diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json index ba8a9b1ed16178..3684f27960299c 100644 --- a/versions/a-/azure-uamqp-c.json +++ b/versions/a-/azure-uamqp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6", + "version-date": "2022-01-21", + "port-version": 1 + }, { "git-tree": "a2c6897e3392683dcce93a846b98b2c95dc41a55", "version-date": "2022-01-21", diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json index ec05c1decfa0e6..e7cf5ca1a18c8f 100644 --- a/versions/a-/azure-uhttp-c.json +++ b/versions/a-/azure-uhttp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28439985096cc9a714695d10830ceb2f54859c24", + "version-date": "2022-01-21", + "port-version": 1 + }, { "git-tree": "f614a1ac990dd4189b292fa0e6e31897ee4b7ae8", "version-date": "2022-01-21", diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json index c523e9e1e1b408..8933265990a138 100644 --- a/versions/a-/azure-umqtt-c.json +++ b/versions/a-/azure-umqtt-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c", + "version-date": "2022-01-21", + "port-version": 1 + }, { "git-tree": "f5b18f17519b9de8a2ab956eebc7dff6e7bf7a05", "version-date": "2022-01-21", diff --git a/versions/baseline.json b/versions/baseline.json index eb316255bf354c..07d1837bc61689 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -314,7 +314,7 @@ }, "azure-c-shared-utility": { "baseline": "2022-01-21", - "port-version": 1 + "port-version": 2 }, "azure-core-cpp": { "baseline": "1.3.1", @@ -326,7 +326,7 @@ }, "azure-iot-sdk-c": { "baseline": "2022-01-21", - "port-version": 1 + "port-version": 2 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", @@ -374,15 +374,15 @@ }, "azure-uamqp-c": { "baseline": "2022-01-21", - "port-version": 0 + "port-version": 1 }, "azure-uhttp-c": { "baseline": "2022-01-21", - "port-version": 0 + "port-version": 1 }, "azure-umqtt-c": { "baseline": "2022-01-21", - "port-version": 0 + "port-version": 1 }, "b64": { "baseline": "2.0.0.1", From 964f2fa1456a87e7546c306e9ac0e805ae2375e5 Mon Sep 17 00:00:00 2001 From: Igor Kostenko Date: Thu, 3 Mar 2022 20:29:38 +0000 Subject: [PATCH 12/64] [cryptopp] Update to version 8.6.0 to fix CVE-2021-40530 (#23324) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [cryptopp] Update to version 8.6.0 * Update ports/cryptopp/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * regenerate versions * retrigger agent * retrigger agent * [crypto] modify patch according upsteam PR, modify version field * update deprecated functions * Update versions/c-/cryptopp.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Igor Kostenko Co-authored-by: JackBoosY --- ports/cryptopp/cmake.patch | 20 +++++++++++++++++--- ports/cryptopp/portfile.cmake | 15 +++++++-------- ports/cryptopp/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/c-/cryptopp.json | 5 +++++ 5 files changed, 42 insertions(+), 15 deletions(-) diff --git a/ports/cryptopp/cmake.patch b/ports/cryptopp/cmake.patch index 8502ff17c0183e..b0839bca7e2f14 100644 --- a/ports/cryptopp/cmake.patch +++ b/ports/cryptopp/cmake.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1683961..f63c71e 100644 +index fb43b95..c39e470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -395,6 +395,10 @@ if (MSVC) - list(APPEND CRYPTOPP_COMPILE_OPTIONS /FI winapifamily.h) +@@ -451,6 +451,10 @@ if (MSVC) + endif() endif () +if(WINDOWS_STORE) @@ -13,3 +13,17 @@ index 1683961..f63c71e 100644 # Enable PIC for all target machines except 32-bit i386 due to register pressures. if (NOT CRYPTOPP_I386) SET(CMAKE_POSITION_INDEPENDENT_CODE 1) +@@ -1022,10 +1026,10 @@ endif () + # add_compile_definitions added in CMake 3.12 + if (${CMAKE_VERSION} VERSION_LESS "3.12") + # https://stackoverflow.com/q/61250087 +- add_definitions("${CMAKE_CPP_FLAGS}" "${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_definitions(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_DEFINITIONS} ${CRYPTOPP_COMPILE_OPTIONS}) + else() +- add_compile_definitions("${CMAKE_CPP_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}") +- add_compile_options("${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_compile_definitions(${CRYPTOPP_COMPILE_DEFINITIONS}) ++ add_compile_options(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_OPTIONS}) + endif() + + #============================================================================ diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 03612d3057aeb7..584eb7144637d1 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO noloader/cryptopp-cmake - REF CRYPTOPP_8_5_0 - SHA512 758633786c81f5a34ade0ab99983b3262bb3a028b086e734b1f8ddb618c801453d517f67176178936f87ec36a91fca93fba9bcaec4301705138954e6eb49d136 + REF CRYPTOPP_8_6_0 + SHA512 655107b8a41e1e6603a6b3ed2ddc95fad22b646c071c7251c3c7e2151afe439de848679235a3790fe540263424324f06c922687719da6dfea341bc2a75337bdc HEAD_REF master PATCHES cmake.patch @@ -13,8 +13,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO weidai11/cryptopp - REF CRYPTOPP_8_5_0 - SHA512 e8dd210c9e9d4925edc456e4d68780deaa224d85e11394ad5da835dcb1a1e6b3e899aa473acf20449f9721116960884b6d88b29335479b305bb7e29faa87e6c0 + REF CRYPTOPP_8_6_0 + SHA512 ccb4baa6674cd830cddb779216ce702b3cdba6de8a3d627c218861507c36bddd2861b0d0e8cad35001a1e9f0c3d5020404684c87dd05d85264ac166fa7f70589 HEAD_REF master PATCHES patch.patch ) @@ -51,9 +51,8 @@ endif() # https://www.cryptopp.com/wiki/Visual_Studio#Dynamic_Runtime_Linking # https://www.cryptopp.com/wiki/Visual_Studio#The_DLL -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_SHARED=OFF -DBUILD_STATIC=ON @@ -62,8 +61,8 @@ vcpkg_configure_cmake( -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cryptopp) +vcpkg_cmake_install () +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cryptopp) # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json index e75fa21625bf38..02ffa51b16b412 100644 --- a/ports/cryptopp/vcpkg.json +++ b/ports/cryptopp/vcpkg.json @@ -1,9 +1,18 @@ { "name": "cryptopp", - "version-string": "8.5.0", - "port-version": 1, + "version": "8.6.0", "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "pem-pack": { "description": "Crypto++ with PEM pack" diff --git a/versions/baseline.json b/versions/baseline.json index 07d1837bc61689..0ea7e29521e4b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1673,8 +1673,8 @@ "port-version": 0 }, "cryptopp": { - "baseline": "8.5.0", - "port-version": 1 + "baseline": "8.6.0", + "port-version": 0 }, "cspice": { "baseline": "67", diff --git a/versions/c-/cryptopp.json b/versions/c-/cryptopp.json index 56bb041ddbb988..879c3d14c7264e 100644 --- a/versions/c-/cryptopp.json +++ b/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d47535ac1767600626347e025079450a909c6ba", + "version": "8.6.0", + "port-version": 0 + }, { "git-tree": "2092d648b56a683bcd8b3e72f4adc3a966956c17", "version-string": "8.5.0", From fc568b18677294b72a4affc6c6496f7d51a39327 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 4 Mar 2022 04:31:21 +0800 Subject: [PATCH 13/64] [llvm] fix build error (#23334) * fix link error * Add license * delete useless patch --- ports/llvm/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index fc1ed5ba6a11ff..b7f4ce9e7446c0 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "llvm", "version": "13.0.0", - "port-version": 1, + "port-version": 2, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", + "license": "Apache-2.0", "supports": "!uwp & !(arm & windows)", "dependencies": [ { @@ -336,7 +337,16 @@ "description": "Build with XCore backend." }, "tools": { - "description": "Build LLVM tools." + "description": "Build LLVM tools.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "enable-threads" + ] + } + ] }, "utils": { "description": "Build LLVM utils." diff --git a/versions/baseline.json b/versions/baseline.json index 0ea7e29521e4b2..f002c0171a3c4b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4198,7 +4198,7 @@ }, "llvm": { "baseline": "13.0.0", - "port-version": 1 + "port-version": 2 }, "lmdb": { "baseline": "0.9.24", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 4479987746ea34..1f1c017b091391 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c86dc65e952d8abe6140578df4db2c742180358", + "version": "13.0.0", + "port-version": 2 + }, { "git-tree": "b3ebd32f2ff4394d72edeb0f4b804d914a2e3f94", "version": "13.0.0", From 75ae1ef84437bc457fb4db54360f88af57bb158a Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 3 Mar 2022 21:52:10 +0100 Subject: [PATCH 14/64] [libssh2] Fix various issues + add features (#23327) * [libssh2] Fix various issues * Remove dynamic linking * Add feature zlib * Disable dynamic linking on Windows and UWP * version * Use MSBuild generator on Windows * version * Hack for generator on OSX * version * Fix windows dynamic build * version Co-authored-by: JackBoosY --- ports/libssh2/0002-fix-macros.patch | 19 +++++++++++++ ports/libssh2/LICENSE | 41 ----------------------------- ports/libssh2/portfile.cmake | 32 ++++++++++++++++------ ports/libssh2/vcpkg.json | 22 +++++++++++++++- versions/baseline.json | 2 +- versions/l-/libssh2.json | 5 ++++ 6 files changed, 70 insertions(+), 51 deletions(-) create mode 100644 ports/libssh2/0002-fix-macros.patch delete mode 100644 ports/libssh2/LICENSE diff --git a/ports/libssh2/0002-fix-macros.patch b/ports/libssh2/0002-fix-macros.patch new file mode 100644 index 00000000000000..dc0f7193301b3e --- /dev/null +++ b/ports/libssh2/0002-fix-macros.patch @@ -0,0 +1,19 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2539607..eceb5a0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -355,9 +355,12 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + # Daniel's note: this should not be necessary and we need to work to + # get this removed. + if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_WIN32) ++ if (BUILD_SHARED_LIBS) ++ target_compile_definitions(libssh2 PUBLIC _WINDLL PRIVATE LIBSSH2_LIBRARY) ++ endif() + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_DARWIN) + endif() + + if(MSVC) diff --git a/ports/libssh2/LICENSE b/ports/libssh2/LICENSE deleted file mode 100644 index d629fbd3f49bcd..00000000000000 --- a/ports/libssh2/LICENSE +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2004-2007 Sara Golemon - * Copyright (c) 2005,2006 Mikhail Gusarov - * Copyright (c) 2006-2007 The Written Word, Inc. - * Copyright (c) 2007 Eli Fant - * Copyright (c) 2009-2014 Daniel Stenberg - * Copyright (C) 2008, 2009 Simon Josefsson - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the copyright holder nor the names - * of any other contributors may be used to endorse or - * promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - */ \ No newline at end of file diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 7949dc64e69755..329373712808c3 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -4,20 +4,39 @@ vcpkg_from_github( REF libssh2-1.10.0 SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F HEAD_REF master - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch" + PATCHES + 0001-Fix-UWP.patch + 0002-fix-macros.patch ) -vcpkg_configure_cmake( +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + zlib ENABLE_ZLIB_COMPRESSION +) + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF - -DENABLE_ZLIB_COMPRESSION=ON + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DENABLE_DEBUG_LOGGING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef LIBSSH2_WIN32" "if 1") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 1") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0") + endif() +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") @@ -25,8 +44,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2) - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libssh2" RENAME copyright) -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index 9dc048318fad39..f1215ecce569ca 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,10 +1,30 @@ { "name": "libssh2", "version": "1.10.0", + "port-version": 1, "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", + "license": "BSD-3-Clause", "dependencies": [ "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ "zlib" - ] + ], + "features": { + "zlib": { + "description": "Use compressing via zlib", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index f002c0171a3c4b..0db4dbac01ee44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3990,7 +3990,7 @@ }, "libssh2": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 1 }, "libstemmer": { "baseline": "2017-9", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 0d3fbfbeb86152..44b1bff0d855aa 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c6dd977de517dc2091377a58c55b7d23f2bc3a0", + "version": "1.10.0", + "port-version": 1 + }, { "git-tree": "996df01b95684f41e8870b9154aeea3bffc63840", "version": "1.10.0", From 97113b43b3b6905a8c583900a0540471cfa88d6e Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 4 Mar 2022 11:33:15 -0800 Subject: [PATCH 15/64] [azure-core-cpp] Update to 1.4.0 (#23371) ## 1.4.0 (2022-03-03) ### Features Added - Stabilized the beta features and changes. --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 82279f8f189b31..3f6a0c7e37874a 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.3.1 - SHA512 affdd6387b5b40f0362d4151f91b1a0f3d0269189240baf981e31a9a1860b77d7fcfeb7819f93f9b1e5764ab1ba2190cf1c6261f23345e0928453550f8537de1 + REF azure-core_1.4.0 + SHA512 08359026469beeeaf9e7318da00683fa58943a093fc690fc0701ed99d4baf28834b42a19794eeae9df8fca70f35cda34809298bba45cb04a363b2475e93ad974 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 91bf1818164b37..b5a171ae335848 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.3.1", + "version-semver": "1.4.0", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index f51e6c6f320473..c790d0328454ca 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73975ac66807a0477bcaa3fa75fdfaf0f74bdb06", + "version-semver": "1.4.0", + "port-version": 0 + }, { "git-tree": "b34bd865f3d3caf5b7021d5e9048d775b3e9cfb0", "version-semver": "1.3.1", diff --git a/versions/baseline.json b/versions/baseline.json index 0db4dbac01ee44..06be615a1d8715 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -317,7 +317,7 @@ "port-version": 2 }, "azure-core-cpp": { - "baseline": "1.3.1", + "baseline": "1.4.0", "port-version": 0 }, "azure-identity-cpp": { From 54ab0528f86d847f8ff4954f51a51ee1689d809c Mon Sep 17 00:00:00 2001 From: Gregory Popovitch Date: Fri, 4 Mar 2022 14:35:45 -0500 Subject: [PATCH 16/64] [parallel-hashmap] update version to 1.34 (#23365) * [parallel-hashmap] update version to 1.34 * run `vcpkg x-add-version --all` and change `version-string` to `version` * make suggested changes * add changes suggested by @JonLui1993 * ran `vcpkg x-add-version --all ` as suggested * update version * update parallel-hashmap.json Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/parallel-hashmap/portfile.cmake | 11 +++++------ ports/parallel-hashmap/vcpkg.json | 12 +++++++++--- versions/baseline.json | 4 ++-- versions/p-/parallel-hashmap.json | 5 +++++ 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index e8b81b15d18176..044226d8bf2f6c 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -3,17 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.33 - SHA512 287f098229153d925632e68e3cdbabfae0ea0ab8864089e4c0553a166c6079ca82ed5246ba53afd2a2917abcf06f37bc18f098e721f5f3b8def4d2d8c1c8c745 + REF 1.34 + SHA512 3747422e80406aa77b009adee3c16325640dd1044560882fb881dac5ef4109f7d165d26ed7e64002c9285275f95962725ce20c918da12c0c113999c8ca3c7429 HEAD_REF master ) # Use greg7mdp/parallel-hashmap's own build process, skipping examples and tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Delete redundant directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index b1d7230cf1d651..8393345a885e6b 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,12 @@ { "name": "parallel-hashmap", - "version-string": "1.33", - "port-version": 1, - "description": "A header-only, very fast and memory-friendly family of C++ hash maps." + "version": "1.34", + "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 06be615a1d8715..248281bc007375 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5221,8 +5221,8 @@ "port-version": 1 }, "parallel-hashmap": { - "baseline": "1.33", - "port-version": 1 + "baseline": "1.34", + "port-version": 0 }, "parallelstl": { "baseline": "20200330", diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index eb98c22e2cadb4..eadbb281397c44 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f72efb2dae42b2f746be8e239b00b707b3a61449", + "version": "1.34", + "port-version": 0 + }, { "git-tree": "4c8c5305bf3135855a29acfde1effc1f9897ea4d", "version-string": "1.33", From 89f1922df7fc2d558b2bebd09c03c0b37e05664f Mon Sep 17 00:00:00 2001 From: Bobby Reynolds <37971212+reynoldsbd@users.noreply.github.com> Date: Fri, 4 Mar 2022 13:28:09 -0800 Subject: [PATCH 17/64] [libjpeg-turbo] Upgrade to 2.1.3 (#23280) --- ports/libjpeg-turbo/portfile.cmake | 4 ++-- ports/libjpeg-turbo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 8a4ab26554aa3b..752617c45eae0a 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo - REF ecf021bc0d6f435daacff7c35ccaeef0145df1b9 # 2.1.2 - SHA512 74ca399599f785e8c8c271f57f73c17acf6eadbd27c0c62aa1f95bbcb51542fd92aa19b4beee811c73902085fbcd365236dcc579726372c09fa9b12c2599d0f5 + REF c5f269eb9665435271c05fbcaf8721fa58e9eafa # 2.1.3 + SHA512 5d1c3cbbc7628339cfedc0f81a65ceb972aba2b8ffcc72d001f87526d0ff468f83665c78165051aa95c39200d9aaa6aee76e01266a4ea9cddb678dc6ef17ec27 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index c5ee4936c6acb4..f82e4ed431d0ed 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjpeg-turbo", - "version": "2.1.2", + "version": "2.1.3", "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 248281bc007375..23fe62c4bec688 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3629,7 +3629,7 @@ "port-version": 3 }, "libjpeg-turbo": { - "baseline": "2.1.2", + "baseline": "2.1.3", "port-version": 0 }, "libjuice": { diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index ce4a07cbfd2851..8845498f52c5cb 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "987bbe2533672eff1aaf160f0f36c818a1f986ee", + "version": "2.1.3", + "port-version": 0 + }, { "git-tree": "b37f789a1bb562a1469e0c30cf195c641ab824a6", "version": "2.1.2", From 59f1aea1b1095292b6c24bfba6982764048a63dc Mon Sep 17 00:00:00 2001 From: Edoardo Lolletti Date: Fri, 4 Mar 2022 22:30:30 +0100 Subject: [PATCH 18/64] [libgit2] Update to 1.4.2 (#23184) * Update libgit2 to 1.4.2 * Update versions jsons * Update ports/libgit2/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libgit2/fix-configcmake.patch | 62 +++++++++++++++-------------- ports/libgit2/portfile.cmake | 8 ++-- ports/libgit2/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libgit2.json | 5 +++ 5 files changed, 44 insertions(+), 38 deletions(-) diff --git a/ports/libgit2/fix-configcmake.patch b/ports/libgit2/fix-configcmake.patch index 3f860a656e0bc7..1cc67d89741a11 100644 --- a/ports/libgit2/fix-configcmake.patch +++ b/ports/libgit2/fix-configcmake.patch @@ -1,32 +1,34 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fdb3673..da1f972 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -125,7 +125,6 @@ include(SelectHashes) - target_sources(git2internal PRIVATE ${SRC_SHA1}) - +diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake +index 2a3a91b8c..cbb409350 100644 +--- a/cmake/SelectRegex.cmake ++++ b/cmake/SelectRegex.cmake +@@ -1,5 +1,4 @@ # Specify regular expression implementation --FIND_PACKAGE(PCRE) +-find_package(PCRE) - IF(REGEX_BACKEND STREQUAL "") - CHECK_SYMBOL_EXISTS(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) -@@ -159,8 +158,8 @@ ELSEIF(REGEX_BACKEND STREQUAL "pcre") - ADD_FEATURE_INFO(regex ON "using system PCRE") - SET(GIT_REGEX_PCRE 1) + if(REGEX_BACKEND STREQUAL "") + check_symbol_exists(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) +@@ -33,8 +32,8 @@ elseif(REGEX_BACKEND STREQUAL "pcre") + add_feature_info(regex ON "using system PCRE") + set(GIT_REGEX_PCRE 1) -- LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) -- LIST(APPEND LIBGIT2_LIBS ${PCRE_LIBRARIES}) -+ FIND_PACKAGE(unofficial-pcre CONFIG REQUIRED) -+ LIST(APPEND LIBGIT2_LIBS unofficial::pcre::pcre) - LIST(APPEND LIBGIT2_PC_REQUIRES "libpcre") - ELSEIF(REGEX_BACKEND STREQUAL "regcomp") - ADD_FEATURE_INFO(regex ON "using system regcomp") -@@ -424,10 +423,28 @@ IF (MSVC_IDE) - ENDIF () +- list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) +- list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES}) ++ find_package(unofficial-pcre CONFIG REQUIRED) ++ list(APPEND LIBGIT2_SYSTEM_LIBS unofficial::pcre::pcre) + list(APPEND LIBGIT2_PC_REQUIRES "libpcre") + elseif(REGEX_BACKEND STREQUAL "regcomp") + add_feature_info(regex ON "using system regcomp") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e7b54d036..6b549deef 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -298,10 +298,28 @@ if(MSVC_IDE) + endif() # Install --INSTALL(TARGETS git2 -+INSTALL(TARGETS git2 EXPORT unofficial-git2Targets +-install(TARGETS git2 ++install(TARGETS git2 EXPORT unofficial-git2Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -38,16 +40,16 @@ index fdb3673..da1f972 100644 +) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" +[[include(CMakeFindDependencyMacro) -+IF(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") ++if(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") + find_dependency(ZLIB) -+ENDIF() -+IF(@REGEX_BACKEND@ STREQUAL "pcre") ++endif() ++if(@REGEX_BACKEND@ STREQUAL "pcre") + find_dependency(unofficial-pcre CONFIG) -+ENDIF() ++endif() +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-git2Targets.cmake") +]]) +configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake DESTINATION share/unofficial-git2) + - INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 1f3a9a0d757085..867d0b175f3949 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF v1.3.0 - SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e - HEAD_REF master + REF v1.4.2 + SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277 + HEAD_REF maint/v1.4 PATCHES fix-configcmake.patch ) @@ -67,7 +67,7 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_CLAR=OFF + -DBUILD_TESTS=OFF -DUSE_HTTP_PARSER=system -DUSE_HTTPS=${USE_HTTPS} -DREGEX_BACKEND=${REGEX_BACKEND} diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index 7ecca211e2fa78..1614564db7fb8c 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgit2", - "version-semver": "1.3.0", - "port-version": 2, + "version-semver": "1.4.2", "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 23fe62c4bec688..03aeb5a40c77d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3529,8 +3529,8 @@ "port-version": 0 }, "libgit2": { - "baseline": "1.3.0", - "port-version": 2 + "baseline": "1.4.2", + "port-version": 0 }, "libgnutls": { "baseline": "3.6.15", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 6eeb5426acfe3b..170466619c5b3f 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e036ca61d2e12b110c920cadf92f0aa4f39cac9b", + "version-semver": "1.4.2", + "port-version": 0 + }, { "git-tree": "37f2b6e92b60481a4db74de9da17385706d7d2e9", "version-semver": "1.3.0", From ce25440a3591437d87db3dd8f9d7f13cebbd946d Mon Sep 17 00:00:00 2001 From: injae <8687lee@gmail.com> Date: Sat, 5 Mar 2022 06:37:19 +0900 Subject: [PATCH 19/64] [serdepp] add new port (#22455) * update version * versions/s-/serdepp.json test * version serdepp.json update * remove serdepp features * portfile.cmake update and remove features * update version * update description * update description * version update * update description * update version * disable_parallel_configure ON * version update * add script find_package(Git) * version update * git_executable test * version update * [serdepp] new port * [serdepp] version update * 0.1.4-pre -> 0.1.4 * vcpkg version update * vcpkg version refresh * version update * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update * baseline update Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/serdepp/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/serdepp/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/serdepp.json | 9 +++++++++ 4 files changed, 60 insertions(+) create mode 100644 ports/serdepp/portfile.cmake create mode 100644 ports/serdepp/vcpkg.json create mode 100644 versions/s-/serdepp.json diff --git a/ports/serdepp/portfile.cmake b/ports/serdepp/portfile.cmake new file mode 100644 index 00000000000000..3e347b7c91c324 --- /dev/null +++ b/ports/serdepp/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO injae/serdepp + REF v0.1.4 + SHA512 da84ad82e882c0cada5c9dd3c77afd45aaf7b3b4eb150257b09b9b4854b349fdb2c39be2f6ba40bb39b34262e44609a02afba1ec860625f25a2313f7ac34a055 + HEAD_REF main +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSERDEPP_BUILD_TESTING=OFF + -DENABLE_INLINE_CPPM_TOOLS=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/serdepp) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/lib/cmake" +) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/serdepp/vcpkg.json b/ports/serdepp/vcpkg.json new file mode 100644 index 00000000000000..0bf3d3c7ac235f --- /dev/null +++ b/ports/serdepp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "serdepp", + "version": "0.1.4", + "description": "c++ 17 universal serialize deserialize library like rust serde, support libraries: [nlohmann_json, fmt, yaml-cpp, toml11, rapidjson]", + "homepage": "https://github.com/injae/serdepp", + "license": "MIT", + "dependencies": [ + "magic-enum", + "nameof", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 03aeb5a40c77d7..548eb689bfe7f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6356,6 +6356,10 @@ "baseline": "0.30.4", "port-version": 0 }, + "serdepp": { + "baseline": "0.1.4", + "port-version": 0 + }, "sf2cute": { "baseline": "0.2.0", "port-version": 2 diff --git a/versions/s-/serdepp.json b/versions/s-/serdepp.json new file mode 100644 index 00000000000000..a6effc714a29e4 --- /dev/null +++ b/versions/s-/serdepp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "37783a8fa004467ce9ee44c8f1e79fd994abd8e7", + "version": "0.1.4", + "port-version": 0 + } + ] +} From b44c4dd0e247fea49a6f51a154b4bd6a0d300155 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 5 Mar 2022 05:43:33 +0800 Subject: [PATCH 20/64] [7-zip] update to <21.07> (#23029) * [7-zip] update to <21.07> * update version * only support windows * update version * support !uwp * update version * update license and license path, support arm64-windows, * UPDATE LICENSE * update version * update export and portfile.cmake * overwrite version * delete unused license, add fix absolute path * udpate version * add config_fixup * update version * update CMakeLists.txt * update version --- ports/7zip/CMakeLists.txt | 115 ++++++++++++++++++++++---------------- ports/7zip/License.txt | 90 ----------------------------- ports/7zip/portfile.cmake | 22 ++++---- ports/7zip/vcpkg.json | 16 +++++- versions/7-/7zip.json | 5 ++ versions/baseline.json | 4 +- 6 files changed, 99 insertions(+), 153 deletions(-) delete mode 100644 ports/7zip/License.txt diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt index 4ed90058413b0c..ec45bf6811b398 100644 --- a/ports/7zip/CMakeLists.txt +++ b/ports/7zip/CMakeLists.txt @@ -1,23 +1,17 @@ -# Created from 7-zip v19.00 - 7zip/CPP/7zip/Bundles/Format7zF -cmake_minimum_required(VERSION 3.11) -cmake_policy(VERSION 3.11) +cmake_minimum_required(VERSION 3.19) -project(7zip LANGUAGES C CXX ASM_MASM) +project(7zip LANGUAGES C CXX) -set(SRC_ASM - Asm/x86/AesOpt.asm - Asm/x86/7zCrcOpt.asm - Asm/x86/XzCrc64Opt.asm -) - -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set_source_files_properties(${SRC_ASM} PROPERTIES COMPILE_FLAGS "-Dx64") -else() - set_source_files_properties(${SRC_ASM} PROPERTIES COMPILE_FLAGS "-safeseh") +if(VCPKG_TARGET_IS_WINDOWS) + enable_language(ASM_MASM) +elseif(VCPKG_TARGET_IS_LINUX) + enable_language(ASM) endif() -set(SRC_COMPRESS +add_library(7zip) + +target_sources(7zip PRIVATE CPP/7zip/Compress/Bcj2Coder.cpp CPP/7zip/Compress/Bcj2Register.cpp CPP/7zip/Compress/BcjCoder.cpp @@ -68,9 +62,6 @@ set(SRC_COMPRESS CPP/7zip/Compress/ZlibEncoder.cpp CPP/7zip/Compress/ZDecoder.cpp CPP/7zip/Compress/CodecExports.cpp -) - -set(SRC_CRYPTO CPP/7zip/Crypto/7zAes.cpp CPP/7zip/Crypto/7zAesRegister.cpp CPP/7zip/Crypto/HmacSha1.cpp @@ -85,9 +76,7 @@ set(SRC_CRYPTO CPP/7zip/Crypto/WzAes.cpp CPP/7zip/Crypto/ZipCrypto.cpp CPP/7zip/Crypto/ZipStrong.cpp -) -set(SRC_C C/7zBuf2.c C/7zStream.c C/Alloc.c @@ -113,6 +102,7 @@ set(SRC_C C/MtDec.c C/Ppmd7.c C/Ppmd7Dec.c + C/Ppmd7aDec.c C/Ppmd7Enc.c C/Ppmd8.c C/Ppmd8Dec.c @@ -128,24 +118,16 @@ set(SRC_C C/Aes.c C/7zCrc.c C/XzCrc64.c -) -set_source_files_properties( - ${SRC_COMPRESS} - ${SRC_CRYPTO} - ${SRC_C} - PROPERTIES - COMPILE_FLAGS $<$:"/O2"> -) - -set(SRC_OTHER CPP/Common/CRC.cpp CPP/Common/CrcReg.cpp CPP/Common/DynLimBuf.cpp CPP/Common/IntToString.cpp + CPP/Common/LzFindPrepare.cpp CPP/Common/MyMap.cpp CPP/Common/MyString.cpp CPP/Common/MyVector.cpp + CPP/Common/MyWindows.cpp CPP/Common/MyXml.cpp CPP/Common/NewHandler.cpp CPP/Common/Sha1Reg.cpp @@ -193,6 +175,7 @@ set(SRC_OTHER CPP/7zip/Archive/ArHandler.cpp CPP/7zip/Archive/ArjHandler.cpp CPP/7zip/Archive/Bz2Handler.cpp + CPP/7zip/Archive/Base64Handler.cpp CPP/7zip/Archive/ComHandler.cpp CPP/7zip/Archive/CpioHandler.cpp CPP/7zip/Archive/CramfsHandler.cpp @@ -303,32 +286,72 @@ set(SRC_OTHER CPP/7zip/Archive/Zip/ZipOut.cpp CPP/7zip/Archive/Zip/ZipUpdate.cpp CPP/7zip/Archive/Zip/ZipRegister.cpp -) -add_library(7zip - ${SRC_ASM} - ${SRC_OTHER} - ${SRC_COMPRESS} - ${SRC_CRYPTO} - ${SRC_C} CPP/7zip/Archive/Archive2.def C/Util/LzmaLib/LzmaLib.def ) +# 7zCrcOpt # AesOpt # Sha1Opt # Sha256Opt # XzCrc64Opt # LzFindOpt +set(WINDOWS_PRIVATE_HEADERS + Asm/x86/7zCrcOpt.asm + Asm/x86/AesOpt.asm + Asm/x86/Sha1Opt.asm + Asm/x86/Sha256Opt.asm + Asm/x86/XzCrc64Opt.asm + Asm/x86/LzFindOpt.asm +) +set(WINDOWS_PRIVATE_SOURCE_FILES + C/7zCrcOpt.c + C/AesOpt.c + C/Sha1Opt.c + C/Sha256Opt.c + C/XzCrc64Opt.c + C/LzFindOpt.c +) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE ${WINDOWS_PRIVATE_HEADERS}) + set_source_files_properties(${WINDOWS_PRIVATE_HEADERS} PROPERTIES LANGUAGE ASM_MASM) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + #target_sources(7zip PRIVATE Asm/arm/7zCrcOpt.asm) + target_sources(7zip PRIVATE C/7zCrcOpt.c) + else() + target_sources(7zip PRIVATE ${WINDOWS_PRIVATE_SOURCE_FILES}) + endif() +else() + target_sources(7zip PRIVATE ${WINDOWS_PRIVATE_SOURCE_FILES}) +endif() + +# LzmaDecOpt +target_sources(7zip PRIVATE C/LzmaDec.c) +if((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR + (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + ) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/LzmaDecOpt.asm) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM_MASM) + elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + target_sources(7zip PRIVATE Asm/arm64/LzmaDecOpt.S) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM) + endif() + + get_source_file_property(defs C/LzmaDec.c COMPILE_DEFINITIONS) + list(APPEND defs "_LZMA_DEC_OPT") + set_source_files_properties(C/LzmaDec.c PROPERTIES COMPILE_DEFINITIONS "${defs}") +endif() + target_compile_definitions(7zip PUBLIC + -D_REENTRANT + -D_FILE_OFFSET_BITS=64 + -D_LARGEFILE_SOURCE -DEXTERNAL_CODECS -D_7ZIP_LARGE_PAGES -DUNICODE -D_UNICODE ) -target_compile_options(7zip - PRIVATE - /wd5043 - $<$:/guard:cf> -) - target_include_directories(7zip INTERFACE $/7zip/CPP @@ -359,7 +382,7 @@ set(PUBLIC_HEADERS install( TARGETS 7zip - EXPORT 7zip + EXPORT 7zip-targets ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin @@ -376,9 +399,7 @@ foreach(HEADER ${PUBLIC_HEADERS}) endforeach() install( - EXPORT 7zip + EXPORT 7zip-targets DESTINATION share/7zip - FILE 7zipConfig.cmake NAMESPACE 7zip:: - CONFIGURATIONS Release ) diff --git a/ports/7zip/License.txt b/ports/7zip/License.txt deleted file mode 100644 index e9113842cecc6f..00000000000000 --- a/ports/7zip/License.txt +++ /dev/null @@ -1,90 +0,0 @@ - 7-Zip source code - ~~~~~~~~~~~~~~~~~ - License for use and distribution - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - 7-Zip Copyright (C) 1999-2019 Igor Pavlov. - - The licenses for files are: - - 1) CPP/7zip/Compress/Rar* files: the "GNU LGPL" with "unRAR license restriction" - 2) CPP/7zip/Compress/LzfseDecoder.cpp: the "BSD 3-clause License" - 3) Some files are "public domain" files, if "public domain" status is stated in source file. - 4) the "GNU LGPL" for all other files. If there is no license information in - some source file, that file is under the "GNU LGPL". - - The "GNU LGPL" with "unRAR license restriction" means that you must follow both - "GNU LGPL" rules and "unRAR license restriction" rules. - - - - - GNU LGPL information - -------------------- - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - - - - BSD 3-clause License - -------------------- - - The "BSD 3-clause License" is used for the code in LzfseDecoder.cpp that implements LZFSE data decompression. - That code was derived from the code in the "LZFSE compression library" developed by Apple Inc, - that also uses the "BSD 3-clause License": - - ---- - Copyright (c) 2015-2016, Apple Inc. All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the distribution. - - 3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ---- - - - - - unRAR license restriction - ------------------------- - - The decompression engine for RAR archives was developed using source - code of unRAR program. - All copyrights to original unRAR code are owned by Alexander Roshal. - - The license for original unRAR code has the following restriction: - - The unRAR sources cannot be used to re-create the RAR compression algorithm, - which is proprietary. Distribution of modified unRAR sources in separate form - or as a part of other software is permitted, provided that it is clearly - stated in the documentation and source comments that the code may - not be used to develop a RAR (WinRAR) compatible archiver. - - - -- - Igor Pavlov diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake index 4d88583b956d38..2e6287f359e237 100644 --- a/ports/7zip/portfile.cmake +++ b/ports/7zip/portfile.cmake @@ -1,8 +1,8 @@ -set(7ZIP_VERSION 19.00) +set(7ZIP_VERSION 21.07) vcpkg_download_distfile(ARCHIVE - URLS "https://www.7-zip.org/a/7z1900-src.7z" - FILENAME "7z1900-src.7z" - SHA512 d68b308e175224770adc8b1495f1ba3cf3e7f67168a7355000643d3d32560ae01aa34266f0002395181ed91fb5e682b86e0f79c20625b42d6e2c62dd24a5df93 + URLS "https://www.7-zip.org/a/7z2107-src.7z" + FILENAME "7z2107-src.7z" + SHA512 c13521a9829ac239a89015e1f5da27eeaa2469754e3f8ca32311d964ea9d0b40a17e4f8ccbd425d3e865aa768be345368f1c36f354d5710ac7cb2749dd6a3ab5 ) vcpkg_extract_source_archive_ex( @@ -14,17 +14,17 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + file( - INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/DOC/License.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index e0f7bb59ae8848..1736264839e333 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,8 +1,18 @@ { "name": "7zip", - "version-string": "19.00", - "port-version": 4, + "version-string": "21.07", "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", - "supports": "!(linux | osx | arm | uwp)" + "license": "LGPL-2.1-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 6701c1367cd4d2..84f6ceafbd802d 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a951689070e40d8ff0ed20b4e18bc533ef5db1f", + "version-string": "21.07", + "port-version": 0 + }, { "git-tree": "54b143613df50187b48517d63796569641c4eee7", "version-string": "19.00", diff --git a/versions/baseline.json b/versions/baseline.json index 548eb689bfe7f0..9eee1d13bb39df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5,8 +5,8 @@ "port-version": 2 }, "7zip": { - "baseline": "19.00", - "port-version": 4 + "baseline": "21.07", + "port-version": 0 }, "abseil": { "baseline": "20211102.1", From bd602277bf7fc3188b3d086b302c6840464db900 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 4 Mar 2022 23:16:47 +0100 Subject: [PATCH 21/64] [vcpkg.cmake] Setup CMAKE_PROGRAM_PATH for the host if possible (#23322) * Use host tools by default. * use GLOB_RECURSE and filter the result * be positiv ;) * give me debug output * Revert "give me debug output" This reverts commit 17737bceda8ed0dbe1a60c2fd831a55e53707dcd. * remove unnecessary if(IS_DIRECTORY) Co-authored-by: Alexander Neumann --- scripts/buildsystems/vcpkg.cmake | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 5a475b00f9f017..3e8fd726054e81 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -517,13 +517,26 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C endif() endif() -list(APPEND CMAKE_PROGRAM_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") -file(GLOB Z_VCPKG_TOOLS_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*") -foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) - if(IS_DIRECTORY "${Z_VCPKG_TOOLS_DIR}") - list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") +option(VCPKG_SETUP_CMAKE_PROGRAM_PATH "Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths" ON) +cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "NOT VCPKG_HOST_TRIPLET STREQUAL \"\"" OFF) + +if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") + if(VCPKG_USE_HOST_TOOLS) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") endif() -endforeach() + list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") + file(GLOB_RECURSE Z_VCPKG_TOOLS_DIRS "${tools_base_path}/*") + file(GLOB_RECURSE Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES}) + list(FILTER Z_VCPKG_TOOLS_DIRS EXCLUDE REGEX "/debug/") + foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) + list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") + endforeach() + unset(Z_VCPKG_TOOLS_DIRS) + unset(Z_VCPKG_TOOLS_DIR) + unset(tools_base_path) +endif() cmake_policy(POP) From 54de40278a1b07c56a55b5f6b03c0f8919b69260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 8 Mar 2022 02:58:06 +0800 Subject: [PATCH 22/64] [vcpkg baseline][onnx] Fix find dependency protobuf (#23411) * [onnx] Fix find dependency protobuf * version --- ports/onnx/fix-dependency-protobuf.patch | 12 ++++++++++++ ports/onnx/portfile.cmake | 1 + ports/onnx/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/onnx.json | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/onnx/fix-dependency-protobuf.patch diff --git a/ports/onnx/fix-dependency-protobuf.patch b/ports/onnx/fix-dependency-protobuf.patch new file mode 100644 index 00000000000000..6ccdac66502656 --- /dev/null +++ b/ports/onnx/fix-dependency-protobuf.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1295eab..0fb9f17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,6 +126,7 @@ if(ONNX_BUILD_TESTS) + include(googletest) + endif() + ++find_package(protobuf CONFIG REQUIRED) + if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf)) + # Sometimes we need to use protoc compiled for host architecture while linking + # libprotobuf against target architecture. See https://github.com/caffe2/caffe diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index 61c36b56f24c7f..8070f6dd9f494e 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( SHA512 7519d326cd2b2b13a269ec0d01af07c32115d183dae6e1eaae55f5b23b6c92b2aadbb2b1e555557f4201bbcf921fa563d09d45d7f1d3bd2399c1a94a6ef63303 PATCHES fix-cmakelists.patch + fix-dependency-protobuf.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 069934dd73562a..2eaace7ced619b 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onnx", "version-semver": "1.10.2", + "port-version": 1, "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9eee1d13bb39df..8c9d31e98dc600 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4958,7 +4958,7 @@ }, "onnx": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "onnx-optimizer": { "baseline": "0.2.6", diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index de8a62fc6f5682..a61d8ee3f3c151 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62ee0b78332273115540d669065a467314aace3a", + "version-semver": "1.10.2", + "port-version": 1 + }, { "git-tree": "a83605bd84787898f92ada1bf1874e162a441c10", "version-semver": "1.10.2", From c8baa4708abf9118e26fb1d1950596e874448fad Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 7 Mar 2022 20:01:14 +0100 Subject: [PATCH 23/64] [vcpkg baseline][vcpkg toolchain] Fix toolchain usage with CMake <= 3.19 (#23410) * Fix toolchain usage with CMake <= 3.19 * Add quotes * Merge Neumann-A:fix_tools_selection into dg0yt:cmake-3.19-quirk Co-authored-by: JackBoosY --- scripts/buildsystems/vcpkg.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 3e8fd726054e81..ceac24ffd84212 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -518,7 +518,12 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C endif() option(VCPKG_SETUP_CMAKE_PROGRAM_PATH "Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths" ON) -cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "NOT VCPKG_HOST_TRIPLET STREQUAL \"\"" OFF) +set(VCPKG_CAN_USE_HOST_TOOLS OFF) +if(DEFINED VCPKG_HOST_TRIPLET AND NOT VCPKG_HOST_TRIPLET STREQUAL "") + set(VCPKG_CAN_USE_HOST_TOOLS ON) +endif() +cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "VCPKG_CAN_USE_HOST_TOOLS" OFF) +unset(VCPKG_CAN_USE_HOST_TOOLS) if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") @@ -526,9 +531,9 @@ if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") endif() list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") - file(GLOB_RECURSE Z_VCPKG_TOOLS_DIRS "${tools_base_path}/*") + file(GLOB_RECURSE Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") file(GLOB_RECURSE Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") - list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES}) + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES} "") # need at least one item for REMOVE_ITEM if CMake <= 3.19 list(FILTER Z_VCPKG_TOOLS_DIRS EXCLUDE REGEX "/debug/") foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") From da8e236bf28acdc7a68405b2c6d61b76766f161f Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 8 Mar 2022 03:03:48 +0800 Subject: [PATCH 24/64] [WinReg] update to v5.0.0 (#23409) * [WinReg] update to v5.0.0 * [WinReg] update to v5.0.0 * add license * update version * delete extra space * update version --- ports/winreg/portfile.cmake | 4 ++-- ports/winreg/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/w-/winreg.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index a317df740c7ef3..baa5775f25baeb 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF 2594342b7fe6065430bc377961c37d30614cb4ff #v4.1.2 - SHA512 924cdb77518c3f0843e95cd7e7d4626d4c0c466444cd79fdfa6943975154a54f4eb0d4bd45b8d37d73c650467b1d2728543176688f356c5100d98810e95c9fe8 + REF bcdce7361be8409887adac6f6b5cb0a436a489aa #v5.0.0 + SHA512 8a112cc505ba9ec4431e80ee77b6a08389ea8ed92c2d75be191e2494818913ad01d6b4cc0ccf213dd2dd3455594434ba3876fa385e71bdbb758797672c844d8d HEAD_REF master ) diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index e2cd34ffacc224..d3588bdf49ecdc 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,8 +1,8 @@ { "name": "winreg", - "version": "4.1.2", - "port-version": 1, + "version": "5.0.0", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", - "supports": "windows" + "license": "MIT", + "supports": "windows | uwp" } diff --git a/versions/baseline.json b/versions/baseline.json index 8c9d31e98dc600..65db4f6fe7d103 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7361,8 +7361,8 @@ "port-version": 0 }, "winreg": { - "baseline": "4.1.2", - "port-version": 1 + "baseline": "5.0.0", + "port-version": 0 }, "winsock2": { "baseline": "0.0", diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index f236630184ebf1..8f257f3dd1ee3b 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a788126cfabb1299a7f43933fec7ced6074a7939", + "version": "5.0.0", + "port-version": 0 + }, { "git-tree": "303a59adfcedbd8c8acdc053ec6b1139d056ecae", "version": "4.1.2", From bfc00415da7e612208f7dd25f41f3fbca8d327a0 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 7 Mar 2022 11:06:01 -0800 Subject: [PATCH 25/64] [opencolorio] Fix tools build error (#23408) * [opencolorio] Fix tools build error * update license * update version Co-authored-by: Lily Wang --- ports/opencolorio/fix-buildTools.patch | 13 +++++++++++++ ports/opencolorio/portfile.cmake | 1 + ports/opencolorio/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/opencolorio.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/opencolorio/fix-buildTools.patch diff --git a/ports/opencolorio/fix-buildTools.patch b/ports/opencolorio/fix-buildTools.patch new file mode 100644 index 00000000000000..24b1c3fd850a4c --- /dev/null +++ b/ports/opencolorio/fix-buildTools.patch @@ -0,0 +1,13 @@ +diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt +index b992bbc..804d3c5 100644 +--- a/src/OpenColorIO/CMakeLists.txt ++++ b/src/OpenColorIO/CMakeLists.txt +@@ -248,7 +248,7 @@ if(NOT BUILD_SHARED_LIBS) + else() + # Only exports selected symbols. + target_compile_definitions(OpenColorIO +- PUBLIC ++ PRIVATE + OpenColorIO_EXPORTS + ) + endif() diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index c024129f0cd464..9465e4978a9b30 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-dependency.patch + fix-buildTools.patch ) file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake") diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index 6bf6d0d3317342..751770137964ee 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "opencolorio", "version-semver": "2.1.1", - "port-version": 1, + "port-version": 2, "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 65db4f6fe7d103..cbfe73781e36cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5002,7 +5002,7 @@ }, "opencolorio": { "baseline": "2.1.1", - "port-version": 1 + "port-version": 2 }, "opencolorio-tools": { "baseline": "1.1.1", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 99cec394e31e73..ac457821ba1b2d 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80e8a46f8c1c2cd748834cd225edbe127a489d5a", + "version-semver": "2.1.1", + "port-version": 2 + }, { "git-tree": "c68079d3d055b028af29997748784c7fa8457f7c", "version-semver": "2.1.1", From b25bcfcc2c996d63ddda3023647630821d10fc1c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 7 Mar 2022 20:09:47 +0100 Subject: [PATCH 26/64] [anax] fix osx-arm64 build (#23405) --- ports/anax/osx-arm.patch | 15 +++++++++++++++ ports/anax/portfile.cmake | 13 ++++++------- ports/anax/vcpkg.json | 13 ++++++++++--- versions/a-/anax.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 ports/anax/osx-arm.patch diff --git a/ports/anax/osx-arm.patch b/ports/anax/osx-arm.patch new file mode 100644 index 00000000000000..450cd82e200371 --- /dev/null +++ b/ports/anax/osx-arm.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d427767..80965bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,10 +154,6 @@ set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES + SOVERSION ${ANAX_VERSION_MAJOR} + ) + +-if(APPLE) +- set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES OSX_ARCHITECTURES "i386;x86_64;") +-endif() +- + # Library files + install( + TARGETS ${ANAX_LIBRARY_NAME} diff --git a/ports/anax/portfile.cmake b/ports/anax/portfile.cmake index 411e0483078f4a..56c9156b8daa98 100644 --- a/ports/anax/portfile.cmake +++ b/ports/anax/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( HEAD_REF master PATCHES Add-bin-output.patch + osx-arm.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/anax) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/anax/LICENSE ${CURRENT_PACKAGES_DIR}/share/anax/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/anax/vcpkg.json b/ports/anax/vcpkg.json index 1b44cd38d6e519..fbaeb17bbe40e1 100644 --- a/ports/anax/vcpkg.json +++ b/ports/anax/vcpkg.json @@ -1,7 +1,14 @@ { "name": "anax", - "version-string": "2.1.0", - "port-version": 7, + "version": "2.1.0", + "port-version": 8, "description": "An open source C++ entity system.", - "homepage": "https://github.com/miguelmartin75/anax" + "homepage": "https://github.com/miguelmartin75/anax", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/a-/anax.json b/versions/a-/anax.json index 99ff1a18737ba7..9566506ae08a53 100644 --- a/versions/a-/anax.json +++ b/versions/a-/anax.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db4b3bfeef52da822588d5bb85a4b3bf9affa80f", + "version": "2.1.0", + "port-version": 8 + }, { "git-tree": "347d15eb157a2bad09742ec97dfc417674936982", "version-string": "2.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index cbfe73781e36cd..ca9e7cb7aead9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -78,7 +78,7 @@ }, "anax": { "baseline": "2.1.0", - "port-version": 7 + "port-version": 8 }, "angelscript": { "baseline": "2.35.1", From 7bb4b663f1d2964b00f60d42ef05d5fe208a5a77 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 7 Mar 2022 20:11:41 +0100 Subject: [PATCH 27/64] [ampl-asl] Add supports expression (#23403) --- ports/ampl-asl/portfile.cmake | 13 ++++++------- ports/ampl-asl/vcpkg.json | 17 ++++++++++++++--- versions/a-/ampl-asl.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ports/ampl-asl/portfile.cmake b/ports/ampl-asl/portfile.cmake index 6a8c55f80c3ede..fb6c664ca44fbf 100644 --- a/ports/ampl-asl/portfile.cmake +++ b/ports/ampl-asl/portfile.cmake @@ -13,9 +13,8 @@ vcpkg_from_github( install-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_MCMODELLARGE=OFF -DBUILD_DYNRT_LIBS=OFF # CRT linkage uses C/CXX FLAGS in vcpkg @@ -23,13 +22,13 @@ vcpkg_configure_cmake( -DBUILD_CPP=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-asl TARGET_PATH share/unofficial-asl) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-asl) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # from ampl-mp license -file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/ampl-asl/vcpkg.json b/ports/ampl-asl/vcpkg.json index f8acf57e2547a5..4b5c163b292b61 100644 --- a/ports/ampl-asl/vcpkg.json +++ b/ports/ampl-asl/vcpkg.json @@ -1,8 +1,19 @@ { "name": "ampl-asl", - "version-string": "2020-11-11", - "port-version": 2, + "version-date": "2020-11-11", + "port-version": 3, "description": "AMPL Solver Library", "homepage": "https://github.com/ampl/asl", - "supports": "!uwp" + "license": null, + "supports": "!uwp & !(osx & arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/ampl-asl.json b/versions/a-/ampl-asl.json index aad10ec2833a7a..02f6ff768cd0f3 100644 --- a/versions/a-/ampl-asl.json +++ b/versions/a-/ampl-asl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a88fb5c85a975bf5c5b49b6d87224b25504553d", + "version-date": "2020-11-11", + "port-version": 3 + }, { "git-tree": "024e7d3399beb537eb371c85181e48f4db51a4b0", "version-string": "2020-11-11", diff --git a/versions/baseline.json b/versions/baseline.json index ca9e7cb7aead9b..693555e3d7b36d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -66,7 +66,7 @@ }, "ampl-asl": { "baseline": "2020-11-11", - "port-version": 2 + "port-version": 3 }, "ampl-mp": { "baseline": "2020-11-11", From ad3d92ce59596fa822cbea8c8163bb858079a076 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Mon, 7 Mar 2022 14:14:40 -0500 Subject: [PATCH 28/64] [tcb-span] Add new port (#23393) * [tcb-span] Add new port * Add version * update portifile.cmake * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/tcb-span/portfile.cmake | 20 ++++++++++++++++++++ ports/tcb-span/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/t-/tcb-span.json | 9 +++++++++ 4 files changed, 40 insertions(+) create mode 100644 ports/tcb-span/portfile.cmake create mode 100644 ports/tcb-span/vcpkg.json create mode 100644 versions/t-/tcb-span.json diff --git a/ports/tcb-span/portfile.cmake b/ports/tcb-span/portfile.cmake new file mode 100644 index 00000000000000..48edffef3d4bf7 --- /dev/null +++ b/ports/tcb-span/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tcbrindle/span + REF 427f6bd0bbf36ad46aec4d8bdd7760beeb10dd33 # master commit 2021-12-15 + SHA512 c775bd50bc68d98fcde5e99bb9b6594c8ac9ef15fa15efe89c253b4135df77d83e58743d3c7e90d3aff03429251497a7d56d1900f6e258416c0664a82326243c + HEAD_REF master +) + +# Just a single header +file( + INSTALL "${SOURCE_PATH}/include/tcb/span.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/tcb" +) + +# Handle copyright +file( + INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/tcb-span/vcpkg.json b/ports/tcb-span/vcpkg.json new file mode 100644 index 00000000000000..777f195d002cb4 --- /dev/null +++ b/ports/tcb-span/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tcb-span", + "version-date": "2021-12-15", + "description": "Implementation of C++20's std::span for older compilers", + "homepage": "https://github.com/tcbrindle/span", + "license": "BSL-1.0" +} diff --git a/versions/baseline.json b/versions/baseline.json index 693555e3d7b36d..1c8adb3f3c0dcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6780,6 +6780,10 @@ "baseline": "2020_U3", "port-version": 7 }, + "tcb-span": { + "baseline": "2021-12-15", + "port-version": 0 + }, "tcl": { "baseline": "core-9-0-a1", "port-version": 5 diff --git a/versions/t-/tcb-span.json b/versions/t-/tcb-span.json new file mode 100644 index 00000000000000..64e48cc5286110 --- /dev/null +++ b/versions/t-/tcb-span.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "191bf0b7971f5aac50a5d81224d04e8f9aef7e38", + "version-date": "2021-12-15", + "port-version": 0 + } + ] +} From ddff8f2cd69fce08707ae1f163f69071f0c0a411 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 7 Mar 2022 22:27:29 +0300 Subject: [PATCH 29/64] [qt5] Update to 5.15.3 (#23364) --- ports/qt5-3d/vcpkg.json | 4 +- ports/qt5-activeqt/vcpkg.json | 4 +- ports/qt5-androidextras/vcpkg.json | 4 +- .../cmake/qt_download_submodule.cmake | 2 +- ports/qt5-base/cmake/qt_port_hashes.cmake | 95 +++++----- .../cmake/qt_port_hashes_latest.cmake | 92 +++++----- ports/qt5-base/patches/limits_include.patch | 38 ---- ports/qt5-base/vcpkg.json | 4 +- ports/qt5-charts/vcpkg.json | 4 +- ports/qt5-connectivity/vcpkg.json | 4 +- ports/qt5-datavis3d/vcpkg.json | 4 +- ports/qt5-declarative/portfile.cmake | 5 +- ports/qt5-declarative/vcpkg.json | 4 +- ports/qt5-doc/vcpkg.json | 4 +- ports/qt5-gamepad/vcpkg.json | 4 +- ports/qt5-graphicaleffects/vcpkg.json | 4 +- ports/qt5-imageformats/vcpkg.json | 3 +- ports/qt5-location/vcpkg.json | 4 +- ports/qt5-macextras/vcpkg.json | 4 +- ports/qt5-mqtt/portfile.cmake | 28 +-- ports/qt5-mqtt/vcpkg.json | 4 +- ports/qt5-multimedia/vcpkg.json | 4 +- ports/qt5-networkauth/vcpkg.json | 4 +- ports/qt5-purchasing/vcpkg.json | 4 +- ports/qt5-quickcontrols/vcpkg.json | 4 +- ports/qt5-quickcontrols2/vcpkg.json | 4 +- ports/qt5-remoteobjects/vcpkg.json | 4 +- ports/qt5-script/vcpkg.json | 4 +- ports/qt5-scxml/vcpkg.json | 4 +- ports/qt5-sensors/vcpkg.json | 4 +- ports/qt5-serialbus/vcpkg.json | 4 +- ports/qt5-serialport/vcpkg.json | 4 +- ports/qt5-speech/vcpkg.json | 4 +- ports/qt5-svg/vcpkg.json | 4 +- ports/qt5-tools/vcpkg.json | 4 +- ports/qt5-translations/vcpkg.json | 4 +- ports/qt5-virtualkeyboard/vcpkg.json | 4 +- ports/qt5-wayland/vcpkg.json | 4 +- ports/qt5-webchannel/vcpkg.json | 4 +- ports/qt5-webengine/vcpkg.json | 4 +- ports/qt5-webglplugin/vcpkg.json | 4 +- ports/qt5-websockets/vcpkg.json | 4 +- ports/qt5-webview/vcpkg.json | 4 +- ports/qt5-winextras/vcpkg.json | 4 +- ports/qt5-x11extras/vcpkg.json | 4 +- ports/qt5-xmlpatterns/vcpkg.json | 4 +- ports/qt5/vcpkg.json | 18 +- versions/baseline.json | 164 +++++++++--------- versions/q-/qt5-3d.json | 5 + versions/q-/qt5-activeqt.json | 5 + versions/q-/qt5-androidextras.json | 5 + versions/q-/qt5-base.json | 5 + versions/q-/qt5-charts.json | 5 + versions/q-/qt5-connectivity.json | 5 + versions/q-/qt5-datavis3d.json | 5 + versions/q-/qt5-declarative.json | 5 + versions/q-/qt5-doc.json | 5 + versions/q-/qt5-gamepad.json | 5 + versions/q-/qt5-graphicaleffects.json | 5 + versions/q-/qt5-imageformats.json | 5 + versions/q-/qt5-location.json | 5 + versions/q-/qt5-macextras.json | 5 + versions/q-/qt5-mqtt.json | 5 + versions/q-/qt5-multimedia.json | 5 + versions/q-/qt5-networkauth.json | 5 + versions/q-/qt5-purchasing.json | 5 + versions/q-/qt5-quickcontrols.json | 5 + versions/q-/qt5-quickcontrols2.json | 5 + versions/q-/qt5-remoteobjects.json | 5 + versions/q-/qt5-script.json | 5 + versions/q-/qt5-scxml.json | 5 + versions/q-/qt5-sensors.json | 5 + versions/q-/qt5-serialbus.json | 5 + versions/q-/qt5-serialport.json | 5 + versions/q-/qt5-speech.json | 5 + versions/q-/qt5-svg.json | 5 + versions/q-/qt5-tools.json | 5 + versions/q-/qt5-translations.json | 5 + versions/q-/qt5-virtualkeyboard.json | 5 + versions/q-/qt5-wayland.json | 5 + versions/q-/qt5-webchannel.json | 5 + versions/q-/qt5-webengine.json | 5 + versions/q-/qt5-webglplugin.json | 5 + versions/q-/qt5-websockets.json | 5 + versions/q-/qt5-webview.json | 5 + versions/q-/qt5-winextras.json | 5 + versions/q-/qt5-x11extras.json | 5 + versions/q-/qt5-xmlpatterns.json | 5 + versions/q-/qt5.json | 5 + 89 files changed, 480 insertions(+), 326 deletions(-) diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 2927add1dd26b5..282d07e0e613ea 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-3d", - "version-string": "5.15.2", - "port-version": 3, + "version": "5.15.3", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", + "license": null, "dependencies": [ "assimp", { diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index 05dd52842bc86a..8935f1e5e7f4e4 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-activeqt", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 ActiveQt Module - ActiveX components", + "license": null, "supports": "windows", "dependencies": [ { diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index 12024cbd29872a..15e043cd59eae6 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-androidextras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 androidextras Module;", + "license": null, "supports": "android", "dependencies": [ { diff --git a/ports/qt5-base/cmake/qt_download_submodule.cmake b/ports/qt5-base/cmake/qt_download_submodule.cmake index 63850a4ef2a831..5c8aff03326f1e 100644 --- a/ports/qt5-base/cmake/qt_download_submodule.cmake +++ b/ports/qt5-base/cmake/qt_download_submodule.cmake @@ -14,7 +14,7 @@ function(qt_download_submodule) qt_get_submodule_name(NAME) set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}") - set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") + set(ARCHIVE_NAME "${NAME}-everywhere-opensource-src-${FULL_VERSION}.tar.xz") set(URLS "https://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" "https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" ) diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index c52196078e19ed..c7d0cba8c57429 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,67 +1,68 @@ -#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. +#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. #So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 2) +set(QT_PATCH_VER 3) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) -set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) -set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) -set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) -set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) -set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) -set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) -set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) -set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) -set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) -set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) -set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) -set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID -set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) -set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) -set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) -set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated -set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) -set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) -set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated -set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) -set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) -set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) -set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) -set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) -set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) -set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) -set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) -set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) -set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) -set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) -set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated -##TODO -set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) -set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) -set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) -#set(QT_HASH_qt5-canvas3d 0) deprecated -set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) -set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) -set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) -set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) -set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) +set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) +set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) +set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) +set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) +set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) +set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) +set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) +set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) +set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) +set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) +set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) +set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) +set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) +set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) +set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) +set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) +set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) +set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) +set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) +set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) +set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) +set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) +set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) +set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) +set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) +set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) +set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) +set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) +set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) +set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) +set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) +set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) +set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) +set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) +set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) +set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) +set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) +set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) +set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) +set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) + if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL") + set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "Version:[^0-9]+[0-9]\.[0-9]+\.[0-9]+[^\n]*\n" "Version: ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") + configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) endforeach() endif() -endif() \ No newline at end of file +endif() diff --git a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake index c52196078e19ed..61d8e0ac81a6f9 100644 --- a/ports/qt5-base/cmake/qt_port_hashes_latest.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes_latest.cmake @@ -1,67 +1,67 @@ #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. #So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 2) +set(QT_PATCH_VER 3) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) -set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) -set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) -set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) -set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) -set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) -set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) -set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) -set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) -set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) -set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) -set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) -set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID -set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) -set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) -set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) -set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated -set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) -set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) -set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated -set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) -set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) -set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) -set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) -set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) -set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) -set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) -set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) -set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) -set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) -set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) -set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated -##TODO -set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) -set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) -set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) -#set(QT_HASH_qt5-canvas3d 0) deprecated -set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) -set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) -set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) -set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) -set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) +set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) +set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) +set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) +set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) +set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) +set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) +set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) +set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) +set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) +set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) +set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) +set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) +set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) +set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) +set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) +set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) +set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) +set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) +set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) +set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) +set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) +set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) +set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) +set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) +set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) +set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) +set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) +set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) +set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) +set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) +set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) +set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) +set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) +set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) +set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) +set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) +set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) +set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) +set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) +set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL") + set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "Version:[^0-9]+[0-9]\.[0-9]+\.[0-9]+[^\n]*\n" "Version: ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") + configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) endforeach() endif() -endif() \ No newline at end of file +endif() diff --git a/ports/qt5-base/patches/limits_include.patch b/ports/qt5-base/patches/limits_include.patch index 0ed514b7633d2d..4fe4952817d548 100644 --- a/ports/qt5-base/patches/limits_include.patch +++ b/ports/qt5-base/patches/limits_include.patch @@ -1,38 +1,3 @@ -From 61325e4547225b8b2ecefda4ca328a38c075c909 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Wed, 11 Aug 2021 15:35:05 +0200 -Subject: [PATCH] Add missing limits include - ---- - src/corelib/global/qendian.h | 1 + - src/corelib/global/qfloat16.h | 1 + - src/corelib/text/qbytearraymatcher.h | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 257efbbdbe..05f11d6f81 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -47,6 +47,7 @@ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -+#include - - #ifdef min // MSVC - #undef min -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index c7a9c87af3..3287d7cbf2 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) - // All processors that support AVX2 do support F16C too. That doesn't mean diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h index 0eedfc1d20..f5f9bef7b8 100644 --- a/src/corelib/text/qbytearraymatcher.h @@ -46,6 +11,3 @@ index 0eedfc1d20..f5f9bef7b8 100644 QT_BEGIN_NAMESPACE --- -2.32.0 - diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index be79037702fca4..382d75830b2122 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,9 +1,9 @@ { "name": "qt5-base", - "version-semver": "5.15.2", - "port-version": 20, + "version": "5.15.3", "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "angle", diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index 9d0a9b981e7684..adbd870105802e 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-charts", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index a887329794d839..79a85b47a81503 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-connectivity", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index ddb155c33834b0..1d551e375b8ada 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-datavis3d", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index a528d7f3e73ed8..7432d0f28489df 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -1,3 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.2/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") \ No newline at end of file + +if(NOT QT_UPDATE_VERSION) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.3/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +endif() diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index 3a5477c4a17a20..2b0b4abcd6e9a2 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-declarative", - "version": "5.15.2", - "port-version": 3, + "version": "5.15.3", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index d311b5ada3a488..a4f655ca179be9 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-doc", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 doc Module;", + "license": null, "supports": "linux", "dependencies": [ { diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 4bd3fb05f7507d..a1de0a3dda4e07 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-gamepad", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index 83055ba6e14dcf..8f6bc2d3fd330a 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-graphicaleffects", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 GraphicalEffects Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index a31ec4c71c1bfe..da6422d1e77b50 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 8abfa73c8aff13..fd0b1e89160e7a 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-location", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index 3ac6b3fc7f73d6..fd4552617512ba 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-macextras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", + "license": null, "supports": "osx", "dependencies": [ { diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake index ca6e25d0d4d746..f0462af132e36e 100644 --- a/ports/qt5-mqtt/portfile.cmake +++ b/ports/qt5-mqtt/portfile.cmake @@ -1,28 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -#qt_submodule_installation() No binary package for this port. -if(QT_UPDATE_VERSION) - set(VCPKG_USE_HEAD_VERSION ON) -endif() - -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL git://code.qt.io/qt/qtmqtt.git - REF ${QT_HASH_${PORT}} - HEAD_REF "v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}" - PATCHES ${_qis_PATCHES} -) - -if(QT_UPDATE_VERSION) - message(STATUS "New qtmqtt ref: ${VCPKG_HEAD_VERSION}") -endif() - -# qt module builds from a git repository require a .git entry to invoke syncqt -file(WRITE "${SOURCE_PATH}/.git" "repocontent") - -# syncqt is a perl script -vcpkg_find_acquire_program(PERL) -get_filename_component(perl_exe_path ${PERL} DIRECTORY) -vcpkg_add_to_path("${perl_exe_path}") - -qt_build_submodule(${SOURCE_PATH}) -qt_install_copyright(${SOURCE_PATH}) +qt_submodule_installation(PATCHES ${_qis_PATCHES}) diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index c4dac430ad181d..438929f9b38323 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-mqtt", - "version": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 MQTT module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index bc35ddac76fd80..6b2e45a2cc23f5 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-multimedia", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 5aa743b193dd37..4ecdeb1504cb80 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-networkauth", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Network Authorization Module", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index b1b52cd67b5a2c..f2e59ed2127914 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-purchasing", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index ca2bd64054dd23..711c177858633a 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-quickcontrols", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 QuickControls Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index bf9665c890991d..a87e806c97ec86 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-quickcontrols2", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 QuickControls2 Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 38f4f5a8f39bd0..6b8738ff029b8f 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-remoteobjects", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index 874be0e27d5b96..260a2c1527aa05 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-script", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Script Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index b32ce788301eb6..5c7c5307267ee5 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-scxml", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index 2fe0948eda3baa..1c7ef5d77a74b9 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-sensors", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index 3e34dd716e8e12..9d0d3f38879f0c 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-serialbus", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Serialbus Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index 8d9e79ccf8d2ef..5d91085737bd73 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-serialport", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index 387b650a306bc4..f9898c0f64d82a 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-speech", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Speech Module", + "license": null, "dependencies": [ { "name": "atlmfc", diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 125ae9503bb110..f32761483611ab 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-svg", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index 5c81111397b2f5..df212fc048cd0f 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-tools", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", + "license": null, "dependencies": [ { "name": "qt5-activeqt", diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index c85cd0149e59d5..cfc49dc2cb5c4d 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-translations", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 translations module", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index c53720d04842f3..07cd620afa6b26 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-virtualkeyboard", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", + "license": null, "dependencies": [ "qt5-multimedia", "qt5-quickcontrols", diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 7ccb51624c5972..76eb173096fefe 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-wayland", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 wayland Module;", + "license": null, "supports": "linux", "dependencies": [ { diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index a50e4f1a4f7201..1ba42163984175 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webchannel", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 83a599f65bf8b5..3ea9d9a5e071fa 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webengine", - "version-string": "5.15.2", - "port-version": 3, + "version": "5.15.3", "description": "Qt5 webengine Module;", + "license": null, "supports": "!static", "dependencies": [ { diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 596fb42c8b4fe6..518136852df14c 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webglplugin", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 webglplugin Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 173b65271dba34..69e6af408a36a7 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-websockets", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index c033a0465328ff..8b8c4dbd4fd74d 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webview", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", + "license": null, "dependencies": [ "qt5-declarative" ] diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 64434f24eb83fb..da324e17806fc8 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-winextras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", + "license": null, "supports": "windows", "dependencies": [ { diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index 032093137ff979..7660c0c15a3076 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-x11extras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 x11extras Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index efe86ebc5f0245..2ceb26459e0f31 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-xmlpatterns", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index bbf4197fdf3f6e..1b0f107c167282 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,9 +1,9 @@ { "name": "qt5", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qt5-base", @@ -75,7 +75,6 @@ "name": "qt5", "default-features": false, "features": [ - "mysqlplugin", "webengine" ], "platform": "!static" @@ -87,6 +86,14 @@ "wayland" ], "platform": "!windows" + }, + { + "name": "qt5-base", + "default-features": false, + "features": [ + "mysqlplugin", + "postgresqlplugin" + ] } ] }, @@ -117,7 +124,10 @@ "doc": { "description": [], "dependencies": [ - "qt5-doc" + { + "name": "qt5-doc", + "platform": "!windows" + } ] }, "essentials": { diff --git a/versions/baseline.json b/versions/baseline.json index 1c8adb3f3c0dcd..1b22f266f79d3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5597,176 +5597,176 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.2", - "port-version": 3 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-base": { - "baseline": "5.15.2", - "port-version": 20 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-canvas3d": { "baseline": "0", "port-version": 1 }, "qt5-charts": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.2", - "port-version": 3 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-modularscripts": { "baseline": "deprecated", "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-script": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.2", - "port-version": 3 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5compat": { "baseline": "6.2.3", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 65e6b9b3b41225..f1bdb8731854c2 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5538f55e5cb938c965447c3a5ce67b243f5d97f1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "4c43f4aec27c0ac682f88d1edfcce7c28e4a9458", "version-string": "5.15.2", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index 83332ee66ed0ee..35044981c9702d 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebae9d515816c48a9bbb2550acd02d02bfcfddc7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8bf9b51fd87d81531f301ee9060b76c829221afb", "version-string": "5.15.2", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index a8f18ffd40df70..1c72b66eac7dce 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0e32e6213649f8645b05c868b81dc3c982bfb30", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b8ff6ba90c3b7046e2728056998ff79665353503", "version-string": "5.15.2", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 839426b03aa97c..fc639f17dda5a1 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c2fa92b6281b496e3aead1b02238ab7668c204a", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "f21ebf7bf6644292d70d9c564c1408a224f26c77", "version-semver": "5.15.2", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 7e8eac197dc5fe..4a69f2305d4f4e 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4fa404a600c749529faae7807d2f24f5a6f8673", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d51381395f58fbcf7b9488c2e49708522d968ffb", "version-string": "5.15.2", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 58a0903bbf4586..9e4118aede8013 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8929178e2d3f0d544b21ed4bd1ad635e81fdefc5", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "4f34765d100d517dc137a96aabc37ab5cb95ea13", "version-string": "5.15.2", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 1bc9e97643bf10..db45fe7b362010 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8300805371f9fb2d98a2a2ace37e9e93149483e7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8a675679d46b85666ef053efb36a2bb70b40b8ee", "version-string": "5.15.2", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index dd12f79f23ca1b..734ecb9697232d 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51388bc681cd6616f0d2ecb29b1f3901b2e66613", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "670f3d6bfa437ca047f1d1644743e2f2012524c8", "version": "5.15.2", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index 7ccfe2d85ff214..df590ce00b568a 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cecc56a1a87cf86f87dcde5bc650f8de1e53b60", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "4cb09a0ee4bcb79b460c69a4e924cbe19538a2d1", "version-string": "5.15.2", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 5a9c6b8470fdf6..d937d0954bb827 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53e4e7090cc36a827b518f376c485aacade15d37", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d74a2774e03103111a4e73c990eb65e78416e784", "version-string": "5.15.2", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 4f9f479b24006c..fc40fa1637df02 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bb49ed2d96c2ad0d18a0508f2c170a0ef0a51cf", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "7548a80471fd031625a4395776ea298e2737c280", "version-string": "5.15.2", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index edd344a2d52559..d0446553918624 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdb4dae2e952e636c45967063bcb7c5dbb9cea65", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "5bf32f350b7d08389629bc565c66aeb5f84e93b0", "version": "5.15.2", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index cffd62afadc744..a3db41f5aea654 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "374ad16cce9ae4eee7c91f701a72c21ede178794", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "7fb1b17892d53638ec4ada0a73b19ecef4062ec8", "version-string": "5.15.2", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index fcd9001920232e..b342d08f982f30 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35696a5675057de9b50f3bbb2215b3f0879d3261", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "fb1f68ce5b03012e9fa7ed0924bc2036c4d97edd", "version-string": "5.15.2", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 36e684e44ada85..6d45e47f213b52 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8622cf28b900e34394e7c67ee272a0f0ae1a945", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "9a02099176012e710ae215855f4e72fe6f5b704a", "version": "5.15.2", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 9f8782b6db6406..9248263492824e 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8336d9a40e956b24f846b25c7b017cfac417f1d8", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b909b49f99e6080fdd74b20419ac9f1059d993f6", "version-string": "5.15.2", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index dd41498330ac99..71860f30e08a19 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fed32ceb703389b16ddbf6843597358c92ff27e2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "f6fcb48f7415ecf2a5f2f3966c48a08abd9b0355", "version-string": "5.15.2", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index b3a1c08491108c..e95c72dd4816f1 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1507aeba5c46c35cccbf662602be9bcfe6d4bc1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "0e0745a65f393550ec04750071456604a5db72ba", "version-string": "5.15.2", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index ab5305153af009..cf1e69cbdd78b4 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0023d4eae57568295996c372c262c746fce54cd1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "49313a150ff19dacc9614849648f29c90e424cd3", "version-string": "5.15.2", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index cea41fe2314540..c499391c83d1f0 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da9577fcd83a97070fbb31e9723645e1a353e780", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "c0f3cb1b07b4ac8c05297fd8c438ba7e1ba97ed8", "version-string": "5.15.2", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index f148c990dba0cd..f51c7a4acf2412 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4b1cc8e132e4c53c32401e8eaea14140f39906", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "73a19321158fe546f1469f290a83050fa6af14f1", "version-string": "5.15.2", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 842001bcc98163..491fdc3d47c6da 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "450d4c10bbd324c74ddca59e7d16c6cb215aa077", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d412fb9a21bbf733e6e2e00c2015787a7c262c6a", "version-string": "5.15.2", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 70cfc0bb7cd7ec..8ed279f7efc002 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "894ab2a120cd88e276b795234c66715ac787e4ab", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "657fa8e20641b75338667e14b696127b252fcfd5", "version-string": "5.15.2", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 87c3645756f1d4..8604dd80b1fb23 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7faff943ee0ed0c4be86730ded240b322d2b829", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "5ab7355283e60f00090972eafddf269519155344", "version-string": "5.15.2", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index eefb33d0c43479..70492fed04eede 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16c9b0f5f3bb86c3fe988f049069901ae578d0e", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "23c4f38498a3eeaef1a0428cc0f9facb77c50bb5", "version-string": "5.15.2", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index 17d9dae6dab929..dbe0967192778b 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc7ba67e09a801eca90691b7c7db4baf43369a09", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b6e0403e0e46d6b3aa07ea90da894a33589c3dde", "version-string": "5.15.2", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 86bfb420785bf9..07c2e5ae9ac37b 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf21b1bb4dc124cba22d170e77ceb78315ab7de2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "12c00b4bbf2206f8bb68ad44e8b44dbfd65fa6e4", "version-string": "5.15.2", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 9954a1f1f996a1..f57f54bc12f860 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a43bcf48e884abdd82502f747342962e2a2c4b8", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "75e1a170720117fcc34369aae8ab7ee4816974a3", "version-string": "5.15.2", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index f4df8a3489020c..a5deb8aa64418b 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f3066692eacc724dde9d8f17d4cb67f019ecc75", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b28b98fb7bd66abe2c108d66c3a89c0e388d638f", "version-string": "5.15.2", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index 687f16bb80c0b0..b2f540c9e3c00d 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0df59e14f9c24d2584e7f0424424f50eb4c9f7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "195b59491201660e5c6299f6f3f78c446827e8d7", "version-string": "5.15.2", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 1cabc7e949091e..81eb34974bcdb9 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8514424cbc1c746ec7149ec383fbdd5174a0e4", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "45281062a0b509d6c5f2cfce1f26e77e90fa6192", "version-string": "5.15.2", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 5960d4316a8e43..77179d15c5c29e 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e8f0ffa97c7f3d1dfe627808bcafc4d4a77d3e2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "10dc10d68dd34e3db201364ec60567459c6857dc", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 361bfbd96ba0d4..28d7cc5a6d655a 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd0f8bbb8bb85bc208907a24c82fe9db0b902922", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "39e51839b2f67b03e0f72bf862dc44ad72bcc804", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index a3228a8ba3b47b..b7b79a2326cb95 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "365537bee64190f604e1be03f0473ffe41067a82", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 94398229114124..0c8b2fb9e1e264 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d081435832cdf86757d280e7fbf1bf2b5780199", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "44c3faa9de1a6f18a9f496e828c4ee64f0fcc315", "version-string": "5.15.2", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index 671a9ca61d7a8d..ec5af0ba63cc8b 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0380195d2431d25311a4fa542d3437d05f339da", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "0ca77dc0c75bd411f1d1e51257c761e775ca341d", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index f4e2014f7ea278..d1dac375d4f01b 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6129ae1fa4b8945885ca352eca1bde34e1a345", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8c8a8916c8fda707b4c8096388ea7156bada9a4c", "version-string": "5.15.2", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 1d4926a14ace17..cf85ea6039f1b4 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89250816793ceacdf74730157af6f287070b8bf1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "85a345a5fdc5a15584e6b2add00f1669e4099dbc", "version-string": "5.15.2", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 1042604afb7acb..2a5fc9c4420005 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5321c86715348b879cee60dc4323c2e1d8fc9fe9", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "ce0ca52833bf80d8bc958cd4428acd10ab397911", "version-string": "5.15.2", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 3777966f9887ee..27f8c21d64a568 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b87833daca4ff1492a4890d0f73bcbb416dfc615", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d4531f24cddd2692989fac9e84a9eb09301ee180", "version-string": "5.15.2", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 39ad388946c300..654869f5624dae 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "428cdd43abdc1200e889c66b9c388b421d16bf58", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "9810d811337a74ca11e032b94b52f4e4bed5d1b1", "version-string": "5.15.2", From 106bbc1fd1efa21436bbde50e94027803fbaac63 Mon Sep 17 00:00:00 2001 From: maz-1 Date: Tue, 8 Mar 2022 03:30:14 +0800 Subject: [PATCH 30/64] [libe57] update to 1.1.332; fix debug library lookup (#23336) * [libe57] update to 1.1.332; fix debug library lookup * Update version database * add license field --- ports/libe57/0001_cmake.patch | 19 +++++++++ .../libe57/0002_replace_tr1_with_cpp11.patch | 39 +++++++++---------- ports/libe57/portfile.cmake | 4 +- ports/libe57/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/l-/libe57.json | 5 +++ 6 files changed, 48 insertions(+), 24 deletions(-) diff --git a/ports/libe57/0001_cmake.patch b/ports/libe57/0001_cmake.patch index 47001bbe466be9..e4963aeb55f4b7 100644 --- a/ports/libe57/0001_cmake.patch +++ b/ports/libe57/0001_cmake.patch @@ -86,3 +86,22 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt ) #include (InstallRequiredSystemLibraries) +--- a/src/refimpl/E57RefImplConfig.cmake 2011-10-06 16:01:00.000000000 +0800 ++++ b/src/refimpl/E57RefImplConfig.cmake 2022-03-01 16:48:29.117485600 +0800 +@@ -49,6 +49,8 @@ + # NOTE: You will also need to include the boost and xerces libraries to your + # project. + ++get_filename_component(E57RefImpl_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) ++ + IF (NOT "${E57RefImpl_DIR}/include" EQUAL "${E57RefImpl_INCLUDE_DIR}") + SET(E57RefImpl_LIBRARY_DEBUG E57RefImpl_LIBRARY_DEBUG-NOTFOUND) + SET(E57RefImpl_LIBRARY_RELEASE E57RefImpl_LIBRARY_RELEASE-NOTFOUND) +@@ -78,6 +80,6 @@ + NAMES libE57RefImpl-d + E57RefImpl-d +- HINTS ${E57RefImpl_DIR}/lib ++ HINTS ${E57RefImpl_DIR}/debug/lib + DOC "E57 debug library" + ) + diff --git a/ports/libe57/0002_replace_tr1_with_cpp11.patch b/ports/libe57/0002_replace_tr1_with_cpp11.patch index 1b48de7c22a612..ff23c340bf63ab 100644 --- a/ports/libe57/0002_replace_tr1_with_cpp11.patch +++ b/ports/libe57/0002_replace_tr1_with_cpp11.patch @@ -1,20 +1,20 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-06-16 22:53:02.033465000 +0800 -+++ b/CMakeLists.txt 2021-06-16 23:01:31.542323600 +0800 -@@ -25,7 +25,9 @@ - # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - # DEALINGS IN THE SOFTWARE. +diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2013-04-03 22:24:08.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-01 17:23:01.210728200 +0800 +@@ -36,8 +36,9 @@ + # If you find any errors or have suggestion to improve the build script: + # patches are most welcome! Please send them to the development mailing list. --cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.1) -+ + +-cmake_minimum_required(VERSION 2.8.2) +set(CMAKE_CXX_STANDARD 11) # Override flags to enable prepare for linking to static runtime set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) -diff -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp +diff --color -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp --- a/src/tools/e57fields.cpp 2012-04-04 17:19:01.000000000 +0800 -+++ b/src/tools/e57fields.cpp 2021-06-16 22:55:02.789463000 +0800 ++++ b/src/tools/e57fields.cpp 2022-03-01 17:24:17.904911600 +0800 @@ -30,11 +30,7 @@ #include #include @@ -49,10 +49,10 @@ diff -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp /// The precalculated parts of the element path name. /// The only part that is missing is the record number which goes in between. -diff -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp ---- a/src/tools/e57unpack.cpp 2011-10-06 16:01:00.000000000 +0800 -+++ b/src/tools/e57unpack.cpp 2021-06-16 22:56:57.150323800 +0800 -@@ -41,12 +41,8 @@ +diff --color -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp +--- a/src/tools/e57unpack.cpp 2013-04-03 22:24:08.000000000 +0800 ++++ b/src/tools/e57unpack.cpp 2022-03-01 17:25:15.206260200 +0800 +@@ -45,12 +45,8 @@ #include using std::runtime_error; @@ -67,10 +67,10 @@ diff -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp #include using std::string; -diff -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp +diff --color -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp --- a/src/tools/e57validate.cpp 2011-10-06 16:01:00.000000000 +0800 -+++ b/src/tools/e57validate.cpp 2021-06-16 22:58:19.365323700 +0800 -@@ -66,11 +66,8 @@ ++++ b/src/tools/e57validate.cpp 2022-03-01 17:25:46.220771800 +0800 +@@ -66,11 +66,7 @@ ================================================================*/ @@ -79,13 +79,12 @@ diff -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp -#else -# include -using std::tr1::unordered_map; -+ +-#endif +#include +using std::unordered_map; --#endif #include using std::strlen; -@@ -694,7 +692,7 @@ +@@ -694,7 +691,7 @@ void dump(int indent = 0, std::ostream& os = std::cout); //================ private: diff --git a/ports/libe57/portfile.cmake b/ports/libe57/portfile.cmake index 1f7bfd9ea5c3f4..c260430d67d37d 100644 --- a/ports/libe57/portfile.cmake +++ b/ports/libe57/portfile.cmake @@ -1,11 +1,11 @@ -set(VERSION 1.1.312) +set(VERSION 1.1.332) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO e57-3d-imgfmt FILENAME "E57RefImpl_src-${VERSION}.zip" - SHA512 c729cc3094131f115ddf9b8c24a9420c4ab9d16a4343acfefb42f997f4bf25247cd5563126271df2af95f103093b7f6b360dbade52c9e66ec39dd2f06e041eb7 + SHA512 86adb88cff32d72905e923b1205d609a2bce2eabd78995c59a7957395b233766a5ce31481db08977117abc1a70bbed90d2ce0cdb9897704a8c63d992e91a3907 PATCHES "0001_cmake.patch" "0002_replace_tr1_with_cpp11.patch" diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json index 09984c737be08b..eb35fdaab4f877 100644 --- a/ports/libe57/vcpkg.json +++ b/ports/libe57/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libe57", - "version-semver": "1.1.312", + "version-semver": "1.1.332", "port-version": 1, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", + "license": "BSL-1.0", "dependencies": [ "boost-crc", "boost-filesystem", diff --git a/versions/baseline.json b/versions/baseline.json index 1b22f266f79d3c..5363784abf571a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3457,7 +3457,7 @@ "port-version": 3 }, "libe57": { - "baseline": "1.1.312", + "baseline": "1.1.332", "port-version": 1 }, "libe57format": { diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json index e21d6930bf7c4d..0371207eac8941 100644 --- a/versions/l-/libe57.json +++ b/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e38a82bc97129e317606207d234101aefe7dcb17", + "version-semver": "1.1.332", + "port-version": 1 + }, { "git-tree": "ed9a20551a07f8dbcb637af8394653c326e95aac", "version-semver": "1.1.312", From 61a704cfd6b2c80b4af7eb6ac10b0c2d8624c853 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 7 Mar 2022 20:39:32 +0100 Subject: [PATCH 31/64] [vcpkg-ci] Modify task names (#23361) * Add triplet to name of main CI task * Fix osx bootstrap task name * Hide output from switch to parent hash * Bump test port version * Hardcode osx+linux triplet names * Improve logging order * Add error handling to each tool download * Revert "Bump test port version" * Don't prefetch 7zip --- scripts/azure-pipelines/linux/azure-pipelines.yml | 2 +- scripts/azure-pipelines/osx/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/test-modified-ports.ps1 | 15 +++++++++------ .../azure-pipelines/windows/azure-pipelines.yml | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 0025750ee29150..5c50454b448686 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -41,7 +41,7 @@ jobs: inputs: filePath: bootstrap-vcpkg.sh - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for x64-linux' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 8749826188ce15..ce5c095d2fa5cb 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -35,11 +35,11 @@ jobs: exit 0 displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' - task: Bash@3 - displayName: 'Build vcpkg' + displayName: 'Bootstrap vcpkg' inputs: filePath: bootstrap-vcpkg.sh - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for x64-osx' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 6125b07856e678..12f26d26b604b5 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -153,20 +153,23 @@ $parentHashes = @() if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) { # Prefetch tools for better output - & "./vcpkg$executableExtension" fetch 7zip - & "./vcpkg$executableExtension" fetch cmake - & "./vcpkg$executableExtension" fetch ninja - & "./vcpkg$executableExtension" fetch git + foreach ($tool in @('cmake', 'ninja', 'git')) { + & "./vcpkg$executableExtension" fetch $tool + if ($LASTEXITCODE -ne 0) + { + throw "Failed to fetch $tool" + } + } Write-Host "Determining parent hashes using HEAD~1" $parentHashesFile = Join-Path $WorkingRoot 'parent-hashes.json' $parentHashes = @("--parent-hashes=$parentHashesFile") - & git revert -n -m 1 HEAD + & git revert -n -m 1 HEAD | Out-Null & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" ` | ForEach-Object { if ($_ -match ' dependency information| determine pass') { Write-Host $_ } } - & git reset --hard HEAD Write-Host "Running CI using parent hashes" + & git reset --hard HEAD } & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 60ba6fa1b80a14..3d494a04258ac5 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -62,7 +62,7 @@ jobs: PathtoPublish: '$(DiffFile)' ArtifactName: 'format.diff' - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for ${{ parameters.triplet }}' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' From 5962cf5a3bfc2124e8de991a4e45a8edcb3b4c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 7 Mar 2022 20:42:23 +0100 Subject: [PATCH 32/64] [mimalloc] Update to 2.0.5 (#23264) * [mimalloc] Update to 2.0.5 * [mimalloc] Update version files * [mimalloc] Fix dll install path * [mimalloc] Update version files --- ports/mimalloc/fix-cmake.patch | 27 +++++++-------------------- ports/mimalloc/portfile.cmake | 4 ++-- ports/mimalloc/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/m-/mimalloc.json | 5 +++++ 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch index e3ada035d342de..eb43278d04b58e 100644 --- a/ports/mimalloc/fix-cmake.patch +++ b/ports/mimalloc/fix-cmake.patch @@ -1,38 +1,25 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b56953c..d7ad3e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -303,10 +303,13 @@ if(MI_BUILD_SHARED) +@@ -315,11 +315,11 @@ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib) add_custom_command(TARGET mimalloc POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $ COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") -+ install ( -+ FILES $/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll -+ DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) +- install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir}) ++ install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() - + - install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -- install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) endif() # static library -@@ -332,6 +335,8 @@ if (MI_BUILD_STATIC) - install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) - endif() - -+install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) -+ - # install include files - install(FILES include/mimalloc.h DESTINATION ${mi_install_incdir}) - install(FILES include/mimalloc-override.h DESTINATION ${mi_install_incdir}) -@@ -366,9 +371,6 @@ if (MI_BUILD_OBJECT) +@@ -370,9 +370,6 @@ # install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_objdir}) # the FILES expression can also be: $ # but that fails cmake versions less than 3.10 so we leave it as is for now - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} -- DESTINATION ${mi_install_libdir} +- DESTINATION ${mi_install_objdir} - RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) endif() diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 030bd1f651a852..ff0f06366fb238 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF v2.0.3 - SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f + REF v2.0.5 + SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d HEAD_REF master PATCHES fix-cmake.patch diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index e8fbec6c798d36..31f7d57b752ca5 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,9 +1,9 @@ { "name": "mimalloc", - "version": "2.0.3", - "port-version": 2, + "version": "2.0.5", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", + "license": "MIT", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 5363784abf571a..86debaebd51c1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4437,8 +4437,8 @@ "port-version": 4 }, "mimalloc": { - "baseline": "2.0.3", - "port-version": 2 + "baseline": "2.0.5", + "port-version": 0 }, "minc": { "baseline": "2.4.03", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index 93333585b179ca..8c6494be1d8d57 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "370692d9dc2cb2bc9f013041003e069e47febb67", + "version": "2.0.5", + "port-version": 0 + }, { "git-tree": "e68a15fa535a3dcf4a1dba0f277eb239cc27b863", "version": "2.0.3", From be5c4ef68b51142ba705f0678b45d284977de677 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 8 Mar 2022 12:47:23 -0800 Subject: [PATCH 33/64] Update vcpkg-tool to 2022-03-08. (#23424) * Update vcpkg-tool to 2022-03-08. * Back off required git version to something actually in the build lab. * Remove hiding of the output of --parent-hashes. * Update 7zip reference as indicated in https://github.com/microsoft/vcpkg-tool/pull/413 --- .../azure-pipelines/test-modified-ports.ps1 | 4 +--- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- scripts/vcpkgTools.xml | 19 +++++++++++++------ 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 12f26d26b604b5..588eecdb725220 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -165,9 +165,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) $parentHashesFile = Join-Path $WorkingRoot 'parent-hashes.json' $parentHashes = @("--parent-hashes=$parentHashesFile") & git revert -n -m 1 HEAD | Out-Null - & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" ` - | ForEach-Object { if ($_ -match ' dependency information| determine pass') { Write-Host $_ } } - + & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" Write-Host "Running CI using parent hashes" & git reset --hard HEAD } diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 31ed647f344c8f..724001d548f7cf 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-02-24' +$versionDate = '2022-03-08' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 684e697e3508c6..1fffdd91e6a088 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -124,23 +124,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-02-24" +vcpkgToolReleaseTag="2022-03-08" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="8d435af9f1d330a765d8af91594cac75698313b7e0ac8f05797210a7e4b19cbb09a1ad3d458eeec9aaacca0ab3566ed8656d6325703694058c1da794c38531a8" + vcpkgToolReleaseSha="d17438ae78d5a5aaaf82bb1605930770dc82dcc64c938613237a02482b591555049203341f42c7446ad725972c18576535a80ec15ff9c8c102f3817cae51a720" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="e13949075b83c6fd14721e81536918c1f42a4d977616cf98e2fc472b830ec31a1fb223a0f2291a874de3f0ddf13b81f3b1aacb4c74adba1ec9d4e85acb6902e7" + vcpkgToolReleaseSha="0a3808d0b414e4d7b3535187a3ddbf94b58db7fccff52641aa28593e31e64c320bb5d183521aecd8b529aa7294bed0cc1afc002fa03504a7e79aa9fad754794a" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="3e0ede98b857a5b4a21a5d367f90dd5a7999ac32d90df4c383ac78dfd143de73774cdc628aa14b1e3141e5a3bf1c30ba108cfffe3b66a597890dfb7f57e4d3f3" + vcpkgToolReleaseSha="19f1c42b699d213405abf9937cf0ac361920a7208a5c397e1106bfc193ab8ecc70c37f7faa9f057809321bc536b61c8a8bf991f0dee7ece1e9916b00ed448c1c" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="8f6a696bea331170671e301cde76f41bbe1369d2355383a110a50972fb5d60802f6ec011606db4e51cd89dc1c59d314223aeacdc4232c84b205fa82e4d888453" + vcpkgToolReleaseSha="5336525a069c7360645362f344f0cadf545ec6ab8d32e72d90ad17131382bb80c74ace6b6d767ad8225b27118740ac476bda006f8244251c3c8787b29dcf7b7e" fi # Do the download or build. diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index bb3f7508af5a46..ba874724f07ff5 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -36,7 +36,7 @@ cmake-3.20.4.txz - 2.35.1.2 + 2.7.4 mingw32\bin\git.exe https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f @@ -112,13 +112,20 @@ 1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73 QtInstallerFramework-win-x86.zip - - 19.00 + + 21.07 Files\7-Zip\7z.exe - https://www.7-zip.org/a/7z1900-x64.msi - 7837a8677a01eed9c3309923f7084bc864063ba214ee169882c5b04a7a8b198ed052c15e981860d9d7952c98f459a4fab87a72fd78e7d0303004dcb86f4324c8 - 7z1900-x64.msi + https://www.7-zip.org/a/7z2107-x64.msi + d55b44f1255d1b0e629719383a600a7e83dc6378d470096337b886ce24684d26bcc2b04f9cea39ad888179edce23ad2bd0e8e1863ddc40106c176adece8c012d + 7z2107-x64.msi + + 21.07 + 7za.exe + https://www.7-zip.org/a/7z2107-extra.7z + 648d894940bcc29951752d7a8fd18c770ee8d4fd944e17f1a52588e51ca8f58375ba48514538f2e1387786fd812bb86f75fd6bdd0892685cdcafb2989942c848 + 7z2107-extra.7z + 1.35.0 aria2-1.35.0-win-32bit-build1\aria2c.exe From 857bccdad005957391854448a15ba30e8c118503 Mon Sep 17 00:00:00 2001 From: Akash Date: Tue, 8 Mar 2022 16:58:51 -0800 Subject: [PATCH 34/64] [gazebo] new port (#22466) * Add gazebo11 port * [sdformat9] Use external tinyxml on Windows * Update versions * Use newer vcpkg functions * Fix sdformat9 * Update versions * Try fixing gazebo * Copy extra ogre dlls * Update gazebo ref * Update versions * Fix ogre dll dir * Update version date * Update versions * Update versions * Add licenses * Update versions * Rename to gazebo * Update versions * Update versions * Apply suggestions from code review Co-authored-by: Robert Schumacher * Update ports/gazebo/portfile.cmake Co-authored-by: Robert Schumacher * Make pkgconf a host dependency * Update versions * Copy PDBs * Update versions * Change to normal installed directory * Update versions Co-authored-by: Robert Schumacher --- ports/gazebo/0001-Fix-deps.patch | 102 ++++++++++++++ ports/gazebo/portfile.cmake | 52 ++++++++ ports/gazebo/vcpkg.json | 125 ++++++++++++++++++ ports/sdformat9/portfile.cmake | 2 +- .../use-external-tinyxml-windows.patch | 26 ++++ ports/sdformat9/vcpkg.json | 3 +- versions/baseline.json | 6 +- versions/g-/gazebo.json | 9 ++ versions/s-/sdformat9.json | 5 + 9 files changed, 327 insertions(+), 3 deletions(-) create mode 100644 ports/gazebo/0001-Fix-deps.patch create mode 100644 ports/gazebo/portfile.cmake create mode 100644 ports/gazebo/vcpkg.json create mode 100644 ports/sdformat9/use-external-tinyxml-windows.patch create mode 100644 versions/g-/gazebo.json diff --git a/ports/gazebo/0001-Fix-deps.patch b/ports/gazebo/0001-Fix-deps.patch new file mode 100644 index 00000000000000..a933d6884f9b04 --- /dev/null +++ b/ports/gazebo/0001-Fix-deps.patch @@ -0,0 +1,102 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 4085b5aaeb..f89ac88333 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -179,7 +179,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml.") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +@@ -225,7 +225,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml2.") + set (USE_EXTERNAL_TINYXML2 True) + elseif(WIN32) +@@ -513,7 +513,7 @@ if (PKG_CONFIG_FOUND) + endif () + + if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND +- libswscale_FOUND) ++ libswscale_FOUND AND FFMPEG_FEATURE) + set (HAVE_FFMPEG TRUE) + else () + set (HAVE_FFMPEG FALSE) +@@ -538,7 +538,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find GNU Triangulation Surface Library + pkg_check_modules(gts gts) +- if (gts_FOUND) ++ if (GTS_FEATURE) + message (STATUS "Looking for GTS - found") + set (HAVE_GTS TRUE) + else () +@@ -551,13 +551,14 @@ if (PKG_CONFIG_FOUND) + # First and preferred option is to look for bullet standard pkgconfig, + # so check it first. if it is not present, check for the OSRF + # custom bullet2.82.pc file +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) + set (HAVE_BULLET TRUE) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions( -DLIBBULLET_VERSION=${BULLET_VERSION} ) + else() + set (HAVE_BULLET FALSE) +@@ -572,7 +573,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find libusb + pkg_check_modules(libusb-1.0 libusb-1.0) +- if (NOT libusb-1.0_FOUND) ++ if (NO_LIBUSB_FEATURE) + BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.") + set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE) + else() +@@ -648,7 +649,7 @@ endif () + ######################################## + # Find gdal + include (FindGDAL) +-if (NOT GDAL_FOUND) ++if (NO_GDAL_FEATURE) + message (STATUS "Looking for libgdal - not found") + BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.") + set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE) +@@ -718,7 +719,7 @@ endif() + ######################################## + # Find graphviz + include (${gazebo_cmake_dir}/FindGraphviz.cmake) +-if (NOT GRAPHVIZ_FOUND) ++if (NO_GRAPHVIZ_FEATURE) + message (STATUS "Looking for libgraphviz-dev - not found") + BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.") + set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE) +diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in +index b57a90dd76..63ce97095e 100644 +--- a/cmake/gazebo-config.cmake.in ++++ b/cmake/gazebo-config.cmake.in +@@ -99,12 +99,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ + + if (GAZEBO_HAS_BULLET) + if (PKG_CONFIG_FOUND) +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION}) + else() + message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.") diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake new file mode 100644 index 00000000000000..603eab88a00ef7 --- /dev/null +++ b/ports/gazebo/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osrf/gazebo + REF 382dcc3f36095a8d79b5bc9c8b8ad346e867c51d + SHA512 57638cd0b23b5f2bfd32fdc159d6cd77ca34e3bd695c225591979aef4b7271eac93d3706fa1ffa2340f90013267a4171bebe1e4c142f19ad2bf67963dfed627e + HEAD_REF gazebo11 + PATCHES + 0001-Fix-deps.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openal HAVE_OPENAL + ffmpeg FFMPEG_FEATURE + gts GTS_FEATURE + INVERTED_FEATURES + simbody CMAKE_DISABLE_FIND_PACKAGE_Simbody + dart CMAKE_DISABLE_FIND_PACKAGE_DART + bullet CMAKE_DISABLE_FIND_PACKAGE_BULLET + libusb NO_LIBUSB_FEATURE + gdal NO_GDAL_FEATURE + graphviz NO_GRAPHVIZ_FEATURE +) + +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON + -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES gazebo gz gzclient gzserver + AUTO_CLEAN +) +set(EXTRA_OGRE_LIBS Codec_EXR Codec_FreeImage Codec_STBI OgreBites OgreMain OgreMeshLodGenerator OgreOverlay OgrePaging OgreProperty OgreRTShaderSystem OgreTerrain OgreVolume Plugin_BSPSceneManager Plugin_DotScene Plugin_OctreeSceneManager Plugin_OctreeZone Plugin_ParticleFX Plugin_PCZSceneManager RenderSystem_Direct3D11 RenderSystem_GL RenderSystem_GL3Plus) +foreach(LIB IN LISTS EXTRA_OGRE_LIBS) + set(FILE_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB}${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(COPY "${CURRENT_INSTALLED_DIR}/bin/${FILE_NAME}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json new file mode 100644 index 00000000000000..8f4bd528696193 --- /dev/null +++ b/ports/gazebo/vcpkg.json @@ -0,0 +1,125 @@ +{ + "name": "gazebo", + "version-date": "2022-01-20", + "description": "Open source robotics simulator.", + "homepage": "http://gazebosim.org", + "license": "Apache-2.0", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-filesystem", + "boost-format", + "boost-interprocess", + "boost-iostreams", + "boost-program-options", + "boost-property-tree", + "boost-regex", + "boost-system", + "boost-thread", + "boost-uuid", + "ccd", + { + "name": "hdf5", + "features": [ + "cpp" + ] + }, + "ignition-common3", + "ignition-fuel-tools4", + "ignition-math6", + "ignition-msgs5", + "ignition-transport8", + "ogre", + { + "name": "pkgconf", + "host": true + }, + "protobuf", + "qwt", + "sdformat9", + "tbb", + "tiny-process-library", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "bullet", + "dart", + "ffmpeg", + "gdal", + "graphviz", + "gts", + "libusb", + "openal", + "simbody" + ], + "features": { + "bullet": { + "description": "Use the bullet physics engine", + "dependencies": [ + "bullet3" + ] + }, + "dart": { + "description": "Use the dart physics engine", + "dependencies": [ + "dartsim" + ] + }, + "ffmpeg": { + "description": "Enable audio-video capabilities", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "avcodec", + "avformat", + "swscale" + ] + } + ] + }, + "gdal": { + "description": "Enable digital elevation terrains support", + "dependencies": [ + "gdal" + ] + }, + "graphviz": { + "description": "Enable model editor's schematic view", + "dependencies": [ + "graphviz" + ] + }, + "gts": { + "description": "Enable CSG support", + "dependencies": [ + "gts" + ] + }, + "libusb": { + "description": "Enable USB peripheral support", + "dependencies": [ + "libusb" + ] + }, + "openal": { + "description": "Enable audio support", + "dependencies": [ + "openal-soft" + ] + }, + "simbody": { + "description": "Use the simbody physics engine", + "dependencies": [ + "simbody" + ] + } + } +} diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake index c8677065fec48f..058988450fdd93 100644 --- a/ports/sdformat9/portfile.cmake +++ b/ports/sdformat9/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-dependency-urdfdom.patch fix-quote.patch no-absolute.patch + use-external-tinyxml-windows.patch ) # Ruby is required by the sdformat build process @@ -21,7 +22,6 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DUSE_INTERNAL_URDF=OFF - -DUSE_EXTERNAL_TINYXML=ON ) vcpkg_cmake_install() diff --git a/ports/sdformat9/use-external-tinyxml-windows.patch b/ports/sdformat9/use-external-tinyxml-windows.patch new file mode 100644 index 00000000000000..1f48617bc04c36 --- /dev/null +++ b/ports/sdformat9/use-external-tinyxml-windows.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3dad12e5..e290a3be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,7 +113,7 @@ include (${sdf_cmake_dir}/SDFUtils.cmake) + + message (STATUS "\n\n====== Finding 3rd Party Packages ======") + # Use of tinyxml. System installation on UNIX. Internal copy on WIN +-if (UNIX) ++if (true) + message (STATUS "Using system tinyxml") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 427e5e7a..655fafc0 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -9,7 +9,7 @@ if (USE_EXTERNAL_TINYXML) + ################################################# + # Find tinyxml. Only debian distributions package tinyxml with a pkg-config + # Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS) +- pkg_check_modules(tinyxml tinyxml) ++ find_package(tinyxml CONFIG REQUIRED) + if (NOT tinyxml_FOUND) + find_path (tinyxml_INCLUDE_DIRS tinyxml.h ${tinyxml_INCLUDE_DIRS} ENV CPATH) + find_library(tinyxml_LIBRARIES NAMES tinyxml) diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json index 716bc4703c9ef8..c4f2a7dcc84531 100644 --- a/ports/sdformat9/vcpkg.json +++ b/ports/sdformat9/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdformat9", "version": "9.4.0", - "port-version": 4, + "port-version": 5, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", + "license": "Apache-2.0", "supports": "!(linux | uwp)", "dependencies": [ "ignition-math6", diff --git a/versions/baseline.json b/versions/baseline.json index 86debaebd51c1c..1dc849c472c753 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2376,6 +2376,10 @@ "baseline": "2019-08-04", "port-version": 1 }, + "gazebo": { + "baseline": "2022-01-20", + "port-version": 0 + }, "gcem": { "baseline": "1.13.1", "port-version": 1 @@ -6286,7 +6290,7 @@ }, "sdformat9": { "baseline": "9.4.0", - "port-version": 4 + "port-version": 5 }, "sdl1": { "baseline": "1.2.15", diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json new file mode 100644 index 00000000000000..78d9fcac424a3d --- /dev/null +++ b/versions/g-/gazebo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "983e90284c8c0073e0193750a412eb4df01accdc", + "version-date": "2022-01-20", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json index 74f6ba91334767..547317e56551b4 100644 --- a/versions/s-/sdformat9.json +++ b/versions/s-/sdformat9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d050d624faf72f8dcb62fdb7a5378ae5d8e8b5d8", + "version": "9.4.0", + "port-version": 5 + }, { "git-tree": "2b064abf9a6849ed5234b03bf5604ccd0169db4a", "version": "9.4.0", From fb3416466fbebb5f1a6328cf07058155a21ad28e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 9 Mar 2022 19:33:02 +0100 Subject: [PATCH 35/64] [proj, proj4] Update to PROJ 9.0.0 & make proj the regular port (#23186) * Update to PROJ 9.0.0 & make proj the regular port * Consolidate files in share, move data to subdir * Update versions * Update proj to 9.0.0 RC2 * Add license fields * Update versions * Update to PROJ 9.0.0 release * Update versions * Update versions --- ports/gdal/vcpkg.json | 4 +- ports/libgeotiff/vcpkg.json | 4 +- ports/libosmium/vcpkg.json | 4 +- ports/libspatialite/vcpkg.json | 5 +- ports/mapnik/vcpkg.json | 3 +- .../fix-proj4-targets-cmake.patch | 0 .../{proj4 => proj}/fix-win-output-name.patch | 0 ports/proj/portfile.cmake | 70 +++++++++++++++++- ports/{proj4 => proj}/tools-cmake.patch | 10 +-- ports/{proj4 => proj}/usage | 2 +- ports/proj/vcpkg.json | 58 +++++++++++++-- ports/proj4/pkgconfig.patch | 53 -------------- ports/proj4/portfile.cmake | 71 +------------------ ports/proj4/vcpkg.json | 57 ++------------- ports/vtk/vcpkg.json | 4 +- versions/baseline.json | 20 +++--- versions/g-/gdal.json | 5 ++ versions/l-/libgeotiff.json | 5 ++ versions/l-/libosmium.json | 5 ++ versions/l-/libspatialite.json | 5 ++ versions/m-/mapnik.json | 5 ++ versions/p-/proj.json | 5 ++ versions/p-/proj4.json | 5 ++ versions/v-/vtk.json | 5 ++ 24 files changed, 200 insertions(+), 205 deletions(-) rename ports/{proj4 => proj}/fix-proj4-targets-cmake.patch (100%) rename ports/{proj4 => proj}/fix-win-output-name.patch (100%) rename ports/{proj4 => proj}/tools-cmake.patch (54%) rename ports/{proj4 => proj}/usage (68%) delete mode 100644 ports/proj4/pkgconfig.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 0175fd95b19731..0d5299bc7489fb 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.4.1", - "port-version": 3, + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -29,7 +29,7 @@ "libwebp", "libxml2", "openjpeg", - "proj4", + "proj", "sqlite3", "tiff", { diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json index ec7a39eb07d484..e07616b4e8c320 100644 --- a/ports/libgeotiff/vcpkg.json +++ b/ports/libgeotiff/vcpkg.json @@ -1,10 +1,12 @@ { "name": "libgeotiff", "version": "1.7.0", + "port-version": 1, "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", + "license": "MIT", "dependencies": [ - "proj4", + "proj", { "name": "tiff", "default-features": false diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json index 904c1e22a35bb5..ffd7c586163780 100644 --- a/ports/libosmium/vcpkg.json +++ b/ports/libosmium/vcpkg.json @@ -1,13 +1,15 @@ { "name": "libosmium", "version-semver": "2.17.1", + "port-version": 1, "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", + "license": "BSL-1.0", "dependencies": [ "boost", "bzip2", "expat", - "proj4", + "proj", "protozero", "utfcpp", { diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 6b3c5d80772d0e..521ba15233cfe2 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,14 +1,15 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 3, + "port-version": 4, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", + "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", "dependencies": [ "geos", "libiconv", "libxml2", - "proj4", + "proj", { "name": "sqlite3", "default-features": false, diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 818794b1da96ce..c1dc491aea2459 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mapnik", "version-date": "2022-01-28", + "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", @@ -157,7 +158,7 @@ "proj": { "description": "PROJ Functionalities", "dependencies": [ - "proj4" + "proj" ] }, "svg-renderer": { diff --git a/ports/proj4/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch similarity index 100% rename from ports/proj4/fix-proj4-targets-cmake.patch rename to ports/proj/fix-proj4-targets-cmake.patch diff --git a/ports/proj4/fix-win-output-name.patch b/ports/proj/fix-win-output-name.patch similarity index 100% rename from ports/proj4/fix-win-output-name.patch rename to ports/proj/fix-win-output-name.patch diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index cc6e26fcb0b69f..63a50506c3ea18 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -1 +1,69 @@ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/PROJ + REF 9.0.0 + SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520 + HEAD_REF master + PATCHES + fix-win-output-name.patch + fix-proj4-targets-cmake.patch + tools-cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + net ENABLE_CURL + tiff ENABLE_TIFF + tools BUILD_APPS +) + +vcpkg_list(SET TOOL_NAMES cct cs2cs geod gie invgeod invproj proj projinfo projsync) +if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES) + set(BUILD_PROJSYNC OFF) + vcpkg_list(APPEND FEATURE_OPTIONS -DBUILD_PROJSYNC=${BUILD_PROJSYNC}) + vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync) +endif() + +find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DNLOHMANN_JSON=external + -DPROJ_LIB_SUBDIR=lib + -DPROJ_INCLUDE_SUBDIR=include + -DPROJ_DATA_SUBDIR=share/${PORT}/data + -DBUILD_TESTING=OFF + "-DEXE_SQLITE3=${EXE_SQLITE3}" +) + +vcpkg_cmake_install() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Enforce consistency with src/lib_proj.cmake build time configuration. + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proj.h" + "#ifndef PROJ_DLL" + "#ifndef PROJ_DLL\n# define PROJ_DLL\n#elif 0" + ) +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME proj4 CONFIG_PATH lib/cmake/proj4 DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proj) + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif () + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +if(NOT DEFINED VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc" " -lproj" " -lproj_d") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/proj4/tools-cmake.patch b/ports/proj/tools-cmake.patch similarity index 54% rename from ports/proj4/tools-cmake.patch rename to ports/proj/tools-cmake.patch index 514a15ad193805..cc76be215d2c99 100644 --- a/ports/proj4/tools-cmake.patch +++ b/ports/proj/tools-cmake.patch @@ -1,14 +1,14 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index 534bc311b..f9fb0f1bb 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt +--- a/src/apps/CMakeLists.txt ++++ b/src/apps/CMakeLists.txt @@ -83,10 +83,3 @@ if(BUILD_PROJSYNC) - endif() + # global configurations for all apps -if(MSVC OR CMAKE_CONFIGURATION_TYPES) - if(BIN_TARGETS) -- # Add _d suffix for your debug versions of the tools +- # Add _d suffix for debug versions of the apps - set_target_properties(${BIN_TARGETS} PROPERTIES - DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) - endif() diff --git a/ports/proj4/usage b/ports/proj/usage similarity index 68% rename from ports/proj4/usage rename to ports/proj/usage index ebf9f6c8d5aae1..a1236dde61303a 100644 --- a/ports/proj4/usage +++ b/ports/proj/usage @@ -1,4 +1,4 @@ -The package proj4 provides CMake targets: +The package proj provides CMake targets: find_package(PROJ CONFIG REQUIRED) target_link_libraries(main PRIVATE PROJ::proj) diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index 50beaca9bc8e84..a17d5a8aa352f1 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,9 +1,57 @@ { "name": "proj", - "version-string": "0", - "port-version": 1, - "description": "a stub package that pulls in proj4. Do not depend on this package.", + "version": "9.0.0", + "description": "PROJ library for cartographic projections", + "homepage": "https://proj.org/", + "license": "MIT", "dependencies": [ - "proj4" - ] + "nlohmann-json", + { + "name": "sqlite3", + "default-features": false + }, + { + "name": "sqlite3", + "host": true, + "features": [ + "tool" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "net", + "tiff" + ], + "features": { + "net": { + "description": "Enable network support", + "dependencies": [ + "curl" + ] + }, + "tiff": { + "description": "Enable TIFF support to read some grids", + "dependencies": [ + { + "name": "tiff", + "default-features": false, + "features": [ + "lzma", + "zip" + ] + } + ] + }, + "tools": { + "description": "Build tools" + } + } } diff --git a/ports/proj4/pkgconfig.patch b/ports/proj4/pkgconfig.patch deleted file mode 100644 index 89cf782e4573d4..00000000000000 --- a/ports/proj4/pkgconfig.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89763d7..f648296 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -342,7 +342,7 @@ install(FILES ${docfiles} - ################################################################################ - # pkg-config support - ################################################################################ --if(UNIX OR MINGW) -+if(1) - configure_proj_pc() - - install(FILES -diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake -index 2e0db05..46e5de1 100644 ---- a/cmake/ProjUtilities.cmake -+++ b/cmake/ProjUtilities.cmake -@@ -78,15 +78,21 @@ function(configure_proj_pc) - set(VERSION ${PROJ_VERSION}) - # Build list for Libs.private - set(EXTRA_LIBS -- -lstdc++ -- -lsqlite3 - ${CMAKE_THREAD_LIBS_INIT} - ) -+ set(REQUIRES_PRIVATE "sqlite3") - if(TIFF_ENABLED) -- list(APPEND EXTRA_LIBS -ltiff) -+ string(APPEND REQUIRES_PRIVATE " libtiff-4") - endif() - if(CURL_ENABLED) -- list(APPEND EXTRA_LIBS -lcurl) -+ string(APPEND REQUIRES_PRIVATE " libcurl") -+ endif() -+ if(WIN32 AND NOT MINGW) -+ string(APPEND EXTRA_LIBS " -lole32 -lshell32") -+ elseif(NOT APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^gnu") -+ string(APPEND EXTRA_LIBS " -lstdc++") -+ else() -+ string(APPEND EXTRA_LIBS " -lc++") - endif() - if(HAVE_LIBM) - list(APPEND EXTRA_LIBS -lm) -diff --git a/proj.pc.in b/proj.pc.in -index 846310d..3feac38 100644 ---- a/proj.pc.in -+++ b/proj.pc.in -@@ -11,4 +11,5 @@ Requires: - Version: @VERSION@ - Libs: -L${libdir} -lproj - Libs.private: @EXTRA_LIBS@ -+Requires.private: @REQUIRES_PRIVATE@ - Cflags: -I${includedir} diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index ec14da721685f0..cc6e26fcb0b69f 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,70 +1 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO OSGeo/PROJ - REF 8.2.1 - SHA512 8af4c41320e3fd60af3bfa89a89fd1bb22461786a4288a5873d82f90c51eaef021f539b6a6bcc8e393f786a84ea3747a75d80d95e620f20ef2a353f1a90b74bc - HEAD_REF master - PATCHES - fix-win-output-name.patch - fix-proj4-targets-cmake.patch - tools-cmake.patch - pkgconfig.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - net ENABLE_CURL - tiff ENABLE_TIFF - tools BUILD_APPS -) - -vcpkg_list(SET TOOL_NAMES cct cs2cs geod gie invgeod invproj proj projinfo projsync) -if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES) - set(BUILD_PROJSYNC OFF) - vcpkg_list(APPEND FEATURE_OPTIONS -DBUILD_PROJSYNC=${BUILD_PROJSYNC}) - vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync) -endif() - -find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DNLOHMANN_JSON=external - -DPROJ_LIB_SUBDIR=lib - -DPROJ_INCLUDE_SUBDIR=include - -DPROJ_DATA_SUBDIR=share/${PORT} - -DBUILD_TESTING=OFF - "-DEXE_SQLITE3=${EXE_SQLITE3}" -) - -vcpkg_cmake_install() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # Enforce consistency with src/lib_proj.cmake build time configuration. - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proj.h" - "#ifndef PROJ_DLL" - "#ifndef PROJ_DLL\n# define PROJ_DLL\n#elif 0" - ) -endif() - -vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ CONFIG_PATH lib/cmake/proj DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ4 CONFIG_PATH lib/cmake/proj4) - -if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) -endif () - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() -if(NOT DEFINED VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc" " -lproj" " -lproj_d") -endif() - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 85c45af001aeaf..9cfa1ad3687b9d 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,57 +1,12 @@ { "name": "proj4", - "version-semver": "8.2.1", - "port-version": 1, - "description": "PROJ library for cartographic projections", - "homepage": "https://proj.org/", + "version-semver": "8.9.9", + "description": "A stub package that pulls in proj. Do not depend on this package.", + "license": "MIT", "dependencies": [ - "nlohmann-json", { - "name": "sqlite3", - "default-features": false - }, - { - "name": "sqlite3", - "host": true, - "features": [ - "tool" - ] - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "default-features": [ - "net", - "tiff" - ], - "features": { - "net": { - "description": "Enable network support", - "dependencies": [ - "curl" - ] - }, - "tiff": { - "description": "Enable TIFF support to read some grids", - "dependencies": [ - { - "name": "tiff", - "default-features": false, - "features": [ - "lzma", - "zip" - ] - } - ] - }, - "tools": { - "description": "Build tools" + "name": "proj", + "version>=": "9.0.0" } - } + ] } diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index edc48ba75db0af..426ffdd13537b1 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 8, + "port-version": 9, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", @@ -31,7 +31,7 @@ "lz4", "netcdf-c", "pegtl-2", - "proj4", + "proj", "pugixml", "sqlite3", "tiff", diff --git a/versions/baseline.json b/versions/baseline.json index 1dc849c472c753..d813b21f2cf7e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2386,7 +2386,7 @@ }, "gdal": { "baseline": "3.4.1", - "port-version": 3 + "port-version": 4 }, "gdcm": { "baseline": "3.0.7", @@ -3530,7 +3530,7 @@ }, "libgeotiff": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 1 }, "libgit2": { "baseline": "1.4.2", @@ -3806,7 +3806,7 @@ }, "libosmium": { "baseline": "2.17.1", - "port-version": 0 + "port-version": 1 }, "libosmscout": { "baseline": "1.1.1", @@ -3970,7 +3970,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 3 + "port-version": 4 }, "libspnav": { "baseline": "0.2.3", @@ -4334,7 +4334,7 @@ }, "mapnik": { "baseline": "2022-01-28", - "port-version": 0 + "port-version": 1 }, "marble": { "baseline": "19.08.2", @@ -5485,12 +5485,12 @@ "port-version": 1 }, "proj": { - "baseline": "0", - "port-version": 1 + "baseline": "9.0.0", + "port-version": 0 }, "proj4": { - "baseline": "8.2.1", - "port-version": 1 + "baseline": "8.9.9", + "port-version": 0 }, "prometheus-cpp": { "baseline": "1.0.0", @@ -7286,7 +7286,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 8 + "port-version": 9 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 15d6d0dbbde0fe..ec6f7ea3683064 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daeafe53684ed8335d3bf77deeffa3424b26120d", + "version-semver": "3.4.1", + "port-version": 4 + }, { "git-tree": "a8c88697265b7f88d7576c24c57456da86500b19", "version-semver": "3.4.1", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index a7ca72e9aa9a0c..dbe169b3498f3a 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91982f7018b13638993efc70c14bf0996105f0bc", + "version": "1.7.0", + "port-version": 1 + }, { "git-tree": "f68bbf7c0472548573a69d1e41801edb1179c028", "version": "1.7.0", diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index acf60f09b41e6f..ff0000a08fa991 100644 --- a/versions/l-/libosmium.json +++ b/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e9ae3d97e11dfebbba6d839add7886b4bede3b1", + "version-semver": "2.17.1", + "port-version": 1 + }, { "git-tree": "862e140771bed4c7e9b7bc8ffc798edbbd3daa1c", "version-semver": "2.17.1", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index eba260adbd00f5..a122398270ea2a 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d7f5aa6151c1285c1b6cd5b6c03ee34db4c0c98", + "version": "5.0.1", + "port-version": 4 + }, { "git-tree": "ad90cccc74f447ccc40309956f67092c845fe40b", "version": "5.0.1", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index a8094e66f505b3..19ea139ebe822a 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab089220fb5ecc215804a68c2122d3e0d3ed58bc", + "version-date": "2022-01-28", + "port-version": 1 + }, { "git-tree": "f352e6316057a4b1751482bd75dd9793aa92771a", "version-date": "2022-01-28", diff --git a/versions/p-/proj.json b/versions/p-/proj.json index b4186059715e2f..59f4dd4bc8f6d0 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "a90853a886ef1a9425ad477bc996b99c0824ff33", "version-string": "0", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index 6c56e608b9399a..0a5a59c7b6b79e 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ccf46b756dabd4cd841b866dcd5491d84a946e1", + "version-semver": "8.9.9", + "port-version": 0 + }, { "git-tree": "de72240f9bceda0263f58b734ab6de4f97632dbe", "version-semver": "8.2.1", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 994e3899bd57c7..d1def2d959d199 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fa106f1a3c80a3ad15d8db406067c5253decc8e", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 9 + }, { "git-tree": "585d1bca8e71d950c6d12ceb6ad720825ecbd704", "version-semver": "9.0.3-pv5.9.1", From b3d781ae271640f6024999389b4f8dbb23d5a960 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 9 Mar 2022 11:58:59 -0800 Subject: [PATCH 36/64] [vcpkg-tool] update to 2022-03-09 (#23463) * Update vcpkg-ce SHA and exclude empty file prettifyJs2Xml.js from signing. by @BillyONeal in https://github.com/microsoft/vcpkg-tool/pull/423 * no lib arch checks for mingw by @autoantwort in https://github.com/microsoft/vcpkg-tool/pull/426 **Full Changelog**: https://github.com/microsoft/vcpkg-tool/compare/2022-03-08...2022-03-09 --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 724001d548f7cf..1d695cb3d7de07 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-03-08' +$versionDate = '2022-03-09' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1fffdd91e6a088..5d408801541b72 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -124,23 +124,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-03-08" +vcpkgToolReleaseTag="2022-03-09" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="d17438ae78d5a5aaaf82bb1605930770dc82dcc64c938613237a02482b591555049203341f42c7446ad725972c18576535a80ec15ff9c8c102f3817cae51a720" + vcpkgToolReleaseSha="fc04f2db2676e9b5958c3bf2c8537f470acb1ed9e0a2b6be1145feebbb701251644dc73311fe5cc4d791272b90e3810d358ded6ca9436700a531634d405180c2" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="0a3808d0b414e4d7b3535187a3ddbf94b58db7fccff52641aa28593e31e64c320bb5d183521aecd8b529aa7294bed0cc1afc002fa03504a7e79aa9fad754794a" + vcpkgToolReleaseSha="0d9dc5669a389601d919893e9e742ec41e5ee09c7aaea7d2f89e8f388f6e08296dea4132f016e44dac771c8b40aabcf195dd228ade8cd0a199cde037d8fdce49" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="19f1c42b699d213405abf9937cf0ac361920a7208a5c397e1106bfc193ab8ecc70c37f7faa9f057809321bc536b61c8a8bf991f0dee7ece1e9916b00ed448c1c" + vcpkgToolReleaseSha="1bc60ca03d76d75033d3cc864e96ff8f36843661c744e6bb7554ee50d5bd8dd027d5b7cdc7909801e75a72b44ac04d66dac29bb6669569c65c62f06f0064dd88" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="5336525a069c7360645362f344f0cadf545ec6ab8d32e72d90ad17131382bb80c74ace6b6d767ad8225b27118740ac476bda006f8244251c3c8787b29dcf7b7e" + vcpkgToolReleaseSha="409480568f161055ba1bb41fc6e9ed99e196f180731ee05422ab4ba182d6277b5a59048b1b10fe39e10c8f4cc8becd2f752fabb775b4623e6888a00af7af782f" fi # Do the download or build. From 05cb8362fae47d28309adb4f2d51f269a87c41d8 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:00:09 -0800 Subject: [PATCH 37/64] [Azure Storage] Update to March Release (#23443) * [azure-storage-common-cpp] Update to 12.2.2 ## 12.2.2 (2022-03-09) ### Features Added - Added `SetImmutabilityPolicy` permission for account SAS. - Bumped up SAS token service version to `2020-08-04`. * [azure-storage-files-datalake-cpp] Update to 12.3.1 ## 12.3.1 (2022-03-09) ### Other Changes - No public changes in this release. * [azure-storage-files-shares-cpp] Update to 12.2.1 ## 12.2.1 (2022-03-09) ### Other Changes - Deprecated enum `LeaseDuration`, use `LeaseDurationType` instead. * [azure-storage-queues-cpp] Update to 12.0.0-beta.4 ## 12.0.0-beta.4 (2022-03-09) ### Other Changes - Changed SAS token signed version to `2018-03-28`. --- ports/azure-storage-common-cpp/portfile.cmake | 4 ++-- ports/azure-storage-common-cpp/vcpkg.json | 2 +- ports/azure-storage-files-datalake-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-datalake-cpp/vcpkg.json | 2 +- ports/azure-storage-files-shares-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-shares-cpp/vcpkg.json | 4 ++-- ports/azure-storage-queues-cpp/portfile.cmake | 4 ++-- ports/azure-storage-queues-cpp/vcpkg.json | 4 ++-- versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-files-datalake-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/a-/azure-storage-queues-cpp.json | 5 +++++ versions/baseline.json | 8 ++++---- 13 files changed, 38 insertions(+), 18 deletions(-) diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index a6bebd059a6953..e84cb2a07aacc2 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.2.1 - SHA512 23abd931d00e65546bf3000d9b6a6b81c0d24df363e2ca181cf3dd6803e24032198769e7557a0af08ff44591c1d88c425b85058b748029901c8fb4dd7956234e + REF azure-storage-common_12.2.2 + SHA512 dff3c48a4177e43b2ca0f28128a6c6002e46f64895c1431cafc8db766de6f3498c9502d671c3ba49122feb8bf271291fda1bd24986bb9ff650ab33be60b14447 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 8c39bdd6af24d2..6d74341ec20c47 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.2.1", + "version-semver": "12.2.2", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index cd329220f5bc28..e29137531a4365 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.3.0 - SHA512 6da6729129cd6a6b7cac2b543ace970e0d96590ab4b76bd1ccf72b694983c7b3ab1242037f579368f476c71d6b49e81ca251cf25f787b504b342dfad4520d106 + REF azure-storage-files-datalake_12.3.1 + SHA512 4d0879808e0d2c2ca0e2c6a89496af3f51a8bcebd071ea51359bb42f1ead193292bb3e21c8c3f023634a48585ab68bdd4d95af0b7357a3e92030c6d1a12ceba9 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index 6894aed17f277a..fff483c1272902 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.3.0", + "version-semver": "12.3.1", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 420ee8925c841b..21dacef3ab9eee 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.2.0 - SHA512 b3e0c0a6b4ab11ff9d4c3318a56621d4d6c453b393f692f5d61118a18c571fbb5a1b259c44bb2ba7ac14e056d3a30bde66e36601139d704baeb9cbc865c43ecd + REF azure-storage-files-shares_12.2.1 + SHA512 c3fd61496833fd90984c20c3ec6f3be663dda922458a7984ce6010c82df28a546f2e24f7d3690f327b22dbdf2abc669f12ebc182f43ba171111ece0450dbe35c ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 54807b9b469ca1..0d0d853eb5a427 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.2.0", + "version-semver": "12.2.1", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.2.2" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index 28a2fd365b7612..cb4c32538acdef 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-queues_12.0.0-beta.3 - SHA512 ca27afcd552aa58d7c0299d8c2e7bfcd08fad80b1437df393437612cc30e039a3d73042979e26d01391c690a4c9865e49c2bc1b98a1009e0bbb15515d024be5a + REF azure-storage-queues_12.0.0-beta.4 + SHA512 8330fcbf2a8c22d7e6ac7c0dc86613c8552c645e4344599333fd68eb4a7cb446d6a4f7c0d7f630c8bab947a67d445828901f2c4999b7f27457b1c9d7ef06f988 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index 46dbd769e66bd2..b48d71ab27de70 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-queues-cpp", - "version-semver": "12.0.0-beta.3", + "version-semver": "12.0.0-beta.4", "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.1" + "version>=": "12.2.2" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 382c0339a7bcfc..e97cad3e30deca 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de5c104dfa95871220c17e4f8f97a99b5da33920", + "version-semver": "12.2.2", + "port-version": 0 + }, { "git-tree": "55a55770fa93d6e541d1540df78aefae2cf905cb", "version-semver": "12.2.1", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index 0cd9a8ebc42f2d..859384ca87ae83 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a254add1b8a2c6f8d6a59760d6016af1e5c19a6", + "version-semver": "12.3.1", + "port-version": 0 + }, { "git-tree": "b312efdf9afad6dc09ce91eb31e19e725a8c1a7a", "version-semver": "12.3.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 581aeff7f022d7..19d79ba64d3af3 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69a5e9af5d75d9e2f33dbd89576297373a332048", + "version-semver": "12.2.1", + "port-version": 0 + }, { "git-tree": "b7c34584a28f09d204e8ab6cbcf23ea93e330653", "version-semver": "12.2.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index 7df363746c9b5b..886d99170c8eba 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4fe64dbaeaacf8bfff69155eea6f001ebee8e15", + "version-semver": "12.0.0-beta.4", + "port-version": 0 + }, { "git-tree": "863a1b7f8841d14dd89ca0f70b0f78408add806d", "version-semver": "12.0.0-beta.3", diff --git a/versions/baseline.json b/versions/baseline.json index d813b21f2cf7e4..fb6d8487952a25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -353,7 +353,7 @@ "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.2.1", + "baseline": "12.2.2", "port-version": 0 }, "azure-storage-cpp": { @@ -361,15 +361,15 @@ "port-version": 3 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.3.0", + "baseline": "12.3.1", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.2.0", + "baseline": "12.2.1", "port-version": 0 }, "azure-storage-queues-cpp": { - "baseline": "12.0.0-beta.3", + "baseline": "12.0.0-beta.4", "port-version": 0 }, "azure-uamqp-c": { From 2db6cb97ca925615eeadec71d2ec82b2a9d09e92 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:03:05 -0800 Subject: [PATCH 38/64] [azure-identity-cpp] Update to 1.2.0 (#23442) ## 1.2.0 (2022-03-08) ### Features Added No changes since `1.2.0-beta.1`. --- ports/azure-identity-cpp/portfile.cmake | 4 ++-- ports/azure-identity-cpp/vcpkg.json | 4 ++-- versions/a-/azure-identity-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index c438a71c279dcd..a6b797a23a2251 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-identity_1.1.1 - SHA512 a2a17a297c74a82b4c64b984699a4e2c76391ed060cd04e61d74641e5dc96c61df0d4139553bee9024aa2b694c1dac94e9e2ed2b54f11512258c66dca2b21823 + REF azure-identity_1.2.0 + SHA512 f27adda21a7d7b687cae08bed6b9f1e7ef10a9f36a886021c939da570c01fe4ab153bbc5852280bb147c879d6cdb4361d9655656398368814f4842ebc9ddc2dc ) vcpkg_cmake_configure( diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index 37a05cd73684ca..d88dfb3378b03d 100644 --- a/ports/azure-identity-cpp/vcpkg.json +++ b/ports/azure-identity-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-identity-cpp", - "version-semver": "1.1.1", + "version-semver": "1.2.0", "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.3.1" + "version>=": "1.4.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index 2e6f71e6a08838..0aaefe2b384f27 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6de8ed7d7b299df5cee8483a4f84cb07dd57b1c", + "version-semver": "1.2.0", + "port-version": 0 + }, { "git-tree": "df411f808c6dab5e59a7f378308856d803150c04", "version-semver": "1.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index fb6d8487952a25..9591486252db81 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -321,7 +321,7 @@ "port-version": 0 }, "azure-identity-cpp": { - "baseline": "1.1.1", + "baseline": "1.2.0", "port-version": 0 }, "azure-iot-sdk-c": { From 6308196b257548596f8ac478413d8e652108e234 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:04:15 -0800 Subject: [PATCH 39/64] [Azure SDK Key Vault] Update to March Release Certificates and Secrets (#23441) * [azure-security-keyvault-certificates-cpp] Update to 4.0.0-beta.2 ## 4.0.0-beta.2 (2022-03-08) ### Breaking Changes - Updated `CreateCertificateOperation.PollUntilDone()` (returned from `StartCreateCertificate()`) to return the operation status instead of the newly created certificate. * [azure-security-keyvault-secrets-cpp] Update to 4.0.0-beta.2 ## 4.0.0-beta.2 (2022-03-08) - Second preview. - Internal improvements. --- .../azure-security-keyvault-certificates-cpp/portfile.cmake | 4 ++-- ports/azure-security-keyvault-certificates-cpp/vcpkg.json | 4 ++-- ports/azure-security-keyvault-secrets-cpp/portfile.cmake | 4 ++-- ports/azure-security-keyvault-secrets-cpp/vcpkg.json | 4 ++-- versions/a-/azure-security-keyvault-certificates-cpp.json | 5 +++++ versions/a-/azure-security-keyvault-secrets-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index 5b0035e64d287a..ff74c8cd4c09ca 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-certificates_4.0.0-beta.1 - SHA512 8cb7fccade755cb984a311430a808e777a041e663b607a40308a79b353431abea2eaef1c49c48c783ec9020b5d0e6e53fa101f2e2432bd71bba3b578bfe810ca + REF azure-security-keyvault-certificates_4.0.0-beta.2 + SHA512 b8e3c2fc942854610a9ae3a0f57f1f1e5a5fe73905ca5085bb418b68e9888f7acb1d0866ba7692b055d4438bdf4f3f796e5860a95e0d9663e68353dabd07bed7 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index 06b6ce023199f4..a7ea535745a55b 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-certificates-cpp", - "version-semver": "4.0.0-beta.1", + "version-semver": "4.0.0-beta.2", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.2.0" + "version>=": "1.3.1" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index 3e6b1c84faa044..3589f406199d0d 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-secrets_4.0.0-beta.1 - SHA512 dc40606fdd5f0c6934f9720fc9722346a5bff02093cd9a1805ca6a2356854a8648fcdf689e3456162b0b93dc85bea916ca1532547a4937113067deb5abdb3ff7 + REF azure-security-keyvault-secrets_4.0.0-beta.2 + SHA512 471158c13cd356289f1876f68c69ce761adead141aa832d13abed8a3dd5a221666a09a9c33d8f840ec1372d4edf602d867dba5978262785bf9b9040a50e08904 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index f95d098002d357..198577edfa0bb2 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-secrets-cpp", - "version-semver": "4.0.0-beta.1", + "version-semver": "4.0.0-beta.2", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.2.0" + "version>=": "1.3.1" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index b423c1eba4affd..caf536d42acd69 100644 --- a/versions/a-/azure-security-keyvault-certificates-cpp.json +++ b/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbaebc2afcade7b67f33d7d62ec680aaa0b3700d", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "5faeb850df56edd9f4689f69f4d64e6e51dde80b", "version-semver": "4.0.0-beta.1", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index 70bd3973ec8d0f..37bae1323bf9d2 100644 --- a/versions/a-/azure-security-keyvault-secrets-cpp.json +++ b/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c977a0be18a1e5f8591268d35b0a221ef9e8f7f9", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "e0a2ec6fd19019aaf9f485eea66c5b660b1bc7a4", "version-semver": "4.0.0-beta.1", diff --git a/versions/baseline.json b/versions/baseline.json index 9591486252db81..539209d079e7e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -337,7 +337,7 @@ "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { - "baseline": "4.0.0-beta.1", + "baseline": "4.0.0-beta.2", "port-version": 0 }, "azure-security-keyvault-keys-cpp": { @@ -345,7 +345,7 @@ "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.0.0-beta.1", + "baseline": "4.0.0-beta.2", "port-version": 0 }, "azure-storage-blobs-cpp": { From 198b84f4276e96af5a08455810548a8a8a55de03 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 9 Mar 2022 22:12:40 +0100 Subject: [PATCH 40/64] [croncpp] don't build tests (#23434) --- ports/croncpp/no-test.patch | 17 +++++++++++++++++ ports/croncpp/portfile.cmake | 19 +++++++++++-------- ports/croncpp/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 2 +- versions/c-/croncpp.json | 5 +++++ 5 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 ports/croncpp/no-test.patch diff --git a/ports/croncpp/no-test.patch b/ports/croncpp/no-test.patch new file mode 100644 index 00000000000000..0860e3f10a49a7 --- /dev/null +++ b/ports/croncpp/no-test.patch @@ -0,0 +1,17 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index a82e605..405f306 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if(BUILD_TESTS) + cmake_minimum_required(VERSION 3.7.0) + project(test_croncpp) + +@@ -9,7 +10,6 @@ file(GLOB SOURCES "*.cpp" "include/*.cpp") + + add_executable(test_croncpp ${SOURCES} ${headers}) + +-if(BUILD_TESTS) + enable_testing() + + add_test(NAME "test_croncpp" COMMAND "test_croncpp" "-r compact") diff --git a/ports/croncpp/portfile.cmake b/ports/croncpp/portfile.cmake index ebf35895bc3732..bfdd2f84fd7614 100644 --- a/ports/croncpp/portfile.cmake +++ b/ports/croncpp/portfile.cmake @@ -5,19 +5,22 @@ vcpkg_from_github( REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020 SHA512 8f4d892ce90d8eca3711b21728bb599bf64857b20c0b143c5277687d0b6e5d5b8bf3e6dc7f9e8d028ba4e5ee711a5a9e750bcc2f771177d2f659c0c19e12207a HEAD_REF master - PATCHES 0001-fix-cmake.patch + PATCHES + 0001-fix-cmake.patch + no-test.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/croncpp RENAME copyright) +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/croncpp/vcpkg.json b/ports/croncpp/vcpkg.json index d1b9e05dea43a6..e41db7b7732997 100644 --- a/ports/croncpp/vcpkg.json +++ b/ports/croncpp/vcpkg.json @@ -1,7 +1,18 @@ { "name": "croncpp", - "version-string": "2020-09-04", - "port-version": 2, + "version-date": "2020-09-04", + "port-version": 3, "description": "croncpp is a C++17 header-only cross-platform library for handling CRON expressions.", - "homepage": "https://github.com/mariusbancila/croncpp" + "homepage": "https://github.com/mariusbancila/croncpp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 539209d079e7e6..d87a108b82ff86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1662,7 +1662,7 @@ }, "croncpp": { "baseline": "2020-09-04", - "port-version": 2 + "port-version": 3 }, "crossguid": { "baseline": "2021-10-22", diff --git a/versions/c-/croncpp.json b/versions/c-/croncpp.json index f1feb4ca48847a..99f598042fc628 100644 --- a/versions/c-/croncpp.json +++ b/versions/c-/croncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fb4aefe39d2d695cb5cc89a4f3c92e4229605f5", + "version-date": "2020-09-04", + "port-version": 3 + }, { "git-tree": "79f67dcb192287955f663db8cc36f73455f78990", "version-string": "2020-09-04", From 5a8a1dfff8e2dffd4c8cc2d1fc0da379ffd18b25 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 9 Mar 2022 14:29:15 -0800 Subject: [PATCH 41/64] [ci] create parent-hashes in ArtifactStagingDirectory (#23468) instead of WorkingRoot - this should mean that we don't get permission errors in CI Co-authored-by: nicole mazzuca --- scripts/azure-pipelines/test-modified-ports.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 588eecdb725220..d0b542c57d3cf3 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -162,7 +162,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) } Write-Host "Determining parent hashes using HEAD~1" - $parentHashesFile = Join-Path $WorkingRoot 'parent-hashes.json' + $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' $parentHashes = @("--parent-hashes=$parentHashesFile") & git revert -n -m 1 HEAD | Out-Null & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" From 16d13ffc54cec8c05374fc20bd48cbb14ecc974d Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 10 Mar 2022 20:11:10 -0500 Subject: [PATCH 42/64] [google-cloud-cpp] update to latest release (v1.38.0) (#23368) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/support_absl_cxx17.patch | 2 +- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 1b33de172e566a..3ba4d08c6d2308 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.37.0 - SHA512 4174bfa7d911b8f09411962af53607d3536f2eaa0af8bce02b847e7fee87df9fd46683f4314d2df0cea23994e094845ead485314387814791cd39647cac0c546 + REF v1.38.0 + SHA512 8d13450d5d669c8f736a6b8cb57291e7de997ab8dcd3dbce8dabd6d71ff81096ef92f02cf64711d40a1465b47f8fd5ce21a355c9526c5900adc076e25b062fa7 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/support_absl_cxx17.patch b/ports/google-cloud-cpp/support_absl_cxx17.patch index 7addced4d6a07c..0f8074b1d547e3 100644 --- a/ports/google-cloud-cpp/support_absl_cxx17.patch +++ b/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -3,7 +3,7 @@ index 0e2b703..7097f06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,13 @@ project( - VERSION 1.37.0 + VERSION 1.38.0 LANGUAGES CXX C) -# Allow applications to override the CMAKE_CXX_STANDARD, but if not set use 11. diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 75bc283e877fab..d5a4282e95a643 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.37.0", + "version": "1.38.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d87a108b82ff86..03f7ab5515e427 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2545,7 +2545,7 @@ "port-version": 1 }, "google-cloud-cpp": { - "baseline": "1.37.0", + "baseline": "1.38.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index eec2c886e22470..8a91975572fec1 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f67a7068dcb56bb2a97b03a6960d522b71eb28f5", + "version": "1.38.0", + "port-version": 0 + }, { "git-tree": "b986c9bce793574d2a4936c1b23e705aa8b29abc", "version": "1.37.0", From e6509c997fef840f7cfdb84cf6e757b70ee283a8 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 10 Mar 2022 18:44:08 -0800 Subject: [PATCH 43/64] Update VMs for March 2022 Patch Tuesday (#23467) * Add defenses (sleep) to Linux image creation, remove sudo from provisioning scripts, and use apt-get. * Update pools. --- scripts/azure-pipelines/azure-pipelines.yml | 4 +-- .../azure-pipelines/linux/create-image.ps1 | 18 ++++++++++- .../azure-pipelines/linux/provision-image.sh | 30 ++++++++++--------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index f9199b8c45ba3d..c0f844fa8e876c 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-01-11' - linux-pool: 'PrLin-2021-12-13' + windows-pool: 'PrWin-2022-03-09' + linux-pool: 'PrLin-2022-03-09' osx-pool: 'PrOsx-2022-02-04' jobs: diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index 5eacd2b8c01970..d19bb673fa09bf 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -23,7 +23,7 @@ $ProtoVMName = 'PROTOTYPE' $ErrorActionPreference = 'Stop' $ProgressActivity = 'Creating Linux Image' -$TotalProgress = 9 +$TotalProgress = 11 $CurrentProgress = 1 Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking @@ -104,6 +104,22 @@ New-AzVm ` -Location $Location ` -VM $VM +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Waiting 1 minute to let Azure VM customizations be applied' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Start-Sleep -Seconds 60 + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Restarting VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Restart-AzVm -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + #################################################################################################### Write-Progress ` -Activity $ProgressActivity ` diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 3abc8cb0f59c0b..58ca5a4a67b1ad 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -3,8 +3,10 @@ # SPDX-License-Identifier: MIT # -sudo apt -y update -sudo apt -y dist-upgrade +export DEBIAN_FRONTEND=noninteractive + +apt-get -y update +apt-get -y dist-upgrade # Install common build dependencies APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \ @@ -54,7 +56,7 @@ APT_PACKAGES="$APT_PACKAGES libxdamage-dev" # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" -sudo apt -y install $APT_PACKAGES +apt-get -y install $APT_PACKAGES # Install newer version of nasm than the apt package, required by intel-ipsec mkdir /tmp/nasm @@ -63,24 +65,24 @@ curl -O https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz tar -xf nasm-2.15.05.tar.gz cd nasm-2.15.05/ ./configure --prefix=/usr && make -j -sudo make install +make install cd ~ # Install the latest Haskell stack -curl -sSL https://get.haskellstack.org/ | sudo sh +curl -sSL https://get.haskellstack.org/ | sh # Install CUDA wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub -sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" -sudo apt -y update -sudo apt install -y --no-install-recommends cuda-compiler-11-3 cuda-libraries-dev-11-3 cuda-driver-dev-11-3 \ +mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" +apt-get -y update +apt-get install -y --no-install-recommends cuda-compiler-11-3 cuda-libraries-dev-11-3 cuda-driver-dev-11-3 \ cuda-cudart-dev-11-3 libcublas-11-3 libcurand-dev-11-3 libcudnn8-dev libnccl2 libnccl-dev # Install PowerShell wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -sudo dpkg -i packages-microsoft-prod.deb -sudo apt update -sudo add-apt-repository universe -sudo apt install -y powershell +dpkg -i packages-microsoft-prod.deb +apt-get update +add-apt-repository universe +apt-get install -y powershell From 03ecabfe1a90a8b650c8f8855d9e04576007a3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 12 Mar 2022 01:57:37 +0800 Subject: [PATCH 44/64] [vcpkg baseline] Fix ports build on Linux (#23478) * [vcpkg baseline] Fix ncurses linux build * version * fix homepage * version * [libgnutls] Fix build on Linux * version * [pcapplusplus] Re-factory build system, use cmake instead. * version * version * Update ports/ncurses/vcpkg.json * Update versions/n-/ncurses.json --- ports/libgnutls/portfile.cmake | 1 + ports/libgnutls/vcpkg.json | 3 +- ports/ncurses/portfile.cmake | 2 + ports/ncurses/vcpkg.json | 5 +- ports/pcapplusplus/CMakeLists.txt | 106 ++++++++++++++++++++++++++++++ ports/pcapplusplus/portfile.cmake | 102 ++++------------------------ ports/pcapplusplus/vcpkg.json | 8 ++- versions/baseline.json | 6 +- versions/l-/libgnutls.json | 5 ++ versions/n-/ncurses.json | 5 ++ versions/p-/pcapplusplus.json | 5 ++ 11 files changed, 151 insertions(+), 97 deletions(-) create mode 100644 ports/pcapplusplus/CMakeLists.txt diff --git a/ports/libgnutls/portfile.cmake b/ports/libgnutls/portfile.cmake index a6d074f062326d..aa83cb647a66c0 100644 --- a/ports/libgnutls/portfile.cmake +++ b/ports/libgnutls/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_configure_make( --disable-maintainer-mode --disable-rpath --disable-libdane + --disable-guile --with-included-unistring --without-p11-kit --without-tpm diff --git a/ports/libgnutls/vcpkg.json b/ports/libgnutls/vcpkg.json index 1d48006bedcdab..c09c9244e0dd59 100644 --- a/ports/libgnutls/vcpkg.json +++ b/ports/libgnutls/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libgnutls", "version": "3.6.15", - "port-version": 2, + "port-version": 3, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", "homepage": "https://www.gnutls.org/", + "license": "LGPL-2.1-or-later", "supports": "!windows", "dependencies": [ "gettext", diff --git a/ports/ncurses/portfile.cmake b/ports/ncurses/portfile.cmake index 65ed48e71b3eb8..f93d4d9c328ce1 100644 --- a/ports/ncurses/portfile.cmake +++ b/ports/ncurses/portfile.cmake @@ -41,10 +41,12 @@ endif() set(OPTIONS_DEBUG "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" --with-debug + --without-normal ) set(OPTIONS_RELEASE "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/lib/pkgconfig" --without-debug + --with-normal ) vcpkg_configure_make( diff --git a/ports/ncurses/vcpkg.json b/ports/ncurses/vcpkg.json index 7396cf74812b44..465e15d472ca88 100644 --- a/ports/ncurses/vcpkg.json +++ b/ports/ncurses/vcpkg.json @@ -1,6 +1,9 @@ { "name": "ncurses", - "version-string": "6.3", + "version": "6.3", + "port-version": 1, "description": "free software emulation of curses in System V Release 4.0", + "homepage": "https://invisible-island.net/ncurses/announce.html", + "license": "MIT", "supports": "!windows | mingw" } diff --git a/ports/pcapplusplus/CMakeLists.txt b/ports/pcapplusplus/CMakeLists.txt new file mode 100644 index 00000000000000..89ac75005c0c02 --- /dev/null +++ b/ports/pcapplusplus/CMakeLists.txt @@ -0,0 +1,106 @@ +cmake_minimum_required(VERSION 3.12) + +project(pcapplusplus CXX) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +if (WIN32) + set(BUILD_SHARED_LIBS OFF) +endif() + +# dependencies +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) +if (WIN32) + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_RELEASE NAMES Packet PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_DEBUG NAMES Packet PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) + select_library_configurations(PACKET) + list(APPEND PCAP_LIBRARIES ${PACKET_LIBRARIES}) +else() + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES pcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES pcap PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) +endif() + +find_package(Threads REQUIRED) + +# common++ +file(GLOB COMMONPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Common++/header/*.h") +file(GLOB COMMONPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Common++/src/*.cpp") + +add_library(commonpp ${COMMONPP_SOURCES}) + +target_include_directories(commonpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Common++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/EndianPortable/include") +set_target_properties(commonpp PROPERTIES OUTPUT_NAME Common++) +if (WIN32) + target_compile_definitions(commonpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(commonpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(commonpp PRIVATE MAC_OS_X) +endif() + +# packet++ +file(GLOB PACKETPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Packet++/header/*.h") +file(GLOB PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Packet++/src/*.cpp") +list(APPEND PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library/md5.cpp") + +add_library(packetpp ${PACKETPP_SOURCES}) + +target_include_directories(packetpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Packet++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library") +target_link_libraries(packetpp PRIVATE commonpp) +set_target_properties(packetpp PROPERTIES OUTPUT_NAME Packet++) +if (WIN32) + target_compile_definitions(packetpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(packetpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(packetpp PRIVATE MAC_OS_X) +endif() + +# pcap++ +file(GLOB PCAPPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header/*.h") +file(GLOB PCAPPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pcap++/src/*.cpp") +file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.cpp") + +add_library(pcappp ${PCAPPP_SOURCES}) + +target_include_directories(pcappp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header" "${PCAP_INCLUDES}" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/include") +target_link_libraries(pcappp PUBLIC commonpp packetpp ${PCAP_LIBRARIES} Threads::Threads) + +if (WIN32) + target_link_libraries(pcappp PUBLIC ws2_32 iphlpapi) +elseif (APPLE) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) + target_link_libraries(pcappp PUBLIC ${COREFOUNDATION_LIBRARY} ${SYSTEMCONFIGURATION_LIBRARY}) +endif() + +if (WIN32) + target_compile_definitions(pcappp PRIVATE WPCAP HAVE_REMOTE HAVE_STRUCT_TIMESPEC _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(pcappp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(pcappp PRIVATE MAC_OS_X) +endif() + +set_target_properties(pcappp PROPERTIES OUTPUT_NAME Pcap++) + +# Install +install(FILES ${PCAPPP_HEADERS} ${COMMONPP_HEADERS} ${PACKETPP_HEADERS} DESTINATION include) +install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION share/pcapplusplus) + +install( + TARGETS pcappp commonpp packetpp + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/ports/pcapplusplus/portfile.cmake b/ports/pcapplusplus/portfile.cmake index e280af3c3ffc64..1da5a37ab43987 100644 --- a/ports/pcapplusplus/portfile.cmake +++ b/ports/pcapplusplus/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,97 +9,15 @@ vcpkg_from_github( SHA512 ad10034950c0c3e6a4638e8b314c8983ce42609948d7d8d40ad0ff678820a2469807bd29aff77e657a150008602475b50cea84a0766ad87ea203985519cb38ac HEAD_REF master ) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(VS_VERSION "vs2015") - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(VS_VERSION "vs2017") - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(VS_VERSION "vs2019") - else() - message(FATAL_ERROR "Unsupported visual studio version") - endif() - - vcpkg_execute_required_process( - COMMAND configure-windows-visual-studio.bat -v ${VS_VERSION} -w . -p . - WORKING_DIRECTORY ${SOURCE_PATH} - ) - - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Common++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - USE_VCPKG_INTEGRATION - ) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Packet++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - USE_VCPKG_INTEGRATION - ) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Pcap++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - USE_VCPKG_INTEGRATION - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - LICENSE_SUBPATH LICENSE - ) - - # Lib - file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Release/*") - file( - INSTALL ${LIB_FILES_RELEASE} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Debug/*") - file( - INSTALL ${LIB_FILES_RELEASE} - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - - file( - REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/lib/LightPcapNg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/LightPcapNg.lib" - ) -else() - if(VCPKG_TARGET_IS_LINUX) - set(CONFIG_CMD "./configure-linux.sh") - elseif(VCPKG_TARGET_IS_OSX) - set(CONFIG_CMD "./configure-mac_os_x.sh") - else() - message(FATAL_ERROR "Unsupported platform") - endif() - - vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/${CONFIG_CMD} --libpcap-include-dir ${CURRENT_INSTALLED_DIR}/include - WORKING_DIRECTORY ${SOURCE_PATH} - ) - - vcpkg_execute_build_process( - COMMAND make libs - WORKING_DIRECTORY ${SOURCE_PATH} - ) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) - # Lib - file(GLOB LIB_FILES "${SOURCE_PATH}/Dist/*.a") - file( - INSTALL ${LIB_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) +vcpkg_cmake_install() +vcpkg_copy_pdbs() - # Include - file(GLOB HEADER_FILES "${SOURCE_PATH}/Dist/header/*.h") - file( - INSTALL ${HEADER_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include - ) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") - # Copyright - file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json index 0d37fff7eb6f33..b1df5ae7af61d7 100644 --- a/ports/pcapplusplus/vcpkg.json +++ b/ports/pcapplusplus/vcpkg.json @@ -1,8 +1,10 @@ { "name": "pcapplusplus", - "version-string": "21.11", + "version": "21.11", + "port-version": 1, "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", "homepage": "https://github.com/seladb/PcapPlusPlus", + "license": null, "dependencies": [ { "name": "libpcap", @@ -12,6 +14,10 @@ "name": "pthreads", "platform": "windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "winpcap", "platform": "windows" diff --git a/versions/baseline.json b/versions/baseline.json index 03f7ab5515e427..cf2b0af04047b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3538,7 +3538,7 @@ }, "libgnutls": { "baseline": "3.6.15", - "port-version": 2 + "port-version": 3 }, "libgo": { "baseline": "3.1", @@ -4730,7 +4730,7 @@ }, "ncurses": { "baseline": "6.3", - "port-version": 0 + "port-version": 1 }, "neargye-semver": { "baseline": "0.3.0", @@ -5254,7 +5254,7 @@ }, "pcapplusplus": { "baseline": "21.11", - "port-version": 0 + "port-version": 1 }, "pcg": { "baseline": "2021-04-06", diff --git a/versions/l-/libgnutls.json b/versions/l-/libgnutls.json index fd09cc37043157..7e42855838404b 100644 --- a/versions/l-/libgnutls.json +++ b/versions/l-/libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f041c07b59c7ac2389ac1fd6d8a175466bb648b7", + "version": "3.6.15", + "port-version": 3 + }, { "git-tree": "c03a1c452fa39d1b6d884aa3ef12c0c98a11f0a3", "version": "3.6.15", diff --git a/versions/n-/ncurses.json b/versions/n-/ncurses.json index bf9d494289882c..26698d56191cd5 100644 --- a/versions/n-/ncurses.json +++ b/versions/n-/ncurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea7aecbf38cef7f64f929c679d55812e679ca496", + "version": "6.3", + "port-version": 1 + }, { "git-tree": "68d49e9492a5a00c0b04cfbe2985ed99fc33973a", "version-string": "6.3", diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json index 7c5b4840c76e73..c90a7c04976638 100644 --- a/versions/p-/pcapplusplus.json +++ b/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1f63c9365f0cb128761835ebceeafb6b162c815", + "version": "21.11", + "port-version": 1 + }, { "git-tree": "e0480fc24edf7b699eb027d24c3737026dd1128c", "version-string": "21.11", From 944af3ecd78dbba00dab453719863d2c1213939b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 11 Mar 2022 19:57:35 +0100 Subject: [PATCH 45/64] [proj4] Retain former features (fixes `vcpkg upgrade`) (#23487) * Mirror proj features in proj4 for vcpkg upgrade * Update version --- ports/proj4/vcpkg.json | 46 +++++++++++++++++++++++++++++++++++++++++- versions/baseline.json | 2 +- versions/p-/proj4.json | 5 +++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 9cfa1ad3687b9d..a669741020d21e 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,12 +1,56 @@ { "name": "proj4", "version-semver": "8.9.9", + "port-version": 1, "description": "A stub package that pulls in proj. Do not depend on this package.", "license": "MIT", "dependencies": [ { "name": "proj", + "default-features": false, "version>=": "9.0.0" } - ] + ], + "default-features": [ + "net", + "tiff" + ], + "features": { + "net": { + "description": "Enable network support", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "net" + ] + } + ] + }, + "tiff": { + "description": "Enable TIFF support to read some grids", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + } + ] + }, + "tools": { + "description": "Build tools", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "tools" + ] + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index cf2b0af04047b1..0424fcbaabff4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5490,7 +5490,7 @@ }, "proj4": { "baseline": "8.9.9", - "port-version": 0 + "port-version": 1 }, "prometheus-cpp": { "baseline": "1.0.0", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index 0a5a59c7b6b79e..6644539313cb80 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "284d584afb127d11beb4126bf1ee7eccef413229", + "version-semver": "8.9.9", + "port-version": 1 + }, { "git-tree": "4ccf46b756dabd4cd841b866dcd5491d84a946e1", "version-semver": "8.9.9", From bac362526575ada1427ece4aefada4e39a894361 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Fri, 11 Mar 2022 10:59:11 -0800 Subject: [PATCH 46/64] [libheif] fix license (#23480) * [libheif] fix license * update manifest version * update versions --- ports/libheif/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libheif.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index c827f42a0d3083..957f728f42a69a 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libheif", "version": "1.12.0", - "port-version": 2, + "port-version": 3, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", - "license": "GPL-3.0-only", + "license": "LGPL-3.0-only", "dependencies": [ { "name": "gdk-pixbuf", diff --git a/versions/baseline.json b/versions/baseline.json index 0424fcbaabff4d..fc3383016f3e03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3582,7 +3582,7 @@ }, "libheif": { "baseline": "1.12.0", - "port-version": 2 + "port-version": 3 }, "libhsplasma": { "baseline": "2021.06.08", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 0b64a5873f96f3..437397e9a737e8 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9638a1f823a06ad68484b408f5640ac2204b5262", + "version": "1.12.0", + "port-version": 3 + }, { "git-tree": "73b2b4b29035aa22da5ccd0c4c46dbb6e5516424", "version": "1.12.0", From 5630040cd39633545057ec1fcfc97149f3ff3490 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Fri, 11 Mar 2022 11:00:08 -0800 Subject: [PATCH 47/64] [libde265] fix static linkage (#23479) * [libde265] fix static linkage * [libde265] update versions * update manifest version tag * update versions --- ports/libde265/portfile.cmake | 3 +++ ports/libde265/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/l-/libde265.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 6fad08dee40757..2280ff18a07970 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -39,6 +39,9 @@ vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index 5276b3880985d0..76a03dc5ddcf7b 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libde265", - "version-string": "1.0.8", - "port-version": 3, + "version": "1.0.8", + "port-version": 4, "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", + "license": "LGPL-3.0-only", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index fc3383016f3e03..c287b30623d781 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3442,7 +3442,7 @@ }, "libde265": { "baseline": "1.0.8", - "port-version": 3 + "port-version": 4 }, "libdisasm": { "baseline": "0.23", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index cc1bf8f531d025..19996e838cd39a 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f69d985ecdaa897d5efd10422f739d450373e26d", + "version": "1.0.8", + "port-version": 4 + }, { "git-tree": "83f4bc2d067f213063ca93d6f1514d3f7278452c", "version-string": "1.0.8", From 95641c83f5f25ca28050e7c82a171f7d7b3c080b Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Fri, 11 Mar 2022 22:07:30 +0300 Subject: [PATCH 48/64] [lionkor-commandline] Add new port (#23471) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [commandline] Add new port * Fix formating * Fix deps * Update versions * Remove redudant build * Update commandline.json * Update portfile.cmake * Update commandline.json * Ban osx * Update commandline.json * Update ports/commandline/add-install.patch Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/commandline/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Fixes * Update commandline.json * Rename commandline.json to lionkor-commandline.json * Update baseline.json * Update vcpkg.json * Rename ports/commandline/vcpkg.json to ports/lionkor-commandline/vcpkg.json * Rename ports/commandline/portfile.cmake to ports/lionkor-commandline/portfile.cmake * Rename ports/commandline/add-install.patch to ports/lionkor-commandline/add-install.patch * Update baseline.json * version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY --- ports/lionkor-commandline/add-install.patch | 10 +++++++++ ports/lionkor-commandline/portfile.cmake | 24 +++++++++++++++++++++ ports/lionkor-commandline/vcpkg.json | 18 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/lionkor-commandline.json | 9 ++++++++ 5 files changed, 65 insertions(+) create mode 100644 ports/lionkor-commandline/add-install.patch create mode 100644 ports/lionkor-commandline/portfile.cmake create mode 100644 ports/lionkor-commandline/vcpkg.json create mode 100644 versions/l-/lionkor-commandline.json diff --git a/ports/lionkor-commandline/add-install.patch b/ports/lionkor-commandline/add-install.patch new file mode 100644 index 00000000000000..5b794737336107 --- /dev/null +++ b/ports/lionkor-commandline/add-install.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4db57c..7ace55c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,3 +22,5 @@ if(BUILD_EXAMPLES) + target_link_libraries(test commandline) + endif() + ++set_target_properties(commandline PROPERTIES PUBLIC_HEADER "commandline.h") ++install(TARGETS commandline RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) diff --git a/ports/lionkor-commandline/portfile.cmake b/ports/lionkor-commandline/portfile.cmake new file mode 100644 index 00000000000000..cecb25de34f0ee --- /dev/null +++ b/ports/lionkor-commandline/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lionkor/commandline + REF 4a8000d6b767263a79c589fcc74099a4454e07a9 + SHA512 81ee2716b7048e51d26f75033be7a6d3a1aec9bfef833ad067112b26144023dfad8f5f8d145b4162dba2de3ad09de223dbe9143cf9e2f5f5102374d3412aebf7 + HEAD_REF master + PATCHES + add-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lionkor-commandline/vcpkg.json b/ports/lionkor-commandline/vcpkg.json new file mode 100644 index 00000000000000..0aaffc9833b4db --- /dev/null +++ b/ports/lionkor-commandline/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "lionkor-commandline", + "version-semver": "1.0.0", + "description": "A C++ commandline for use in servers and chat software. Provides very simple asynchronous input/output.", + "homepage": "https://github.com/lionkor/commandline/", + "license": "MIT", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c287b30623d781..3d612384cc0b7c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4188,6 +4188,10 @@ "baseline": "4754bee2d8eb3", "port-version": 2 }, + "lionkor-commandline": { + "baseline": "1.0.0", + "port-version": 0 + }, "live555": { "baseline": "2021-12-18", "port-version": 0 diff --git a/versions/l-/lionkor-commandline.json b/versions/l-/lionkor-commandline.json new file mode 100644 index 00000000000000..d5d8277faa1e43 --- /dev/null +++ b/versions/l-/lionkor-commandline.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "857618e8e62e8395973a0c48c61c837877b65fac", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} From 6b3b187f8072d4154af8bfd339ab60ca82112ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 11 Mar 2022 20:09:10 +0100 Subject: [PATCH 49/64] [zpp-bits] Add new port (#23458) * [zpp-bits] Add new port * [zpp-bits] Update version files * [zpp-bits] Add missing version file --- ports/zpp-bits/portfile.cmake | 14 ++++++++++++++ ports/zpp-bits/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/z-/zpp-bits.json | 9 +++++++++ 4 files changed, 34 insertions(+) create mode 100644 ports/zpp-bits/portfile.cmake create mode 100644 ports/zpp-bits/vcpkg.json create mode 100644 versions/z-/zpp-bits.json diff --git a/ports/zpp-bits/portfile.cmake b/ports/zpp-bits/portfile.cmake new file mode 100644 index 00000000000000..02287e7b24bc97 --- /dev/null +++ b/ports/zpp-bits/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eyalz800/zpp_bits + REF v4.3.3 + SHA512 6534711a75d62e4244125329db436ca27bf6b8c31aa9ecb92473f4e5687aa390d9d197d1cb91ed3452363af1537ffdef4a13fe6a1c3049616576a475ba69a548 + HEAD_REF master +) + +file( + COPY "${SOURCE_PATH}/zpp_bits.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zpp-bits/vcpkg.json b/ports/zpp-bits/vcpkg.json new file mode 100644 index 00000000000000..b75cc2d3d72734 --- /dev/null +++ b/ports/zpp-bits/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zpp-bits", + "version": "4.3.3", + "description": "A lightweight C++20 serialization and RPC library", + "homepage": "https://github.com/eyalz800/zpp_bits", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 3d612384cc0b7c..e732e61c5f01ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7596,6 +7596,10 @@ "baseline": "1.0.3", "port-version": 1 }, + "zpp-bits": { + "baseline": "4.3.3", + "port-version": 0 + }, "zserge-webview": { "baseline": "2019-04-27", "port-version": 3 diff --git a/versions/z-/zpp-bits.json b/versions/z-/zpp-bits.json new file mode 100644 index 00000000000000..8b50b3560f8005 --- /dev/null +++ b/versions/z-/zpp-bits.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cfb5cd37a6ed4a1ccab70eeb3112db9ad3d2f026", + "version": "4.3.3", + "port-version": 0 + } + ] +} From 1c6792303a5bab3ed7b1dc6c9c592e1a2426d8d8 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 11 Mar 2022 20:14:42 +0100 Subject: [PATCH 50/64] [sentencepiece] Clarify supported triplets (#23438) * Set supports expression * version * Fix typo * version --- ports/sentencepiece/vcpkg.json | 2 ++ scripts/ci.baseline.txt | 5 ----- versions/baseline.json | 2 +- versions/s-/sentencepiece.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json index ed0f04c456d0af..ad6898b3fb18dd 100644 --- a/ports/sentencepiece/vcpkg.json +++ b/ports/sentencepiece/vcpkg.json @@ -1,7 +1,9 @@ { "name": "sentencepiece", "version": "0.1.96", + "port-version": 1, "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training", + "supports": "!((windows | uwp) & !static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2e9b92c02102e7..ba7e811b96d5f6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1167,11 +1167,6 @@ sdl2-net:x64-uwp=fail # https://github.com/microsoft/vcpkg/issues/10918 seal:arm-uwp=fail seal:x64-uwp=fail -sentencepiece:arm64-windows=fail -sentencepiece:arm-uwp=fail -sentencepiece:x64-uwp=fail -sentencepiece:x64-windows=fail -sentencepiece:x86-windows=fail septag-sx:arm64-windows=fail septag-sx:arm-uwp=fail septag-sx:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index e732e61c5f01ab..6bdab5be035a67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6346,7 +6346,7 @@ }, "sentencepiece": { "baseline": "0.1.96", - "port-version": 0 + "port-version": 1 }, "sentry-native": { "baseline": "0.4.15", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index 311ecd37394d4d..5d3c9d9ac35df4 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b243e85760f8f59100632997fdc34cdae47bcfd4", + "version": "0.1.96", + "port-version": 1 + }, { "git-tree": "b83e7b28dc28e405cfee3c94385e2039c8564040", "version": "0.1.96", From 5bbca2ad2624b803d8925c8aef6c735b500f2dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 12 Mar 2022 03:17:51 +0800 Subject: [PATCH 51/64] [libjpeg-turbo] Fix usage when building static (#23427) * [libjpeg-turbo] Fix usage when building static * version --- ports/libjpeg-turbo/portfile.cmake | 24 ++++++++++++++++++------ ports/libjpeg-turbo/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 752617c45eae0a..091af45bc744ea 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -54,6 +54,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libjpeg-turbo) # Rename libraries for static builds if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -64,14 +68,24 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") endif() endif() -vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libjpeg-turbo) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" @@ -81,5 +95,3 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR} file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jpeg") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index f82e4ed431d0ed..97e1b2566a3b23 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libjpeg-turbo", "version": "2.1.3", + "port-version": 1, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 6bdab5be035a67..6b93a77e819e44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3634,7 +3634,7 @@ }, "libjpeg-turbo": { "baseline": "2.1.3", - "port-version": 0 + "port-version": 1 }, "libjuice": { "baseline": "0.9.6", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 8845498f52c5cb..64cd6ea781538c 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7373af20f73237f0453fb02a1ba097e5f710d2f5", + "version": "2.1.3", + "port-version": 1 + }, { "git-tree": "987bbe2533672eff1aaf160f0f36c818a1f986ee", "version": "2.1.3", From 4c58b84126c8fac70052298720e487a7a824cd7e Mon Sep 17 00:00:00 2001 From: Jianshen Liu Date: Fri, 11 Mar 2022 11:18:19 -0800 Subject: [PATCH 52/64] Fix the dependency of installing arrow with the parquet feature (#23423) --- ports/arrow/vcpkg.json | 7 +++++-- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 728534954f6e47..1c2b84085435f0 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrow", "version": "7.0.0", - "port-version": 1, + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -75,7 +75,10 @@ ] }, "parquet": { - "description": "Parquet support" + "description": "Parquet support", + "dependencies": [ + "rapidjson" + ] }, "plasma": { "description": "Plasma support", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 3ca7acb06dad3f..66bc46896e2ef4 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d3371b4741fc81354b2033d584c48a1929373f4", + "version": "7.0.0", + "port-version": 2 + }, { "git-tree": "71eea8dac175d368506f19bb246b40bf4829846a", "version": "7.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6b93a77e819e44..1f1a89debaed48 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -170,7 +170,7 @@ }, "arrow": { "baseline": "7.0.0", - "port-version": 1 + "port-version": 2 }, "ashes": { "baseline": "2021-06-18", From 9a6b6dabb4926a42098226b4fe5c7f6609ce2560 Mon Sep 17 00:00:00 2001 From: maz-1 Date: Sat, 12 Mar 2022 03:20:00 +0800 Subject: [PATCH 53/64] [ois] fix pkgconfig file not installed on windows (#23426) * [ois] fix pkgconfig file not installed on windows * fix debug suffix --- ports/ois/0001_install_pkgconfig_win32.patch | 29 ++++++++++++++++++++ ports/ois/portfile.cmake | 2 ++ ports/ois/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/o-/ois.json | 5 ++++ 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 ports/ois/0001_install_pkgconfig_win32.patch diff --git a/ports/ois/0001_install_pkgconfig_win32.patch b/ports/ois/0001_install_pkgconfig_win32.patch new file mode 100644 index 00000000000000..2568e3f7c996f1 --- /dev/null +++ b/ports/ois/0001_install_pkgconfig_win32.patch @@ -0,0 +1,29 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-14 03:09:42.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-08 12:48:17.012589000 +0800 +@@ -255,7 +255,12 @@ + install(FILES $ DESTINATION bin OPTIONAL) + endif(MSVC AND BUILD_SHARED_LIBS) + +-if(UNIX) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) +- install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++if (CMAKE_DEBUG_POSTFIX AND CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OIS_POSTFIX ${CMAKE_DEBUG_POSTFIX}) ++else() ++ set(OIS_POSTFIX "") + endif() ++ ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) ++install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++ +diff -Naur a/OIS.pc.in b/OIS.pc.in +--- a/OIS.pc.in 2021-05-14 03:09:42.000000000 +0800 ++++ b/OIS.pc.in 2022-03-08 12:48:33.599696300 +0800 +@@ -6,5 +6,5 @@ + Name: OIS + Description: Cross platform C++ Input Framework + Version: @OIS_VERSION@ +-Libs: -L${libdir} -lOIS ++Libs: -L${libdir} -lOIS@OIS_POSTFIX@ + Cflags: -I${includedir} -I${includedir}/ois diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index 69e24c4393a2cd..e7b5d2bce00fca 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.5.1 SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340 HEAD_REF master + PATCHES + 0001_install_pkgconfig_win32.patch ) vcpkg_cmake_configure( diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index 9daa139ed56793..c73ac9131e911c 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ois", "version": "1.5.1", + "port-version": 1, "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", "homepage": "https://wgois.github.io/OIS/", + "license": "Zlib", "supports": "!(arm | arm64 | uwp)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 1f1a89debaed48..fd752abeebe89b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4946,7 +4946,7 @@ }, "ois": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "ompl": { "baseline": "1.5.1", diff --git a/versions/o-/ois.json b/versions/o-/ois.json index d273f8c520a8f3..39d8df3b2b7240 100644 --- a/versions/o-/ois.json +++ b/versions/o-/ois.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79d79b0c5901492572044ad873cdf4df864accea", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "05dc4bcc0372eaa7b8a86f89a268c5ef0c69c5bf", "version": "1.5.1", From 2e82d5e9586bdbbef1a3d0755612e482f7fd10cd Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 11 Mar 2022 20:20:56 +0100 Subject: [PATCH 54/64] [yato] fix arm build by updating (#23406) --- ports/yato/portfile.cmake | 25 ++++++++----------------- ports/yato/vcpkg.json | 13 ++++++++++--- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 4 ++-- versions/y-/yato.json | 5 +++++ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ports/yato/portfile.cmake b/ports/yato/portfile.cmake index e0b7a916b6e377..7626249b6b24dd 100644 --- a/ports/yato/portfile.cmake +++ b/ports/yato/portfile.cmake @@ -1,8 +1,8 @@ -vcpkg_from_bitbucket( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO alexey_gruzdev/yato - REF v1.0 - SHA512 631b870fd2704a03d9d66ef244f4e50968ae63da4fda0c7cd1f6ce2cea2b1e8b4506b0148cd1af1e133a70fd5d9cdc9d8c054edac6141118ee3c9427e186b270 + REPO agruzdev/Yato + REF 9b5a49f6ec4169b67b9e5ffd11fdae9c238b0a3d + SHA512 41962839cd13a314a17fef5f6065d7c3ed9967832039ca31993105685d584307d00f17c1514f4acf855a71fd884a1104c2d9c6a4461be5d2d7cfdc50b1ea7bdb HEAD_REF master ) @@ -17,24 +17,15 @@ file(COPY "${SOURCE_PATH}/modules/config/yato" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DYATO_BUILD_TESTS:BOOL=OFF -DYATO_BUILD_ACTORS:BOOL=ON -DYATO_BUILD_CONFIG:BOOL=ON - -DYATO_CONFIG_MANUAL:BOOL=ON - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ ) -vcpkg_build_cmake() +vcpkg_cmake_build() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/yato) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/yato/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/yato/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yato/vcpkg.json b/ports/yato/vcpkg.json index 7a5840b6ffaaad..d854276ce54311 100644 --- a/ports/yato/vcpkg.json +++ b/ports/yato/vcpkg.json @@ -1,6 +1,13 @@ { "name": "yato", - "version-string": "1.0", - "port-version": 3, - "description": "Modern C++14 containers and utilities, actors system, typesafe config" + "version-date": "2022-03-06", + "description": "Modern C++14 containers and utilities, actors system, typesafe config", + "license": "Apache-2.0", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ba7e811b96d5f6..73f5c40bc94bcf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1355,9 +1355,6 @@ yajl:arm-uwp=fail yajl:x64-uwp=fail yara:arm-uwp=fail yara:x64-uwp=fail -yato:arm64-windows=fail -yato:arm-uwp=fail -yato:x64-uwp=fail z3:arm-uwp=fail z3:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index fd752abeebe89b..8aa91d2061cfdb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7545,8 +7545,8 @@ "port-version": 1 }, "yato": { - "baseline": "1.0", - "port-version": 3 + "baseline": "2022-03-06", + "port-version": 0 }, "yoga": { "baseline": "1.19.0", diff --git a/versions/y-/yato.json b/versions/y-/yato.json index 6a7e311f8ef73e..856103ad3cb7c3 100644 --- a/versions/y-/yato.json +++ b/versions/y-/yato.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "302773e4845f27896621a44a76a964baec26f3e8", + "version-date": "2022-03-06", + "port-version": 0 + }, { "git-tree": "8605c052211c8394b3f3a524ffe071307582a941", "version-string": "1.0", From 75d2a36b8e4bbee183d3db72f60de705c54f39c3 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 11 Mar 2022 11:21:42 -0800 Subject: [PATCH 55/64] [raylib] Fix cannot find -lglfw on Linux (#23348) * [raylib] Fix cannot find -lglfw * update version * update version Co-authored-by: Lily Wang --- ports/raylib/fix-linkGlfw.patch | 29 +++++++++++++++++++++++++++++ ports/raylib/portfile.cmake | 8 ++++++-- ports/raylib/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/r-/raylib.json | 5 +++++ 5 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 ports/raylib/fix-linkGlfw.patch diff --git a/ports/raylib/fix-linkGlfw.patch b/ports/raylib/fix-linkGlfw.patch new file mode 100644 index 00000000000000..d495e281462229 --- /dev/null +++ b/ports/raylib/fix-linkGlfw.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake +index 1b94cdf..4cc8f8f 100644 +--- a/cmake/GlfwImport.cmake ++++ b/cmake/GlfwImport.cmake +@@ -5,7 +5,7 @@ elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") + find_package(glfw3 3.3.3 QUIET) + endif() + if (glfw3_FOUND) +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif() + + # Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option +@@ -32,3 +32,4 @@ else() + MESSAGE(STATUS "Using external GLFW") + set(GLFW_PKG_DEPS glfw3) + endif() ++set(GLFW_PKG_DEPS glfw3) +diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake +index c156d6b..55c5bca 100644 +--- a/cmake/LibraryConfigurations.cmake ++++ b/cmake/LibraryConfigurations.cmake +@@ -104,5 +104,5 @@ endif () + set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY}) + + if (${PLATFORM} MATCHES "Desktop") +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif () diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index 03434d92ebd4dd..96a0298d42d527 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -10,12 +10,17 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li ) endif() +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + set(patches fix-linkGlfw.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib REF 4.0.0 SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417 HEAD_REF master + PATCHES ${patches} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED) @@ -34,8 +39,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_GAMES=OFF diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 4732c3d41c48f0..348eb943e668e7 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,12 +1,16 @@ { "name": "raylib", "version-semver": "4.0.0", - "port-version": 2, + "port-version": 3, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib", "supports": "!(arm | uwp)", "dependencies": [ + { + "name": "glfw3", + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 8aa91d2061cfdb..c27061d483c122 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6030,7 +6030,7 @@ }, "raylib": { "baseline": "4.0.0", - "port-version": 2 + "port-version": 3 }, "rbdl": { "baseline": "2.6.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 82e0effffcd1d2..91b54dde0c2ac4 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743", + "version-semver": "4.0.0", + "port-version": 3 + }, { "git-tree": "94a36f9f2d45dcba0e7ee689b5d58ad11bc4a4b9", "version-semver": "4.0.0", From fa93152c9bacb9a37022b3c4a37c3ba09cdb2680 Mon Sep 17 00:00:00 2001 From: Gregory Popovitch Date: Fri, 11 Mar 2022 14:25:53 -0500 Subject: [PATCH 56/64] [GTL] Add new port (#23400) * [parallel-hashmap] update version to 1.34 * run `vcpkg x-add-version --all` and change `version-string` to `version` * make suggested changes * add changes suggested by @JonLui1993 * ran `vcpkg x-add-version --all ` as suggested * update version * update parallel-hashmap.json * initial version * finish adding gtl port * add suggested changes (quotes around paths) * Update gtl.json * add quotes to paths as suggested. * Update vcpkg.json * fix error: Error: String `1.00` is not a valid Relaxed version string (semver with arbitrary numeric identifiers) * Revert "add quotes to paths as suggested." This reverts commit 3b3f8daa0f449de3d699b844823e97e08591c124. * Update gtl.json * remove old version as suggested by @Thomas1664 Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/gtl/portfile.cmake | 21 +++++++++++++++++++++ ports/gtl/vcpkg.json | 12 ++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gtl.json | 9 +++++++++ 4 files changed, 46 insertions(+) create mode 100644 ports/gtl/portfile.cmake create mode 100644 ports/gtl/vcpkg.json create mode 100644 versions/g-/gtl.json diff --git a/ports/gtl/portfile.cmake b/ports/gtl/portfile.cmake new file mode 100644 index 00000000000000..ed16730c14f71f --- /dev/null +++ b/ports/gtl/portfile.cmake @@ -0,0 +1,21 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/gtl + REF 1.00 + SHA512 842a5e2634919a04fdd87995a8ada2f949c51a070a7c175043e0f9105a93248325023f85b28f9406276c2912a0fb4015a2e9ba30113d4a0214492da0dc5e5716 + HEAD_REF main +) + +# Use greg7mdp/gtl's own build process, skipping examples and tests +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +# Delete redundant directories +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/doc") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gtl/vcpkg.json b/ports/gtl/vcpkg.json new file mode 100644 index 00000000000000..b6b93c45f4392d --- /dev/null +++ b/ports/gtl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gtl", + "version": "1.0.0", + "description": "Greg's Template Library of useful classes.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c27061d483c122..4580c60b99ec42 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2640,6 +2640,10 @@ "baseline": "4.6.0", "port-version": 0 }, + "gtl": { + "baseline": "1.0.0", + "port-version": 0 + }, "gts": { "baseline": "0.7.6", "port-version": 4 diff --git a/versions/g-/gtl.json b/versions/g-/gtl.json new file mode 100644 index 00000000000000..5776144adfa1b4 --- /dev/null +++ b/versions/g-/gtl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "52665bb6e7f0bbe30ffabc59521a937072ecc9e2", + "version": "1.0.0", + "port-version": 0 + } + ] +} From 5bce4414785619228cb353bdb21ddbca95fa3cbe Mon Sep 17 00:00:00 2001 From: VuYeK Date: Fri, 11 Mar 2022 20:26:40 +0100 Subject: [PATCH 57/64] [sciter-js] Updated sciter-js to 4.4.8.31 (#23357) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated sciter-js to 4.4.8.31 * Updated sciter-js to 4.4.8.31 * Updated sciter-js to 4.4.8.31 * Update ports/sciter-js/vcpkg.json * Update versions/s-/sciter-js.json * Update versions/s-/sciter-js.json * Update versions/s-/sciter-js.json * string * update version * version * update version Co-authored-by: FrankXie Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/sciter-js/portfile.cmake | 10 ++++------ ports/sciter-js/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sciter-js.json | 23 ++++++++++++++--------- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index b9f438d5b97211..82759029ea3264 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -6,8 +6,8 @@ endif() set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION d5a13ff197fed3af46d4bc931c158828eb61e357) -set(SCITER_SHA 5be2db9d2e5caa19be158020a084a246acd6dad2047062f603b3af4f3cdbdd7f7750b263ad6dfaa6c3667de6c51084fc2df75cd3cb8cd60501550377dded1928) +set(SCITER_REVISION 52bfe183983118c884294c864ee7b3d0dd199de6) +set(SCITER_SHA d31ef2a07525bf1c91b9f36ee434db6227bead732f5779cb4ee28ab6d92957bfb3d4656a960d3c47e64f3efc207f78be64853a56b1e1a14f56fd3c829b022155) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH x64) @@ -94,8 +94,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SCITER_BIN}/scapp.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/usciter.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/inspector.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/window-mixin.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${SCITER_TOOLS}) if ("windowless" IN_LIST FEATURES) set(SCITER_BIN ${SOURCE_PATH}/bin.lite/windows/${SCITER_ARCH}) @@ -104,8 +104,6 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - message(WARNING "Sciter requires manual deployment of the correct DLL files.") + endif() diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json index 46e0121088d952..6e5606aabf93f0 100644 --- a/ports/sciter-js/vcpkg.json +++ b/ports/sciter-js/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sciter-js", - "version-string": "4.4.8.16", + "version": "4.4.8.31", "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://github.com/c-smile/sciter-js-sdk", "supports": "!uwp & !arm & !static", diff --git a/versions/baseline.json b/versions/baseline.json index 4580c60b99ec42..9a0e88f6db1b6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6273,7 +6273,7 @@ "port-version": 0 }, "sciter-js": { - "baseline": "4.4.8.16", + "baseline": "4.4.8.31", "port-version": 0 }, "scnlib": { diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 7f0cd51fd30dce..c8c3f635249f89 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,9 +1,14 @@ -{ - "versions": [ - { - "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", - "version-string": "4.4.8.16", - "port-version": 0 - } - ] -} +{ + "versions": [ + { + "git-tree": "01c76a267b6924a5f1f03349738e479e8bbe2c0b", + "version": "4.4.8.31", + "port-version": 0 + }, + { + "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", + "version-string": "4.4.8.16", + "port-version": 0 + } + ] +} From 1cbd04e45ea8ac264469ebc4670ffd053ed2ed61 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 11 Mar 2022 14:33:51 -0500 Subject: [PATCH 58/64] [llvm] Fix LLVM install for 'utils' feature (#23399) * [llvm] Install utils when feature is selected * Update version --- ports/llvm/portfile.cmake | 1 + ports/llvm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 7df4d47612d64e..205d250396b6cb 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_check_features( tools LLVM_INCLUDE_TOOLS utils LLVM_BUILD_UTILS utils LLVM_INCLUDE_UTILS + utils LLVM_INSTALL_UTILS enable-rtti LLVM_ENABLE_RTTI enable-ffi LLVM_ENABLE_FFI enable-terminfo LLVM_ENABLE_TERMINFO diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index b7f4ce9e7446c0..29be0e7bb0924d 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llvm", "version": "13.0.0", - "port-version": 2, + "port-version": 3, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9a0e88f6db1b6b..a6de96bdedab31 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4210,7 +4210,7 @@ }, "llvm": { "baseline": "13.0.0", - "port-version": 2 + "port-version": 3 }, "lmdb": { "baseline": "0.9.24", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 1f1c017b091391..ee0a089ff7ab9a 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15418b7e938058677963d920b616403240eca37f", + "version": "13.0.0", + "port-version": 3 + }, { "git-tree": "2c86dc65e952d8abe6140578df4db2c742180358", "version": "13.0.0", From 183ba0e2f43830b95779859c40bb59bc014236b9 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 11 Mar 2022 11:35:32 -0800 Subject: [PATCH 59/64] [qt5-webengine] Fix apply patch failed (#23484) * [qt5-webengine] Fix apply patch failed * update version Co-authored-by: Lily Wang --- ports/qt5-webengine/build_1.patch | 6 +++--- ports/qt5-webengine/build_2.patch | 15 +++++---------- ports/qt5-webengine/build_3.patch | 17 ----------------- ports/qt5-webengine/portfile.cmake | 3 +-- ports/qt5-webengine/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-webengine.json | 5 +++++ 7 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 ports/qt5-webengine/build_3.patch diff --git a/ports/qt5-webengine/build_1.patch b/ports/qt5-webengine/build_1.patch index dfa3ea721f2718..4bef9ebd43b444 100644 --- a/ports/qt5-webengine/build_1.patch +++ b/ports/qt5-webengine/build_1.patch @@ -1,12 +1,12 @@ diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn -index ad7675f4e..4a43479d9 100644 +index fb57176..fa84cc5 100644 --- a/src/3rdparty/chromium/third_party/angle/BUILD.gn +++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -126,7 +126,6 @@ config("extra_warnings") { +@@ -131,7 +131,6 @@ config("extra_warnings") { # Enable more default warnings on Windows. if (is_win) { cflags += [ - "/we4244", # Conversion: possible loss of data. + "/we4312", # Conversion: greater size. "/we4456", # Variable shadowing. "/we4458", # declaration hides class member. - "/we4715", # not all control paths return a value diff --git a/ports/qt5-webengine/build_2.patch b/ports/qt5-webengine/build_2.patch index 7a4622516d846f..77d7cbe0dc3f20 100644 --- a/ports/qt5-webengine/build_2.patch +++ b/ports/qt5-webengine/build_2.patch @@ -1,29 +1,24 @@ diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h -index 59dbfad04..134357395 100644 +index 18ca770..5585a67 100644 --- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h -@@ -74,7 +74,7 @@ class CircularQueue { +@@ -74,16 +74,16 @@ class CircularQueue { return queue_->Get(pos_); } - const T* operator->() const { + T* operator->() const { - #if PERFETTO_DCHECK_IS_ON() - PERFETTO_DCHECK(generation_ == queue_->generation()); - #endif -@@ -82,13 +82,13 @@ class CircularQueue { + return const_cast::Iterator*>(this)->operator->(); } T& operator*() { return *(operator->()); } - const T& operator*() const { return *(operator->()); } + T& operator*() const { return *(operator->()); } - value_type& operator[](difference_type i) { - return *(*this + i); - } + value_type& operator[](difference_type i) { return *(*this + i); } - const value_type& operator[](difference_type i) const { + value_type& operator[](difference_type i) const { - return *(*this + i); + return const_cast::Iterator&>(*this)[i]; } diff --git a/ports/qt5-webengine/build_3.patch b/ports/qt5-webengine/build_3.patch deleted file mode 100644 index a86c5dec4641b4..00000000000000 --- a/ports/qt5-webengine/build_3.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -index 78c316e04..fdb0312e0 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -@@ -138,9 +138,9 @@ class LABColorSpace { - clamp(lab.Z(), -128.0f, 128.0f)}; - - return { -- invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X(), -- invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y(), -- invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z()}; -+ (float)(invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X()), -+ (float)(invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y()), -+ (float)(invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z())}; - } - - private: diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 60020c83f8a139..080b21b3ce3e45 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -44,8 +44,7 @@ vcpkg_add_to_path(PREPEND "${NINJA_DIR}") set(PATCHES common.pri.patch gl.patch build_1.patch - build_2.patch - build_3.patch) + build_2.patch) set(OPTIONS) if("proprietary-codecs" IN_LIST FEATURES) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 3ea9d9a5e071fa..f6349b28bf7832 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.3", + "port-version": 1, "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/versions/baseline.json b/versions/baseline.json index a6de96bdedab31..235dc985f3077e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5754,7 +5754,7 @@ }, "qt5-webengine": { "baseline": "5.15.3", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.3", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index b7b79a2326cb95..159af06521d1b0 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38", + "version": "5.15.3", + "port-version": 1 + }, { "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad", "version": "5.15.3", From 89ed56ebabc5d0e6329c4b6d21eb354358c24cbe Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 11 Mar 2022 14:36:11 -0500 Subject: [PATCH 60/64] [python3] Update to Python 3.10.2. (#23156) * [python3] Update to Python 3.10.2. * Version nonsense * Update Python tool to 3.10.2. * [python3] Update version file * [python3] Update versions again Co-authored-by: Victor Romero --- ports/python3/portfile.cmake | 4 ++-- ports/python3/vcpkg.json | 3 +-- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++--- scripts/vcpkgTools.xml | 6 +++--- versions/baseline.json | 4 ++-- versions/p-/python3.json | 5 +++++ 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index f9326117369a9e..74733674c1bc48 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MINOR 10) -set(PYTHON_VERSION_PATCH 1) +set(PYTHON_VERSION_PATCH 2) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -40,7 +40,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 23f99b77c7978282d43a6e442811de1d6e8cc9597c6d1143ec65ae986f64805c36a0a033632a4d1a89053a55854904bcf11415d91e2a3b4a5308c4a21de80098 + SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18 HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index dd6dd537f48437..a57226bdb19896 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version-semver": "3.10.1", - "port-version": 8, + "version-semver": "3.10.2", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 591230cfe3be21..40e0c6094a8f5d 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -247,17 +247,17 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "PYTHON3") if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.10.1) + set(program_version 3.10.2) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(tool_subdirectory "python-${program_version}-x86") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") set(download_filename "python-${program_version}-embed-win32.zip") - set(download_sha512 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8) + set(download_sha512 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9) else() set(tool_subdirectory "python-${program_version}-x64") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") set(download_filename "python-${program_version}-embed-amd64.zip") - set(download_sha512 cb67b15c312cf6e157b5023106b52129998f0cc214fc79e53ffa8b7ef9f34200690d9ab6798401c47be4e6c22bfbfcb3c0fd17e71d9253c53d4572b1d4931029) + set(download_sha512 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index ba874724f07ff5..6a70c26c2a4b60 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -3,9 +3,9 @@ 3.10.1 python.exe - https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-win32.zip - 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8 - python-3.10.1-embed-win32.zip + https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip + d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 + python-3.10.2-embed-win32.zip 3.22.2 diff --git a/versions/baseline.json b/versions/baseline.json index 235dc985f3077e..131a5eaf830a58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5569,8 +5569,8 @@ "port-version": 3 }, "python3": { - "baseline": "3.10.1", - "port-version": 8 + "baseline": "3.10.2", + "port-version": 0 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index e06b54fbcdaed0..2ccde84c0420c3 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cf2e0bbf8fd712f82ed1997be82b136f1c13108", + "version-semver": "3.10.2", + "port-version": 0 + }, { "git-tree": "ce4fddbb41412be06577c61632e8e9ef0a67901c", "version-semver": "3.10.1", From 8a1b0ffb855cb658401ad701d617480f786d1535 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 11 Mar 2022 22:03:36 +0100 Subject: [PATCH 61/64] [libssh2] Fix deleted configfiles (#23509) * Fix config files * version * Add comment * version * Keep pkgconfig files * version --- ports/libssh2/portfile.cmake | 6 +++--- ports/libssh2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libssh2.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 329373712808c3..e99db47049eceb 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -39,10 +39,10 @@ if (VCPKG_TARGET_IS_WINDOWS) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") +# Do not delete the entire share directory as it contains the *-config.cmake files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index f1215ecce569ca..e57d86d68b822e 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libssh2", "version": "1.10.0", - "port-version": 1, + "port-version": 2, "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 131a5eaf830a58..2eea89fabf8e8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3998,7 +3998,7 @@ }, "libssh2": { "baseline": "1.10.0", - "port-version": 1 + "port-version": 2 }, "libstemmer": { "baseline": "2017-9", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 44b1bff0d855aa..baafe9a00fc65f 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "944feb4094c60226c2526be764fed688bb8b334f", + "version": "1.10.0", + "port-version": 2 + }, { "git-tree": "3c6dd977de517dc2091377a58c55b7d23f2bc3a0", "version": "1.10.0", From 43235cf746cddb4981a8ef4abdb80aafe4d4e0e2 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sat, 12 Mar 2022 00:45:49 +0300 Subject: [PATCH 62/64] [earcut.hpp] New port (#23507) --- ports/earcut-hpp/portfile.cmake | 13 +++++++++++++ ports/earcut-hpp/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/e-/earcut-hpp.json | 9 +++++++++ 4 files changed, 33 insertions(+) create mode 100644 ports/earcut-hpp/portfile.cmake create mode 100644 ports/earcut-hpp/vcpkg.json create mode 100644 versions/e-/earcut-hpp.json diff --git a/ports/earcut-hpp/portfile.cmake b/ports/earcut-hpp/portfile.cmake new file mode 100644 index 00000000000000..7cdb44ea22e050 --- /dev/null +++ b/ports/earcut-hpp/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/earcut.hpp + REF v2.2.3 + SHA512 f87f0084dbbcda85b409c326587a376d443f2484b6a69c216d2ad94ea8ea238912dfe1174b464b08faec10ea5c29ebae6478e7abfe5ff682a7b043784c1e3acf + HEAD_REF master +) + +# This is a header only library +file(INSTALL "${SOURCE_PATH}/include/mapbox/earcut.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mapbox") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/earcut-hpp/vcpkg.json b/ports/earcut-hpp/vcpkg.json new file mode 100644 index 00000000000000..053a57abe2aedd --- /dev/null +++ b/ports/earcut-hpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "earcut-hpp", + "version": "2.2.3", + "description": "earcut.hpp is a C++ port of earcut.js, a fast, header-only polygon triangulation library.", + "homepage": "https://github.com/mapbox/earcut.hpp", + "license": "ISC" +} diff --git a/versions/baseline.json b/versions/baseline.json index 2eea89fabf8e8e..0bd88f0e03e2ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1952,6 +1952,10 @@ "baseline": "2.09.12", "port-version": 2 }, + "earcut-hpp": { + "baseline": "2.2.3", + "port-version": 0 + }, "eastl": { "baseline": "3.18.00", "port-version": 2 diff --git a/versions/e-/earcut-hpp.json b/versions/e-/earcut-hpp.json new file mode 100644 index 00000000000000..41b661439a6f67 --- /dev/null +++ b/versions/e-/earcut-hpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "89c9c15fcd180f5e17b02290430dfe7019dc830c", + "version": "2.2.3", + "port-version": 0 + } + ] +} From af2287382b1991dbdcb7e5112d236f3323b9dd7a Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Fri, 11 Mar 2022 17:19:27 -0600 Subject: [PATCH 63/64] [HPX] Don't remove HPXCacheVariables.cmake during install (#23042) * Don't remove HPXCacheVariables.cmake during install - make sure HPXCMakeVariables.cmake does not contain any directory names * Fixing versions --- ports/hpx/fix-cmakecache-paths.patch | 22 ++++++++++++++++++++++ ports/hpx/portfile.cmake | 5 +++-- ports/hpx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hpx.json | 5 +++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 ports/hpx/fix-cmakecache-paths.patch diff --git a/ports/hpx/fix-cmakecache-paths.patch b/ports/hpx/fix-cmakecache-paths.patch new file mode 100644 index 00000000000000..5a9e1b3ca02bbe --- /dev/null +++ b/ports/hpx/fix-cmakecache-paths.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/HPX_ForwardCacheVariables.cmake b/cmake/HPX_ForwardCacheVariables.cmake +index 7c434085a76..34cc47c7750 100644 +--- a/cmake/HPX_ForwardCacheVariables.cmake ++++ b/cmake/HPX_ForwardCacheVariables.cmake +@@ -23,6 +23,17 @@ set(_cache_var_file_template + ) + set(_cache_variables) + foreach(_var IN LISTS cache_vars) ++ if(HPX_WITH_VCPKG) ++ # avoid writing directory names into cache file ++ string(FIND ${_var} "_DIR" _pos) ++ if(NOT ${_pos} EQUAL -1) ++ continue() ++ endif() ++ string(FIND ${_var} "_PATH" _pos) ++ if(NOT ${_pos} EQUAL -1) ++ continue() ++ endif() ++ endif() + set(_cache_variables "${_cache_variables}set(${_var} ${${_var}})\n") + endforeach() + diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index b08459014745e1..9cbdf361fe99a8 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF 1.7.1 SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 HEAD_REF stable - PATCHES fix-dependency-hwloc.patch + PATCHES + fix-dependency-hwloc.patch + fix-cmakecache-paths.patch ) set(HPX_WITH_MALLOC system) @@ -93,6 +95,5 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") -file(REMOVE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXCacheVariables.cmake") vcpkg_copy_pdbs() diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index 3a6c33eebd43fb..c82018a7574d64 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hpx", "version-semver": "1.7.1", - "port-version": 4, + "port-version": 5, "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." diff --git a/versions/baseline.json b/versions/baseline.json index 0bd88f0e03e2ba..c6782a4d05506f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2738,7 +2738,7 @@ }, "hpx": { "baseline": "1.7.1", - "port-version": 4 + "port-version": 5 }, "http-parser": { "baseline": "2.9.4", diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 9eec62df03df63..2bf34abecc8d43 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48d153f2932b01257af5a799676268abdfb35fac", + "version-semver": "1.7.1", + "port-version": 5 + }, { "git-tree": "815641d6119376c546119a841f6c035e8f27b8da", "version-semver": "1.7.1", From 965961552d9dca07ee88e89c8a236afdda2d7a14 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:09:48 +0100 Subject: [PATCH 64/64] [baseline] [python3] fix bz2(d) search on linux (#23525) * fix python3 ci? * add bz2d patch * fix extra spaces * version stuff --- ports/python3/0010-bz2d.patch | 19 +++++++++++++++++++ ports/python3/portfile.cmake | 3 +++ ports/python3/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 ports/python3/0010-bz2d.patch diff --git a/ports/python3/0010-bz2d.patch b/ports/python3/0010-bz2d.patch new file mode 100644 index 00000000000000..162cc7cabab272 --- /dev/null +++ b/ports/python3/0010-bz2d.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index 43e807f20..df4d43d3d 100644 +--- a/setup.py ++++ b/setup.py +@@ -1741,6 +1741,14 @@ def detect_compress_exts(self): + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2'], + extra_link_args=bz2_extra_link_args)) ++ elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')): ++ if MACOS: ++ bz2_extra_link_args = ('-Wl,-search_paths_first',) ++ else: ++ bz2_extra_link_args = () ++ self.add(Extension('_bz2', ['_bz2module.c'], ++ libraries=['bz2d'], ++ extra_link_args=bz2_extra_link_args)) + else: + self.missing.append('_bz2') + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 74733674c1bc48..d99a0fd673bf55 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -14,6 +14,7 @@ set(PATCHES 0004-dont-copy-vcruntime.patch 0005-only-build-required-projects.patch 0009-python.pc.patch + 0010-bz2d.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) @@ -217,6 +218,8 @@ else() "--with-ensurepip" "--with-suffix=" "--with-system-expat" + "--without-readline" + "--disable-test-modules" ) if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS "LIBS=-liconv -lintl") diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index a57226bdb19896..1a2ec9110034a3 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "python3", - "version-semver": "3.10.2", + "version": "3.10.2", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index c6782a4d05506f..f9a31fcc4222cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5574,7 +5574,7 @@ }, "python3": { "baseline": "3.10.2", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 2ccde84c0420c3..a89a02eb10de82 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e348bd50d8c4252bda83903ce22f1e60d34be88", + "version": "3.10.2", + "port-version": 1 + }, { "git-tree": "0cf2e0bbf8fd712f82ed1997be82b136f1c13108", "version-semver": "3.10.2",