diff --git a/.github/workflows/check_issues.yml b/.github/workflows/check_issues.yml new file mode 100644 index 00000000000000..c8db5c942592f6 --- /dev/null +++ b/.github/workflows/check_issues.yml @@ -0,0 +1,32 @@ +name: Check For Common Issues + +on: + issues: + types: + - opened + +jobs: + missing-windows-sdk-issue: + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - uses: actions/github-script@v6 + with: + script: | + let issue_query = { + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo + }; + let issue = await github.rest.issues.get(issue_query) + let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/; + if (reg.test(issue.data.body)){ + await github.rest.issues.removeAllLabels(issue_query); + await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]}); + let body = "Thanks for posting this issue. Please make sure you have the following installed.\n" + + "- Visual Studio Desktop development with C++.\n" + + "- Windows 10 SDK or Windows 11 SDK."; + await github.rest.issues.createComment({...issue_query, body}); + // Close the issue? + } diff --git a/overlay/osx/qt5-base/cmake/qt_download_submodule.cmake b/overlay/osx/qt5-base/cmake/qt_download_submodule.cmake index a244ba442cea3a..03740c1ad31e7e 100644 --- a/overlay/osx/qt5-base/cmake/qt_download_submodule.cmake +++ b/overlay/osx/qt5-base/cmake/qt_download_submodule.cmake @@ -17,7 +17,7 @@ function(qt_download_submodule) set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + URLS "https://download.qt.io/new_archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" FILENAME ${ARCHIVE_NAME} SHA512 ${QT_HASH_${PORT}} ) diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake index ae68509292b774..4d467a3c796a75 100644 --- a/ports/3fd/portfile.cmake +++ b/ports/3fd/portfile.cmake @@ -1,14 +1,3 @@ -# Check architecture: -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(BUILD_ARCH "ARM") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - # Check library linkage: vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) @@ -28,14 +17,12 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP: vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "3FD/3FD.WinRT.UWP.vcxproj" - PLATFORM ${BUILD_ARCH} USE_VCPKG_INTEGRATION ) elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32: vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "3FD/3FD.vcxproj" - PLATFORM ${BUILD_ARCH} TARGET Build USE_VCPKG_INTEGRATION ) diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json index 5ee8f2d4ecf622..8dbaa3a6708c07 100644 --- a/ports/3fd/vcpkg.json +++ b/ports/3fd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "3fd", "version": "2.6.3", - "port-version": 2, + "port-version": 3, "description": "C++ Framework For Fast Development", "supports": "windows & !static & !arm64", "dependencies": [ diff --git a/ports/absent/vcpkg.json b/ports/absent/vcpkg.json index 3623acc8cd0e44..3034fe368eb853 100644 --- a/ports/absent/vcpkg.json +++ b/ports/absent/vcpkg.json @@ -1,7 +1,7 @@ { "name": "absent", - "version-string": "0.3.1", - "port-version": 2, + "version": "0.3.1", + "port-version": 3, "description": "A small C++17 library meant to simplify the composition of nullable types in a generic, type-safe, and declarative way", "homepage": "https://github.com/rvarago/absent", "dependencies": [ diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 489ad61fbd7565..b2b4af77fca4e1 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz" FILENAME "ACE-TAO-${VERSION}.tar.gz" - SHA512 7210091f0512fa9c7ba2ea9e3f805a2ba0aab4d848a8e9e5651a824dcac65ddd50b95c98f4da86900487fa0a79aede126d021f4eb109f224224fc88a58133f79 + SHA512 a40a4761d396f1e7dc96287075810a3d874794f56057cf1f18b2bd27fbb89e024c2926890fd0a8efe825c31865c382b91e90477d78cba64877b93ba9909b7da2 ) else() # Don't change to vcpkg_from_github! This points to a release and not an archive vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz" FILENAME "ACE-src-${VERSION}.tar.gz" - SHA512 6e8b63ee8fa691656544a7a9e5887b499a8791f25766a8081df1d64e911f667a95fed26c1eb6355f6ce1233694f8ef11c1a986ca16a686e21fb1e375035a29ed + SHA512 716b27e347e013b866fa08f7ab182c60faf108e8000089b90717db86d6dd92d8c7e776d4850be27c5f50c8e31543f573ce19466efcd9b4b7bc8836eec5447860 ) endif() @@ -65,12 +65,6 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path("${PERL_PATH}") -if (TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(MSBUILD_PLATFORM "Win32") -else () - set(MSBUILD_PLATFORM "${TRIPLET_SYSTEM_ARCH}") -endif() - # Add ace/config.h file # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html if(VCPKG_TARGET_IS_WINDOWS) @@ -142,7 +136,6 @@ if(VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH} LICENSE_SUBPATH COPYING - PLATFORM ${MSBUILD_PLATFORM} SKIP_CLEAN ) @@ -285,7 +278,6 @@ if(VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH_XML} LICENSE_SUBPATH COPYING - PLATFORM ${MSBUILD_PLATFORM} SKIP_CLEAN ) diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 62f28842ef2aad..3280d76579ec88 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ace", - "version": "7.0.11", - "port-version": 2, + "version": "7.1.0", + "port-version": 1, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/ports/activemq-cpp/activemq-cppConfig.cmake b/ports/activemq-cpp/activemq-cppConfig.cmake index 5719f9b6bb30a1..715a1630d9ac5e 100644 --- a/ports/activemq-cpp/activemq-cppConfig.cmake +++ b/ports/activemq-cpp/activemq-cppConfig.cmake @@ -133,9 +133,9 @@ if (ACTIVEMQ_CPP_DLL_RELEASE) # if (ACTIVEMQ_CPP_LIB_RELEASE AND ACTIVEMQ_CPP_DLL_DEBUG AND ACTIVEMQ_CPP_LIB_DEBUG) _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.lib") - _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/bin/libapr-1.dll") _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.lib") - _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/bin/libapr-1.dll") if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_DLL_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG AND ACTIVEMQ_CPP_APR_DLL_DEBUG) _activemq_cpp_windows_dependencies() if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND) diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake index 2461dde4987718..2a08698cc66b31 100644 --- a/ports/activemq-cpp/portfile.cmake +++ b/ports/activemq-cpp/portfile.cmake @@ -1,5 +1,3 @@ -set(VERSION 3.9.5) - set(PATCHES ) if (NOT VCPKG_TARGET_IS_LINUX) set(PATCHES FunctionLevelLinkingOn.diff) @@ -15,9 +13,9 @@ vcpkg_download_distfile(ARCHIVE FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2" SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES ${PATCHES} ) @@ -65,12 +63,10 @@ else() vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";libapr-1.lib" ";apr-1.lib") endif() - if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") - elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") - set(BUILD_ARCH "x64") else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") + set(BUILD_ARCH "${VCPKG_TARGET_ARCHITECTURE}") endif() string(REPLACE "/" "\\" WIN_SOURCE_PATH "${SOURCE_PATH}") @@ -108,13 +104,13 @@ else() endif() endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) - if (ACTIVEMQCPP_SHARED_LIB) + if(ACTIVEMQCPP_SHARED_LIB) file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index d4306507ea868c..9c30eca47c76ad 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 10, + "port-version": 13, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "license": "Apache-2.0", "supports": "!(uwp | osx)", diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake new file mode 100644 index 00000000000000..b67f8ccd6b4637 --- /dev/null +++ b/ports/ada-url/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ada-url/ada + REF "v${VERSION}" + SHA512 689dcdc3e89f2ae51e039f6d354efea3231d3ff025c58f572596d87cebd7d5f2bf5ca8c530df8514369a14831dfdb1c65bc1d93a0ece579031eb3f0dd47548c0 + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools ADA_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DADA_BENCHMARKS=OFF + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME ada CONFIG_PATH "lib/cmake/ada") + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES adaparse AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-MIT") diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json new file mode 100644 index 00000000000000..a0981262bac9fb --- /dev/null +++ b/ports/ada-url/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "ada-url", + "version": "2.4.2", + "description": "WHATWG-compliant and fast URL parser written in modern C++", + "homepage": "https://ada-url.com/", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build CLI tools (adaparse)", + "supports": "!uwp" + } + } +} diff --git a/ports/akali/portfile.cmake b/ports/akali/portfile.cmake deleted file mode 100644 index 3ed9ff3641a636..00000000000000 --- a/ports/akali/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO winsoft666/akali - REF 2e35164a9a2a48a50af06c8ae59fcad0f4d6584e - SHA512 103c4da3d318d7ae7da4821e58eced918c9d64dbc6d97e9e6c15fa69731331cf6160f593437366cb3a844fa292a8d875e3e63a679e7fbdeae22bb4d73e3d3144 - HEAD_REF master -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DAKALI_STATIC:BOOL=${AKALI_STATIC} - -DBUILD_TESTS:BOOL=OFF -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/akali") - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/akali) -elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/akali") - vcpkg_cmake_config_fixup(CONFIG_PATH share/akali) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 1") -else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 0") -endif() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - - diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json deleted file mode 100644 index c06a223e7ba35f..00000000000000 --- a/ports/akali/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "akali", - "version": "1.43", - "port-version": 1, - "description": "C++ Common Library.", - "homepage": "https://github.com/winsoft666/akali", - "license": "MIT", - "supports": "!(arm | arm64 | uwp)", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/aklomp-base64/portfile.cmake b/ports/aklomp-base64/portfile.cmake index f747c3c601ff93..2c9550a50c2980 100644 --- a/ports/aklomp-base64/portfile.cmake +++ b/ports/aklomp-base64/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup( + PACKAGE_NAME base64 CONFIG_PATH "lib/cmake/base64" ) diff --git a/ports/aklomp-base64/vcpkg.json b/ports/aklomp-base64/vcpkg.json index 4aba98f63d9224..889c35790f767d 100644 --- a/ports/aklomp-base64/vcpkg.json +++ b/ports/aklomp-base64/vcpkg.json @@ -1,6 +1,7 @@ { "name": "aklomp-base64", "version-date": "2023-01-06", + "port-version": 1, "description": "Implementation of a base64 stream encoding/decoding library in C99 with SIMD (AVX2, AVX512, NEON, AArch64/NEON, SSSE3, SSE4.1, SSE4.2, AVX) and OpenMP acceleration", "homepage": "https://github.com/aklomp/base64", "license": "BSD-2-Clause", diff --git a/ports/alac-decoder/vcpkg.json b/ports/alac-decoder/vcpkg.json index 4755cc81f9ab9a..9792d5a6b74bee 100644 --- a/ports/alac-decoder/vcpkg.json +++ b/ports/alac-decoder/vcpkg.json @@ -1,7 +1,7 @@ { "name": "alac-decoder", - "version-string": "0.2", - "port-version": 6, + "version": "0.2", + "port-version": 7, "description": "ALAC C implementation of a decoder, written from reverse engineering the file format", "homepage": "https://distfiles.macports.org/alac_decoder", "dependencies": [ diff --git a/ports/alac/vcpkg.json b/ports/alac/vcpkg.json index d9e252fff43d2d..f1e99550cf6dcf 100644 --- a/ports/alac/vcpkg.json +++ b/ports/alac/vcpkg.json @@ -1,7 +1,7 @@ { "name": "alac", - "version-string": "2017-11-03-c38887c5", - "port-version": 3, + "version": "2017-11-03-c38887c5", + "port-version": 4, "description": "The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.", "homepage": "https://github.com/macosforge/alac", "supports": "!uwp", diff --git a/ports/alembic/disable-warnings-as-error.patch b/ports/alembic/disable-warnings-as-error.patch deleted file mode 100644 index 48ad94b3036e11..00000000000000 --- a/ports/alembic/disable-warnings-as-error.patch +++ /dev/null @@ -1,19 +0,0 @@ -Workaround for https://github.com/alembic/alembic/issues/309 -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,14 +125,6 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") - ENDIF() - --# Set some debug vs opt flags --if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND NOT MSVC) -- add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wno-deprecated) -- if((CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) OR -- CMAKE_CXX_COMPILER_ID MATCHES "CLANG") -- add_definitions( -Wno-error=implicit-fallthrough) -- endif() --endif() - - IF (NOT ${WINDOWS}) - SET(EXTERNAL_MATH_LIBS "-lm") diff --git a/ports/alembic/fix-runtime-destination.patch b/ports/alembic/fix-runtime-destination.patch index 28a817be20632a..093218644d5c61 100644 --- a/ports/alembic/fix-runtime-destination.patch +++ b/ports/alembic/fix-runtime-destination.patch @@ -1,8 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index 860a8be..ee0f4f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ option(DOCS_PATH - +@@ -74,7 +74,7 @@ option(DOCS_PATH + # Set static/dynamic build options SET(LIB_TYPE STATIC) -SET(RUNTIME_INSTALL_DIR lib) @@ -11,13 +12,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt SET(ARCHIVE_INSTALL_DIR lib) IF (ALEMBIC_SHARED_LIBS) diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt +index 25e760c..9acac61 100644 --- a/lib/Alembic/CMakeLists.txt +++ b/lib/Alembic/CMakeLists.txt -@@ -78,12 +78,11 @@ option(DOCS_PATH - ${ZLIB_LIBRARY} - ) - --SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs") +@@ -87,9 +87,9 @@ TARGET_LINK_LIBRARIES(Alembic + SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE STRING "Where to install the Alembic libs") INSTALL(TARGETS Alembic EXPORT AlembicTargets - LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} @@ -26,6 +25,6 @@ diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt + LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR} + RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}) - + #-****************************************************************************** # PACKAGE EXPORTS diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 2415acdcea46d2..f5c90aaceb7bde 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic - REF 1.8.3 - SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036 + REF "${VERSION}" + SHA512 89a480970eb09893112bf650011ede852205d1fa3718680a3983392bbcf3eb3f22f4ec01f42d12bfcaf655ce43d7d6f583b764ec03f4c5a84023359502b3636e HEAD_REF master PATCHES fix-runtime-destination.patch - disable-warnings-as-error.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS) @@ -24,6 +23,7 @@ vcpkg_cmake_configure( -DALEMBIC_SHARED_LIBS=${ALEMBIC_SHARED_LIBS} -DUSE_TESTS=OFF ${FEATURE_OPTIONS} + -DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF ) vcpkg_cmake_install() @@ -46,4 +46,4 @@ vcpkg_copy_tools( ) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json index cbc9fc27fecbe5..e3d6c17aa24630 100644 --- a/ports/alembic/vcpkg.json +++ b/ports/alembic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "alembic", - "version": "1.8.3", - "port-version": 1, + "version": "1.8.5", "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", "homepage": "https://alembic.io/", "supports": "!(windows & x86) & !uwp", diff --git a/ports/aliyun-oss-c-sdk/vcpkg.json b/ports/aliyun-oss-c-sdk/vcpkg.json index d8c37f5a3fe954..d2267e5d562594 100644 --- a/ports/aliyun-oss-c-sdk/vcpkg.json +++ b/ports/aliyun-oss-c-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aliyun-oss-c-sdk", - "version-string": "3.10.0", - "port-version": 2, + "version": "3.10.0", + "port-version": 3, "description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.", "supports": "!(uwp | linux | osx)", "dependencies": [ diff --git a/ports/alsa/portfile.cmake b/ports/alsa/portfile.cmake index e8e2c7bbad3226..bd1bd80946778d 100644 --- a/ports/alsa/portfile.cmake +++ b/ports/alsa/portfile.cmake @@ -1,18 +1,21 @@ -if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - message(FATAL_ERROR "Package only supports Linux platform.") -endif() - message( -"alsa currently requires the following libraries from the system package manager: - autoconf libtool -These can be installed on Ubuntu systems via sudo apt install autoconf libtool" +"alsa currently requires the following programs from the system package manager: + autoconf autoheader aclocal automake libtoolize +On Debian and Ubuntu derivatives: + sudo apt install autoconf libtool +On recent Red Hat and Fedora derivatives: + sudo dnf install autoconf libtool +On Arch Linux and derivatives: + sudo pacman -S autoconf automake libtool +On Alpine: + apk add autoconf automake libtool" ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alsa-project/alsa-lib - REF v1.2.6.1 - SHA512 d1de9112ec0d600db6e5a20b558811a7a9f34d00a9b1dfb5332669b73732c1c1b8ddda57368edc199e255eba8bcb8a6767b4d9325c9860ade02d84dcaac6eb47 + REF "v${VERSION}" + SHA512 34ebeb64fd43432df779bfd6de08fb26cfd59d75586100cab7308d1ecf60d722cf137f1209426a288bdbaa27c31e963ce09690272b8d85653989a935a6fc50af HEAD_REF master PATCHES "fix-plugin-dir.patch" @@ -54,10 +57,14 @@ vcpkg_configure_make( vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug" +) -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/alsa/vcpkg-cmake-wrapper.cmake b/ports/alsa/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..ae3b078abeb6a4 --- /dev/null +++ b/ports/alsa/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,96 @@ +find_path( + ALSA_INCLUDE_DIR + NAMES alsa/asoundlib.h + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" + NO_DEFAULT_PATH +) + +find_library( + ALSA_LIBRARY_DEBUG + NAMES asound + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" + NO_DEFAULT_PATH +) + +find_library( + ALSA_LIBRARY_RELEASE + NAMES asound + PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" + NO_DEFAULT_PATH +) + +include(SelectLibraryConfigurations) +select_library_configurations(ALSA) +unset(ALSA_FOUND) + +if(NOT ALSA_INCLUDE_DIR OR NOT ALSA_LIBRARY) + message(FATAL_ERROR "Broken installation of the alsa vcpkg port") +endif() + +_find_package(${ARGS}) + +if(TARGET ALSA::ALSA) + if(ALSA_LIBRARY_DEBUG) + set_property( + TARGET ALSA::ALSA + APPEND + PROPERTY IMPORTED_CONFIGURATIONS DEBUG + ) + set_target_properties( + ALSA::ALSA + PROPERTIES + IMPORTED_LOCATION_DEBUG "${ALSA_LIBRARY_DEBUG}" + ) + endif() + if(ALSA_LIBRARY_RELEASE) + set_property( + TARGET ALSA::ALSA + APPEND + PROPERTY IMPORTED_CONFIGURATIONS RELEASE + ) + set_target_properties( + ALSA::ALSA + PROPERTIES + IMPORTED_LOCATION_RELEASE "${ALSA_LIBRARY_RELEASE}" + ) + endif() + + find_library(Z_VCPKG_HAS_LIBM NAMES m) + if(Z_VCPKG_HAS_LIBM) + list(APPEND ALSA_LIBRARIES m) + set_property( + TARGET ALSA::ALSA + APPEND + PROPERTY INTERFACE_LINK_LIBRARIES m + ) + endif() + + if(CMAKE_DL_LIBS) + list(APPEND ALSA_LIBRARIES ${CMAKE_DL_LIBS}) + set_property( + TARGET ALSA::ALSA + APPEND + PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS} + ) + endif() + + find_package(Threads) + if(TARGET Threads::Threads) + list(APPEND ALSA_LIBRARIES Threads::Threads) + set_property( + TARGET ALSA::ALSA + APPEND + PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads + ) + endif() + + find_library(Z_VCPKG_HAS_LIBRT NAMES rt) + if(Z_VCPKG_HAS_LIBRT) + list(APPEND ALSA_LIBRARIES rt) + set_property( + TARGET ALSA::ALSA + APPEND + PROPERTY INTERFACE_LINK_LIBRARIES rt + ) + endif() +endif() diff --git a/ports/alsa/vcpkg.json b/ports/alsa/vcpkg.json index 57db52c12d77a2..abd0244acce389 100644 --- a/ports/alsa/vcpkg.json +++ b/ports/alsa/vcpkg.json @@ -1,7 +1,7 @@ { "name": "alsa", - "version": "1.2.6.1", - "port-version": 2, + "version": "1.2.8", + "port-version": 1, "description": "The Advanced Linux Sound Architecture (ALSA) - library", "homepage": "https://www.alsa-project.org/", "license": "LGPL-2.1-or-later", diff --git a/ports/amqpcpp/fix-max_min_macros.patch b/ports/amqpcpp/fix-max_min_macros.patch new file mode 100644 index 00000000000000..4d1e2ae205af37 --- /dev/null +++ b/ports/amqpcpp/fix-max_min_macros.patch @@ -0,0 +1,31 @@ +diff --git a/include/amqpcpp/message.h b/include/amqpcpp/message.h +index 0a35838..96b43e1 100644 +--- a/include/amqpcpp/message.h ++++ b/include/amqpcpp/message.h +@@ -80,7 +80,7 @@ protected: + // safety-check: on 32-bit platforms size_t is obviously also a 32-bit dword + // in which case casting the uint64_t to a size_t could result in truncation + // here we check whether the given size fits inside a size_t +- if (std::numeric_limits::max() < size) throw std::runtime_error("message is too big for this system"); ++ if ((std::numeric_limits::max)() < size) throw std::runtime_error("message is too big for this system"); + + // store the new size + _bodySize = size; +@@ -98,7 +98,7 @@ protected: + if (_mutableBody) + { + // prevent overflow +- size = std::min(size, _bodySize - _filled); ++ size = (std::min)(size, _bodySize - _filled); + + // append more data + memcpy(_mutableBody + _filled, buffer, (size_t)size); +@@ -121,7 +121,7 @@ protected: + _body = _mutableBody; + + // store the initial data +- _filled = std::min((size_t)size, (size_t)_bodySize); ++ _filled = (std::min)((size_t)size, (size_t)_bodySize); + memcpy(_mutableBody, buffer, _filled); + } + diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake index 4e01b1141fe6c1..c02df71d35d222 100644 --- a/ports/amqpcpp/portfile.cmake +++ b/ports/amqpcpp/portfile.cmake @@ -4,10 +4,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CopernicaMarketingSoftware/AMQP-CPP REF "v${VERSION}" - SHA512 6220d6cdd3114cf02f08f1d8599d1f6de94df204384f9da7db1c18f74732a5c23063cd50066b7d32906af0a968d600daf0d59f1649d9674fa67446197c6e4988 + SHA512 3af0c0a9aeb98e349cedc7144bfc4ef1b63270d3b20d240b98b990c048402d5d4ea3a2ba28a468aab24ad45544b111809a0692716dc33af493ea5160f132834b HEAD_REF master PATCHES find-openssl.patch + fix-max_min_macros.patch ) if(VCPKG_TARGET_IS_LINUX) diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json index ff7ce61a5b32b9..2a6c97a385e18e 100644 --- a/ports/amqpcpp/vcpkg.json +++ b/ports/amqpcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "amqpcpp", - "version": "4.3.19", + "version": "4.3.23", "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker", "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP", "license": "Apache-2.0", diff --git a/ports/angelscript/fix-dependency.patch b/ports/angelscript/fix-dependency.patch new file mode 100644 index 00000000000000..be5213f84a5f18 --- /dev/null +++ b/ports/angelscript/fix-dependency.patch @@ -0,0 +1,9 @@ +diff --git a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +index 4d1ef0f..ec14fe9 100644 +--- a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake ++++ b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +@@ -1,2 +1,4 @@ + include("${CMAKE_CURRENT_LIST_DIR}/AngelscriptTargets.cmake") ++include(CMakeFindDependencyMacro) ++find_dependency(Threads REQUIRED) + diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index 3ac44aa0f6dd0b..ac93fa2d0442dc 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.0.zip" - FILENAME "angelscript_2.36.0.zip" - SHA512 afd2b9096d0b62bc3d182d684fe34ddc8e9520af7734eea1f1a5c7d3439a28a1be7502faf692080cb0c4591799b7fea09fc8c4ccf25b8ec63a3d306e678682ff + URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.1.zip" + FILENAME "angelscript_2.36.1.zip" + SHA512 d6d213ce72135c89e47e67521f654611ff67673f3decd9db3da4b7bf317a04a3f91c5c6ae36658ec3f2b20498facd069af02a91255a24ec79c96d8c90d6b554e ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES mark-threads-private.patch + fix-dependency.patch ) vcpkg_cmake_configure( @@ -26,4 +27,4 @@ if("addons" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/add_on/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/angelscript" FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") endif() -file(INSTALL "${SOURCE_PATH}/docs/manual/doc_license.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/manual/doc_license.html") diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json index 1f8a7aec97bc0b..472f7a81154f4b 100644 --- a/ports/angelscript/vcpkg.json +++ b/ports/angelscript/vcpkg.json @@ -1,6 +1,7 @@ { "name": "angelscript", - "version": "2.36.0", + "version": "2.36.1", + "port-version": 1, "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", "homepage": "https://angelcode.com/angelscript", "license": "Zlib", diff --git a/ports/angle/cmake-buildsystem/PlatformMac.cmake b/ports/angle/cmake-buildsystem/PlatformMac.cmake index c9f0a2327565e6..52c2c08961e5db 100644 --- a/ports/angle/cmake-buildsystem/PlatformMac.cmake +++ b/ports/angle/cmake-buildsystem/PlatformMac.cmake @@ -41,8 +41,13 @@ endif() # OpenGL backend if(USE_OPENGL) + list(APPEND ANGLE_SOURCES + ${angle_translator_glsl_base_sources} + ${angle_translator_glsl_sources} + ${angle_translator_apple_sources} + ) # Enable GLSL compiler output. - list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL) + list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL ANGLE_ENABLE_GL_DESKTOP_BACKEND ANGLE_ENABLE_APPLE_WORKAROUNDS) endif() if(USE_ANGLE_EGL OR ENABLE_WEBGL) diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 1058ec6040390a..d63a12f2029230 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 1, + "port-version": 2, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/ports/annoy/portfile.cmake b/ports/annoy/portfile.cmake index c33cb628f8afab..c0e1af93829270 100644 --- a/ports/annoy/portfile.cmake +++ b/ports/annoy/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO spotify/annoy - REF 0457742d12cf7a263f7c709ef1d470e5f08f791d # master on 2023-02-25 - SHA512 df26b18a5a165081a9373076f974ee977b0b4b54e7a58da3723f608e4cc46aab1d0978f2663965c8bbb81d123c8efff1a77040ef2bfdc0287b08214514b40ecc + REF "v${VERSION}" + SHA512 bf6e3095871cef2da20310f0a6260d65079cd2116b00ee39c82a6cb96d6cc80780b4f677c3746b85e7fe45672707a06c37bd8e8ecf793507584eca4760731018 HEAD_REF master ) diff --git a/ports/annoy/vcpkg.json b/ports/annoy/vcpkg.json index c594444b8fc6a5..e44d3d11224ec0 100644 --- a/ports/annoy/vcpkg.json +++ b/ports/annoy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "annoy", - "version-date": "2023-02-25", + "version": "1.17.2", "description": "Approximate Nearest Neighbors optimized for memory usage and loading/saving to disk", "homepage": "https://github.com/spotify/annoy", "license": "Apache-2.0", diff --git a/ports/argagg/vcpkg.json b/ports/argagg/vcpkg.json index ad43aa2ea7dfed..12ec3e78844e7a 100644 --- a/ports/argagg/vcpkg.json +++ b/ports/argagg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "argagg", - "version-string": "0.4.6", - "port-version": 2, + "version": "0.4.6", + "port-version": 3, "description": "A simple C++11 command line argument parser", "dependencies": [ { diff --git a/ports/argon2/CMakeLists.txt b/ports/argon2/CMakeLists.txt index 88b7f7e753b738..c42eec532f78f4 100644 --- a/ports/argon2/CMakeLists.txt +++ b/ports/argon2/CMakeLists.txt @@ -1,14 +1,14 @@ -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.25) -project(argon2) +project(argon2 LANGUAGES C) -set(ARGON2_VERSION 20190702) +option(WITH_OPTIMIZATIONS "Enable SSE2/AVX2/AVX512 optimizations") +option(BUILD_TOOL "Build the tool" OFF) -option(BUILD_SHARED_LIBS "Build using shared libraries" ON) - -if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang") - OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") +if(BUILD_SHARED_LIBS) + if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") + endif() endif() find_package(Threads REQUIRED) @@ -18,66 +18,58 @@ set(ARGON2_HEADERS ) set (ARGON2_SRC - "src/argon2.c" - "src/core.c" - "src/blake2/blake2b.c" - "src/thread.c" - "src/encoding.c" + src/argon2.c + src/core.c + src/blake2/blake2b.c + src/thread.c + src/encoding.c ) - -set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) - -message(STATUS "Checking support for hardware optimization:") -try_compile(WITH_OPTIMIZATIONS - ${CMAKE_CURRENT_BINARY_DIR}/optimization - SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/opt.c - CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}/include - OUTPUT_VARIABLE OUTPUT_TEST_SUPPORT_OPTIMIZATION) - -message(STATUS "Build with hardware optimization? ${WITH_OPTIMIZATIONS}") - if (WITH_OPTIMIZATIONS) - list(APPEND ARGON2_SRC "src/opt.c") + list(APPEND ARGON2_SRC src/opt.c) else() - list(APPEND ARGON2_SRC "src/ref.c") + list(APPEND ARGON2_SRC src/ref.c) endif() add_library(libargon2 ${ARGON2_SRC}) -target_include_directories(libargon2 PUBLIC $ $ PRIVATE src) -target_link_libraries(libargon2 Threads::Threads) -target_compile_definitions(libargon2 PUBLIC "A2_VISCTL") set_target_properties(libargon2 PROPERTIES OUTPUT_NAME argon2) - -add_executable(argon2_tool ${ARGON2_SRC} src/run.c) -target_include_directories(argon2_tool PRIVATE include src) -target_compile_definitions(argon2_tool PUBLIC "A2_VISCTL") -target_link_libraries(argon2_tool Threads::Threads) - -install(FILES ${ARGON2_HEADERS} DESTINATION include) - -set(PREFIX ${CMAKE_INSTALL_PREFIX}) -set(UPSTREAM_VER 20190702) -if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(EXTRA_LIBS "-lrt -ldl") -endif () - -configure_file ("${CMAKE_SOURCE_DIR}/libargon2.pc.in" "${PROJECT_BINARY_DIR}/libargon2.pc" @ONLY) -install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libargon2.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") +target_include_directories(libargon2 PUBLIC $ $ PRIVATE src) +target_link_libraries(libargon2 PRIVATE Threads::Threads) +if(BUILD_SHARED_LIBS) + if(WIN32) + target_compile_definitions(libargon2 PRIVATE "BUILDING_ARGON2_DLL" INTERFACE "USING_ARGON2_DLL") + else() + target_compile_definitions(libargon2 PRIVATE "A2_VISCTL") + endif() +endif() install(TARGETS libargon2 - EXPORT unofficial-libargon2 + EXPORT unofficial-argon2-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) -install(EXPORT unofficial-libargon2 +if(BUILD_TOOL) + add_executable(argon2 src/run.c) + target_link_libraries(argon2 PRIVATE libargon2) + set_target_properties(argon2 PROPERTIES PDB_NAME "argon2${CMAKE_EXECUTABLE_SUFFIX}.pdb") + + install(TARGETS argon2 RUNTIME DESTINATION bin) +endif() + +install(FILES ${ARGON2_HEADERS} DESTINATION include) + +install(EXPORT unofficial-argon2-targets NAMESPACE unofficial::argon2:: - DESTINATION "share/unofficial-libargon2" + DESTINATION "share/unofficial-argon2" ) -install(TARGETS argon2_tool - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) +function(make_pc_file) + set(PREFIX "${CMAKE_INSTALL_PREFIX}") + set(INCLUDE "include") + set(HOST_MULTIARCH "lib") + set(EXTRA_LIBS "") + configure_file ("${CMAKE_SOURCE_DIR}/libargon2.pc.in" "${PROJECT_BINARY_DIR}/libargon2.pc" @ONLY) +endfunction() +make_pc_file() +install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libargon2.pc" DESTINATION "lib/pkgconfig") diff --git a/ports/argon2/portfile.cmake b/ports/argon2/portfile.cmake index 54da71466f2e30..2cc0c11bf4c67e 100644 --- a/ports/argon2/portfile.cmake +++ b/ports/argon2/portfile.cmake @@ -6,26 +6,43 @@ vcpkg_from_github( HEAD_REF master PATCHES visibility.patch + visibility-for-tool.patch thread-header.patch ) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hwopt WITH_OPTIMIZATIONS + tool BUILD_TOOL +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DUPSTREAM_VER=${VERSION} + OPTIONS_DEBUG + -DBUILD_TOOL=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-libargon2 PACKAGE_NAME unofficial-libargon2) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-argon2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-argon2") +vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-argon2 PACKAGE_NAME unofficial-argon2) +# Migration path +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libargon2") + +if(BUILD_TOOL) + vcpkg_copy_tools(TOOL_NAMES argon2 AUTO_CLEAN) +endif() -vcpkg_copy_tools(TOOL_NAMES argon2_tool AUTO_CLEAN) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/argon2.h" "defined(USING_ARGON2_DLL)" "1") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${PORT}/argon2_tool${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/argon2${VCPKG_HOST_EXECUTABLE_SUFFIX}") -configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-libargon2/unofficial-libargon2-config.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/argon2/unofficial-argon2-config.cmake b/ports/argon2/unofficial-argon2-config.cmake new file mode 100644 index 00000000000000..9034d40c742103 --- /dev/null +++ b/ports/argon2/unofficial-argon2-config.cmake @@ -0,0 +1,4 @@ +include(CMakeFindDependencyMacro) +find_dependency(Threads) + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-argon2-targets.cmake") diff --git a/ports/argon2/unofficial-libargon2-config.cmake b/ports/argon2/unofficial-libargon2-config.cmake index 2723beed5bdce0..dfe78b5af46517 100644 --- a/ports/argon2/unofficial-libargon2-config.cmake +++ b/ports/argon2/unofficial-libargon2-config.cmake @@ -1,6 +1,4 @@ -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) - include(CMakeFindDependencyMacro) - find_dependency(Threads) -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2.cmake") +file(READ "${CMAKE_CURRENT_LIST_DIR}/../argon2/usage" usage) +message(WARNING "find_package(unofficial-libargon2) is deprecated.\n${usage}") +include(CMakeFindDependencyMacro) +find_dependency(unofficial-argon2 CONFIG) diff --git a/ports/argon2/usage b/ports/argon2/usage new file mode 100644 index 00000000000000..f874d576e53c72 --- /dev/null +++ b/ports/argon2/usage @@ -0,0 +1,4 @@ +argon2 provides CMake targets: + + find_package(unofficial-argon2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::argon2::libargon2) diff --git a/ports/argon2/vcpkg.json b/ports/argon2/vcpkg.json index 9a6b0e1d7d96fe..74bc563ec53a0a 100644 --- a/ports/argon2/vcpkg.json +++ b/ports/argon2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "argon2", "version": "20190702", + "port-version": 1, "description": "Password-hashing library.", "homepage": "https://github.com/P-H-C/phc-winner-argon2", "license": "Apache-2.0 OR CC0-1.0", @@ -16,7 +17,11 @@ ], "features": { "hwopt": { - "description": "Enable SSE2/AVX2/AVX512 optimizations if supported on architecture" + "description": "Enable SSE2/AVX2/AVX512 optimizations", + "supports": "x86 | x64" + }, + "tool": { + "description": "Install the argon2 tool" } } } diff --git a/ports/argon2/visibility-for-tool.patch b/ports/argon2/visibility-for-tool.patch new file mode 100644 index 00000000000000..8635305491b71e --- /dev/null +++ b/ports/argon2/visibility-for-tool.patch @@ -0,0 +1,13 @@ +diff --git a/src/core.h b/src/core.h +index 78000ba..91c7bcf 100644 +--- a/src/core.h ++++ b/src/core.h +@@ -135,7 +135,7 @@ void secure_wipe_memory(void *v, size_t n); + * @param mem Pointer to the memory + * @param s Memory size in bytes + */ +-void clear_internal_memory(void *v, size_t n); ++ARGON2_PUBLIC void clear_internal_memory(void *v, size_t n); + + /* + * Computes absolute position of reference block in the lane following a skewed diff --git a/ports/argon2/visibility.patch b/ports/argon2/visibility.patch index 53bcce7e1ac1ef..d6e99510f31bd8 100644 --- a/ports/argon2/visibility.patch +++ b/ports/argon2/visibility.patch @@ -1,46 +1,16 @@ -Fix symbol visibility across build triplets. -Submitted upstream in https://github.com/P-H-C/phc-winner-argon2/pull/262 - - diff --git a/include/argon2.h b/include/argon2.h -index 3980bb3..2738960 100644 +index fc8682c..1401051 100644 --- a/include/argon2.h +++ b/include/argon2.h -@@ -27,15 +27,29 @@ extern "C" { - #endif - - /* Symbols visibility control */ --#ifdef A2_VISCTL --#define ARGON2_PUBLIC __attribute__((visibility("default"))) --#define ARGON2_LOCAL __attribute__ ((visibility ("hidden"))) +@@ -30,7 +30,10 @@ extern "C" { + #ifdef A2_VISCTL + #define ARGON2_PUBLIC __attribute__((visibility("default"))) + #define ARGON2_LOCAL __attribute__ ((visibility ("hidden"))) -#elif _MSC_VER --#define ARGON2_PUBLIC __declspec(dllexport) --#define ARGON2_LOCAL -+#if defined(_WIN32) -+ #if defined(A2_VISCTL) -+ #if defined(_MSC_VER) || defined(__MINGW32__) -+ #define ARGON2_PUBLIC __declspec(dllexport) -+ #else -+ #define ARGON2_PUBLIC __attribute__ ((dllexport)) -+ #endif -+ #else -+ #if defined(_MSC_VER) || defined(__MINGW32__) -+ #define ARGON2_PUBLIC __declspec(dllimport) -+ #else -+ #define ARGON2_PUBLIC /*__attribute__ ((dllimport))*/ -+ #endif -+ #endif -+ #define ARGON2_LOCAL ++#elif defined(_WIN32) && defined(USING_ARGON2_DLL) ++#define ARGON2_PUBLIC __declspec(dllimport) ++#define ARGON2_LOCAL ++#elif defined(_WIN32) && defined(BUILDING_ARGON2_DLL) + #define ARGON2_PUBLIC __declspec(dllexport) + #define ARGON2_LOCAL #else --#define ARGON2_PUBLIC --#define ARGON2_LOCAL -+ #if defined(A2_VISCTL) -+ #define ARGON2_PUBLIC __attribute__ ((visibility ("default"))) -+ #define ARGON2_LOCAL __attribute__ ((visibility ("hidden"))) -+ #else -+ #define ARGON2_PUBLIC -+ #define ARGON2_LOCAL -+ #endif - #endif - - /* diff --git a/ports/arrow/brotli.patch b/ports/arrow/brotli.patch deleted file mode 100644 index 1cb633bb387ba0..00000000000000 --- a/ports/arrow/brotli.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake -index 4053b79ca7..bdca85fab4 100644 ---- a/cpp/cmake_modules/FindBrotli.cmake -+++ b/cpp/cmake_modules/FindBrotli.cmake -@@ -21,6 +21,23 @@ if(Brotli_FOUND) - return() - endif() - -+if(ARROW_PACAKGE_KIND STREQUAL "vcpkg") -+ set(find_package_args "") -+ if(Brotli_FIND_VERSION) -+ list(APPEND find_package_args ${Brotli_FIND_VERSION}) -+ endif() -+ if(Brotli_FIND_QUIETLY) -+ list(APPEND find_package_args QUIET) -+ endif() -+ find_package(Brotli NAMES unofficial-brotli ${find_package_args}) -+ if(Brotli_FOUND) -+ add_library(Brotli::brotlicommon ALIAS unofficial::brotli::brotlicommon) -+ add_library(Brotli::brotlienc ALIAS unofficial::brotli::brotlienc) -+ add_library(Brotli::brotlidec ALIAS unofficial::brotli::brotlidec) -+ return() -+ endif() -+endif() -+ - if(ARROW_BROTLI_USE_SHARED) - set(BROTLI_COMMON_LIB_NAMES - brotlicommon diff --git a/ports/arrow/fix-ci-error.patch b/ports/arrow/fix-ci-error.patch new file mode 100644 index 00000000000000..adbe0f8668365a --- /dev/null +++ b/ports/arrow/fix-ci-error.patch @@ -0,0 +1,13 @@ +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index eeda520..f55080e 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -921,7 +921,7 @@ if(WIN32) + list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll") + endif() + +-if(NOT WIN32 AND NOT APPLE) ++if(NOT WIN32 AND NOT APPLE AND NOT ANDROID) + # Pass -lrt on Linux only + list(APPEND ARROW_SYSTEM_LINK_LIBS rt) + endif() diff --git a/ports/arrow/fix-dataset.patch b/ports/arrow/fix-dataset.patch deleted file mode 100644 index 24e297215485e3..00000000000000 --- a/ports/arrow/fix-dataset.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/cpp/src/arrow/dataset/CMakeLists.txt b/cpp/src/arrow/dataset/CMakeLists.txt -index b80370e63985..04f80ab6d1b3 100644 ---- a/cpp/src/arrow/dataset/CMakeLists.txt -+++ b/cpp/src/arrow/dataset/CMakeLists.txt -@@ -31,6 +31,12 @@ set(ARROW_DATASET_SRCS - scanner.cc - scan_node.cc) - -+if(ARROW_PARQUET) -+ set(ARROW_DATASET_PKG_CONFIG_REQUIRES parquet) -+else() -+ set(ARROW_DATASET_PKG_CONFIG_REQUIRES arrow) -+endif() -+ - set(ARROW_DATASET_STATIC_LINK_LIBS) - set(ARROW_DATASET_SHARED_LINK_LIBS) - set(ARROW_DATASET_STATIC_INSTALL_INTERFACE_LIBS) -diff --git a/cpp/src/arrow/dataset/arrow-dataset.pc.in b/cpp/src/arrow/dataset/arrow-dataset.pc.in -index 3e474e3825c5..d587fd110c08 100644 ---- a/cpp/src/arrow/dataset/arrow-dataset.pc.in -+++ b/cpp/src/arrow/dataset/arrow-dataset.pc.in -@@ -22,6 +22,6 @@ libdir=@ARROW_PKG_CONFIG_LIBDIR@ - Name: Apache Arrow Dataset - Description: Apache Arrow Dataset provides an API to read and write semantic datasets stored in different locations and formats. - Version: @ARROW_VERSION@ --Requires: arrow parquet -+Requires: @ARROW_DATASET_PKG_CONFIG_REQUIRES@ - Libs: -L${libdir} -larrow_dataset - Cflags.private: -DARROW_DS_STATIC diff --git a/ports/arrow/fix-pkgconfig-windows.patch b/ports/arrow/fix-pkgconfig-windows.patch deleted file mode 100644 index eaef423bc4d816..00000000000000 --- a/ports/arrow/fix-pkgconfig-windows.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 109a40a12019e28ecd60bbf9210f9c949c827d31 Mon Sep 17 00:00:00 2001 -From: Luke Elliott -Date: Wed, 7 Dec 2022 11:57:57 +0000 -Subject: [PATCH] GH-14869: [C++] Add Cflags.private defining _STATIC to - .pc.in. - -Required for Windows usage of static builds via vcpkg & pkgconfig. ---- - cpp/src/arrow/arrow-testing.pc.in | 1 + - cpp/src/arrow/arrow.pc.in | 1 + - cpp/src/arrow/dataset/arrow-dataset.pc.in | 1 + - cpp/src/arrow/engine/arrow-substrait.pc.in | 1 + - cpp/src/arrow/flight/arrow-flight.pc.in | 1 + - cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in | 1 + - cpp/src/gandiva/gandiva.pc.in | 1 + - cpp/src/parquet/parquet.pc.in | 1 + - python/pyarrow/src/arrow-python.pc.in | 1 + - 9 files changed, 9 insertions(+) - -diff --git a/cpp/src/arrow/arrow-testing.pc.in b/cpp/src/arrow/arrow-testing.pc.in -index 5a991e796d83..9a452a5d113f 100644 ---- a/cpp/src/arrow/arrow-testing.pc.in -+++ b/cpp/src/arrow/arrow-testing.pc.in -@@ -27,3 +27,4 @@ Version: @ARROW_VERSION@ - Requires: arrow - Libs: -L${libdir} -larrow_testing - Cflags: -I${gtest_includedir} -+Cflags.private: -DARROW_TESTING_STATIC -diff --git a/cpp/src/arrow/arrow.pc.in b/cpp/src/arrow/arrow.pc.in -index 3a5710ab6b88..90c98bf32b2b 100644 ---- a/cpp/src/arrow/arrow.pc.in -+++ b/cpp/src/arrow/arrow.pc.in -@@ -30,3 +30,4 @@ Requires.private:@ARROW_PC_REQUIRES_PRIVATE@ - Libs: -L${libdir} -larrow - Libs.private:@ARROW_PC_LIBS_PRIVATE@ - Cflags: -I${includedir} -+Cflags.private: -DARROW_STATIC -diff --git a/cpp/src/arrow/dataset/arrow-dataset.pc.in b/cpp/src/arrow/dataset/arrow-dataset.pc.in -index 7c433321c135..3e474e3825c5 100644 ---- a/cpp/src/arrow/dataset/arrow-dataset.pc.in -+++ b/cpp/src/arrow/dataset/arrow-dataset.pc.in -@@ -24,3 +24,4 @@ Description: Apache Arrow Dataset provides an API to read and write semantic dat - Version: @ARROW_VERSION@ - Requires: arrow parquet - Libs: -L${libdir} -larrow_dataset -+Cflags.private: -DARROW_DS_STATIC -diff --git a/cpp/src/arrow/engine/arrow-substrait.pc.in b/cpp/src/arrow/engine/arrow-substrait.pc.in -index 77ac510933f5..173e1c91efd8 100644 ---- a/cpp/src/arrow/engine/arrow-substrait.pc.in -+++ b/cpp/src/arrow/engine/arrow-substrait.pc.in -@@ -24,3 +24,4 @@ Description: Apache Arrow's Substrait Consumer. - Version: @ARROW_VERSION@ - Requires: arrow - Libs: -L${libdir} -larrow_substrait -+Cflags.private: -DARROW_ENGINE_STATIC -diff --git a/cpp/src/arrow/flight/arrow-flight.pc.in b/cpp/src/arrow/flight/arrow-flight.pc.in -index 955fc19b0df4..5a57a8922377 100644 ---- a/cpp/src/arrow/flight/arrow-flight.pc.in -+++ b/cpp/src/arrow/flight/arrow-flight.pc.in -@@ -24,3 +24,4 @@ Description: Apache Arrow's RPC system built on gRPC - Version: @ARROW_VERSION@ - Requires: arrow - Libs: -L${libdir} -larrow_flight -+Cflags.private: -DARROW_FLIGHT_STATIC -diff --git a/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in b/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in -index 4f8398bdd259..b76964b97c89 100644 ---- a/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in -+++ b/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in -@@ -24,3 +24,4 @@ Description: Apache Arrow Flight SQL extension - Version: @ARROW_VERSION@ - Requires: arrow-flight - Libs: -L${libdir} -larrow_flight_sql -+Cflags.private: -DARROW_FLIGHT_SQL_STATIC -diff --git a/cpp/src/gandiva/gandiva.pc.in b/cpp/src/gandiva/gandiva.pc.in -index 60034c285790..49260092d297 100644 ---- a/cpp/src/gandiva/gandiva.pc.in -+++ b/cpp/src/gandiva/gandiva.pc.in -@@ -25,3 +25,4 @@ Version: @GANDIVA_VERSION@ - Requires: arrow - Libs: -L${libdir} -lgandiva - Cflags: -I${includedir} -+Cflags.private: -DGANDIVA_STATIC -diff --git a/cpp/src/parquet/parquet.pc.in b/cpp/src/parquet/parquet.pc.in -index e510bb1d6bfc..b992eba81998 100644 ---- a/cpp/src/parquet/parquet.pc.in -+++ b/cpp/src/parquet/parquet.pc.in -@@ -29,3 +29,4 @@ Version: @ARROW_VERSION@ - Requires: arrow - Libs: -L${libdir} -lparquet - Cflags: -I${includedir} -+Cflags.private: -DPARQUET_STATIC -diff --git a/python/pyarrow/src/arrow-python.pc.in b/python/pyarrow/src/arrow-python.pc.in -index c077c7dc84c3..0efd0ad98309 100644 ---- a/python/pyarrow/src/arrow-python.pc.in -+++ b/python/pyarrow/src/arrow-python.pc.in -@@ -25,3 +25,4 @@ Version: @ARROW_VERSION@ - Requires: arrow - Libs: -L${libdir} -larrow_python - Cflags: -I${includedir} -I@PYTHON_INCLUDE_DIRS@ -+Cflags.private: -DARROW_PYTHON_STATIC diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 0d40c2736a1ceb..7a1bbcb7c3dcb7 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,22 +2,21 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 c6198e5c9b8fe5ccd89e445c9252da44d8d7c9e0c8eb5a802fa0cabf89482fddf775ed383bac1acc9331bc3195d21df7ea02c4a73aa6ee163c2959f34175d650 + SHA512 f815be4fb20b6001ba5525270765fe239b5468708a7be34b93b60ee0ce63464727d183c9756fbc33bffd199019e1f06a7fddd306ce8388435cea7771070a2ca9 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE ${ARCHIVE_PATH} PATCHES - brotli.patch msvc-static-name.patch - thrift.patch utf8proc.patch - fix-pkgconfig-windows.patch # needed for fix-dataset.patch (https://github.com/apache/arrow/pull/14900) - fix-dataset.patch # https://github.com/apache/arrow/pull/33665 + thrift.patch + fix-ci-error.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + acero ARROW_ACERO csv ARROW_CSV cuda ARROW_CUDA dataset ARROW_DATASET @@ -30,7 +29,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS orc ARROW_ORC parquet ARROW_PARQUET parquet PARQUET_REQUIRE_ENCRYPTION - plasma ARROW_PLASMA s3 ARROW_S3 ) @@ -101,10 +99,6 @@ if("example" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example") endif() -if("plasma" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES plasma-store-server AUTO_CLEAN) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") diff --git a/ports/arrow/thrift.patch b/ports/arrow/thrift.patch index 985da8bcba806c..7c81e23dba7fe7 100644 --- a/ports/arrow/thrift.patch +++ b/ports/arrow/thrift.patch @@ -1,62 +1,22 @@ -diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThriftAlt.cmake -similarity index 91% -rename from cpp/cmake_modules/FindThrift.cmake -rename to cpp/cmake_modules/FindThriftAlt.cmake -index 2f20a5cb59..e317e2c7c4 100644 ---- a/cpp/cmake_modules/FindThrift.cmake +diff --git a/cpp/cmake_modules/FindThriftAlt.cmake b/cpp/cmake_modules/FindThriftAlt.cmake +index f3e4902..65ceac8 100644 +--- a/cpp/cmake_modules/FindThriftAlt.cmake +++ b/cpp/cmake_modules/FindThriftAlt.cmake -@@ -28,7 +28,23 @@ - # thrift::thrift, a library target to use Thrift - # thrift::compiler, a executable target to use Thrift compiler - -+if(ThriftAlt_FOUND) -+ return() -+endif() +@@ -45,7 +45,7 @@ endif() + # * https://github.com/apache/thrift/pull/2725 + # * https://github.com/apache/thrift/pull/2726 + # * https://github.com/conda-forge/thrift-cpp-feedstock/issues/68 +-if(NOT WIN32) ++ + set(find_package_args "") + if(ThriftAlt_FIND_VERSION) + list(APPEND find_package_args ${ThriftAlt_FIND_VERSION}) +@@ -61,7 +61,7 @@ if(NOT WIN32) + "${THRIFT_COMPILER}") + return() + endif() +-endif() + -+set(find_package_args "") -+if(ThriftAlt_FIND_VERSION) -+ list(APPEND find_package_args ${ThriftAlt_FIND_VERSION}) -+endif() -+if(ThriftAlt_FIND_QUIETLY) -+ list(APPEND find_package_args QUIET) -+endif() -+find_package(Thrift ${find_package_args}) - if(Thrift_FOUND) -+ set(ThriftAlt_FOUND TRUE) -+ add_executable(thrift::compiler IMPORTED) -+ set_target_properties(thrift::compiler PROPERTIES IMPORTED_LOCATION -+ "${THRIFT_COMPILER}") - return() - endif() - -@@ -133,12 +149,12 @@ else() - endif() - - find_package_handle_standard_args( -- Thrift -+ ThriftAlt - REQUIRED_VARS THRIFT_LIB THRIFT_INCLUDE_DIR - VERSION_VAR Thrift_VERSION - HANDLE_COMPONENTS) - --if(Thrift_FOUND) -+if(ThriftAlt_FOUND) - if(ARROW_THRIFT_USE_SHARED) - add_library(thrift::thrift SHARED IMPORTED) - else() -diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index b7cd31f3d7..72b8cfe286 100644 ---- a/cpp/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake -@@ -1510,8 +1510,10 @@ macro(build_thrift) - endmacro() - if(ARROW_WITH_THRIFT) -- # Thrift c++ code generated by 0.13 requires 0.11 or greater -+ # Thrift C++ code generated by 0.13 requires 0.11 or greater - resolve_dependency(Thrift -+ HAVE_ALT -+ TRUE - REQUIRED_VERSION - 0.11.0 - PC_PACKAGE_NAMES + function(extract_thrift_version) + if(ThriftAlt_INCLUDE_DIR) diff --git a/ports/arrow/utf8proc.patch b/ports/arrow/utf8proc.patch index e36a50405de4c5..eea9ca59e2ed7e 100644 --- a/ports/arrow/utf8proc.patch +++ b/ports/arrow/utf8proc.patch @@ -1,26 +1,13 @@ diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake -index 2f0f59a02c..f5382a8f21 100644 +index e347414..83f2aa1 100644 --- a/cpp/cmake_modules/Findutf8proc.cmake +++ b/cpp/cmake_modules/Findutf8proc.cmake -@@ -19,6 +19,21 @@ if(utf8proc_FOUND) - return() - endif() - -+if(ARROW_PACAKGE_KIND STREQUAL "vcpkg") -+ set(find_package_args "") -+ if(utf8proc_FIND_VERSION) -+ list(APPEND find_package_args ${utf8proc_FIND_VERSION}) -+ endif() -+ if(utf8proc_FIND_QUIETLY) -+ list(APPEND find_package_args QUIET) -+ endif() -+ find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args}) -+ if(utf8proc_FOUND) -+ add_library(utf8proc::utf8proc ALIAS utf8proc) -+ return() -+ endif() -+endif() -+ - function(extract_utf8proc_version) - if(utf8proc_INCLUDE_DIR) - file(READ "${utf8proc_INCLUDE_DIR}/utf8proc.h" UTF8PROC_H_CONTENT) +@@ -30,7 +30,7 @@ if(ARROW_PACKAGE_KIND STREQUAL "vcpkg") + if(utf8proc_FIND_REQUIRED) + list(APPEND find_package_args REQUIRED) + endif() +- find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args}) ++ find_package(utf8proc NAMES unofficial-utf8proc) + if(utf8proc_FOUND) + add_library(utf8proc::utf8proc ALIAS utf8proc) + return() diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 74cb06d577b25d..fd0baed8b0ea93 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrow", - "version": "10.0.1", - "port-version": 4, + "version": "12.0.0", + "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -38,6 +38,9 @@ "parquet" ], "features": { + "acero": { + "description": "Acero support" + }, "csv": { "description": "CSV support" }, @@ -103,10 +106,6 @@ "rapidjson" ] }, - "plasma": { - "description": "Plasma support", - "supports": "!windows" - }, "s3": { "description": "S3 support", "dependencies": [ diff --git a/ports/asiosdk/portfile.cmake b/ports/asiosdk/portfile.cmake index a5760164140df7..9807a4c2699538 100644 --- a/ports/asiosdk/portfile.cmake +++ b/ports/asiosdk/portfile.cmake @@ -6,10 +6,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 eac6c1a57829b7f722a681c54b2f6469d54695523f08f727d0dd6744dcd7fce4f3249c57689bb15ed7a8bcb912833b226439d800913e122e0ef9ab73672f6542 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${VERSION} + SOURCE_BASE ${VERSION} ) file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio) diff --git a/ports/asiosdk/vcpkg.json b/ports/asiosdk/vcpkg.json index 55f3f5b4fc9a4a..0d85c574fe95a5 100644 --- a/ports/asiosdk/vcpkg.json +++ b/ports/asiosdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "asiosdk", "version": "2.3.3", - "port-version": 5, + "port-version": 6, "description": "ASIO is a low latency audio API from Steinberg.", "homepage": "https://www.steinberg.net/en/company/developers.html", "supports": "windows & !(arm | uwp)" diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index ffcdcd59a23674..007c0635d9d8a4 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO asmjit/asmjit - REF d0d14ac774977d0060a351f66e35cb57ba0bf59c # accessed on 2021-10-26 - SHA512 2822763fcb3c18f6699119c1773404667d81f8afb86f8f2e8dbe627526a2877b049d16505557e680e4e310f0e0667263dc4ac442f682e95f2568bf0bf8b61b4b - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO asmjit/asmjit + REF 51b10b19b6631434d3f9ad536a6fb140944a36d2 # commited on 2023-03-25 + SHA512 1fba5159d2adad64e9a2b07a1f90de6988d1da47b9802ca8b57c61a89d8a90924525f6d0d6607279994bdbadcf693b2cc96cd7e4bf7f018ad64127b640dc38fb + HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ASMJIT_STATIC) @@ -28,4 +28,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/asmjit/vcpkg.json b/ports/asmjit/vcpkg.json index bf06441091f447..fedfb2c7f7008e 100644 --- a/ports/asmjit/vcpkg.json +++ b/ports/asmjit/vcpkg.json @@ -1,7 +1,6 @@ { "name": "asmjit", - "version-date": "2021-10-26", - "port-version": 1, + "version-date": "2023-03-25", "description": "Complete x86/x64 JIT and Remote Assembler for C++", "homepage": "https://github.com/asmjit/asmjit", "supports": "!arm", diff --git a/ports/asmtk/fix-link-amsjit.patch b/ports/asmtk/fix-link-amsjit.patch new file mode 100644 index 00000000000000..720afbe94cf8f9 --- /dev/null +++ b/ports/asmtk/fix-link-amsjit.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d348072..d5b6be9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,7 +172,7 @@ if (NOT ASMTK_EMBED) + $<$>:${ASMTK_PRIVATE_CFLAGS_REL}>) + + if(ASMJIT_EXTERNAL) +- target_link_libraries(asmtk PUBLIC ${ASMJIT_LIBRARY}) ++ target_link_libraries(asmtk PUBLIC asmjit::asmjit) + find_path(ASMJIT_INCLUDE_DIR NAMES asmjit/asmjit.h) + target_include_directories(asmtk PRIVATE ${ASMJIT_INCLUDE_DIR}) + else() diff --git a/ports/asmtk/portfile.cmake b/ports/asmtk/portfile.cmake new file mode 100644 index 00000000000000..be25e0bcb79bba --- /dev/null +++ b/ports/asmtk/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asmjit/asmtk + REF 425b108d3afe510f8b94ca5523cd31ae29381422 # accessed on 2022-11-06 + SHA512 d825f488c66dca9ca4c3279992e4ea36a4d1b7ad65fa3e0c70b151ce0d2b1f9b5ad053ff1d447da38475bf843fe3b130706e3c9916a64f76560add9c8d796a5b + HEAD_REF master + PATCHES + fix-link-amsjit.patch +) + +set(ASMJIT_EXTERNAL ON) +set(ASMTK_EMBED OFF) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ASMTK_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DASMTK_STATIC=${ASMTK_STATIC} + -DASMJIT_EXTERNAL=${ASMJIT_EXTERNAL} + -DASMTK_EMBED=${ASMTK_EMBED} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asmtk) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/asmtk/vcpkg.json b/ports/asmtk/vcpkg.json new file mode 100644 index 00000000000000..981d9b9021bd8c --- /dev/null +++ b/ports/asmtk/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "asmtk", + "version-date": "2022-11-06", + "description": "Assembler toolkit based on AsmJit ", + "homepage": "https://github.com/asmjit/asmtk", + "supports": "!arm", + "dependencies": [ + "asmjit", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/asynch/vcpkg.json b/ports/asynch/vcpkg.json index 0ee8a5df26a511..9ee855beb6b8f7 100644 --- a/ports/asynch/vcpkg.json +++ b/ports/asynch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "asynch", - "version-string": "2019-09-21", - "port-version": 2, + "version-date": "2019-09-21", + "port-version": 3, "description": "Async.h - asynchronous, stackless subroutines.", "homepage": "https://github.com/naasking/async.h" } diff --git a/ports/at-spi2-core/portfile.cmake b/ports/at-spi2-core/portfile.cmake index a078ec6ac43bb2..fcb68416044dae 100644 --- a/ports/at-spi2-core/portfile.cmake +++ b/ports/at-spi2-core/portfile.cmake @@ -14,10 +14,7 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dintrospection=no - ADDITIONAL_NATIVE_BINARIES - glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES + ADDITIONAL_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json index e972a826e422ee..9985253c0b5a3c 100644 --- a/ports/at-spi2-core/vcpkg.json +++ b/ports/at-spi2-core/vcpkg.json @@ -1,7 +1,7 @@ { "name": "at-spi2-core", "version": "2.44.1", - "port-version": 1, + "port-version": 2, "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.", "homepage": "https://www.gtk.org/", "license": null, diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index a4c337b6efe423..bb9c636df41bf1 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json index 426760e8f4ac7b..523ff23c338f5a 100644 --- a/ports/atkmm/vcpkg.json +++ b/ports/atkmm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "atkmm", "version": "2.36.1", + "port-version": 1, "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.", "homepage": "https://www.gtkmm.org", - "license": "LGPL-2.1", + "license": "LGPL-2.1-or-later", "dependencies": [ "atk", "gettext", diff --git a/ports/atlmfc/vcpkg.json b/ports/atlmfc/vcpkg.json index 5a8ce22d6b14e2..6b9eea357c7951 100644 --- a/ports/atlmfc/vcpkg.json +++ b/ports/atlmfc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "atlmfc", - "version-string": "0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "a stub package that ensures VS has ATL/MFC installed.", "supports": "windows" } diff --git a/ports/aurora/vcpkg.json b/ports/aurora/vcpkg.json index e0efe0331e641e..7e89fcf296fc78 100644 --- a/ports/aurora/vcpkg.json +++ b/ports/aurora/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aurora", - "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", - "port-version": 1, + "version": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 2, "description": "Aurora is an open-source C++ library providing various rather uncommon C++ utilities", "homepage": "https://github.com/Bromeon/Aurora" } diff --git a/ports/autobahn/vcpkg.json b/ports/autobahn/vcpkg.json index cc755ff05796cd..3bd52ecc0734b2 100644 --- a/ports/autobahn/vcpkg.json +++ b/ports/autobahn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "autobahn", - "version-string": "20.8.1", - "port-version": 1, + "version": "20.8.1", + "port-version": 2, "description": "WAMP for C++ in Boost/Asio", "homepage": "https://crossbar.io/autobahn", "dependencies": [ diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake index 05a4649c825646..645075a34e9e85 100644 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ b/ports/aws-sdk-cpp/compute_build_only.cmake @@ -548,9 +548,6 @@ endif() if("mobile" IN_LIST FEATURES) list(APPEND BUILD_ONLY mobile) endif() -if("mobileanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mobileanalytics) -endif() if("monitoring" IN_LIST FEATURES) list(APPEND BUILD_ONLY monitoring) endif() diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch index 828647cc4365ce..1dc1cfd7603d4e 100644 --- a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch +++ b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a653e38628..76d6067646 100644 +index 41d220d5fa..f6ee9a2a74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -142,7 +142,6 @@ else() - endif() - - # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables. --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) - - # build the sdk targets - project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) +@@ -147,7 +147,6 @@ if (LEGACY_BUILD) + endif () + + # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables. +- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) + + # build the sdk targets + project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 5e9c815ea9adb0..aab2e305840b06 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,12 +4,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 d30a9cbe67aca41e98c799b55122ff97e9a935d2073ae4c1ca6545b68719236c0f2daf665cc3c0da4210e6e24e908a7a3cd0b826242e8fb5a97763f43e92b57a + SHA512 e3fff504e8437741493451f602289010150d767f57ceb0a3aea02bf85268ddb2afb7473affa4a162aa356a410573ded50324979bf77265e81c047c861d887635 PATCHES patch-relocatable-rpath.patch fix-aws-root.patch fix-openssl3.patch lock-curl-http-and-tls-settings.patch + turn-off-warnings-as-errors.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) diff --git a/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch b/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch new file mode 100644 index 00000000000000..c682b9d5bc901e --- /dev/null +++ b/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index a7689dc595..13e594f12c 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -153,9 +153,6 @@ macro(set_msvc_warnings) + endif() + + # warnings as errors, max warning level (4) +- if(NOT CMAKE_CXX_FLAGS MATCHES "/WX") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") +- endif() + + # taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 3e8e960872f4f1..3e5f0b7c6092dc 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.4", + "version": "1.11.65", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", @@ -585,9 +585,6 @@ "mobile": { "description": "C++ SDK for the AWS mobile service" }, - "mobileanalytics": { - "description": "C++ SDK for the AWS mobileanalytics service" - }, "monitoring": { "description": "C++ SDK for the AWS monitoring service" }, diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index 412f0a83c36543..a3220c27677e8e 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-c-shared-utility", "version-date": "2023-01-18", + "port-version": 1, "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "license": "MIT", @@ -9,11 +10,11 @@ "azure-macro-utils-c", { "name": "curl", - "platform": "linux" + "platform": "!windows" }, { "name": "openssl", - "platform": "linux" + "platform": "!windows & !osx" }, "umock-c", { diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 280c6597c43e5f..e9a8ed2c69ef18 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.8.0 - SHA512 13d49b79dbc9e5c2fd8ce019e76b2ba92258174f7b12945eae67c7451548ada4afc059023b5092c3de7ce77bc4bb0954a5c483b8451aeefde4a3133401ace632 + REF azure-core_1.9.0 + SHA512 15650af728123e902c5bcf99ae2e8186b7ad77fe1187f11f379ec7c0dab5a0aba197d6cf6e5348845f51fa0f2d195e9f8eba9595756e600c166bebdf0a8c1b31 ) vcpkg_check_features( @@ -13,7 +13,7 @@ vcpkg_check_features( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core/ + SOURCE_PATH "${SOURCE_PATH}/sdk/core/azure-core/" OPTIONS ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 19f6d21d6305c6..00290ccf0a12be 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.8.0", + "version-semver": "1.9.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/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index ded88368a6bd3d..fa24cb7b5f63dc 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-identity_1.4.0 - SHA512 ddc6aee949e1a6dfb39ea36d118cec652889e31334e90c51e516e520599d0ce5bbcdaa6dfab7168f2b91c80647d5a0e29f13b465fdf092d112e955b6367f2de8 + REF azure-identity_1.5.0 + SHA512 1f96c2c9a056e83e083d9d8bc6c55fce1bc84b1ccee0a980c4b09d13b364551a1760c8a44232e5786b179fd60bea4b5b05c6cadd6b7fb270979a606a895bb7b6 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/identity/azure-identity/ + SOURCE_PATH "${SOURCE_PATH}/sdk/identity/azure-identity/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index 083a640fff6c16..057682c67891f7 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.4.0", + "version-semver": "1.5.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.8.0" + "version>=": "1.9.0" }, "openssl", { diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 414b6775f0b42f..0bbc78a5220e12 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -63,8 +63,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 17630a00f4e9ff3ef68945b62021f6d0390030b43c120c207afe934075a7a87c5848be1f46f4c35c7ecd5698012452ffcbb67f739e9048857410ec7077e5e8c6 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH PACKAGE_PATH +vcpkg_extract_source_archive( + PACKAGE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL ) diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index 3addef920be400..9726bd8cdb0e33 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 4, + "port-version": 5, "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", "supports": "linux | windows", diff --git a/ports/azure-security-keyvault-administration-cpp/portfile.cmake b/ports/azure-security-keyvault-administration-cpp/portfile.cmake index 36ba5827ad364e..c232d70966ca09 100644 --- a/ports/azure-security-keyvault-administration-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-administration-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-administration_4.0.0-beta.2 - SHA512 9f4f9f115bbc922cc62fd6aa75e4eb56aaed21058e0defd129993c38888dc90cdd29b3c4e746f8b1fb0c716cefe5d605e59994a68a7d6aaf7fdbcee0a81c535e + REF azure-security-keyvault-administration_4.0.0-beta.3 + SHA512 1209811b470821f929ffd5d09df58ff19b19f13a657acf304fefd457ee533acb3e91774ca6d72d0106e42d601d0bd4d23fbd563f62a4c9a62d686afe61cb4e6c ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration/ + SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/ports/azure-security-keyvault-administration-cpp/vcpkg.json index e3c8f800a790ba..ea4daed6b5394a 100644 --- a/ports/azure-security-keyvault-administration-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-administration-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-administration-cpp", - "version-semver": "4.0.0-beta.2", + "version-semver": "4.0.0-beta.3", "description": [ "Microsoft Azure Key Vault Administration SDK for C++", "This library provides Azure Key Vault Administration SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.7.2" + "version>=": "1.9.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index cd0d8c43820f2a..2c8d0408e3e774 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-certificates_4.1.0 - SHA512 fc07f48d82d0475b28a62ce9de386433908d94b00678cd89c8310cdb6f8dd3e0e973936191f10be08af7b0293b7b434223c3682de4a06f0b4b067baf37e8e0b3 + REF azure-security-keyvault-certificates_4.2.0 + SHA512 bcfbeb47bbf0871113be3a7704b519af2b3209304be8f9c29874325e8efd3e4e440706aae1f86139076097b31e3777b85e3c9b01861bc5ace9113645d8a97260 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/ + SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index dc1aec87a7e9ba..0b69efb1caa348 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.1.0", + "version-semver": "4.2.0", "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.5.0" + "version>=": "1.9.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 9c8413d7fdb01e..b33975db40bb3b 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-keys_4.3.0 - SHA512 e2c6555d5c89c73c015356de1fbda3274186000710ba75d85b233a3b00bd50b7ee9ea0c527aa408503ba9781dffe7b849a5c3e6e239d41187e7752663e43b9ea + REF azure-security-keyvault-keys_4.4.0 + SHA512 00fc21a1ecf4b40543a1a381777970739579f3384392cdb9a2eb44563d05a5ac648f797cb5198df27f74cd4b45d341b06e45f552ed2a878f2cfd50f3461ad4fd ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/ + SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index 2d1ae6215534b5..c754a70e6bf75e 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.3.0", + "version-semver": "4.4.0", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.5.0" + "version>=": "1.9.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index d5e16e3435c410..5f5b3bf01dd933 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-secrets_4.1.0 - SHA512 82deeda461aaac3d38adcf1080ecd0b8883dfb6c5e9db6b86deaac2e6d683dac3e97998afeb9a1657da715f9e46f25f9b9a6c4938ade0a1979b1136291d66e7f + REF azure-security-keyvault-secrets_4.2.0 + SHA512 1f464e60f9cb234bb28c3daa5abb0a27fdb9c75327f7eb84b3d5215524457aae9b6c64617a35175341afcaf0da39373190c867fb1d5a1780b9395062a7420aaa ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/ + SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index 95bfc889e0737c..943a299cfedade 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.1.0", + "version-semver": "4.2.0", "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.5.0" + "version>=": "1.9.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 91c474ecad3970..9ef991aeb312ea 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.3.1 - SHA512 4c062c23637ed94b7688292649d02fb0c67d6402ec682b7a077f3a2aa7dc322cf01e979c5042407876b8c1407cba339252c0c1dde2b7e7aa6727ecfcbe9633ca + REF azure-storage-common_12.3.2 + SHA512 e437c12ba1056838a1d68257522f412f709b4bcbd3e58d4f7fc47768f125a61258667e0f4fcb93927522da9ab2a9495c3d8c53d81f01a86feb142a7025b1ee4c ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/ + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 802869816e7797..24dfb910a93c91 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.3.1", + "version-semver": "12.3.2", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.8.0" + "version>=": "1.9.0" }, { "name": "libxml2", diff --git a/ports/azure-storage-cpp/vcpkg.json b/ports/azure-storage-cpp/vcpkg.json index c8c6825b3cf7cb..4b5f6141347252 100644 --- a/ports/azure-storage-cpp/vcpkg.json +++ b/ports/azure-storage-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-storage-cpp", - "version-string": "7.5.0", - "port-version": 4, + "version": "7.5.0", + "port-version": 5, "description": [ "[legacy] Microsoft Azure Storage Client SDK for C++", "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index 6b4fd14d1f1de2..d1f39b7bad4922 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.5.0 - SHA512 fe6b7ffe6efa24c273e3151fdeadb4b981e277bf9aa7b19b23759d5070bfc0c65c365296add83fb4f364b0653a651be31d9ccbd06bfc4c6ac62cf0c5330a66dc + REF azure-storage-files-datalake_12.6.0 + SHA512 29f1f929abdb7a013593679143ad7a90b52af10f630832c15c133c11925c27528d9221c73ad1b53aad59d7017c82347a4d06bfaf96aaa9ae60ea5a23d8355fcc ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/ + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index a0bff61355efc1..4ca085dc661f12 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.5.0", + "version-semver": "12.6.0", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-blobs-cpp", "default-features": false, - "version>=": "12.6.2" + "version>=": "12.7.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 5b82217a1bce55..19be8c992e0b07 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.4.0 - SHA512 e064d808b92de3ec32d4328ce274c9a67ea03f106f71afe311182ed9eff3adad1dfb00ade83da98b10a8e6a7d3b6082d965a1af4b495fd92879d21b669c55ba0 + REF azure-storage-files-shares_12.5.0 + SHA512 e56a3af0df71f9887248fdf48274345b236a56a7556235d1c3bab61668fee0c1163e86339c080166445c6b66dfbbba1938204592ca6f6a2b232303836317d7f6 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/ + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index e5c76e20ccd210..c42fe1433482a1 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.4.0", + "version-semver": "12.5.0", "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.3.1" + "version>=": "12.3.2" }, { "name": "vcpkg-cmake", diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 5273f7dbcb6be3..8a8b0a71002766 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/bdwgc - REF v8.2.2 - SHA512 da6a2de30f096610ea1c0de1ff7a3ab434debaa39199bc1426daff620901fc76e5747e43171d742b17f4afa3c77ef447cba4fda69d76a711e108f3f03af917ca + REF v8.2.4 + SHA512 323d65a867f95cfbf5ecb0ff57e8dede0282cffd0d75153526e50282fe019b2e9b3a0cf16d551654832bd4f01ce8f8461590bfc5f4ea9b5eed80384321d369d7 HEAD_REF master ) diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index eb669775e1dde1..7bba131fbb8ef5 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bdwgc", - "version": "8.2.2", + "version": "8.2.4", "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", "homepage": "https://www.hboehm.info/gc/", "license": "MIT", diff --git a/ports/beast/vcpkg.json b/ports/beast/vcpkg.json index 7fd6806ce5e75f..9f1d6b4a264d3a 100644 --- a/ports/beast/vcpkg.json +++ b/ports/beast/vcpkg.json @@ -1,7 +1,7 @@ { "name": "beast", - "version-string": "0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "HTTP/1 and WebSocket, header-only using Boost.Asio and C++11", "homepage": "https://www.boost.org/doc/libs/release/libs/beast/", "dependencies": [ diff --git a/ports/behaviortree-cpp/001_port_fixes.patch b/ports/behaviortree-cpp/001_port_fixes.patch deleted file mode 100644 index 9897caa1881e74..00000000000000 --- a/ports/behaviortree-cpp/001_port_fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a390aed..658f994 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -233,7 +233,7 @@ if( ZMQ_FOUND ) - endif() - - if(MSVC) -- target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /WX) -+ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /wd4702) - else() - target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE - -Wall -Wextra -Werror=return-type) diff --git a/ports/behaviortree-cpp/002_fix_dependencies.patch b/ports/behaviortree-cpp/002_fix_dependencies.patch deleted file mode 100644 index d554e37ce549ff..00000000000000 --- a/ports/behaviortree-cpp/002_fix_dependencies.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 658f994..a04cf27 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ if(MSVC) - endif() - - #---- Include boost to add coroutines ---- --find_package(Boost COMPONENTS coroutine QUIET) -+find_package(Boost REQUIRED) # coroutine2 is header-only - - if(Boost_FOUND) - string(REPLACE "." "0" Boost_VERSION_NODOT ${Boost_VERSION}) -@@ -46,17 +46,18 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON) - - #---- Find other packages ---- - find_package(Threads) --find_package(ZMQ) -+find_package(cppzmq) - - list(APPEND BEHAVIOR_TREE_PUBLIC_LIBRARIES - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} - ) - --if( ZMQ_FOUND ) -+if( ZMQ_FOUND OR ON ) - message(STATUS "ZeroMQ found.") - add_definitions( -DZMQ_FOUND ) - list(APPEND BT_SOURCE src/loggers/bt_zmq_publisher.cpp) -+ list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES cppzmq) - else() - message(WARNING "ZeroMQ NOT found. Skipping the build of [PublisherZMQ] and [bt_recorder].") - endif() diff --git a/ports/behaviortree-cpp/fix-x86_build.patch b/ports/behaviortree-cpp/fix-x86_build.patch new file mode 100644 index 00000000000000..164e9dff03d166 --- /dev/null +++ b/ports/behaviortree-cpp/fix-x86_build.patch @@ -0,0 +1,35 @@ +diff --git a/3rdparty/lexy/include/lexy/_detail/swar.hpp b/3rdparty/lexy/include/lexy/_detail/swar.hpp +index a268abb..d31bdaa 100644 +--- a/3rdparty/lexy/include/lexy/_detail/swar.hpp ++++ b/3rdparty/lexy/include/lexy/_detail/swar.hpp +@@ -141,8 +141,13 @@ constexpr std::size_t swar_find_difference(swar_int lhs, swar_int rhs) + auto bit_idx = __builtin_ctzll(mask); + #elif defined(_MSC_VER) + unsigned long bit_idx; +- if (!_BitScanForward64(&bit_idx, mask)) +- bit_idx = 64; ++ #if defined(_WIN64) ++ if (!_BitScanForward64(&bit_idx, mask)) ++ bit_idx = 64; ++ #elif defined(_WIN32) ++ if (!_BitScanForward(&bit_idx, mask)) ++ bit_idx = 32; ++ #endif + #else + # error "unsupported compiler; please file an issue" + #endif +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 295b317..0f1cd5c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,6 +154,10 @@ else() + add_library(${BTCPP_LIBRARY} STATIC ${BT_SOURCE}) + endif() + ++if (MSVC) ++ target_compile_definitions(${BTCPP_LIBRARY} PRIVATE NOMINMAX) ++endif () ++ + message(STATUS "BTCPP_EXTRA_LIBRARIES: ${BTCPP_EXTRA_LIBRARIES}") + + target_link_libraries(${BTCPP_LIBRARY} diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index 7b77e10c52bd5f..a15d5c9c1937c9 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -1,17 +1,14 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.6.tar.gz" - FILENAME "BehaviorTree.CPP.3.5.6.tar.gz" - SHA512 cd3b15eb7c5bab68239b697da166220b4df8dd7e6cf5e831f316d411e24be56c9ed74e54a3e3dd332164d740159eaf9ce62d005601fd65133809dab29430c9b7 + URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/${VERSION}.tar.gz" + FILENAME "BehaviorTree.CPP.${VERSION}.tar.gz" + SHA512 4505c4c8798ccbbc02f58320810eb86e791fb6ef57d8c85882e62bd2b509b41e0549dc311ed61926a873b5b956eda979efda488f01d00746e1e8db559f60253c ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - 001_port_fixes.patch - 002_fix_dependencies.patch + fix-x86_build.patch ) vcpkg_cmake_configure( @@ -19,19 +16,23 @@ vcpkg_cmake_configure( OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1 -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1 - -DBUILD_EXAMPLES=OFF - -DBUILD_UNIT_TESTS=OFF - -DBUILD_TOOLS=OFF + -DBTCPP_EXAMPLES=OFF + -DBTCPP_UNIT_TESTS=OFF + -DBTCPP_BUILD_TOOLS=OFF + -DBTCPP_GROOT_INTERFACE=OFF + -DBTCPP_SQLITE_LOGGING=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Curses ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/BehaviorTreeV3/cmake PACKAGE_NAME behaviortreev3) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/behaviortree_cpp PACKAGE_NAME behaviortree_cpp) vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3" - "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3" -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index d99f0e5215fab6..7305ae8c9ef05d 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "behaviortree-cpp", - "version": "3.5.6", - "port-version": 3, + "version": "4.1.1", "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp", diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index 8e8cef31422b29..c0391f7e1fcbcb 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.7.1 - SHA512 396af1c1d3eaa2b78c6d23b1472f6088db85a294056ae1c2366dc5c0becdc8f141ba8fc3a235033324ab0a41c2298f5d242ef09b9b6f69d9877de6bcb2062efd - HEAD_REF master + REF v1.8.0 + SHA512 ae8df163ca1319752a03497a259800dc33c71164e7def2feeadcf18d018c64eaf846ea2a562183e3d3cde0af58291de0b091ec6d9c025076f469c403b2ab0d51 + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index 279c2663daf72f..2cc12d063a787f 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", - "version-semver": "1.7.1", + "version-semver": "1.8.0", "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "license": "Apache-2.0", diff --git a/ports/binlog/portfile.cmake b/ports/binlog/portfile.cmake index 1d0a4479596e99..8322e1b2263b43 100644 --- a/ports/binlog/portfile.cmake +++ b/ports/binlog/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_cmake_configure( -DBINLOG_BUILD_EXAMPLES=OFF -DBINLOG_BUILD_UNIT_TESTS=OFF -DBINLOG_BUILD_INTEGRATION_TESTS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_benchmark=ON ) vcpkg_cmake_install() diff --git a/ports/binlog/vcpkg.json b/ports/binlog/vcpkg.json index 98de2e834bcd89..a11da3a0aedd1f 100644 --- a/ports/binlog/vcpkg.json +++ b/ports/binlog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "binlog", "version-date": "2021-04-16", + "port-version": 1, "description": "Binlog is a high performance C++ log library to produce structured binary logs.", "homepage": "http://opensource.morganstanley.com/binlog/", "license": "Apache-2.0", diff --git a/ports/binn/vcpkg.json b/ports/binn/vcpkg.json index edf21b9baf36e6..55ee55290d0dc6 100644 --- a/ports/binn/vcpkg.json +++ b/ports/binn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "binn", - "version-string": "3.0", - "port-version": 2, + "version": "3.0", + "port-version": 3, "description": "Binn is a binary data serialization format designed to be compact, fast and easy to use.", "dependencies": [ { diff --git a/ports/blake3/CMakeLists.txt b/ports/blake3/CMakeLists.txt deleted file mode 100644 index 1ef6c3893f272e..00000000000000 --- a/ports/blake3/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -cmake_minimum_required(VERSION 3.19) - -project(blake3 LANGUAGES C) - -add_library(blake3) - -target_sources(blake3 PRIVATE - c/blake3.c - c/blake3_dispatch.c - c/blake3_portable.c -) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - target_compile_definitions(blake3 PRIVATE BLAKE3_NO_AVX512=1) - target_sources(blake3 PRIVATE - c/blake3_avx2.c - c/blake3_sse2.c - c/blake3_sse41.c - ) - if(NOT MSVC) - set_source_files_properties(c/blake3_avx2.c COMPILE_FLAGS -mavx2) - set_source_files_properties(c/blake3_sse2.c COMPILE_FLAGS -msse2) - set_source_files_properties(c/blake3_sse41.c COMPILE_FLAGS -msse4.1) - endif() -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - if(WIN32 AND MSVC) - enable_language(ASM_MASM) - target_sources(blake3 PRIVATE - c/blake3_avx2_x86-64_windows_msvc.asm - c/blake3_sse2_x86-64_windows_msvc.asm - c/blake3_sse41_x86-64_windows_msvc.asm - c/blake3_avx512_x86-64_windows_msvc.asm - ) - elseif(WIN32 AND NOT MSVC) - enable_language(ASM) - target_sources(blake3 PRIVATE - c/blake3_avx2_x86-64_windows_gnu.S - c/blake3_sse2_x86-64_windows_gnu.S - c/blake3_sse41_x86-64_windows_gnu.S - c/blake3_avx512_x86-64_windows_gnu.S - ) - else() - enable_language(ASM) - target_sources(blake3 PRIVATE - c/blake3_avx2_x86-64_unix.S - c/blake3_sse2_x86-64_unix.S - c/blake3_sse41_x86-64_unix.S - c/blake3_avx512_x86-64_unix.S - ) - endif() -else() - target_compile_definitions(blake3 PRIVATE BLAKE3_NO_SSE2=1 BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1 BLAKE3_NO_AVX512=1) -endif() - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON=1) - target_sources(blake3 PRIVATE - c/blake3_neon.c - ) -else() - target_compile_definitions(blake3 PRIVATE BLAKE3_NO_NEON=1) -endif() - -install(TARGETS blake3) -install(FILES c/blake3.h DESTINATION include) diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake index 85d73c206e23a4..23e2bcdd87940e 100644 --- a/ports/blake3/portfile.cmake +++ b/ports/blake3/portfile.cmake @@ -1,20 +1,49 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE3-team/BLAKE3 - REF 1.3.3 + REF "${VERSION}" SHA512 3ea57a86af7357582479ed5d762d368ee52421636c72723b08f528f9bf53637bad0058c5aded0b9a1b9479f374f5d3b110677e00c2b1124a47bfcdac800c2836 HEAD_REF main ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +# these four files are included in the next release +vcpkg_download_distfile( + CMAKELISTS_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/CMakeLists.txt + FILENAME blake3-CMakeLists.txt + SHA512 598699b90053fdbe381843f886c213f5e6d03281a9b8c1403726c300e83a9da353879da7170637024663af576e54f74a307049577360ded90d25e11bd852edde +) +vcpkg_download_distfile( + CMAKECONFIGIN_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3-config.cmake.in + FILENAME blake3-config.cmake.in + SHA512 f9bdb41bd4e4930ab31624f484f895fbda57066a4b3e0a38e7ffefab7343779d1c356fbaf6231643fd069f7a176b840f234f74d9f9ee4167cc430d7bfec0f40f +) +vcpkg_download_distfile( + PKGCONFIGIN_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/libblake3.pc.in + FILENAME libblake3.pc.in + SHA512 cfbaea63368e655c3ac3357f791b6332ae0241f3fd4f98e19c48f28e633e25a5b1125d1cc6b4815edfd013a76379dffcf9723852a7b76f2910d19dc77e538fa2 +) +vcpkg_download_distfile( # we need the dllexport macro (otherwise these files are identical) + BLAKE3_H_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3.h + FILENAME blake3.h + SHA512 0f9852ff0e527e8fe0d567408c5c100ee3707a1b942ac1fbd78208a68ecfd32814729b5082720278d25d4cf45eb1020fcf3e4199cab0a67a6ca6af4321bcbc3e +) +file(COPY_FILE "${CMAKELISTS_SOURCE_PATH}" "${SOURCE_PATH}/c/CMakeLists.txt") +file(COPY_FILE "${CMAKECONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3-config.cmake.in") +file(COPY_FILE "${PKGCONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/libblake3.pc.in") +file(COPY_FILE "${BLAKE3_H_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3.h") vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/c" ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json index 1672cb66cb676b..cc5f7d369f51f2 100644 --- a/ports/blake3/vcpkg.json +++ b/ports/blake3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "blake3", "version": "1.3.3", + "port-version": 1, "description": "BLAKE3 cryptographic hash function.", "homepage": "https://github.com/BLAKE3-team/BLAKE3", "license": "CC0-1.0 OR Apache-2.0", @@ -8,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake index 8a79545628bcc3..c78f91d842a54a 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO blaze-lib/blaze - REF v3.8.1 - SHA512 6dfd3cb46d796b94cc44a30c4cd5ebfb366d2eb312d75a28787cacb4636df52e4e4e3dce3d9501bf2c07e7fd3621e8ce7f9ffa61a950a4146375b12d75d4872b + REF "v${VERSION}" + SHA512 9786628159991f547902ceb44a159f0ba84d08be16ccc45bfb9aad3cfbf16eaede4ea43d2d4981d420a8a387a07721b113754f6038a6db2d9c7ed2ea967b5361 HEAD_REF master ) @@ -19,4 +19,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/blaze/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/blaze/vcpkg.json b/ports/blaze/vcpkg.json index 116078565de6c7..5df573d5d7537d 100644 --- a/ports/blaze/vcpkg.json +++ b/ports/blaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blaze", - "version": "3.8.1", + "version": "3.8.2", "description": "Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.", "homepage": "https://bitbucket.org/blaze-lib/blaze", "license": "BSD-3-Clause", diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 541ef72ffbed1e..575cb0835f9f37 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 7b420376ed32f3979f860d8c3be04128ab5c6690 - SHA512 88818bfe18b0638b02f84277a4584ddf2cee2158540c1794c3a96c12891274472dc896bef94408baf9ec398e30549c0b3feda58e4b7bf3014a0cf436f394a3ed + REF 452d549751188b04367b5af46c040cb737f5f76c # commited on 2023-05-11 + SHA512 e2d3a0f5b956aadde5498f3aa4fb0663db8ad525cc909da080315fddf9f6322632a62761f0fe94ddb7c6347896e42c62e7e03e944843b3ca3400326eddc4ffcc HEAD_REF master ) @@ -20,8 +20,8 @@ if(NOT BLEND2D_NO_JIT) vcpkg_from_github( OUT_SOURCE_PATH ASMJIT_SOURCE_PATH REPO asmjit/asmjit - REF a9ac13536e08041296010645551b2cdcd615d512 - SHA512 64e7649208889f0c96890d3904c2f8e716a72b1edf2dfd07af0114565e03681e503c062af8b4fea4ed70122bd7eab2f966038f7b29058f60f6f3f609508422b6 + REF 3577608cab0bc509f856ebf6e41b2f9d9f71acc4 # commited on 2023-04-28 + SHA512 36557af5c82ccc8e5ef2d4effe22b75e22c2bf1f4504daae3ff813e907449be6e7b25678af071cb9dede7c6e02dc5c8ad2fc2a3da011aa660eb7f5c75ab23042 HEAD_REF master ) @@ -49,7 +49,7 @@ if(BLEND2D_STATIC) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") if(BLEND2D_STATIC) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage_static.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 602067bb5b91c2..22ffc51bf65e0c 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,12 +1,11 @@ { "name": "blend2d", - "version-date": "2022-12-31", - "port-version": 2, + "version": "0.10", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", "license": "Zlib", - "supports": "!(arm & windows) & !uwp & !wasm32", + "supports": "!uwp & !wasm32", "dependencies": [ { "name": "vcpkg-cmake", @@ -28,13 +27,42 @@ "description": "Default feature. Enables use of futex." }, "jit": { - "description": "Default feature. Enables jit pipeline compilation." + "description": "Default feature. Enables jit pipeline compilation.", + "dependencies": [ + { + "name": "blend2d", + "default-features": false, + "features": [ + "futex" + ], + "platform": "windows" + } + ] }, "logging": { - "description": "Default feature. Enables logging." + "description": "Default feature. Enables logging.", + "dependencies": [ + { + "name": "blend2d", + "default-features": false, + "features": [ + "jit" + ] + } + ] }, "tls": { - "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported." + "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported.", + "dependencies": [ + { + "name": "blend2d", + "default-features": false, + "features": [ + "futex" + ], + "platform": "windows" + } + ] } } } diff --git a/ports/blingfire/ninja.patch b/ports/blingfire/ninja.patch new file mode 100644 index 00000000000000..ae7e654f3e3a66 --- /dev/null +++ b/ports/blingfire/ninja.patch @@ -0,0 +1,9 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 818a3da..e8b3bed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,3 +19,3 @@ IF (WIN32 AND MSVC) + set (CMAKE_CXX_FLAGS " -DNDEBUG") +- add_compile_options("/O2" "/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256") ++ add_compile_options("/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256") + add_compile_options("$<$:/Od>") diff --git a/ports/blingfire/portfile.cmake b/ports/blingfire/portfile.cmake new file mode 100644 index 00000000000000..ed09b83e4504ef --- /dev/null +++ b/ports/blingfire/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/BlingFire + REF c0381c68b6aa6d1b4e569888bae1642e40494a99 + SHA512 0fa15791fc815a992023bae6f30c84dda1d477bcdedcf1343d4dbe4b09b51e17fd87bf130d58e50f378ca94982a6306d7f980e3ff4522091be036428684bdcbb + HEAD_REF master + PATCHES + ninja.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${ADDITIONAL_OPTIONS} + ) + +vcpkg_cmake_install() + +file(GLOB BINS "${SOURCE_PATH}/nuget/lib/*.bin") + +foreach(BIN ${BINS}) + file(INSTALL "${BIN}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +endforeach() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file diff --git a/ports/blingfire/vcpkg.json b/ports/blingfire/vcpkg.json new file mode 100644 index 00000000000000..57e11ede933b47 --- /dev/null +++ b/ports/blingfire/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "blingfire", + "version": "0.1.8.1", + "port-version": 1, + "description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.", + "license": "MIT", + "supports": "windows & !static", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/boinc/CMakeLists.txt b/ports/boinc/CMakeLists.txt index f00a67cdf1ef6d..91996a8ab77c79 100644 --- a/ports/boinc/CMakeLists.txt +++ b/ports/boinc/CMakeLists.txt @@ -32,6 +32,7 @@ set(LIBBOINC_HEADERS_APPLE set(LIBBOINC_HEADERS_GENERIC lib/app_ipc.h lib/base64.h + lib/boinc_stdio.h lib/cal_boinc.h lib/cc_config.h lib/cert_sig.h diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index 310146e83c2c75..fc173f5815b152 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc - REF client_release/7.22/7.22.0 - SHA512 f8c87338750605f59f5265fd0bfe2956acfca0c42ef58402df860f0eb9953467ee34286308a916e1d4ee12cbf85c05422558ccdf241ab8f26b86c966f66aec4a + REF client_release/7.22/7.22.2 + SHA512 ac1f63ecea4d24a86459d5f58aac45f04dfaee3e358fcb5a0ae201e9289e11debada30bf0f3ab1bba462068788a2eca2f4d6b3c45d3603c7b6ca6ad51effc85b HEAD_REF master ) @@ -37,6 +37,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup() +file(READ "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" BOINC_CONFIG) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) +${BOINC_CONFIG} +") vcpkg_copy_pdbs() diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 362a5b6ad37761..eca3f87d9903a7 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boinc", - "version": "7.22.0", + "version": "7.22.2", "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 5c72c8af4c9ca8..4c70c9f44b73ce 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -1,21 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(BOND_VER 9.0.3) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/bond - REF ${BOND_VER} - SHA512 3a7884eb00e6d0ab40c688f4a40cb2d3f356c48b38d48a9a08c756047a94b82619ef345483f42c3240732f5da06816b65a61acb83bfebb3c2c6b44099ce71bf9 + REF "${VERSION}" + SHA512 a5475d3f988928fc3d03b69fc34b33ada35bd790138a0f4a733642558c72945e79c5dcde88b656cbc1cafbc3cb2dd4ba28031e09e507d730056876148ef65014 HEAD_REF master PATCHES fix-install-path.patch skip-grpc-compilation.patch ) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(GBC_ARCHIVE - URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip" - FILENAME "gbc-${BOND_VER}-amd64.zip" - SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd + URLS "https://github.com/microsoft/bond/releases/download/${VERSION}/gbc-${VERSION}-amd64.zip" + FILENAME "gbc-${VERSION}-amd64.zip" + SHA512 590b051aa47ad161f8a8a5f782e22d2201ad536e0772c9e528f98df1d1fd2b154723d21587d35c8b948805ab229dfb3b515273ae37d05028554fd49b39dc5418 ) # Clear the generator to prevent it from updating @@ -24,7 +22,7 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL) file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools") - set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe") + set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${VERSION}-amd64.exe") if(NOT EXISTS "${FETCHED_GBC_PATH}") message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exist, but it doesn't.") endif() @@ -71,4 +69,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Put the license file where vcpkg expects it -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/bond/skip-grpc-compilation.patch b/ports/bond/skip-grpc-compilation.patch index 10906b13137b6b..eb45faba4265c8 100644 --- a/ports/bond/skip-grpc-compilation.patch +++ b/ports/bond/skip-grpc-compilation.patch @@ -1,11 +1,15 @@ diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index f8c7bf3..e69de29 100644 +index 8c1f368..8b13789 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt -@@ -1,6 +0,0 @@ +@@ -1,10 +1 @@ -include (Compiler) -- + -if (BOND_ENABLE_GRPC) -- cxx_add_compile_options (Clang -Wno-unused-value) -- add_subdirectory(grpc) --endif() +- if (BOND_FIND_GRPC) +- find_package(grpc CONFIG REQUIRED) +- else () +- cxx_add_compile_options(Clang -Wno-unused-value) +- add_subdirectory(grpc) +- endif () +-endif () diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json index 8abedfb472a1bb..1fc94cea811587 100644 --- a/ports/bond/vcpkg.json +++ b/ports/bond/vcpkg.json @@ -1,7 +1,6 @@ { "name": "bond", - "version": "9.0.3", - "port-version": 3, + "version": "10.0.0", "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "homepage": "https://github.com/Microsoft/bond", "dependencies": [ diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index 4b55468aeecafd..e5e3533e042b9e 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.81.0 - SHA512 960095a14ea202e938132bfdc0e6cf95fa4849b6f81066174ef957d3ca35637e6e52eeb830a164c5b181c33e6b308ae74eece2b2d5ec49fe7f2309f0ddef144a + REF boost-1.82.0 + SHA512 8ad900f0f421af1302682a397d1bffb2aee4c5ab4b2103f3afe427905c7fa86cbabaaaffc6fbcef0f3ddb60f865756aafd1e7b5baa42176ed3ed2d2d8388b264 HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index 059343d2b64930..56adf6a3f5a817 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,95 +1,95 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-accumulators", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-circular-buffer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-ublas", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index f907c79fe91e2f..8219eb6808b11e 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.81.0 - SHA512 f46a57798924682e053fcb21f136811963c36798db6dc2a9e6f594e95c77d4645406f5b20b0cadb0dcf28987fad7b62587ec5a82994cd5637d4daec49f2352d3 + REF boost-1.82.0 + SHA512 46b49d336360fdaf6b3f28c93e4b4c6949d5b89ea4f718849ef40417811e32819b367513949a3040b343850698dac878a785639e18dc938066a1db9a07490ab6 HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index c2fdf77a05b490..cc1edc63abcafc 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,83 +1,83 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-algorithm", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-unordered", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index f0e4758a59815d..2af2e091392ee8 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.81.0 - SHA512 5d13df60dc85e6a0e8c03e1939044e63169d7a963ccfe74e20d6bbfbd3f52a41b43544ea8a9e730c0412061087a5ad7b7742707c0c0f98990cab78abceaff7d0 + REF boost-1.82.0 + SHA512 939a4143d07e3656dcc2625288c2e3cbb77aba4b80d48bf2c3f7c403f634857b7898a7b49d90b225adae27c91643b169b5f52e75b93e9d76e664d4d631c8ba08 HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index 87508e60883ecf..335d4a2d39dc85 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-align", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 79af202aa29da0..f4a9415370c5e8 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.81.0 - SHA512 9ab99e2cf74f895a41b1efe637ba68f1afac2190a45aab67a9de10d919875e95b90851c2ddb3458b5fdab73da1adee3a58d5fd630080c3ec2c7639daabede42e + REF boost-1.82.0 + SHA512 3d65777d2b2037e996199c56420f6de419661e6dc79a226d42860f526232b31a256c0ddccb605244d98b9fc854fef42134ffe9e20b138c8f2309984345d3fc86 HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index ee19b4d2fc6f67..3de6e9afa493cd 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-any", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 87e1f4a5d3b543..d109f4152481ca 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.81.0 - SHA512 1ed3ede8b8d7bb4921c11c26ac20588054e9bc21d59900eb713057227753343bc07c7fd8f6b62b6695b10a421528eccc68539a74d78a2402ec4656a25937e39d + REF boost-1.82.0 + SHA512 aeec923cf445eb88c67c9cf46a617db4a9e99c8fceca233573907c029e6152dd57e296415a715148cea2acbdc8a4a196bc6d1460685fd05785cd5f975c05fa12 HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index 2072dccc03f28a..f89e3cd916dca5 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,35 +1,35 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-array", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 0e59f10674c2e2..4a209cdb1fc290 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.81.0 - SHA512 98fb62fb97a00cc133417cfc2e1e69f7c62042265770c956345c58294ba148df1900709a0fa3768ad4849d472ab7be6133ef473a8b08db866cd7f96623e4bc1d + REF boost-1.82.0 + SHA512 d54fd77ca7996da138b10408df1eae28bbcae0c6475467cc19837bf6f6624c38ad7f9e1eec87ceae27f516583b204fdbaeb04daad7cc28e6aeec02ab5f188731 HEAD_REF master PATCHES windows_alloca_header.patch ) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 46d674f6ff4590..92fdbee2820bef 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,89 +1,89 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-asio", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-chrono", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-coroutine", "platform": "!(arm & windows) & !uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-date-time", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ], "features": { diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 7b32b4179a7ea1..bdf7007e71d3e7 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.81.0 - SHA512 c443b61a9ad29d4c9707aaaa997300a959fdef2d360aec9ee221abc12cd8446b3bc969e6c282ba778bee7d6fb54cc02655f15e01eacf1ad87262534dc4cc32bf + REF boost-1.82.0 + SHA512 5f0a4f6edb6a4f933b14bcb5b637224d50ba078565d6f1405bc1eec282ac7fefe22b7ba8d61429159c6814cfab50deccf16c09aff10972bed9180b51c381b1ab HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index 1e96cf0030c043..c6078e2dd6d650 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,19 +1,19 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-assert", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index b04b6bbf7d09af..51bf600d98ddf1 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.81.0 - SHA512 13f3c7d6a14f0698f156c024f58ccaf00e1fceb5c2497c5883bc2ee7396d6d7c2e67b6436bf3d6fba9fad254106ade61a6a1a867c6220f0baa0c5c917151c14c + REF boost-1.82.0 + SHA512 8b9e8999b9a8375eedcb37a0261484a4c592382bb7c3cc2eb58ed3c9f2b74330ac31a5776ffb121d52ca022d8493dc46c6f977fe9440bacfce250eb1efab92c6 HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index f422e8faec0616..22d88f78dfefec 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,59 +1,59 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-assign", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-ptr-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 05c32d3343c6ff..856d81225b0535 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.81.0 - SHA512 2a581e1cea33016f84d47d51a51d8bff91a7e2ba57f5acde4ffa5b95fcc6b73da4e276ca0616c43282ee11a21c9bdb715c10b09204a59f885d00965de6092efe + REF boost-1.82.0 + SHA512 d14db6e1fc5d1d23f564a2117784b94951a6d4daffd48c505d13c2c697f84eb0f05b843a66b79dd9fc7a2cb764d6b015fed897e5f92dcb9546567ded111b7e8a HEAD_REF master ) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index d68dbcfd575928..d7cb4758872886 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,57 +1,57 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-atomic", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index f10c1ec2ab33c6..89edf3b4a4fd48 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.81.0 - SHA512 bf5d34274c3252daf2b319d0419588dfe9adff88acaf7afdbfcfdf0ecc59fd15c985c3f048dbaec65004b460a58adc9ab747f90b9620bb6c0ddc46157909aec0 + REF boost-1.82.0 + SHA512 85dd18b1ecc56cdd3ab18fa95b14971ccc91270c262ff204cdb807aa2a77b88e0bcb5b873f2c2bb444d99e9d9815d14c8a26770104875f6796c137d48f831ce4 HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index f825abeea4220d..80432f2a27d6cb 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-beast", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "license": "BSL-1.0", @@ -10,91 +10,91 @@ "dependencies": [ { "name": "boost-asio", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-endian", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-logic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-string", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 6561b3df665608..3c0281e75d1570 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.81.0 - SHA512 8b0d7a5630db6ad79c0f4e9399ac4e18eac8ba45f4a829cedae6227795a407885689bdcf3c09336069e8d4c7468546c6ddc74bba4c58bb76b62815093abba13f + REF boost-1.82.0 + SHA512 3ab80d2750b472f4f3f365dc695a28df128d2b9302a6c78e94fb0974780523583e20a88a3c4e28f3c349672911bc0b730b52ef1f272a9cd70f7f219418effffa HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index 4d1d32e83f4857..42ece31a91e7f4 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,71 +1,67 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-bimap", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lambda", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" - }, - { - "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 1895005fdc734e..ace8bef2243ce6 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.81.0 - SHA512 360c6723b51ff22cad80042d54a687d661cd0c0312efce3fe3a65194ea75bbb6576e3cfe6b93f6046d4102fd48c5cffc9bb1514cc7f9b044baf171a1be68b5dd + REF boost-1.82.0 + SHA512 f816e3421e34e6f185708ce1cc0590a634f893493fd62d1d75a51e98b84eadf75af55301d1ae79e39f62ae5e81b5fc8f3366d5a6745e75ecfe5cdf770b57de41 HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index 2fc883d233eba5..7ea117d5e7a6b2 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,23 +1,23 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-bind", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-build/0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch b/ports/boost-build/0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch new file mode 100644 index 00000000000000..3e1aa6dfe3679d --- /dev/null +++ b/ports/boost-build/0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch @@ -0,0 +1,26 @@ +From 1004fb82914b8295fe4ec43afb510994babf2161 Mon Sep 17 00:00:00 2001 +From: Matt Gardner +Date: Fri, 17 Mar 2023 15:09:17 -0700 +Subject: [PATCH] workaround MSVC codegen bug in 17.5 on ARM64 + +--- + src/engine/glob.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/engine/glob.cpp b/src/engine/glob.cpp +index bec00ee56..1ce66c7e6 100644 +--- a/src/engine/glob.cpp ++++ b/src/engine/glob.cpp +@@ -111,6 +111,9 @@ int glob( const char * c, const char * s ) + * globchars() - build a bitlist to check for character group match. + */ + ++#if defined(_MSC_VER) && _MSC_VER == 1935 && defined(_M_ARM64) ++__declspec(noinline) ++#endif + static void globchars( const char * s, const char * e, char * b ) + { + int neg = 0; +-- +2.33.0.vfs.0.0 + diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 2abfad2c7bb489..b30317ab7b4f8c 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,17 +4,18 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return() endif() -set(BOOST_VERSION 1.81.0) +set(BOOST_VERSION 1.82.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 ecd7f3d48200939cfea57ca85a41b5d700d4c934131298aa86840104bc4c35d0366673608dc70c9c62c275b573a9a5a1e4568399f41f3564f8816a295c27d4fc + SHA512 5f8d46f48e037737e3465e3562c9bdbcacb4a075305c073fe665a8e9c7381ecaa4f5b91a42a9c509cf1c2e0f2af10dbb19f9d443a06fd09edf7372c008d91204 HEAD_REF master PATCHES 0002-fix-get-version.patch 0003-fix-emscripten.patch + 0004-workaround-MSVC-codegen-bug-in-17.5-on-ARM64.patch ) vcpkg_download_distfile(ARCHIVE diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 8fbd0dfc6dc100..6bd0ee0a42d078 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-build", - "version": "1.81.0", - "port-version": 3, + "version": "1.82.0", + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "license": "BSL-1.0", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 161788184071d3..053b7f70ae3413 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.81.0 - SHA512 51fd9e84ed411d9a567ca117339f50de3dea13f8cf8e4d39a0ee26ad6fcf10ba922b9d233ba0f3eb0a80a1943fa8316303ae363cea57688d232cc67a07dc17a5 + REF boost-1.82.0 + SHA512 a8768293632678b3f6693103452090f20d5a0f4e5cda600e29b080695eed78db4a5cdc541e737f8c79971da1c02b1972dc41aee94051f456b77c1cff3b8accec HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index 3d29b3c1c3e621..40ce0ffa596279 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-callable-traits", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index c39c376eede2bb..9d85d4c2f76bb4 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.81.0 - SHA512 0f8b217c49eed596e5757146e677783073b80d01d293ab8ab8ef929ee9c91a51c16a97dc51e3e064f1e21b217ffc73b12554a9de2cb77fb8ddb8fa4689d6466b + REF boost-1.82.0 + SHA512 f1edef690e9ecacdd5cece1043f68403a428a4b91f38575971976a13b040d6b7275ba2f4fa6cfb4059aaa764df89011cffe21ebd31b2acd1117fce109a5f2564 HEAD_REF master ) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index bb9f68c630b342..808a4ba23201f3 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,85 +1,85 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-chrono", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-ratio", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index f9c683808fb42b..1c0a49a69aba55 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.81.0 - SHA512 371393bccb266bde50452096adcf15052aedec6d9223ee7ab7be9ceb196a0633ddadd4abbf99d4be85862ca94df1ebd94cd6bcd9fdabc3e05f7aecc015ece5cf + REF boost-1.82.0 + SHA512 6e3bfdf4139bb585be90f54f37f77b3d9ea1dd90b62e0ff3d0c7918a69d4e524d4736999bcc11957eeed1381a96aa499f71e2588d3c8f440062b3216d4aa7f79 HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index 6e123fd7710655..d95a141c6112a8 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,47 +1,47 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-circular-buffer", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index d238a2ab2efe72..a2a6514bba97fe 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.81.0 - SHA512 8931256236336c07c029d39a1599ef524444b0870140fcabdcee3c3106c7ecf92cf32a2bfb442244bbc8078c783ca552a74fe5243c1644fb3e210e9f5f2836f1 + REF boost-1.82.0 + SHA512 3ab0133479e8f7a10336b1eded030f81f8300e0cd15ab186fa5f69177aeaeca92106f54b5f5d1ba260c7a86910a29f71ab40d260f42499e707f99709bceb0fd1 HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index fe50275b8c32e1..ce04c5ec432333 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-compatibility", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index 7c43059eec3850..9da978ea6f8b1a 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.81.0 - SHA512 e4271120d0f7dad73bdafd391b4fbc69118486a9ead46bb232c20302323bd62513abc0c5d5696b45791472e78a95b1ec6d8f013fd69f9f65391df5a82f2aff54 + REF boost-1.82.0 + SHA512 3c38f2ee6b6063842cf08afa4bf8e59706bb85cf956c26fbd574abafe7439ba5557ed2a70e922ff32001b645c453a4d1d956a6489c93adc83a6c3ee57b4a3143 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index 2f75a80096b5b6..f4508b01563c75 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,124 +1,124 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-compute", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-chrono", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-tree", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-proto", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-uuid", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index eae1d9f160fa17..25877eb42457f0 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.81.0 - SHA512 8bfc5a4eebc0c35230d8fdfcbfb90f5d98b3f588f9977c1472951d05e334d46cfd3a3b8d79241e59060adca6cac0b2b7b838b7438405b4e7d20fb4fc49df836a + REF boost-1.82.0 + SHA512 a5e4faf91f8edbca84440fe8ce188abe86088d1249bedabfb866755f238c2dad52312201f764d9b19d15e787824a580b7bb66259e4940c9f7d465b6939648869 HEAD_REF master ) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index d2297d363c942a..da160ca9c010d3 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-concept-check", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index ea8368a241a816..0721c8a0e121ce 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.81.0 - SHA512 0c09fd30aae566c72df30ec57d7b7acefcfd03b5154451596e0f8f5f633664db0f1dfb5239f8ce4503045463af6f79466b2cbbed1a5a1cf3bca96884ceff02ee + REF boost-1.82.0 + SHA512 175d8c355890703e74e301e478d0257a59dde9c4cec5d7765bf7da770ac8345253caef9bc2e88299b9fd038d7a640352181fd933bca2d619bbe0ec12514f4c86 HEAD_REF master ) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index 27c83b25680854..511a4c5754e696 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-config", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index f11cf8384dd491..0e3456400d690c 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.81.0 - SHA512 f7aebe0ce6bea43bbf50eea0f3ee876a91f4afe83f9adf2fb010cd31928dbe38a0f762138c3d50aeadeaf0b6095b3bc0c3a8910392b8c354d33fac1468806d10 + REF boost-1.82.0 + SHA512 651fa89c9281c16f6fa4cf56dee7bf050e3fca1b6322560ba89c35671cf4a5c14cc90b1001fbacc4084ed1b43d0084d71189e74ddd38523bab42c3880b91abcb HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index d3dc3b93c8e2a8..5482a0c891f408 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-container-hash", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-describe", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 290c39478e3b58..2cae030150f591 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.81.0 - SHA512 0fe7331ceffd50444daeaffad6e278be49c5f1adb6a08d80dc724fdfb6c1f3fb4381300e080ca1ae00a57a1aeb406b22662c5480a8a0a0318057f5264e12ccf2 + REF boost-1.82.0 + SHA512 d3da8405ed58bd2d26a71a7a703b597b9888c30d1fab181082aded56af636a5ce3abf56f84b791f1a96d391f7ffe63d7358987890174076309972a5e2c9d43cb HEAD_REF master ) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index 967716689dc7ca..96721794c1586b 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,57 +1,45 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-container", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" - }, - { - "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" - }, - { - "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" - }, - { - "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 94a867aeb1501c..f9739d6c240da4 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.81.0 - SHA512 15bb8a6eb35330653458e9e29b139b709f04885728f6d759966b09a46ec940a29911131db3e99f33c73c571c03c6126484377ef14700eeb180469d6b260719cb + REF boost-1.82.0 + SHA512 e4474d84a93a21e2e7ba67ce08a60a856080d1e2952097dca8fc61776a7eef7c72bb98ff322ec303e255b462e85fba341db1eb59db4b18fb60da20e56946f07f HEAD_REF master ) diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index ee90319fbcb1f5..cf013f150bf43d 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-context", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "license": "BSL-1.0", @@ -10,45 +10,45 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-pool", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 8f4e5c6b5b426c..5514b36f74329f 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.81.0 - SHA512 09c73de3f3418480dbe1ff51cef5606a3a9e584ff51186e10a30cba4e9bf3f84ab0d27b490dcc40012117343c8d2a95e662bd89fa19c2536cc9588afb979296c + REF boost-1.82.0 + SHA512 241df3fd514dd32a98beebb71bb22483e271c0c313ed337d2080ce413eed7c8a77629987d1db185fe8fe254aa99c7c6ff8f17e49a47f030e75fd30c301c30199 HEAD_REF master ) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 88602397171091..ec5702b386d470 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,89 +1,89 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-contract", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index aa065446285ad1..5097dec756961b 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.81.0 - SHA512 97d385dd4693890b60a2971851f4c27ae01a4d451c1e6b8d42500b7dcab8e668067931c2d4cf3ddb123b7a3f5bdf211daa77615b264b28c480119692156d839b + REF boost-1.82.0 + SHA512 0b0695928c8e1a40156d6fac36b51490c4b9011827c7dbadb747867ebc616e75c9d787ed1120298e990a49b86f1206b886c1995e5e3091685abddbf11320d2e4 HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index fc038072571aea..761a19e965ef1c 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-conversion", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 9d6a7d8260d850..a219f244205fb4 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.81.0 - SHA512 4c49c53e0084aa126ef9be3734d38f51448621275728cb00878f08a755eb753899b812c09ad754d5ae4d60940cda442dbc77223ef06a497be9627c2c05836d76 + REF boost-1.82.0 + SHA512 683c8c71b52edb76e31ebee6fee6df8cbf2653b3d595df897cbb636ed068c7276877f6460deaefc89eab5e69a4a19552f74fec0b5c9f9e2dc80591b5407bcce5 HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index cf022dd1ce440f..2c13fbf25178da 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,59 +1,59 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-convert", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index eb1716cb37aa59..e00a631279b281 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.81.0 - SHA512 3d2a86f194fbdff35c6ce974818f39969157e6f9aca19ee1aa4704485cc31b418c95c03201cf5192bd8d56ed81e90f9a7749f2d10dab7cfad7ece483ffbb96b6 + REF boost-1.82.0 + SHA512 3bc4760b7a5536a838b29704ca1600d2836d6c485161950b6dbfbb4bf1abb840b89624a96f290db3af05c5906573ce0b2a67123b90bc50a389e24ec038d815b5 HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index 4460e5e9954622..9d511b8ad26d60 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-core", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index f5b0c30ea934f9..f17e3e59755674 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.81.0 - SHA512 2959e87e856c642fed20b6bfef2d5c8ce8c0f5adae0679277bf0ae55806e9569a9ca803772efa3d87826e611e7e8685be0c4dc00fabe1e1df0a0313353e5d327 + REF boost-1.82.0 + SHA512 f94a3a0dfece7d57a90d7e4dd1454eeb8ab7096be4e14e1b79a63e46d205b83558cc512889e4896664dcdda1657da4c386756ca4e24c2601b9b7b4acc1df06e1 HEAD_REF master ) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 8f82255eb7040e..429c1fb2042976 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-coroutine", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "license": "BSL-1.0", @@ -10,58 +10,58 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index cfbee8e17ad17d..8380890c8a559a 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.81.0 - SHA512 a02232d01e1b15c28c1596101f95be31204a737852501d2fadf04d5489eb5bac6f8da6166bbd1ab43538822b0266b6e493eb4ef41c52bd26024c452f341615e8 + REF boost-1.82.0 + SHA512 1dc72e489c192954db5158e320bab164caa56880fa6f170906ee1d62e87c634809be947544a285701aa8c069d3c73acc90960209ad5e439d5927e7327e178c1d HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index b33a2cb0bce80e..2d6ef6d8dc7b2a 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-coroutine2", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "license": "BSL-1.0", @@ -10,20 +10,20 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 56c79a5dec0588..8ad2072869f87c 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.81.0 - SHA512 6e3d4dbf6343d936a2884a2445482c7245dd03eae46395ba168e50fb551aedd538feb00102b83a13b6fdfbc58f87d09c8252dfd8e584d835f4a9886ecf26619b + REF boost-1.82.0 + SHA512 5218fb2e477604f8d93f7acec53788a0b415ca9818e2895a2c9550add8836ae378c7a9d5d1eb9bd7a5f8bb24b8f83b3946a74b5c1289bda74bd6d18b52f96bbf HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index fa97babc6a7d4f..d27b5c72df4a7d 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-crc", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 4bbd5a567ac790..5d95439d28b455 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.81.0 - SHA512 07eeeb09bab0e64a662a1ea92a24c93e8c119d804e3b63f71ccbb533348c6dbeaf8f759847409fe23c902cadcfd025fee804d67f9a4182eb336094f0c1f37d9a + REF boost-1.82.0 + SHA512 a8130ea6aafba0ab2bd82ada42031a3a03e75f7d01adb559509b1d32695203a512d2a8ac6fdc28f2ef7b3376f605ec92c30ea16cb3d7f7888c6aab7578d1c125 HEAD_REF master ) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index 75ab34ef9063c6..f4834a42a80ba4 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,85 +1,85 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-date-time", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tokenizer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-describe/portfile.cmake b/ports/boost-describe/portfile.cmake index 5fac22c72304cc..c209632476d144 100644 --- a/ports/boost-describe/portfile.cmake +++ b/ports/boost-describe/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/describe - REF boost-1.81.0 - SHA512 1fdf70ac8a20d22ddc09e6e3a23f1df530858f85a70fb6542380024fd6c90592f696ecbd180595cb15edd294232ce90bcf240f250992496962f52ba1ab963789 + REF boost-1.82.0 + SHA512 82a0002966b6bd0fab1d55b58ae7922c4515b1efa942a60b0568952cdf2d73d8ddfbe940d5d75b5f3da1c36035a10b38cf9a74bd343c2264ebfb1290f981f1bb HEAD_REF master ) diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json index 65a8d17d1986d1..bc3377c3cf718d 100644 --- a/ports/boost-describe/vcpkg.json +++ b/ports/boost-describe/vcpkg.json @@ -1,19 +1,19 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-describe", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost describe module", "homepage": "https://github.com/boostorg/describe", "license": "BSL-1.0", "dependencies": [ { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 52b83283083300..d596095ddcbf42 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.81.0 - SHA512 4150ce1a407d4915c40775976ee82542c260ed576c4d614fcc6372042fdae6a245e376cf8a7a835e91c49893147f19db3413921e8d37f89c9c0b47373bb55c82 + REF boost-1.82.0 + SHA512 862bd8310938bf663427ad9201065802e1d233646b987ab813b1b777d988cc21b1526214adc756776e3e4debb8f68401b14264700f87314161bdc1062e7e81aa HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index 4c3ee9a8b04bbc..fd96aa55c80f21 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,35 +1,35 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-detail", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 5c174afede93c5..1854323be749d3 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.81.0 - SHA512 151d7575bf6670058410446fb434bbb026f1bdf42a1de642e9b4c25397d80b51385f4482be1d8b7d2b8aac91a8d7ff39eea1a5d5bee4a72dc21eb8843c60744b + REF boost-1.82.0 + SHA512 ac9b5c1de0770c67e531a2309c8695630da4eb0f046d1abe1b0ebb55242f97787936e60a437a5a635937a547138ae724e302ca8cbe588e42333a05db0030a862 HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index 316f0d306bf040..bb6df043495c16 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,76 +1,76 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-dll", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 74aa05a8ab02e1..0e53252fe80c48 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.81.0 - SHA512 e8a7a7a0735b85d1c3272e23782d3c14fea78982fb158b9dc8ec7e8db3297408f84e40056e4099caa2e44432ab1869c17edc1fa9198499673d1737b9ee5b28a4 + REF boost-1.82.0 + SHA512 782a6e203de483481415db815ae37b7bb29878aa6fe6336fcf4342e910b6067140a76086cd6f024789a0f23ff6ae1beccfb2ba0469229109e117dc3bc6e29198 HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index b0c974e8f4c805..b0d7ad3684f4fa 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,47 +1,47 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-dynamic-bitset", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index c3f49fd4cbaad9..2f13db9c2b0d2c 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.81.0 - SHA512 85fd0ce8b8a85e73dae0db0610d1fe6a61cffa4a2d9f26e9a73a58df92594af8f24eb9a86441161001b372f30a37b86d25a173e839c0440713ae2d02a96f5d74 + REF boost-1.82.0 + SHA512 07c17826f9a1478e68330da7e57f042d02fd78121b488d1e63c68dc35e17463551dc478de2779f292b6f81ec776249ba161653baf31f873d45913dcd822fe261 HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index a0861f1213254c..8a67a9b865df93 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-endian", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index 7396ebea6bbeb4..0bb45dbce62b44 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.81.0 - SHA512 54bb812a259bca5568dcbabdfb0d5bb0fdb3332a24837023822ba1eb30cd466d29251791b7401d56adeda5bd7b4f1507080b82e4f23f5f1f52ee1d46c9ce8d6f + REF boost-1.82.0 + SHA512 d025ed356906a7dae2ce55550b216599a62f907f854814d5553a8f1e935276efe768642eec872de325c9ce17904fde4ab706acb93e6d24897b74794d98d12bdd HEAD_REF master ) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index d6fb82883ab046..4316c12709a980 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,53 +1,53 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-exception", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index 5b740584a724e4..d97af1bdf090a8 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.81.0 - SHA512 331d758c07d155851459d17d10b6a905e4bb159b2ad4c698a4c113df1894c975db99097ec68216ea921c3f77774fac6f4ef568aee16b531356e7f5b29860349a + REF boost-1.82.0 + SHA512 00d12393ad8a3d6cf90aa3a8e1011b61d976d4d08b1b1af719ebefecd269f0b2295db4bb3bd58b6b74416e1986af05dad897ed1d3a83fd43812b77833f85aba7 HEAD_REF master ) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index d27955c271a118..b2a2a5ab97532d 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-fiber", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "license": "BSL-1.0", @@ -10,59 +10,59 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-format", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 93df84bf105499..22a537864a18e4 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.81.0 - SHA512 c27dbeb65aa0623d01876999de35618de9388ced01bb79951ca1de4909e5deaf512e0b6b189136aa2e087f046b28f757b3ca417be52ca9a2513383b87e807a6c + REF boost-1.82.0 + SHA512 53141484dbfc0ee399333eaadc87cb5fe077d0be8dbfb69c6a9c4545d254e894f0f0f7fb16f7de72c344f91ac29c2769125324ad2363b36b7a82bc4651472501 HEAD_REF master ) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index ed1efe5a1c600b..19ba2fd83f61cd 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-filesystem", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "license": "BSL-1.0", @@ -10,73 +10,73 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-atomic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 0739f1d9e91e13..9eae7590d577e4 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.81.0 - SHA512 a918d7ec365b22c62297dd62069cb33e8337750ddfc0ff48757ccef8954ac2a055bbf65ea93eddf366c44a6b7c9da4e32268b420244eeff35158da9f8ec34d15 + REF boost-1.82.0 + SHA512 97f10dac36d22d065989fb24ad7187c39af5c58cdadbd0672d3cba1c03098314bc121a8bcc3c0cb417598a04cfd021bf937f5118a1323031f9ef9d8399636d0c HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index 9e5eaf41dba189..787320305b24aa 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,71 +1,67 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-flyweight", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-interprocess", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" - }, - { - "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 4441283036f6b1..f7263903da1b60 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.81.0 - SHA512 83ab45d2dab0cadb15bcfc3a8ba558b4f4ed38aa72f4d2481fbac3437787937989f3df39c0b658f2219486cac37e31a11d824c1c55d88e1eab8b6d7299924392 + REF boost-1.82.0 + SHA512 ab9113874ebb5c5e34769db78505b1c702a261f33cb63bcd2b7423e158096fe2a71b3635bcc5d759efe2896e39e31c2bf1b30cb9b766b92a07119a1a9b794e4a HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index 6d9787da8d0920..a9001bc819a225 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,39 +1,39 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-foreach", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 403b36162e8e89..b8d1801c1f9d6b 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.81.0 - SHA512 a526b1ef7379a44d67641b9124ea6b145e1153aa631a753e92ad7e3983481b7b9064b28219da408ae71e6837a0b9c53407d9c55418dc0101d5a16ee04068ac39 + REF boost-1.82.0 + SHA512 9103f42b8a12ebe752e0e4ccb45c2e35d13ce00d3522a49abcc95e0a5b1c389930cb782b0d7618fb0e69b66c99d527ad272098cea480656bfcdf8b4130ab27da HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index c98e97fc1a0c54..7e07319f2017d4 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-format", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index 62cf761f3e4634..a4fdf7c22dfa85 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.81.0 - SHA512 c53fccf5ec081dc654ccbdc11df977d13ecd19abcf2a2e70727a4549b7524d27a388a4be2835e695310df73ccf6180fd88af69d50871f2109d04a6c5881ba294 + REF boost-1.82.0 + SHA512 f47c49056d938b945c7ca51a73ca29d61e30f4a447bd54af17790ad6e474acdc67f187e5fd6ecc93296b38210b1f3e6057fbdfa68e35899f4b6c386d08792e53 HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index e3f56895027bae..239d6d521a2fe3 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,39 +1,39 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function-types", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index 9f865f5e1f8217..a78c548a284074 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.81.0 - SHA512 924a1b338c95acf519e1a930d5f3c96607d9b9fbc5fffd5b8aac63f7804a6c19546e22166a3e88af8a4a8b9d0343abc10cbb58dceec402b7c45ac523f4eb6a67 + REF boost-1.82.0 + SHA512 0dea7ded3895403de62b1446c5737e0e75232c0b881dfeb40751c1ad19adb379850e87f0d6747d7397a2b7e889e87c5e4fb9f79bc6e499e282df24a8617b12e3 HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index ffa18cc1177f5a..b50af3d7f1d925 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,55 +1,47 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" - }, - { - "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" - }, - { - "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index c0b8f3e6d68110..1df1bed81d9df6 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.81.0 - SHA512 fd6b0c3c273530338ac566c6e3a01c3f21d07390c3fc49efe8017dda580eea4903dc6cd36b9d7a25bdd9b91681d19dc215a63c84732cfdb7081a1e7e0a124a04 + REF boost-1.82.0 + SHA512 ccd6782a6a05e9629211ab403484cf3dfb22eeae35fd393e690f6e4935a4596436d24e2730f746be12b1866dbe7767e735c6a8ea90c19c837a5d33cc60af6796 HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index 6e6967c29db933..697655fa219b5f 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,51 +1,51 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-functional", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 5a59ab817cba62..44c43a6430df0b 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.81.0 - SHA512 56a9eafff6b0cf20042a408bd5ef6532467fe29146fa3282a05c868dc4ac141fbf5e22edc8d4332cb4808f5e3b1093585d463c8d4404bd9e5c998ae331c0f593 + REF boost-1.82.0 + SHA512 142ee69b7438bca8feacb7511a99680bdc669044a8eb58eb059bc5bbd62de3f9319fbb759c110412e515a106e0ea43dcdb194ebe522bebf5e77b567627ab11f3 HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index 2734444bf54daa..6624002580bb49 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,63 +1,63 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-fusion", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-functional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 5b5a15390b7c80..a4dbe981abdc8e 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.81.0 - SHA512 1dbefe63f9776b234c2532cbb2e47bfce49a8194c30ec82cd1cbe16e8f7304a2196a9338dc00a62cf1bf74c7684d55f33f104126e72e4ae0214978f6212f475a + REF boost-1.82.0 + SHA512 e03a2a1f15dfe140e3fd6fc3725386c094c7d8b1248c713f9530a5b7735d025c7282426adc1de62aa60fe305289605e0f0826936e6b976102f54695f6c4368d5 HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index f2d087e0a6271e..b23079c818702c 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,147 +1,147 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-geometry", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multiprecision", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-polygon", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-qvm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-rational", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tokenizer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index 0a8ca397b244d6..85806d9e44cd77 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.81.0 - SHA512 935684461749bc18238f03f02ae0100fc77eb5665f7cb3f7afd7ba124a8d572cdb9ca78a2e7277d0091fee8f70b12ad1701eb67c65ba69baba8b5ca5e8c82130 + REF boost-1.82.0 + SHA512 58127c4ba4d6cb8a2823092f80d7885e53c27210c48baa8a0924ff4256783b134b48f5a87afb0baa5df48d33439ced045b161d9a691543cf0af9fafdce21241b HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index d36edd6d149ab3..38280708a86b8a 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,59 +1,59 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-gil", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 5bee69307730fa..1732561a92c73b 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.81.0 - SHA512 31de00adb53686cc6518a0392a9987f74d55deb8fa1649a994fd12871be12f6d1729021052453f1a9b6a92daa54149572c79acfc06394df0be9f1b752412da24 + REF boost-1.82.0 + SHA512 b64c1f4dd1f647e5ca94d5463f20fad35f00e4030cd63f7516b0fbdda69ba8d81ec93234f9812dabdea9219bb1f438a550542d020ceb583ba801257d7d0100d9 HEAD_REF master ) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index 867713b2c09d93..a8e6d73fd724d6 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph-parallel", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "license": "BSL-1.0", @@ -10,124 +10,124 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-dynamic-bitset", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-foreach", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-graph", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpi", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-map", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-map-parallel", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, "mpi", { diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 4bcac3d3bd214d..246633c347ab10 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.81.0 - SHA512 beffd30f5b613142c53b66c99a41120ea08f2279cfcad1326d347b93f7d1a846da99bab098a6659f92ffea5aa0f1ac04a0a34fb00d7b0a890e20213fb9ed0473 + REF boost-1.82.0 + SHA512 c7ecfb2a8772026434d3ad89e62448334f6cce42d81ffa94b943a2e2b1a83f6a399bc9d6aadb688df67344a14a0ad459be14b4b6fab2c434645ad5e0f2263f6d HEAD_REF master ) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index 394ef50a937251..43be1f1b4d06e8 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,190 +1,190 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bimap", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-foreach", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-map", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-tree", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tti", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-unordered", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-xpressive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 31f905ff3f2b8b..cc5e9b822a861f 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.81.0 - SHA512 0e593a59fc85bc04aa355aa8fd24f94a14b29ec9ebfd1861253428999fbe76e05ba777e9b066bc95500522d0c08d43dd0558e6e35a2b67405ac6af80f5edcdb8 + REF boost-1.82.0 + SHA512 4095210548cf7e3976e24026a64d0d96319cd4b2a1a613a35f86244c5bf48541374f593a67cce0caba633e27f8bfd88c894bf1a8241ad7765f657ca630345801 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index 1ab901e7d3fc3a..5667411555921c 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,35 +1,35 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hana", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 67a276dcd84b77..d80eeaaee14906 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.81.0 - SHA512 b78fa8f5ac869af94e6b2917d7d2e60cb717131a6fe825bdc335edd11cc37b0b38af8d7b87fd48662d5748263f1efe6a7185fd136cb7b149a17973ddf030d55c + REF boost-1.82.0 + SHA512 19e748e38a2863cd5c17ac9aa9d266322fef8e9065c974fdaa316da0862ba58b4f72ea524277b755bfb4dc5dd13e4fa92abe4a6de1c274d197940bbe83cbb233 HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index a6b44b4c094305..bf47a50fa50fc5 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,63 +1,63 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-heap", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 2a991a9078f9b1..ec25ad66971404 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.81.0 - SHA512 0918c37563bc082b3da18b0c1c2b81aa42b964ab362cb397f2f74f7a58ee9c4dd94163333224bda8ff078921cfeb93488b766dcfec65b551592675cc90dfc5e0 + REF boost-1.82.0 + SHA512 8b5dd702c9e27600003cd929a9efa4570253310df411ce98224d23978eb1d45644139b6c00bd77aa8b39bce3ea79a62b3a45ebd6a58a4b20e5b56010e2499b49 HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 409b6540c7e262..2fe2bf337492d6 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-histogram", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index 4bde2482ca5b94..95d714ee1802bd 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.81.0 - SHA512 85d2af6731cf84750635eb0324067bd1b02b425df0849f668c4e8f4e17b6c970a85240d170667f3e912ec4a6758c0bb0c1852e87c0ab834865cde94d88af6d66 + REF boost-1.82.0 + SHA512 ac281be88a99a8c93d42a6e0db3b8a48d2500b9ea68782fae91ab97ff9c2f75af80da792672e99a42d85489ba2d0669f0f4f027d79914522bfa84b2d8e9c59b7 HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 6d6d477be65c2c..917fd419632488 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hof", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index aba2a84b2c0bbe..5f6702001fb19e 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.81.0 - SHA512 a8576c9731733b792543a5b6d05ed96d34c908c8a2fcdce2f4d2bb7492b252622d528bc8259d918e5df0150f8f2b58394e907ce6e0669a19bd674c7a8bed26ff + REF boost-1.82.0 + SHA512 d808e3961b8f84445294f063c8f3d65220ed23410978d76171e505817a19b472c3052b02c270bca114da7d9d03d958510173df17d724c3533ae6927409eede9d HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 825c0093120493..64b9ad1397a7d4 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,75 +1,75 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-icl", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-date-time", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-rational", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 3a9932ac5a87cf..2bca77a47d3080 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.81.0 - SHA512 e0307da368ea8d3cab9ba8cfaa833466e3392dc687638636aec22f16d2f56719d56711ec2fe8c0f3b2ee3f91dd47d76ac9907746e5eb3f3799691fcec36e78e2 + REF boost-1.82.0 + SHA512 c15b4883578b5ead3d04a38b4dfe6f194668e9c02b69dff36369fb0252b0ef2bf5abda995973257d78e911c15ba2051a0cd5ab6083339ccb9e3adbb2afa85f90 HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index 8d39d15cfae4c2..a33aa9b450b190 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,39 +1,39 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-integer", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index f65ffec3ccd693..e5b670146f0706 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.81.0 - SHA512 fba6692fde5f22734e401ed1b5320e7c6cba8e2b45baf3da4161c3d7fc55fe098024034b6bf995d45d3464a7ed78431d2391c1df0e852f0c382bfe68ef79c2f7 + REF boost-1.82.0 + SHA512 67771c48b9f4591383d68f2fd79f26048a401f9f8cf8bd8a1c6cddac751c84ef9652396622fe53146f8639359e5baa050ef10baabf0feaafa6b66fc7299c8ade HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index 312b4112dcb026..c9f7914978bd6f 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,59 +1,55 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interprocess", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" - }, - { - "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-unordered", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 1acc9926abb8b9..8234cbab0762e0 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.81.0 - SHA512 63f150f486374b68c1969c0c60a5f55ed8e0534b7ef8833975a0345ab1f9659d525ee9a1b858f85631a65494ca346bfe01c62191166b020062052bf45ca4f51c + REF boost-1.82.0 + SHA512 5de7ac82c0e37ec7ed298686b7ab8050bb568e4ea246ef766a299acfa715dbb6e245e7722a7be3d525543113a16f0fb691b03861c1a0cdd97b7aa51c8080dc9f HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 70aa0505a19f76..07b079eaf974c9 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,27 +1,27 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interval", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-logic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index d6674de847a3ae..9900c76f642656 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.81.0 - SHA512 1140d3862f53eb46fab4adefa1535f7ec0270bf555e6720b6c8ad35de583d4635bd564e30a2432faf67cc809d410205649c502ea6355207b48af163349fb748e + REF boost-1.82.0 + SHA512 66afd78359bf510770901a89f668b0bb520ec4c6546cbef83d9fb101989fd406e8baf465f35ff8655618d0b169fc8fd5aa8d2f89349269a091c35ef75285ef07 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index a37ea9349eba6e..1755550a7c4722 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,39 +1,35 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-intrusive", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" - }, - { - "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index 9ba3f831519f6e..e6a297bf776e9a 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.81.0 - SHA512 0228da375019989241b5febd99ff45855aa90c12ff5ee181249e7309f2a9ec21d9c77c89060d4fea41bd66a89ae06c9d3cf190301124a0362a9b4b57cc7f5871 + REF boost-1.82.0 + SHA512 af3b8e922369f8e09f5fd3d91c7bb1ef2b3697199f118a43f1e283dc2675f126994114d11aef531d9d2c63feb070183e7d43a5ce56f6e81b875a29e3ae358814 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index 672a9b8cb053a3..0dd699ce902855 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,19 +1,19 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-io", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 32b0545c030f52..82c25f001f4dca 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.81.0 - SHA512 102adfd8c31e0b00d74914fc0c2a812ec0d5af53184f9caf4260b40028ccd4bd084b0916ad937a11c3af14580c004bc143479d09e55362f27b37033eaeb2ee1c + REF boost-1.82.0 + SHA512 2949f3612cbc809f723a16168ccfb39249ba1e730ec9fa5201a41189bbce22b35e9adeb1478f7cbf012346f67ac7d8841770c8f977711ef0aea0fd6dd01dd785 HEAD_REF master PATCHES Removeseekpos.patch ) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index dfa4fd0d5df298..4ebda8162248da 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iostreams", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", @@ -10,90 +10,90 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index e8a835d36441c1..d205f31cb6a3e2 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.81.0 - SHA512 f96ad21b425922efa5d2c793f72a6b6515a3251816b0bf4554c9f95c59925fdb97f1505c8f7f9bf8b5d2bf05b13ebf27e89d674c7379eac084b37c5e6ff79bf2 + REF boost-1.82.0 + SHA512 078b8f8a36788295494d9c7224f222c50a15badef143af4a0a4f7fc10ae1aecb76d656de7f5c8d7166257dcad98f2e31f38736deaab12ef60af7720258c5332b HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index 181a13a315c731..e90a6698ac5664 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,71 +1,71 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iterator", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 67869b0a6bf4ab..4e391f32011d93 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.81.0 - SHA512 8ff7a7c68444faeb19c5ceaf82bbb35720645dd7fae5f14b0da83deb1d21ee3fc3dc353fb3144625b0062cf058411d8f58011e4da6e75850208831829342bbfb + REF boost-1.82.0 + SHA512 cd5e1d262ae598dd5d4c40af804e4815c26b90effa802385f56e44e6f149ffab1869dc01c27a8b245fb3489893e2d1c4ff8f2dca9461ca851f0eb93472b6a9a0 HEAD_REF master ) diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 2b36a5759637cb..2723781368f7c8 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,61 +1,65 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-json", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" + }, + { + "name": "boost-container-hash", + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-describe", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index 9a48d535485d91..d06f97a5062599 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.81.0 - SHA512 6267e7bf435906eecdc5cb94e824d92b98dd57563c13207d1d8edf2d0c5ca929254d98d0e15993b5823bf5f27832b69453532168e334528d95c0380243617616 + REF boost-1.82.0 + SHA512 77aca9157d9784d0ba3dc4614027c0e411bcf035715f049815b4a27063fd8878477b5ce472bc063db7dd887773ff17164d19d5aede4b3d06365d6c427acc4555 HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index bcb8dd0ea12acd..b67fc557dd224a 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,55 +1,55 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "license": "BSL-1.0", "dependencies": [ { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-lambda2/portfile.cmake b/ports/boost-lambda2/portfile.cmake index de325d8194c85e..09cd204c33c6a1 100644 --- a/ports/boost-lambda2/portfile.cmake +++ b/ports/boost-lambda2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda2 - REF boost-1.81.0 - SHA512 e9e07866168c8596926eb2c68a6dc9ee89a0ca3400edd751f02e1e6cda4799b4d6e932e49dca2d36ae932963b65b70fc1141145802488b872be8acb59338b32e + REF boost-1.82.0 + SHA512 6d7cc0fdc170aab6aebfc14f76598b2c0d7a5330b594c6796c4c40b0f4e30ecb1473d25c83cb16851cd54cc835360711eb16afca8a6406cd407be980ae5ac31e HEAD_REF master ) diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json index c0a84389750027..0f83c926f159d8 100644 --- a/ports/boost-lambda2/vcpkg.json +++ b/ports/boost-lambda2/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda2", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index cbb645f1f909b5..dc1935f3be63e7 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.81.0 - SHA512 a1c084eb82579417c0496f41820666d74a265d6dc82035e3835bc08aa4408a30535ee4dee83b769f8375c85737d36b89b7fc46b94f484ef4c2bbec339d0ccd5a + REF boost-1.82.0 + SHA512 30c437d38a42f88cde1a06f7b9c09a6a6fbdb9329153c55d66ee1ee4ee87b226d5665bf50014441b972a68f15aedc941e06d99f4aa42236c0d538121c5f82c84 HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index cc9cd74bd010a2..644600069b522e 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-leaf", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 3bf0ac1b2bb068..57bb052a8348c5 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.81.0 - SHA512 377420d3f3351cbf5d2e08d354f9507da16075c299c09a30e3d01fabe5d5e2c4e580d86a99f51861f0540e1255f3e3a7ddf7d5c4d306770e5c23182540621828 + REF boost-1.82.0 + SHA512 9f2d9fc93dfc3d0af494c8cf020f3785482a1c7a3410778b4e42e501627268123eeae1ee31f1de433f6cd3268a644b2c922d4b2c967453e17157005cfeef4ebe HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index 017d6c696e6f6c..93afa0139f7e36 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,59 +1,59 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lexical-cast", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 80749da88c7bfc..915cb098654d6a 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.81.0 - SHA512 b3d8f4d3ebc6bcf5684b848f9a8c2c2170026b54d529b5945f0c96fb49190cf424075b6c34d392dde0bed7ae801039721eee24a3d2f1eedfb4156472f9736876 + REF boost-1.82.0 + SHA512 31e08d116f2619ee6071fab9db33d1f338acd2b6a01f2d1b18aef9bdee901a8bdb2407afa93a49558ea816555fc9f333c223d22b118c5fd07984704e8ebc0ddb HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index d189e587136a2a..5246b218ec39ab 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-local-function", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-scope-exit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index bef8372e52c18a..fb8c749bf88944 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.81.0 - SHA512 553fe135656dfd4e1dd797396964508a3a9807c9a04233a86e340402eaf1913f8d89eff6e1c3fe9415258d541af877839d2d7b5616f40df892cbbdb2dfcbdb97 + REF boost-1.82.0 + SHA512 40c96316016f5fbc7f83061ffc236ac751293db7fc56507dbf160fcfb1388bd8cd7133bf80881ad9893aec95dfab32ad73d00d047d07a32ca24f10e068cc988c HEAD_REF master PATCHES fix-dependencies.patch ) diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index befdcbb745783d..c50df322f2994a 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-locale", - "version": "1.81.0", - "port-version": 3, + "version": "1.82.0", + "port-version": 1, "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "license": "BSL-1.0", @@ -10,41 +10,41 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "libiconv", diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index 92e69897bd62df..b5ebd0d30fc856 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.81.0 - SHA512 e912b96971df23f317807d49ed316f417ec4cbcbc37d35fed2c9404ab861dce62fb76074f2ed3e8cfa775b6785878bb85462331ac658924a1e63e158e56ba693 + REF boost-1.82.0 + SHA512 50827a56270d587dfb081177d93d4e16221a8b1164c6b2749f29710eaf07e6f440ced7872f4ac95342f4c6eca43877fb9b27a57a992cd40230ee6a1e2bf72ab7 HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index 90488fce719314..79a6f94645fe11 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,75 +1,75 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lockfree", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-atomic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index 5613efea5f24d3..e3aba311b44b86 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.81.0 - SHA512 916d4e820a1d12ff171960da9f37b273c16bd3b59d3c118b335af17b49795aec250761ae38fa3c0360468b16190161b5782020c6517805631af82861c83a6993 + REF boost-1.82.0 + SHA512 ae7b1c02eec0eaf922f46e96cd895a03b74c138e1d1388e468adc0ab9bd6702d0756850b8fc039fc4b2838317b1fbccf1e84b2831c439c906d55de7d9bee55aa HEAD_REF master ) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 6f98673e943c9f..9fb0ceca483dda 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-log", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "license": "BSL-1.0", @@ -10,187 +10,187 @@ "dependencies": [ { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-asio", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-atomic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-date-time", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-interprocess", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-phoenix", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-tree", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-proto", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-xpressive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index f58d936f8f89d0..b7163a2c991440 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.81.0 - SHA512 c21e4be1a61e711810300269fb5d6594efc5d773f92d7796bcc1c1c4e121d41d5f6cc3bdd7ff90afa286bff54890b5f8992c1d27ea589f60a2f7caae43a044bc + REF boost-1.82.0 + SHA512 9456711b5fb4591a26e42850aa4ec39863a84c74501f53de51653e61dcd414c421a7dc0fd5469efba08e86ec8f6ecabf3ed6ae8ded83b6296ea3e628a8516436 HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index f4ea5a552d8b30..23050fade04397 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,23 +1,23 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-logic", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index 2970d3477ce49c..e7d5b250ea656b 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.81.0 - SHA512 70fc1c2f90e95c143d7e643aa6dfd2e65d9547a6b014cc9b0253ff83540cda2f89f712c21c96243c47af6ec74c2cd78a3876eba9620cc8a9b06ab7fb1713ab81 + REF boost-1.82.0 + SHA512 2788b5cc1ca359544d81c5942465703b11a6c243234adfb4e87a355ebdfdfbd52f99bfab2355b49438bbc0ed4d96d26ac924abd14464519d35099f91bb5129db HEAD_REF master PATCHES 001-remove-checks.patch ) diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index 7c30c1e80f7810..9ff4841024cbbf 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,66 +1,66 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-math", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 0249900dd5bf17..748c89cf788b37 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.81.0 - SHA512 0e83052cc88ca58228d4bcc6bd0b303eaead883eec9734f103c60bac655035bffc1ee6cc6f68dab93a902241a3db503500a30ff884e4cbd757e5b5ca1d6c5ce7 + REF boost-1.82.0 + SHA512 442b4be2ab40768a34b3805de84b67b2f02a3a9632fb2ea94ec12d436b75508f3c5fcb65b8c58e155fdd5ce94d7e405902bef2f5d8fbe377e3af96859531770c HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index c86cbfab499a59..3140b7caaaf467 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,39 +1,39 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-metaparse", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 6b61bd6eff05fe..bc9556e3c15fdd 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -5,7 +5,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cma get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) -set(BOOST_VERSION 1.81.0) +set(BOOST_VERSION 1.82.0) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") if("${CMAKE_MATCH_3}" GREATER 0) set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 9f06862eb9a668..d8acd95a25cf8c 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,14 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-modular-build-helper", - "version": "1.81.0", - "port-version": 5, + "version": "1.82.0", + "port-version": 1, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index 3a80c52ae3bdf8..b1e2b36cd2e9f5 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.81.0 - SHA512 fe2bdd2785f8f834c5b8e9c3866b4875872bc7db122d288591639c816bc767d111f84cc16ffcab6377cc22793c0fe973b5edb3073895767c87ed42bfeebd64a9 + REF boost-1.82.0 + SHA512 d904077c491a0129f1eaddfb0f80d83d53bde31c2d45f34fd1da5445c416ad9f6a2dd3f0e76c89acf01964269e8dfc33032edd262fb653b429044c16db4126b8 HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index d1332a5b6f68d2..0582dd7b305601 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,35 +1,19 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-move", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "license": "BSL-1.0", "dependencies": [ - { - "name": "boost-assert", - "version>=": "1.81.0#2" - }, { "name": "boost-config", - "version>=": "1.81.0#2" - }, - { - "name": "boost-core", - "version>=": "1.81.0#2" - }, - { - "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" - }, - { - "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index cd86a29e42ca5d..b2fdb804660916 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.81.0 - SHA512 656e8c13b49962fc24b1087346d3d604c93a3f4d06c4eb5bac137ba84e0b823857cce9c1c2ab059c3e2ed51620a030c306643331e41cc9abc095b0700c93cdba + REF boost-1.82.0 + SHA512 75735e32ae4acfc511446e9a3c238b9d42d49c2f9cbc1372f031c59eacf6d0b9469da94ece3ee788a29db67bf47233034744d0415808caf50fed708781669cd3 HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index b12e04af7db779..6054de62b76daa 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mp11", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index dbe312a4a3c60a..cb6a56c7a392e7 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.81.0 - SHA512 48b93c0fee3b83924764ffb35586d96337b3031a7135ad2e5c0f31240efc475fe691a17aa6c6799dbbe44bde81bd850965164d5980f1302833d389db9e6e4df1 + REF boost-1.82.0 + SHA512 32a9fdb9d22f8834d0c0f717a57cf511d707f86c792ad2e1b3b1430310be92bda82ac1fba37297c6a57c44d45dd47facc5857b7a99b53e8e76997f8faf9880b7 HEAD_REF master PATCHES fix-build-boost_mpi_python-on-windows.patch ) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 7839c4aaca8b30..7c51a3965d7942 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpi", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "license": "BSL-1.0", @@ -10,85 +10,85 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-foreach", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-graph", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, "mpi", { @@ -107,7 +107,7 @@ "python3" ], "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, "python3" ] diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index e3ac91eefcfd69..6d70e24081e0fe 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.81.0 - SHA512 76abcc8a7385741aa21cb6a6cb20ffe644928d039c293c720f846f62f0b68630d02e4232b1e004c258c4f7cec92744553a4d4a7875280dbc2a4667460441b3aa + REF boost-1.82.0 + SHA512 3f5bb806a0905446ca722696a512d9137d7e2a50d0a4d23c2afe186681c0541c7a567bc5208e1535da7d46f8fa39b36c8045b26c18a57dc4d05ed0427e4aa37d HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index 73721251df48ab..64f7360d4fb6ff 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpl", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index 18b36a4a4a2647..83483c0a598384 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.81.0 - SHA512 4e52cdd009af2df9e012051cdee78d69610b6dc3edf9b3e08d90de742242e7508e14ccf1c9f68f9001c453bb1fc3644b0c5a6f8818a25158048649e4ae17287f + REF boost-1.82.0 + SHA512 3c505a513670ed73b7515b9acf7a6c949112664841658c7b441721430f3f2722843954f896c16db9ba17fa5e32420d0eaf78f384ef5fcc0494d4a1463f807426 HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index 128405fe6b6349..d9cefec575f0f5 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,83 +1,83 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-msm", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-circular-buffer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-phoenix", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-proto", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 770e77ebd353e4..fa68efe1b1ff24 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.81.0 - SHA512 36b65b5989b9ae80af8cbf683ff45c3a2611efc96488e6f10bcfe7eab41cc9c6f4826e4059da7f3f764ccdd9666f6551a871177909436b55a9a6ded91953bb49 + REF boost-1.82.0 + SHA512 c4a77cb2e4e2615587e3f8037b26d9dbde79de71b1eaa19ce2da8354f79cb8d5d6cf218ab854af1a3426c2a1ee3f041889f4a9c259fc388065d89cb33bb80fb8 HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index cac1e8c537c96f..9f1dfee4ed7aee 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,55 +1,55 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-array", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-functional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index b1084208d74aef..c42a24f31432ac 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.81.0 - SHA512 7f08ece99ae953f8ef7855ded2c61366c5e5f751a0058ada537b21958ee8aa7a765ff01d400e61af2facb480f24cd2968a43e84aa826e5db82aac719efbe1f0e + REF boost-1.82.0 + SHA512 e9c284a54330fb4cea806ece9f570470e8061d6b52e130d324043eaccdc66fddec1be057ced8a5a41a3b59c72912b2edae9a35cc51592807eec4e0797b4502e9 HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index 4bbf4f1ec2d16a..b2aea630c57452 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,87 +1,79 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-index", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" - }, - { - "name": "boost-foreach", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" - }, - { - "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 48758c925fc666..d36fba876d40e2 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.81.0 - SHA512 1ba40da0185a9af2cfa37641641ac6d1a281891d6d38f3ee3be0c713f02ff20be23ddefa68a50cf9ae88c5dff3f3c7f7b43d984150215fa1bb419cbb33a840e1 + REF boost-1.82.0 + SHA512 f2441a918e595dca1c2618ff37a5ddebb3bc9e6b923e27e2604ea7ec8f003621b2506f4fd1ec41b3ed3de68c01cd19ff637e205aad0341d272a63edf1469ba5c HEAD_REF master ) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index f7fea02f193450..8ed5c7e77be2bf 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,52 +1,52 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multiprecision", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-mysql/portfile.cmake b/ports/boost-mysql/portfile.cmake new file mode 100644 index 00000000000000..97c6b393786030 --- /dev/null +++ b/ports/boost-mysql/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/mysql + REF boost-1.82.0 + SHA512 e83a7ab69ee28e5eb19ee2e5a19141979f83342cca8402673829f60eb9d8c969dc41542e357b9ffac3da5917d6c5e2d7b4131044eccfba5b01b2b63c97f05edf + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-mysql/vcpkg.json b/ports/boost-mysql/vcpkg.json new file mode 100644 index 00000000000000..148da21a7d807d --- /dev/null +++ b/ports/boost-mysql/vcpkg.json @@ -0,0 +1,55 @@ +{ + "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", + "name": "boost-mysql", + "version": "1.82.0", + "port-version": 1, + "description": "Boost mysql module", + "homepage": "https://github.com/boostorg/mysql", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "boost-asio", + "version>=": "1.82.0#1" + }, + { + "name": "boost-assert", + "version>=": "1.82.0#1" + }, + { + "name": "boost-config", + "version>=": "1.82.0#1" + }, + { + "name": "boost-core", + "version>=": "1.82.0#1" + }, + { + "name": "boost-endian", + "version>=": "1.82.0#1" + }, + { + "name": "boost-lexical-cast", + "version>=": "1.82.0#1" + }, + { + "name": "boost-mp11", + "version>=": "1.82.0#1" + }, + { + "name": "boost-system", + "version>=": "1.82.0#1" + }, + { + "name": "boost-throw-exception", + "version>=": "1.82.0#1" + }, + { + "name": "boost-variant2", + "version>=": "1.82.0#1" + }, + { + "name": "boost-vcpkg-helpers", + "version>=": "1.82.0#1" + } + ] +} diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index f1524e4766f6b7..018592444fb77d 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.81.0 - SHA512 2271e1c030bed4e487dcd0e2d6fc58808db740a0f00412431df3ba81d062e12aba9dbff94fb955b6343ee7d3447c02abe4e8705471355b11a240fd9765cd9a14 + REF boost-1.82.0 + SHA512 f27382299303244be0bb922767cb673e4c46d9a3468c912af7827c4bd5420b79d36d83a7da42affdbbb2d36d2ee051d0e4ffa257d5762c2c429fd076fc09b44c HEAD_REF master ) diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index 16ff5c47a7f925..808abbcfcbfe2d 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-nowide", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "license": "BSL-1.0", @@ -10,25 +10,25 @@ { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 124eaa31fd3ef5..c190debe2beb24 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.81.0 - SHA512 1d8882e1eba195ab7055c0aa93dd21296271b2e31fd89a07ec458c1d0bff2943cc9d86ae4651f0b70b32066d3acc53d77ed40f7a9cfefb9162594a036bae0626 + REF boost-1.82.0 + SHA512 267365467e07d18e09345281101920f55dc07616337af86c008fb8238538a7b68d30e03dc4ab13f4da5d73e0332f925f1065f8ff12e59989a149ab47004f9c58 HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index 803e54db638a80..7e7498b0343918 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-numeric-conversion", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index f86e1670467349..632e566211e1fa 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.81.0 - SHA512 649274e1047db48810b495487772768d59187a243ee5e127721dbb57f2f71b6ae38de32b3dcd1020dac588081389e068c15cd76dd6965b9229bf08c62e023e64 + REF boost-1.82.0 + SHA512 929e73bec728cf878ec382b4e0280a2b796d843bab2a9d22276057435aac9b2aaa442daf29415134d8e40dc0380bf60462dd350d53686c9001cfdf2a42ec7577 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index 9d0cbfb5f16a84..a097af6bb7c927 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,95 +1,95 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-odeint", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-compute", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-ublas", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-units", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ], "features": { @@ -98,7 +98,7 @@ "dependencies": [ { "name": "boost-mpi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 5c7890e0e67d54..dc8fe7ce11b312 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.81.0 - SHA512 68328b99373e4b8697be9cb4d7e5f69e6acf02606f37896f0f2e47304223ad6c9a801b6fa94bdddaa010482b190b854cda1760b0fcf55458e56d147123b88925 + REF boost-1.82.0 + SHA512 5439e9a1ecd2e74e7f9dfb958989edc0a68f0a9275fb8d472fcb32b6b8d120c9eb26e92a345485e0bb04950606cc065a9bfdf6a4cfc28602a5bcc8e13629e934 HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index acd9ff05dc2f81..587664bba0f0b9 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,55 +1,55 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-optional", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index f88f9541a5897f..c8d6cd9f33828f 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.81.0 - SHA512 0e79e5ca56a600d90d8d56ccc3631a7615119c4d9e6d6280d513ef0c96105c79e28d6dbd1f2b1deee4e702eb4393c404d9fba3144869c345650724185625da39 + REF boost-1.82.0 + SHA512 4c19f6e67997877ddb628c84c874fe3828c4afebe5f36094253b6d5062a8bff677f9fe02032c5a98109354920db516c11f2649611f2aed1984dc47682456a3e7 HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index a7947f6ca4b729..ba59ebb80d44c1 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-outcome", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index f1ffd9608313f0..fa04d950bc6015 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter_python - REF boost-1.81.0 - SHA512 c2594479e1bea32004baec77182a29f5b708a3d539469f279c7445a22715d638f427ea44894ae33c128c498dd067e0f018ba623591e46605fb11b671e4796f85 + REF boost-1.82.0 + SHA512 a004ad1fdc46baf6ebdfed52dc3b6d15e2db6aeaceddd07b8f0138e008efead530ee851fe28c8276927bff382cf095594592fdfae8c7a48227688aab4b365caf HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index 5e59fc6e28cf61..a859eba057807f 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter-python", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "license": "BSL-1.0", @@ -10,24 +10,24 @@ "dependencies": [ { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-python", "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index 2cf16dca4ed02b..f9c250d82e3cdb 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.81.0 - SHA512 bfd697eb4a88f586c056f10ba0f97777bfeb6a3407b60c02f6b61097601a78867abd3a950a683acd4a711cf8de45ceff06d451cd64e269ab466f4c9037d42e77 + REF boost-1.82.0 + SHA512 bf96a37f4939be58e8d21bd49bc5ffb8900604038e3c43b32793cb3d012dbfaf161e6015f583afae96b4c4e9d082930a93f49d631881fd40e03e1872182d2ae2 HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 0401febc424f2e..5dc992fb68ec68 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,55 +1,55 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index 58c5dae1c46a08..6380f0dce23eb5 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.81.0 - SHA512 07f06666c66e8408775410d8fc2598a139a50caed45346c14234e3f0e060c1d59c803d393f737956d9772055b6f1b0dc84ff9e98583dcfdb0fe265737b726265 + REF boost-1.82.0 + SHA512 9042b1130a2f6291d9bc9d1daa5ee9d4328e6af8ae6baa01f9637f17ace6daa85861d68043778a054a37b7c02796547ae5c0c42e77746cf7588305262df42ec7 HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index 37c7a819600794..e0d19ec10295bb 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pfr", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 9d9c7fe5a0829f..9c03d83cf07170 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.81.0 - SHA512 11bd2fc20c5cc89649ab37cd3502413827a84f80de5df606de783a001a25fd8d8647ca1f5c458f32609eb48c8c93723475ea1552ceccd5658a96a6890a936310 + REF boost-1.82.0 + SHA512 a0dbbff345e669801be5b93766db5bade30ac9978ddbaf6cae2a613bb16564bdc6a9a70dcb747b95fa3aeb8c3ad139c89bcf372a4026b75c74ebf0941f2d100d HEAD_REF master PATCHES fix-duplicate-symbols.patch ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index ec397926c22139..ae8d884c9d8a31 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,71 +1,71 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-phoenix", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-proto", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 784b670b62749f..41ee933d9e3763 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.81.0 - SHA512 0c1b8ffeb564b0152a937170af0044f099e4f5d66f8503f710ee3111eb0ed267333ecd532cfe87816398cb31c1726a8c3b221dbe26c384142d73a63534f2cb3c + REF boost-1.82.0 + SHA512 64b5c78b25fe7d6150f0381c204976c488b4e0e61c3f33f4d5c323f74535d7a97cbd3cfd45eb9eaf86940d1a54a8431924af0261bf4e255c4aba41013508b77a HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 1e5bb02a46a3cc..92e4df11c9c2e1 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,47 +1,47 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-poly-collection", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-erasure", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index 558a9128ec82de..a9093484e45ab9 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.81.0 - SHA512 81b0a9b26e1c53eeac1122e5e17d4f30be39286051b3467076730ab987a20f3a0825b6a27375e27c9ccbb231dd410ed3f86695b6f9801299c891b4eeaefd8537 + REF boost-1.82.0 + SHA512 c45be5d8657844b1a6b4c2f9c2449d2025f116ef7019adda69e3c7461d0e799187a9183749c4d56eed171cb56740af3655d14df25afe2e032b2a39d6a7799a73 HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 8d53c6bed8dc76..378ef682bf703c 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,19 +1,19 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-polygon", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 350f6638256947..033a60c8c18829 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.81.0 - SHA512 fb84d52bd44be8f6242a523e7b36407c65b8d9c5fc99670ecfbf18571cfdc296c9bb5a005e0d374cd3d2aa65dec828a8150e6e60dbcece3242e44a3d462a05d1 + REF boost-1.82.0 + SHA512 7259283f64f317131fd2913c6f51e8e9d06d69dcf2c325e5c639911c03f815840f1158fbb2cb0734a284e0f1360b99d4f273c30cc5d25983008e8690840e649b HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index bb4541f25b9107..390c3426239e38 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,39 +1,39 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pool", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 7136edd975917a..1fff561a35b7d7 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.81.0 - SHA512 aef179eb05efa197ba5f608041f6211ee58f36dea1e8e8b9ac64fc9187cd5542dd727e5d94b3f373030fb0f07ac4195be3ec0334c7ed0d44f8efa42b8117d55f + REF boost-1.82.0 + SHA512 6dc20b63de6fc83bbcc9df8967fc1fe9f455c0fe5d46c43699face73878cd95fd918c9ccfc2729b48d2d43d0f7ccb6262e9002316f127e7a308ed6f3d15fb8da HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index b276d1e954df94..4d1ebd938c7b8d 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-predef", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 0ddbd7bc85b2cb..2de2c8eaf13648 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.81.0 - SHA512 f6905f711c957dceb83170a79b13487a1dfc237699a4ce1d1efaa1fa47ad93b66f0032b5585d53c3f771409e30da8f866eb4fc317ea7c21b1f42a46d9943339e + REF boost-1.82.0 + SHA512 e481a4fc4e6c4a778416c509bbbe668311b7d019ad80ade74462368295af17caae4d68a0bafe971d10d9922916145bd023b3725a013d86e36b36231e73d8c828 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index 001ca083ccf466..82d1cd60414b27 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-preprocessor", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 66fb66d90a0ea2..cc42f5525785a1 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.81.0 - SHA512 49d8dffcc34161c87ed8bef783e3bea5bdcd4c2b4b65a6a1d60b9422a149437a11db44d5f0ae6edcf7cb69c2a854eb284a3168a7ae0388805d90bfee8d518f2c + REF boost-1.82.0 + SHA512 5676b0986e609c3da702d3905146f54eeb0bc2047e954c81253edcfe48778cc9f90be5e5dcd90bb153281dd12e7c454954f0546f3e3ec04460a4df1cf333b1bc HEAD_REF master ) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 2e2a4822aa1c04..913567c6085eb3 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-process", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "license": "BSL-1.0", @@ -10,72 +10,72 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-asio", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tokenizer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 8462a3422f0a17..da12295366cd5b 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.81.0 - SHA512 15a1ece8cac0c50ac47a61cae0f3e1699a4dc5db8ec521390495d14a69928896f38cdbd5ea0b659065670a51c8adcfa5fa5050bc3e7a100886e7069d1fdb39f1 + REF boost-1.82.0 + SHA512 4b7c27cebc1637e3dcd0a2a7fd09f5793409f8900c545b4b504d14f6448cb01f90e80885654259360a96f0da63c23a2972347b6be1151b8679f9acb4d56b88ef HEAD_REF master ) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index c9f73c1791f1ff..750c2ac3c88925 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,77 +1,77 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-program-options", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tokenizer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-property-map-parallel/portfile.cmake b/ports/boost-property-map-parallel/portfile.cmake index 136562ba96fa14..ec00161b21e8f5 100644 --- a/ports/boost-property-map-parallel/portfile.cmake +++ b/ports/boost-property-map-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map_parallel - REF boost-1.81.0 - SHA512 0baee8c8aa1b014ae921c95edef76a7b4e9bdf1f5d492164240190b60807750e54fa223c4a0a0493bdd1a111e4684ccc48be61393d7f4c10144b22540303a74f + REF boost-1.82.0 + SHA512 f23e7970ca24c4a0e964582d21c0c595f5aa6bf9734e79573689e1ba3d3ae969f6a0abc01d7ea058e78711e2f21bc4a22fe5362bd35c3b5848540c08b9078fcc HEAD_REF master ) diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json index e5f818942cf059..43fe2ad8b96c9e 100644 --- a/ports/boost-property-map-parallel/vcpkg.json +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -1,68 +1,68 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map-parallel", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpi", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-map", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 958c8fd0e55049..06c6d3de938710 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.81.0 - SHA512 13170f7bf807fdcaac37271ced6ad7357cf703c048ef9e9c2db554623ebe276bfbc0f1884b2d1f4b59b0316857ad3f6578401815127439e57064dde7aacc6c43 + REF boost-1.82.0 + SHA512 ca6507ef4ba7ec671f8b217a94a5b4b3cd07c278752c3a6a5501035cf106ac2a230114f196ea3e96edfe36ecf5e73cfbbfb1ac322af62fda35320d4ea8c1ad54 HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 24b3f5488c3b16..19d32896c3a24c 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,75 +1,75 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index 386cdda46aee6d..b91b4d9fc4ec20 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.81.0 - SHA512 a5501277c281641a9be66b12ac28deeb5f6b33441933352c8e1ea27621b20959a0f43588ec32e066515ac614eab84b8fb44303c038cb4dc8414a8a08129f8df8 + REF boost-1.82.0 + SHA512 b6ed3eaa59fed4b9eb27fbc29b5fa98d7159ec4769ddc63fcbcd5a850affccd67c973704ec336175fd1ba6a81af08cb783473fc2222423985f132e1930352d54 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index 9e88d638508a7b..d5ce0d7a984998 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,75 +1,75 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-tree", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-format", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 135774e13ea657..3ee43dfc8a72ba 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.81.0 - SHA512 726377322e940f272eb2a4f32c76143bab9c9330a5e491b32e64d21e523cf7aba2c5412a25b22a1bdf0e0fefe72ea2cb075d17829fb09ee65f1ad32667e66a26 + REF boost-1.82.0 + SHA512 99550ba664e532f458135c52ad1d739aa6c4a2ba238cbf6209b6cc7d550f360333c0d95e2e86181b4f437310dd4d6915a0e03ea9b9d0df56bd4741d5a65699eb HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 982308e07d3547..2207243ea8eac2 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,55 +1,55 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-proto", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 7870988e113ae6..0863c14fc380ab 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.81.0 - SHA512 c7907e4ab0d6ae37c81e22650e77b16d8fa8ab085332db78b3508b35a9ad31a93bdeddfbcc374c7da05f89d36b08263d53ae09a6d1b1c4a90ac514f0584f5562 + REF boost-1.82.0 + SHA512 a5c65927e208fdab5b9f96ff320e2f7661369b7fd3fd89bc2223248b0377915fd9ca2e06b462e5cbf250f4a1b1e613692fd400f4a8a50f681d57d106730b4a53 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 45fc3c560008dd..1652906fcd9a00 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,71 +1,67 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ptr-container", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-circular-buffer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" - }, - { - "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-unordered", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 84ede145849fc3..bd204369ce44e3 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.81.0 - SHA512 4b420629fa40199d8c1aab51cf1d06b10cbba2dadd3a648b9e8ec66a6fe48b8d70c9f09ccaef38b0b0d3ba9c17a5588062694fa73371dd4a64da4992bfbbf9d8 + REF boost-1.82.0 + SHA512 ecc7b5cb7943b09e3882572614d276b6b303a5051399a7ea00b8d985152f680a9b929869e503c4088481fef6d09f9027ed0b99ffd1e95f3411474f06ef9d2ba8 HEAD_REF master ) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 3b7fe3e39b34df..5f38797e60f4c1 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-python", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "license": "BSL-1.0", @@ -10,101 +10,101 @@ "dependencies": [ { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-foreach", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-graph", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-map", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 3086d2eca1233e..960741d7131954 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.81.0 - SHA512 6836aee23678bc4d634bb6cfd3cce800a7f794eaef18e43040019f33980769652e531b29a844e2ffe669cdd14eec526810624a2f2ebd9466aef66b905d1de5a7 + REF boost-1.82.0 + SHA512 ed5ada76dde6506fa23be40a62bcf1e4c821cbccc409213eb811df40f35cdb2a825eb5addceba65308b4648772bd6bbe46df56c144db88c6a2275fe10764a72e HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index 26eeb34e47eca9..7013d5fb8787b1 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,15 +1,15 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-qvm", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index 0e345dd988c88c..1f026466f28f3a 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.81.0 - SHA512 838d6bb5334558116d73dc9ab463439dc31d170520b20c3c8e613181b01672a7e548ef2d59a57862fc8f1790eb22797a0f6d6bcc26c6490b6f6bb23e93307717 + REF boost-1.82.0 + SHA512 3a7a488c34483893c017fe4d0d7886946ec126c5f777e7927bb540178b830010ba078aa28ec89ef4a776d6f4428a5464fc768649b74ffaf290177180aaeb85a9 HEAD_REF master ) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index b15149a2e2967c..72a20ad7d5f211 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-random", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "license": "BSL-1.0", @@ -10,69 +10,69 @@ "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-dynamic-bitset", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index d7c68035bc53df..e4238e10e8cd46 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.81.0 - SHA512 7cdba4d90b181e1d9d787c04903bb970569a6797eef77e6ad400709d7734568a8a7e547aea4be9fcf0ae698dac202d1cbf868287c19c7db6c2c27490ee698152 + REF boost-1.82.0 + SHA512 64fc40af785c29ee358ad1b9a1c140cfb4e58648fac07a3151f6b1a13586642dcb11226a8409ccdcfe9555fa7b2fc0ee485b0f717282690f77125a115d60ad4b HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 04eea408258881..0ce1d3986b6782 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,83 +1,83 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-range", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 94904b6cbb225b..80574bea507aa8 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.81.0 - SHA512 4ccb58b874b3b05946c258762c1283a83e77d0930957df22226017ebf6e03ec948d5a5646b419d58e534a25f1615c73139d0b041804b30e4a12ca724353e4a4d + REF boost-1.82.0 + SHA512 5dfcd8ed7ef7848408016a6249198be767fc394443f6116b92e6a5ad7bd96e16434be2097ac69d04d4913d5eb3be1b6ebbb0d4df2a43da92045cd5f886861348 HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index 736c85f30b35bb..edae87c1fb37b7 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ratio", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-rational", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index eb60f42ef5aaf6..ccd43cdda2e894 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.81.0 - SHA512 6d3c8bd8b45448f23bfb5da85a2a54a303384b47569c4deb34230e810c3f8eecea96b1a8c33f22603b148318d25b1b741e5dd5513bea674a89990c7cf7fdfd94 + REF boost-1.82.0 + SHA512 dbc86e1472c97b484b871c1cfc63ba6ae290ce2fe0d9083be6909cd579a36b298df6e0614a32e8cf714f9e73344bd3368b7a73b9cfd0fc6abfca33feb33b87a4 HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index 286b73c9b71c5d..baab434a2fb111 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,47 +1,47 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-rational", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 2d5f1bc3ff8f25..9a3a264e910e96 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.81.0 - SHA512 562e81ec1c2fe78606c47be5e35ac7e220fc3ce5acd0ddf10cf836fadf947287ecb2d9a630a32239b8d4a50c488abc186a707a14e884fcd640a606f8a9f59034 + REF boost-1.82.0 + SHA512 f4bd05b47fa26c13dbb235f1ce937a4cd07fd39c3fed4cda5d86f13b528f6bb2345569294578ee2d58929f94d37c24ac4e766cd4049b532b2609ea60d045a4a4 HEAD_REF master ) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index c0d60de1f82504..abfb145089a708 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,73 +1,73 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-regex", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index 814a1ac12bc1f2..adae78d293fb61 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/safe_numerics - REF boost-1.81.0 - SHA512 f94ae14c178efd17134bb85a59a4ea41363dc9ad2163d27ad03a269d121cdace0482e4c934e7c57f40969aaaeacf72bdcb244b1b5645eba09985950288f10cda + REF boost-1.82.0 + SHA512 92d995fd08f645cdd60c3e171205e43b66e34507f79e8c9e7a8e02521146767360b9887d7883698c4452caf7768acb43882c6ce2b154f2fb99828c8cb6395aad HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index 856665b29f5a50..d5c12e73b897ea 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,39 +1,39 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-safe-numerics", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "license": "BSL-1.0", "dependencies": [ { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-logic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 31fbdc86c4eedf..24357c4cbf537d 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.81.0 - SHA512 fa319cb0acf71b38140986bec520f0b7561ab378c7edda7545c526273987c5947abbbe2d412a4dff5ec8bf05df2f53e6b809ae834504f6c9d7da161ce5e1e2c5 + REF boost-1.82.0 + SHA512 b759a1c6df861562b3396ee3753a955fbf47d9aac96fa5299de96bd1d27b58e4c2354dfea1efde9af4b77108227346ab5fc81ca50ceb06d5056f0231b0f3028d HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index 0ed20e42ae4dd6..4914a4e3a98efe 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,35 +1,35 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-scope-exit", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 53cfdb5bc31cac..2f1faa8aa2db60 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.81.0 - SHA512 38b4c3dd6f96d3ea4162298c378320d9dd253341ad4d19a6f3be0ec555e60d8d5977ab10905bf8eccd7c0555f097e95bf8254e81f0b5c7f6660d5720b712b8e8 + REF boost-1.82.0 + SHA512 e59acbe632a80b6fcaa9c53f76d6ea2264bb6859af57b10dc4f0b84dfec1e0617e2d1a60ec0acbcdca9c121b49bcc4ddb16d9dae2b2db42aee30b2b6ec00665c HEAD_REF master ) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index 34d0ff715f45cb..e3bd6b85121e60 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,109 +1,109 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-serialization", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-unordered", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 6433d0f66906f9..b4de5181e23187 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.81.0 - SHA512 e5ae1b434e32d8eee2a351269e80fa618d8a46a2799630539a4d1ccd7dded9c98e56e9e4b7c363c0e53bf1a39f944c33d6bc30bf4eb14cf187dc14af09efa468 + REF boost-1.82.0 + SHA512 5452431b482b859e0d334bb6105301f781701a168aef2a2de596ff1c981008b357a53587135bd63ba060c55dea73a69b93a864401dd5cad04d21a5f1499e0533 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index a77404b0748a62..4cfe899ef84225 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,79 +1,79 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-signals2", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index 595f814aac2336..b355d936148ac8 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.81.0 - SHA512 dd4c9a9992063bdc7f68a27de7840ce4e0cbfd6c878705d7e1babc2f79e0e6b6841be72c3202b927ad14b5764c83253e1e8ff6e9d8007d3febf2dfafdbfa9c56 + REF boost-1.82.0 + SHA512 2089a9cbc968a1b2c5ffbb911a9a237d3b241e9ed9cfa444fafc36806280dfea4fc7d65b81fadff0946b4b5e163480536023abb1eb1bc8a4994ae69916dda721 HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index b8e435be86f1e9..b94498fa34e427 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-smart-ptr", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index bdcda3918a620a..5780bf7b2a6e95 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.81.0 - SHA512 f51b77cea6dc031042706c1269dfc663c5926e2d81adc9004df8d391005a85679ad182ab95dcddbf892d47eed539262db93cbe9b379200c8cef36ed165e092cf + REF boost-1.82.0 + SHA512 532fd10752ee6c3ce740844223dc4701f9f47f2a986cddb2ef1289aad3576c5cb3496de2721de9bdd9e2622722608903f738c99448f8ac0921d43a17666839a1 HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index f0ab20a5026306..d425bfc9929f73 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,35 +1,35 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-sort", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index d01c657dab15be..28ba4fc4c1ef82 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.81.0 - SHA512 3249f109b7aa151a434f9de8a32418cd7f9d7e670980dc15033a359a61b9ebf5010f817557a0952fc7ecc248e0cbbc2155bd86178dd42a47b48d8b0263e087ee + REF boost-1.82.0 + SHA512 4ac312395d3487476ad55745b784375942dbf41eef09231ca6c68f813dffab24db3068ee7fea2feb5206c63e0323884ae9687f43019b8147aa7176bf378b6069 HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index c4a50d5c969c37..03681deb2a4333 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,131 +1,131 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-spirit", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-endian", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-phoenix", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-pool", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-proto", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-unordered", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index c19fab55e9ae1f..5bff51abfa0858 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.81.0 - SHA512 6fc332886dfa57f2bbe9dc0b1e6d95ef84fbeee4a90fd2068c5c3598cec45aa9fe18015ca110b3714f93d492ec815de39b0f63b00afdc03beae9f810a4e1a9cb + REF boost-1.82.0 + SHA512 18e01cce338e67f9474ff7ca6732e749216e57fc7d5cbf5f78a5e6b7d6c16e70ee0b92a74986c744c6ee9dd2a34c16fc7b6ac918c783b60835e834fac5749707 HEAD_REF master ) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index 405aa1df60d15c..ad14ea1c381200 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stacktrace", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "license": "BSL-1.0", @@ -10,49 +10,49 @@ "dependencies": [ { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index c0a31217b517c5..6547f771f1ae96 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.81.0 - SHA512 4ab660f7da082e8c211fe3c03b222d1c3e7f556836dec70d10c008b14b5678a5c7aa288e8a0f0f97e23daeb5b1eda7b70738b0cac1b86e12223fcd34a50e305c + REF boost-1.82.0 + SHA512 b0966a43651a58f43f58dc1e7156c3d1609201bf38038e2845a7332c3918156d2561d84534e366b35706483ba426abc901d10e8f4b1dbc2dcc715d88047569bb HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index db820e60e661c5..1ca8acb0529b29 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,63 +1,63 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-statechart", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 9a4bfe144b896f..524a7b2f5a8b24 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.81.0 - SHA512 42eebf9324dd6bdd601eaf388f6eb6f484ab730234991393422febe27cd53b6fa25afdff4914fce810b466049429dcf0045d111df5fe8b6c4f9f9a1f2fe782af + REF boost-1.82.0 + SHA512 334b467feaf8ec091dd21e78cf85b60f79d59316a6c1b43840a006c7bd373734b2f3403ba8bb8924f60f08fe339cee9df392e1c883b8c5f4319ec9efc5ae879e HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index e0368803439ce7..988786d70ce500 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,19 +1,19 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-assert", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 53a8f7a2567338..23920f456e17f6 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_string - REF boost-1.81.0 - SHA512 8ccd07f38512f8ce4031149c087928baea95ea9c54685e10b8b0e2b0dd6e7777243d5b94f436de6647e42f56cc1b1fb74f9a0843db7f5c21ce40100c7bbd6176 + REF boost-1.82.0 + SHA512 e78aa0faebf3e473927cf75416cc548c7496a36303d1c902ed93fa8294120a26a4d9e3f267ab96790a28a192424a197b97aedded1d2fc1bac341222d4945cd8f HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index b42cb24e8d25b1..094739f73d46cf 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,35 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-string", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" + }, + { + "name": "boost-config", + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" + }, + { + "name": "boost-core", + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 5175b627c6684b..3d0878a2d8989b 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stl_interfaces - REF boost-1.81.0 - SHA512 2b1dd15bbc65c40303a5ca635623b959a32fcbd8f3b1e36621a7d5d49082b2ea947ca401e102c23d4bdc95a684b0ade450903899d2d14d5dd530facf51072d60 + REF boost-1.82.0 + SHA512 55307949a54b491ae9d6476c92c1f64c550882b9f0c723111a21afe301731270779c100fc7aecc3fc23f7844e56c2de3b6bb83293624b8032d51619b07d9b768 HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 052de341c620f8..13b0cc84dbdccd 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,27 +1,27 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stl-interfaces", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index 46fa469149b7cb..924801d5b594e3 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.81.0 - SHA512 0b6b86a6ca9743814c4bebe7d1013205f0216e42c691c1bb8be01faf1e7767487d13f87f86269ddc11ea0015516b997dc3680d79ef35f6353cff4639932dd642 + REF boost-1.82.0 + SHA512 96e2ef5cdc4886be3a8bd113ba542d5c633723761792758b510c6f99c751da1686fb099c32a1c684eace84c75a575bfa43859197e511cb8d3f678ff31c27dd66 HEAD_REF master ) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index 0571a2566e1650..0c745eab7126fe 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,45 +1,45 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-system", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 905536fb912e0a..81fef2e4037b10 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.81.0 - SHA512 453e6500de87eb34d5071392d13d3643692871e37d3416e08e1f621aab03d4408fc1f1e94d5be9a2ce2eaf53272b438cc7615c7ffadfa0324e00c3d425f9143b + REF boost-1.82.0 + SHA512 7c3d489e6876659811004c5c4353e4c69ffc66f59e56b2179d315717880b2b899c05cf5024eba82668f447260df6b38efb6bb7270b36e3a5187f39bc9168ffa2 HEAD_REF master ) diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index d0eb60f68e2c8d..ca22799e025632 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-test", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "license": "BSL-1.0", @@ -10,89 +10,89 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index e536567b1f37a7..ac5aa8995370ca 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.81.0 - SHA512 d4550a68438d97996c07967cef47eb9ddb39049d85adb939c4c38161152460f9768f62a588bafd0c7da2e9f5696a371c2609915f182a77c2d065f602f934487d + REF boost-1.82.0 + SHA512 2415a1d5cd7874cc16d5a50517d2df3527cfa188d39b4fb58edb693b8e324430069cb01120c33fdb64706f01a6c59b84a58bdc229a24d7ac01cb8521166a87f8 HEAD_REF master ) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index 5a454a93232030..5fc649f01e549c 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,141 +1,141 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-thread", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-atomic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-chrono", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-date-time", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index 9f500c8456f650..cb6e4611acf84c 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.81.0 - SHA512 e70829495f07b0f2ae969db42b131d6a35831cdb5fd1e53ee5b821803f55b3e6190e781f4adbbe55fb06e588057e0b21aed9f02feb1337596c64d107b05dcc26 + REF boost-1.82.0 + SHA512 0d277736e6c043e84a93d69f5385226b1cf2483f35e860fdcc032998aabec5d2e65c0c02c1b11cee59a0c1e21ba1ab7e1ba975f070ab30918e128ad8b6f45f97 HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index 5bfb14ee51d888..055a62d09db432 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,23 +1,23 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-throw-exception", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 2e913e2d436718..6fa9a76939791f 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.81.0 - SHA512 75c1aa0b3faac45d01eee58456b0cf620bbf9dc1e0481f109554fc590c7a5f35832f1ee5e6665c85c48672b3282b59ce3fc3b75a432078e9f6061345b43af0f2 + REF boost-1.82.0 + SHA512 24eef96802278f2839e83e9d3213b24bb88e669e97614e03335b0f77e65d1ddb2e0679cdc7bb96fb46e2b513ff0b40d94d3317410e9e5cbeb18079252dc8287d HEAD_REF master ) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index c11e05645b1a51..a7847923afeced 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-timer", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "license": "BSL-1.0", @@ -10,44 +10,44 @@ { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-chrono", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 91d767e7a68ff1..852ed98ac3e438 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.81.0 - SHA512 e88ba7f22f028a0d96ee7dbc9ebd4385dfb188ef400a5fb267b60d6f847a25554d69403213b8a72c6c39d373ba27f27cb46c8a851562a1ea3685f7f1ed1acc5a + REF boost-1.82.0 + SHA512 60412277d7628c3ab8326ff0efffaa192ee39f82371eb3cac13a8f04575f90b1a80faa88e374100b9e0bd8af07521ef20a312f2d9fdf8f61be7935abf890f146 HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index 58961cc9998d36..a0eb67f412eb01 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,39 +1,39 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tokenizer", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 9a4cb72de51217..5b0794035d5fb5 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.81.0 - SHA512 d77c77f1eb4efff05382ffacde17cefd9c6bfab6d1ba29286486821493d46683c0eb1a89649fe1cc747518eb45b82129e78ea27b9212078e84ac9b69e809211c + REF boost-1.82.0 + SHA512 2ec45de7457df78febec14d64850b91b7956036d4b3fc859ce95314e5af183b179960fa36cf2a1b8d6345f513d2c8357e3b1838ee3b61d10795cdacf678eca82 HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index 0f4667c456b1b8..a872b1b237c3e5 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,35 +1,35 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tti", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index a0dbd42d080a1a..3bb9cfb1436373 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.81.0 - SHA512 06383d63b6c5a564ed6150835cc4fafc023cea28a72640fc9306980f22af768ebe233b274157c3ddeb7c2467c197cb3ad98284030f1627c906e7000582223cde + REF boost-1.82.0 + SHA512 c44b29c6513ed0f128d7738626eb2c91a8c4762ce82bccb54de6086a47dd4a38479ba134b72e002db315667fd9d95facc5c870c1827334fdaae9c7ee55a80529 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 145ef6cc88e41b..10e88e8b5374ad 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,31 +1,31 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tuple", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index f1003a4ae5986c..5ffc655c697e32 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.81.0 - SHA512 64508fe58bfd05cf3ec9e6e7791dee6d4f7150da2e6ca4ba1b714f9afebae7ba2ac5562684a7c59c453f2a3e9fd65b7ed0fd0f15626235f543f3d0db8d035926 + REF boost-1.82.0 + SHA512 1a14112b95a6b071c3e8b0ed2b18120c1e567e6a545e6cc72309e1970def982a4d9c6da295dff219dda82bb52b5ecad8acd2b9017daaa08e10420934ea477bd7 HEAD_REF master ) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 7f1ec7c06e2890..586eee0085749d 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,81 +1,81 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-erasure", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-vmd", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index 75712a799715c3..62e8eb5858261a 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.81.0 - SHA512 c8affd17154ba2363546a9f40211af1fa5fa59445e7de44cb7ec655a22428825ef308aae62cdbe615e37ce165651300a9efdaecbf55beb20acc06ca899773b72 + REF boost-1.82.0 + SHA512 28b71480a83f57cfb816042e2d56f21afa870f61f617367c82753e57485ca502817dd5cb3f194a163f3b648e38be8fee4d2f80f2df9a534cc76d24791ade2580 HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index 171f5b87d493d1..ac496210195e95 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-index", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 412ab6aab291aa..7000de50714bec 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.81.0 - SHA512 e02cd4fded5ec4a9cc81d5ab710e6041154191ac6458ac9964276afc8f8e19e231794107fbf8d7cf0db18fa5ce8966a0d113e36874f955ec721b2601fbcef04e + REF boost-1.82.0 + SHA512 0ffabde32148936aea8564b45f64c55b4243b2d84f23b615efc6057d43a13da5ff2f8c757b09c1c29a7e2209b3449d2b0eebec370717e52bab9110d6903691e1 HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index f87977d0d8bd00..c5e18e13042f68 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,23 +1,23 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-traits", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index cf19ed926c6a5b..c4fd87d5e9dfa1 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.81.0 - SHA512 764ec23b19bd1954ecbaa8a9669a93b5c79586430a3f14ef29e1189d00d571ffe86b7a65d86e36b2d2eb486e173e3664f637c304e89005eef01931a62fa07e39 + REF boost-1.82.0 + SHA512 2650ac233947f7c36d9f93b30c23b68486376552f16975efec7daa459fc8314aeb3f6d4a2dc5f6d972793602621930472940a28008992a3f9defb76f87e73d85 HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index 895ef030d0e40e..ccaf70cf2ded41 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,27 +1,27 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-typeof", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 8ef630f5e7392a..875be1878fe0f6 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.81.0 - SHA512 9b599b2def2cf75c8d996453036c8b9249f7f1a9256e0755022bc006430c6beec4dd605e862c2323413ad3816abddc53751e24e4691a556ee55b5dc0adde09c3 + REF boost-1.82.0 + SHA512 09b22a1e13348c110a38f504068bb6ed44945168c3749357cd6783193c11645680a92ebd7cddb5c4d6db4f4870b3f6a95c5e2b40cc4282e994da605700cdf868 HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index a1af01c2d81a37..256bdd19ce19db 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,67 +1,67 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ublas", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "license": "BSL-1.0", "dependencies": [ { "name": "boost-compute", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-interval", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index 081fd10d6cff67..dd50dc5258c102 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uninstall", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Internal vcpkg port used to uninstall Boost", "license": "MIT" } diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 9ea9075b9e3a18..af1f688dd57ac8 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.81.0 - SHA512 bf34d467a74423dacd1fdd2ebea58b3aa780a7254236126d45ba689479f5e07abe70e90aaf0ff7758705a3ab6fcafc25774d4e68f46fb7ba7f0ff9769f10deb1 + REF boost-1.82.0 + SHA512 af5b0a8f6f317422fb30c9f7fa5122e53f0b78380ff0adbf02f8af10eea8036b3747b949e131969e148804b917322d579fc4b5ce4fb5082f26d027b649dbdcd7 HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 0a2b2a5dea22d4..4062bb25f7b964 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,63 +1,63 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-units", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lambda", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index ce71f4d70c75ce..1bd27d30ed84c9 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.81.0 - SHA512 beb1227428cac6d4714fd51aa660830d07816f5cbf102e43145ce8920f3470195a0138e5a8b1ddf8f7d304f6ea59bb8b7110afed9b9e80485c8a9bfb2cd5e6c2 + REF boost-1.82.0 + SHA512 209ed0ef79f55782cf3a1440125c7b9448240a7a64abe940274346d16f116dba5df0da0438a2881be4813977a03348760bdcb03b1d8d282da93ae6acaca59fb6 HEAD_REF master ) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 1fdbd55b4bcdee..591a85e6898d8d 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,59 +1,63 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-unordered", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" + }, + { + "name": "boost-static-assert", + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-url/portfile.cmake b/ports/boost-url/portfile.cmake index 2f6a0dcd41b1fd..aef14f147a1ea5 100644 --- a/ports/boost-url/portfile.cmake +++ b/ports/boost-url/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/url - REF boost-1.81.0 - SHA512 857fe1e789b90fa63168fe1477213e241184851b2ea13de216030a629677449653fc353ea788fa67ece75ddda3dd5dd320e9cbeb6f0ba1499053d2781929b098 + REF boost-1.82.0 + SHA512 b8d785b3e64fd8b4b9ae6162958ee9d67a6eb220823e50e91977e37b6954440d83302df2afae93119fc707428981f0c07b262e3ea68675ea6cbd47e3dd8c20c1 HEAD_REF master ) diff --git a/ports/boost-url/vcpkg.json b/ports/boost-url/vcpkg.json index 54c3572f420a0f..6fd1c9c5a1ae31 100644 --- a/ports/boost-url/vcpkg.json +++ b/ports/boost-url/vcpkg.json @@ -1,69 +1,69 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-url", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost url module", "homepage": "https://github.com/boostorg/url", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index d4281b84bb19ab..07fe983816f120 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.81.0 - SHA512 a2dd16d5f8ab78808880b1a84543ef752b0be81114e7051443460a4e226e932236fe5aac46b93bd9add0a3417cd44e1d3b92ba0366183defa5767eb3c35ab226 + REF boost-1.82.0 + SHA512 424c98ac194ff6eb39694d326a7b5dd9ebebbb32a9bf8db6176f2bfc034a252773e713360ce6afa14a68b6828a767db7ddcfdaf54feea0ce85da3e0b9ef37ab3 HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index 5764fdfab067d3..c24e590b6ed59a 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,43 +1,43 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-utility", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index 241246749e2361..8a1eb15018a5e5 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.81.0 - SHA512 326376f237bf09e590e3f7d9b2f298b399f1026ebab8e07785fb53a0a8b6283bea72f0510ceb44ae97097d8733a9c202ac9c1890fc8501727ce6a2b90d0ad425 + REF boost-1.82.0 + SHA512 588c75f7b757a1754ef72bbe3290111e00b531b70be19d63100e996937194de17a571b6a5c6531c389f4db08ea74446911a9f349a3c51959b91d6a7012ec57b4 HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 8703a264f3f239..45f2c7bf098f69 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,76 +1,72 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uuid", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" - }, - { - "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tti", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 86be1e220c81f2..4e9491b27730f4 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.81.0 - SHA512 7dfbd4d2fce03b82b6bb07a1435ca3776b941e6bb7dac4dd6385ee93649af3922dc73b95a5353c1e4b0a906c0b037392fd57cf94306a0f062f3b8999082a225f + REF boost-1.82.0 + SHA512 90ff105b2910c34d3f3ca5ba9341da8625690cc008683c2cb201b31bfecd7e108a7741a17d9fbe102435d3e893c7285d7331f91f4aae3e68e643be5bf8e653a7 HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index 25235f4ba0f73d..28457b214da2df 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,75 +1,75 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index c867cef4c1b6e3..0edbf1b09be535 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.81.0 - SHA512 6ff9254e67cdacfb129a5746b47d3ab23ef2e61fd2cbf9424c32669f6abcb5858e9d5aef01f0dfd8ac214337e32a22195998ec962d54bc21244dc0b79579deae + REF boost-1.82.0 + SHA512 587400708278f40cf02456fcdb1d6f2953740ad56f41b1ade30e7030d7012e59fe444ea1410f18ae5593900597850df8843e430c829e9fb8941ad0321c16c814 HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index 3cdbfeddefe7d6..9fe403a93a37fb 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,27 +1,27 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant2", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json index 77269a8535a4da..c5c1e2d670a328 100644 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,14 +1,14 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-vcpkg-helpers", - "version": "1.81.0", - "port-version": 3, + "version": "1.82.0", + "port-version": 1, "description": "Internal vcpkg port used to modularize Boost", "license": "MIT", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 6cda7703e814b1..27379e83516013 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.81.0 - SHA512 8d4ff82b0b3cb575a2f6c7a01f93bcc8c9dbc15593842180c74f9f4cced671c91439a31f5d6cda45ff17b3e80f8ba5881b5e02f704ffb3592b42e458187fdd52 + REF boost-1.82.0 + SHA512 0a0e36c6fa4acfc2145b0b1fac79914895b41fb3de0e6688c3dc7160942f0dc1121c59a2e81d6a7a65ec005fefd12ff9453250d35ce59eee4ddeeb655a47c692 HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index 1dd346a76b3ff5..967041f94ee731 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,19 +1,19 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-vmd", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "license": "BSL-1.0", "dependencies": [ { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index 288107a24b558e..aa65640c2b2444 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.81.0 - SHA512 70d2d946bff83f081a1b87c95ac2fe9686000cee68b1233e122aa7302f59dce6ed718ebbaa9cdfa413e385b4d3762f5a71a4c6d402eee57ae4e7876da4644266 + REF boost-1.82.0 + SHA512 598f7052b66f54d00949f59107ddbfa8a9fcca9ca5c7aa3c60b3d9611edd69797211a0a32d4048b1c78262ddade0e011c6bc01001b12c195950aa3d6ce6fb0d7 HEAD_REF master ) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index 88d9c95fdcfcaa..97e3b9361b85b2 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,8 +1,8 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-wave", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "license": "BSL-1.0", @@ -10,94 +10,94 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-build", "host": true, - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-format", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.81.0#4" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-pool", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 0e8ffcb376448b..ad070452ef6180 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.81.0 - SHA512 86024de36c1bd1e44dfcd875e712f819c8a30b53b9180d69d3a9c1a18b62f33b2d7d49324a29ffc03a1781bbf9235101a0c03935bae41cec7882a1ea993ceb50 + REF boost-1.82.0 + SHA512 9da0d67af96a1f5aee7169cfc4acd0778b69dd505a7c3bc364f72871560db858128829b4f1f4b8ca6bb6704b8eddf04b872d085eb5afc3c8a74cd3559f785448 HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index fe94ef2a6f87ff..4f012861d8bccb 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,23 +1,23 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-winapi", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 8467144207fe9b..61779f8d87a862 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.81.0 - SHA512 d26f774c51e5fee21e8f799c8b7a076d4ee104c0d9f5e74c11c09a9d2b1799cbe38f31107b8042309c8b5a893d36b7382aa07604aa053a686ce4c9b4fb812919 + REF boost-1.82.0 + SHA512 840720a68de7e3358237d7fd59a0f541fc754283ba0ab96457bbdfc122114f749fb0b47033fc1ccc0b06a2d1b3b8d288a9828585e8870e303f06e4c96c449af4 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index 93207f21423cb3..519c3e12a791b6 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,103 +1,103 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-xpressive", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-proto", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index 976320c7009dc0..4f7fddfbefa032 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.81.0 - SHA512 def98e5c2b1de0587eb5d954cf025ae5242b0dbc3d5eecd9e718c617d6b269bb1842bd6cc0f705c3b29c6a63061a38974aadbab24b31e3acfecd97eb69c48616 + REF boost-1.82.0 + SHA512 248620ea8216fc6d3cb91f41a3606067e6c65b7fdb34b9459d163d06b4e7f6aa7072cf16023f489f950e49ef81b937ebb833d8d0dcbac290e9e00e0cd3820c55 HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index cf6429046989dd..017990a76926fc 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,27 +1,27 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-yap", - "version": "1.81.0", - "port-version": 2, + "version": "1.82.0", + "port-version": 1, "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-hana", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index ea6317484cc6c8..2a8605a0965274 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,599 +1,603 @@ { "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost", - "version": "1.81.0", - "port-version": 3, + "version": "1.82.0", + "port-version": 1, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "license": "BSL-1.0", "dependencies": [ { "name": "boost-accumulators", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-algorithm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-align", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-any", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-asio", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-assign", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-atomic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-beast", "platform": "!emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bimap", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-bind", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-callable-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-chrono", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-circular-buffer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-compatibility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-compute", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-concept-check", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-config", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-container-hash", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-contract", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-convert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-core", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-coroutine", "platform": "!(arm & windows) & !uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-coroutine2", "platform": "!emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-crc", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-date-time", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-describe", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-detail", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-dll", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-dynamic-bitset", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-endian", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fiber", "platform": "!uwp & !arm & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-flyweight", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-foreach", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-format", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-function-types", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-functional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-fusion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-geometry", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-gil", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-graph", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-hana", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-heap", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-histogram", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-hof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-icl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-integer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-interprocess", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-interval", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-intrusive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-io", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iostreams", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-iterator", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-json", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lambda", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lambda2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-leaf", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-lexical-cast", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-local-function", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-locale", "platform": "!uwp", - "version>=": "1.81.0#3" + "version>=": "1.82.0#1" }, { "name": "boost-lockfree", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-log", "platform": "!uwp & !emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-logic", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-math", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-metaparse", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-move", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mp11", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpl", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-msm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-array", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multi-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-multiprecision", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" + }, + { + "name": "boost-mysql", + "version>=": "1.82.0#1" }, { "name": "boost-nowide", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-numeric-conversion", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-odeint", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-optional", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-outcome", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-parameter-python", "platform": "!emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-pfr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-phoenix", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-poly-collection", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-polygon", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-pool", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-predef", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-preprocessor", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-process", "platform": "!emscripten", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-program-options", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-map", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-tree", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-proto", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-ptr-container", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-python", "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-qvm", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-range", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-ratio", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-rational", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-regex", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-safe-numerics", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-scope-exit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-serialization", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-signals2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-smart-ptr", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-sort", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-spirit", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-stacktrace", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-statechart", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-assert", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-static-string", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-stl-interfaces", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-system", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-test", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-thread", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-throw-exception", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-timer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tokenizer", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tti", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-tuple", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-erasure", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-index", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-type-traits", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-typeof", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-ublas", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-units", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-unordered", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-url", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-utility", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-uuid", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-variant2", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-vmd", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-wave", "platform": "!uwp", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-winapi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-xpressive", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-yap", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ], "features": { @@ -602,15 +606,15 @@ "dependencies": [ { "name": "boost-graph-parallel", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-mpi", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" }, { "name": "boost-property-map-parallel", - "version>=": "1.81.0#2" + "version>=": "1.82.0#1" } ] } diff --git a/ports/boringssl/install-pc-files.cmake b/ports/boringssl/install-pc-files.cmake index f86652f2720165..262a533a8ba7b8 100644 --- a/ports/boringssl/install-pc-files.cmake +++ b/ports/boringssl/install-pc-files.cmake @@ -1,15 +1,23 @@ function(install_pc_file name pc_data) # fix platform-specific details - if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") - string(REPLACE "-llibcrypt" "-lcrypto" pc_data "${pc_data}") + if (NOT VCPKG_TARGET_IS_WINDOWS) string(REPLACE "-lcrypt32" "" pc_data "${pc_data}") string(REPLACE "-lws2_32" "" pc_data "${pc_data}") + elseif (NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}") + string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}") + else() + string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}") + endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY) endif() endfunction() diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index 94c11088653eb8..b241a3635adaf8 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -37,14 +37,18 @@ vcpkg_cmake_configure( OPTIONS_DEBUG -DINSTALL_HEADERS=OFF -DINSTALL_TOOLS=OFF + # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix. + -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install() +vcpkg_copy_pdbs() include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") -if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl) +if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/boringssl") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/boringssl/usage b/ports/boringssl/usage new file mode 100644 index 00000000000000..13ef2475767e90 --- /dev/null +++ b/ports/boringssl/usage @@ -0,0 +1,4 @@ +boringssl can be found via the built-in CMake find-module: + + find_package(OpenSSL REQUIRED) + target_link_libraries(main PRIVATE OpenSSL::SSL OpenSSL::Crypto) \ No newline at end of file diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index 40331383875fb9..1bf1fef03436eb 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boringssl", "version-date": "2021-06-23", - "port-version": 3, + "port-version": 4, "description": "BoringSSL is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 85ffa7dbe9194a..fe71f942239e34 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -32,6 +32,7 @@ endif() vcpkg_list(SET configure_arguments "--distribution-info=vcpkg ${TARGET_TRIPLET}" + --disable-cc-tests --with-pkg-config --link-method=copy --with-debug-info diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index a042b64d001851..db28c4df05176e 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,6 +1,7 @@ { "name": "botan", "version": "2.19.3", + "port-version": 1, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/ports/brigand/vcpkg.json b/ports/brigand/vcpkg.json index 99a5e0219c58d6..a8f65f7ed482cb 100644 --- a/ports/brigand/vcpkg.json +++ b/ports/brigand/vcpkg.json @@ -1,7 +1,7 @@ { "name": "brigand", - "version-string": "1.3.0", - "port-version": 2, + "version": "1.3.0", + "port-version": 3, "description": "Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.", "homepage": "https://github.com/edouarda/brigand", "dependencies": [ diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index b0ebdd28f63b28..dd8589ea9ffc58 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -1,13 +1,13 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO bshoshany/thread-pool - REF v3.3.0 - SHA512 980c8dfe90e04cbc622ee4ae2ce67444069311619f0dc5d7ac3b3a3ea59ead42d4c867e669e8ce9c71cdc2a4bae431402a8f5032ab29fdfc1ca507b0e7102d8f - HEAD_REF master -) - -file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp") - -file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bshoshany/thread-pool + REF "v${VERSION}" + SHA512 43200acf989adbabc0478d847931d2e46c4ce13de9d28f2e603e6b86d38a7370c0e50bacd36bff5a1a200f33ae6394764adc64ce9a54df5e418d85fb525b4b3f + HEAD_REF master +) + +file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/include/*.hpp") + +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index f13c66749cfc69..38abafcd5b819c 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "3.3.0", + "version": "3.5.0", "maintainers": "Barak Shoshany ", "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", diff --git a/ports/butteraugli/vcpkg.json b/ports/butteraugli/vcpkg.json index d4df1d2de63d6b..24aa8b5e1c8b84 100644 --- a/ports/butteraugli/vcpkg.json +++ b/ports/butteraugli/vcpkg.json @@ -1,7 +1,7 @@ { "name": "butteraugli", - "version-string": "2019-05-08", - "port-version": 3, + "version-date": "2019-05-08", + "port-version": 4, "description": "butteraugli estimates the psychovisual difference between two images", "homepage": "https://github.com/google/butteraugli", "dependencies": [ diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index c03f48c48fb779..beb353d6e9b4e6 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES fix-import-export-macros.patch ) diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json index 55cdb4ac54552b..38b5d3ae37caac 100644 --- a/ports/bzip2/vcpkg.json +++ b/ports/bzip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bzip2", "version-semver": "1.0.8", - "port-version": 3, + "port-version": 4, "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.", "homepage": "https://sourceware.org/bzip2/", "documentation": "https://sourceware.org/bzip2/docs.html", diff --git a/ports/c9y/portfile.cmake b/ports/c9y/portfile.cmake index 9aa01e40039cf3..82328323fc0a59 100644 --- a/ports/c9y/portfile.cmake +++ b/ports/c9y/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rioki/c9y - REF v0.7.0 - SHA512 1c68351a42cea3a5cc52e00d3828acb16d6a96dfc4b9bf53fa4f8090b691a6f5734e2bb219af5cc54bc997517434417a4567d133c5a589f247abe9de73ba1cac + REF v0.8.0 + SHA512 f3161bde45fd534029ef4609b1b49d4edbeb636c9305e01e7e9cfa6a62cde0978632d46597510bea0ff96cae09b819905c0d8c5d2fd85cf641d7b47ea2a732b1 ) vcpkg_cmake_configure( diff --git a/ports/c9y/vcpkg.json b/ports/c9y/vcpkg.json index 0f0424be56e7b8..0c72352873e9a0 100644 --- a/ports/c9y/vcpkg.json +++ b/ports/c9y/vcpkg.json @@ -1,6 +1,6 @@ { "name": "c9y", - "version-semver": "0.7.0", + "version-semver": "0.8.0", "description": "Concurency", "homepage": "https://github.com/rioki/c9y", "license": "MIT", diff --git a/ports/cachelib/fmt-10.patch b/ports/cachelib/fmt-10.patch new file mode 100644 index 00000000000000..083c00568897c0 --- /dev/null +++ b/ports/cachelib/fmt-10.patch @@ -0,0 +1,44 @@ +diff --git a/cachelib/cachebench/cache/ItemRecords.h b/cachelib/cachebench/cache/ItemRecords.h +index 80fe7489..e581d78e 100644 +--- a/cachelib/cachebench/cache/ItemRecords.h ++++ b/cachelib/cachebench/cache/ItemRecords.h +@@ -102,11 +102,11 @@ class ItemRecords { + } + if (record.destructCount != 0) { + XLOGF(ERR, "unexpected destructCount {} for item {}, context {}|{}", +- record.destructCount, item.getKey(), data.context, record.context); ++ record.destructCount, item.getKey().data(), data.context, record.context); + } + if (record.version != ptr->getVersion()) { + XLOGF(ERR, "unexpected version {}|{} for item {}", record.version, +- ptr->getVersion(), item.getKey()); ++ ptr->getVersion(), item.getKey().data()); + } + ++record.destructCount; + +diff --git a/cachelib/cachebench/runner/FastShutdown.cpp b/cachelib/cachebench/runner/FastShutdown.cpp +index 82c878eb..5ceb342d 100644 +--- a/cachelib/cachebench/runner/FastShutdown.cpp ++++ b/cachelib/cachebench/runner/FastShutdown.cpp +@@ -27,7 +27,7 @@ namespace cachebench { + FastShutdownStressor::FastShutdownStressor(const CacheConfig& cacheConfig, + uint64_t numOps) + : numOps_(numOps), +- cacheDir_{folly::sformat("/tmp/cache_bench_fss_{}", getpid())}, ++ cacheDir_{folly::sformat("/tmp/cache_bench_fss_{}", std::to_string(getpid()))}, + cache_(std::make_unique>( + cacheConfig, nullptr, cacheDir_)) {} + +diff --git a/cachelib/navy/admission_policy/DynamicRandomAP.cpp b/cachelib/navy/admission_policy/DynamicRandomAP.cpp +index 3a8a1aa0..2ab0fa45 100644 +--- a/cachelib/navy/admission_policy/DynamicRandomAP.cpp ++++ b/cachelib/navy/admission_policy/DynamicRandomAP.cpp +@@ -189,7 +189,7 @@ void DynamicRandomAP::updateThrottleParamsLocked(std::chrono::seconds curTime) { + XLOGF(INFO, + "max write rate {} will be used because target current write rate {} " + "exceeds it.", +- maxRate_, curTargetRate); ++ maxRate_.load(std::memory_order_relaxed), curTargetRate); + curTargetRate = maxRate_; + } + writeStats_.curTargetRate = curTargetRate; diff --git a/ports/cachelib/portfile.cmake b/ports/cachelib/portfile.cmake index 01244df653da36..774cd469d72412 100644 --- a/ports/cachelib/portfile.cmake +++ b/ports/cachelib/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/CacheLib REF "v${VERSION}" - SHA512 53f2eb4de0d1c5d4184d7e1d8ceb958625d9426eebaf434227179c9b2a6ed3a3bf063758f86c2e517ca910556230a764bfd54890dc718c2f45aec1d5a806788c + SHA512 fac41a2cb477f252034b932b1499b32b100d164eec4638d387af0487eeb1f84d430cd5908652914e615b188264d2806d6374343938165ebd47dd2494d1e7450d HEAD_REF master PATCHES fix-build.patch + fmt-10.patch ) FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h diff --git a/ports/cachelib/vcpkg.json b/ports/cachelib/vcpkg.json index d941626af23f50..95535128ad6f1a 100644 --- a/ports/cachelib/vcpkg.json +++ b/ports/cachelib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cachelib", - "version-string": "2023.02.27.00", + "version-string": "2023.05.08.00", "description": "facebook cachelib", "homepage": "https://github.com/facebook/CacheLib", "license": "Apache-2.0", diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index c186a2272c4e30..245e17fee2bd79 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF bfa0f83dd5c9151c263c304300c79161ae8cb595 # 0.18.6 - SHA512 58ebd40623edc0245dd38b3a2bbbda7af7d9b030155746949dfe7c4c30bdc07ee2ee84d195dc2e914d69f58c6c46bc9ad496bbc34e7cafe0530200458a4c5a76 + REF bac5b8b24a62ff2a818de1b08f6f31f897e42222 # 0.19.1 + SHA512 c61f3cce4d4707f19db8c1b1a8b2c4655335a7a29c77a0c9692775c9fcdc90d6dce75d3122804c31cf66c47f37d3a3674ad18df67d1204c7f52eb4740ff766af HEAD_REF master PATCHES fix_dependency.patch diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index 5d89216c3c37ec..f0f6c8088189f1 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "caf", - "version": "0.18.6", - "port-version": 1, + "version": "0.19.1", "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", "homepage": "https://github.com/actor-framework/actor-framework", "license": "BSD-3-Clause", diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index d5ef9a900f909e..3c2afc2b43461b 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_configure_meson( OPTIONS -Dbuild-examples=false -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dbuild-tests=false ) vcpkg_install_meson() diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index 16cd7bfb5bbf93..b5edb25adaa556 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairomm", "version": "1.16.2", - "port-version": 2, + "port-version": 3, "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", "license": "LGPL-2.0-only", diff --git a/ports/calceph/portfile.cmake b/ports/calceph/portfile.cmake index ecd7636e4d22fa..b962568e4d75bc 100755 --- a/ports/calceph/portfile.cmake +++ b/ports/calceph/portfile.cmake @@ -1,14 +1,13 @@ -set(CALCEPH_VERSION "3.5.1") -set(CALCEPH_HASH 5e83bb46b92a0b53f2cae717363cb4497d5c9cb57b3903e70d9e2c50176ca7d234212d0209fd3fcb5feebfd0980313be17e2ad4e69482504bfe8686f93216b67) +set(CALCEPH_HASH 4e0b702494c9fc05f6a192671bccdc0f8002b5706cba4bd7ff50d9e8754203b4a78e3759ccc3003809123584c9bca1434411e111357852dbc58e4d1903c1879e) vcpkg_download_distfile(ARCHIVE - URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz" - FILENAME "calceph-${CALCEPH_VERSION}.tar.gz" + URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${VERSION}.tar.gz" + FILENAME "calceph-${VERSION}.tar.gz" SHA512 ${CALCEPH_HASH} ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/calceph/vcpkg.json b/ports/calceph/vcpkg.json index 1c5b7b196e9545..493977480d4ffb 100755 --- a/ports/calceph/vcpkg.json +++ b/ports/calceph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "calceph", - "version": "3.5.1", + "version": "3.5.2", "description": "C library to access the binary planetary ephemeris files.", "homepage": "https://www.imcce.fr/inpop/calceph/", "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake index 86681b824e8e83..b86466d536ea48 100644 --- a/ports/capstone/portfile.cmake +++ b/ports/capstone/portfile.cmake @@ -18,21 +18,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "m680x" CAPSTONE_M680X_SUPPORT "m68k" CAPSTONE_M68K_SUPPORT "mips" CAPSTONE_MIPS_SUPPORT - "osxkernel" CAPSTONE_OSXKERNEL_SUPPORT "ppc" CAPSTONE_PPC_SUPPORT "sparc" CAPSTONE_SPARC_SUPPORT "sysz" CAPSTONE_SYSZ_SUPPORT "tms320c64x" CAPSTONE_TMS320C64X_SUPPORT "x86" CAPSTONE_X86_SUPPORT - "x86-reduce" CAPSTONE_X86_REDUCE "xcore" CAPSTONE_XCORE_SUPPORT "diet" CAPSTONE_BUILD_DIET ) -if ("osxkernel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'osxkernel' only supported in OSX") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json index 06ffbd96857db2..3abea0b2905a35 100644 --- a/ports/capstone/vcpkg.json +++ b/ports/capstone/vcpkg.json @@ -1,7 +1,7 @@ { "name": "capstone", "version": "5.0.0-rc2", - "port-version": 1, + "port-version": 2, "description": "Multi-architecture disassembly framework", "homepage": "https://github.com/capstone-engine/capstone", "dependencies": [ @@ -36,9 +36,6 @@ "mips": { "description": "Capstone disassembly support for MIPS" }, - "osxkernel": { - "description": "Support for embedding Capstone into OSX Kernel extensions" - }, "ppc": { "description": "Capstone disassembly support for PowerPC" }, @@ -54,17 +51,6 @@ "x86": { "description": "Capstone disassembly support for x86" }, - "x86-reduce": { - "description": "Capstone disassembly support for x86 without support for less used instructions", - "dependencies": [ - { - "name": "capstone", - "features": [ - "x86" - ] - } - ] - }, "xcore": { "description": "Capstone disassembly support for XCore" } diff --git a/ports/catch-classic/vcpkg.json b/ports/catch-classic/vcpkg.json index bfe9b7ef4aee9d..75d76b103e1c4c 100644 --- a/ports/catch-classic/vcpkg.json +++ b/ports/catch-classic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "catch-classic", - "version-string": "1.12.2", - "port-version": 1, + "version": "1.12.2", + "port-version": 2, "description": [ "A modern, header-only test framework for unit tests", "This is specifically the legacy 1.x branch provided for compatibility", diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake index 7c1f7e88afcb3e..3a2c71ce5f8267 100644 --- a/ports/ccfits/portfile.cmake +++ b/ports/ccfits/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_download_distfile(ARCHIVE SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH PATCHES dll_exports.patch fix-dependency.patch @@ -20,9 +20,11 @@ vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/bin/CCfits.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll") + endif() endif() # Remove duplicate include files @@ -38,4 +40,4 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\"" ) -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json index f66a2ef5a15534..1bc37f2eedca82 100644 --- a/ports/ccfits/vcpkg.json +++ b/ports/ccfits/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ccfits", "version": "2.5", - "port-version": 9, + "port-version": 11, "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.", "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/", "license": "NASA-1.3", diff --git a/ports/cctz/vcpkg.json b/ports/cctz/vcpkg.json index 67e2ffb2cd8bea..b8e7078a97c917 100644 --- a/ports/cctz/vcpkg.json +++ b/ports/cctz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cctz", - "version-string": "2.3", - "port-version": 4, + "version": "2.3", + "port-version": 5, "description": "two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.", "homepage": "https://github.com/google/cctz", "dependencies": [ diff --git a/ports/cdt/boost-link.patch b/ports/cdt/boost-link.patch deleted file mode 100644 index 41bcb10a06e499..00000000000000 --- a/ports/cdt/boost-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CDT/CMakeLists.txt b/CDT/CMakeLists.txt -index 555fb4e..86be850 100644 ---- a/CDT/CMakeLists.txt -+++ b/CDT/CMakeLists.txt -@@ -155,7 +155,7 @@ target_compile_definitions( - ) - - if(CDT_USE_BOOST) -- target_link_libraries(${PROJECT_NAME} INTERFACE Boost::boost) -+ target_link_libraries(${PROJECT_NAME} PUBLIC Boost::boost) - endif() - - diff --git a/ports/cdt/portfile.cmake b/ports/cdt/portfile.cmake index 43014fd8ef47d2..dbba0ee1c05f21 100644 --- a/ports/cdt/portfile.cmake +++ b/ports/cdt/portfile.cmake @@ -2,17 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO artem-ogre/CDT REF "${VERSION}" - SHA512 811d1fede4960808954bc17f37c8639f52800c98562e9283517c666735ddf3b2f2f8a57992669899be13c40b0fc4439d3cd1a101cb596d2335ef4fc307408c63 + SHA512 cffccb96d8cb13e7cb2edf9e105e5ee193ec1c3f2872ee5fba7a47758d9651e1b0f02af9122b840e90a07a4b9f3773c30ac9b11b966741301c853429d49c0627 HEAD_REF master - PATCHES - boost-link.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "64-bit-index-type" CDT_USE_64_BIT_INDEX_TYPE "as-compiled-library" CDT_USE_AS_COMPILED_LIBRARY - "boost" CDT_USE_BOOST ) if (NOT CDT_USE_AS_COMPILED_LIBRARY) @@ -28,15 +25,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -if(CDT_USE_BOOST) - set(CDT_USE_BOOST_STR "#if 1") -else() - set(CDT_USE_BOOST_STR "#if 0") -endif() -foreach(FILE CDTUtils.h Triangulation.hpp) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${FILE}" "#ifdef CDT_USE_BOOST" "${CDT_USE_BOOST_STR}") -endforeach() - if (CDT_USE_AS_COMPILED_LIBRARY) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() diff --git a/ports/cdt/vcpkg.json b/ports/cdt/vcpkg.json index 64992773672566..63cb80cce66286 100644 --- a/ports/cdt/vcpkg.json +++ b/ports/cdt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cdt", - "version": "1.2.0", + "version": "1.3.0", "description": "Constrained Delaunay Triangulation", "homepage": "https://github.com/artem-ogre/CDT.git", "license": "MPL-2.0", @@ -20,12 +20,6 @@ }, "as-compiled-library": { "description": "Templates for float and double will be instantiated and compiled into a library" - }, - "boost": { - "description": "Boost is used as a fall-back for features missing in C++98 and performance tweaks", - "dependencies": [ - "boost-container" - ] } } } diff --git a/ports/cgicc/vcpkg.json b/ports/cgicc/vcpkg.json index 57ff62c6029dc9..05c442d1028d3e 100644 --- a/ports/cgicc/vcpkg.json +++ b/ports/cgicc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cgicc", - "version-string": "3.2.19", - "port-version": 6, + "version": "3.2.19", + "port-version": 7, "description": "GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web", "homepage": "https://www.gnu.org/software/cgicc/", "dependencies": [ diff --git a/ports/chaiscript/vcpkg.json b/ports/chaiscript/vcpkg.json index e4362e804165b2..bb52fb60fe2423 100644 --- a/ports/chaiscript/vcpkg.json +++ b/ports/chaiscript/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chaiscript", - "version-string": "6.1.0", - "port-version": 2, + "version": "6.1.0", + "port-version": 3, "description": "Embedded Scripting Language Designed for C++", "homepage": "https://github.com/ChaiScript/ChaiScript" } diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index a06a6812d9d1c6..1b62f621d6e390 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls - REF dd9e90d2d2be86194cc3bd164b5cce35abcf2024 #v2.4.1 - SHA512 33690d1647e57dedb22ad5cb75e4b41de41d0c603e0ec8e4b27dc2fa2ce71a97ab07deaa1aa42154369efb609b3954f7db51317f1dafd83d6cf882f2bade59a9 + REF "${VERSION}" + SHA512 4f1b587f008956ab6fb9d2473c37a7b1a842633113245be7f8bb29b8c64304a6d580a29fcfca97ba1ac75adedbaf89e29adc4ac9e4117e1af1aa5949dbd34df9 HEAD_REF master ) @@ -18,7 +18,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/charls) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") vcpkg_copy_pdbs() diff --git a/ports/charls/vcpkg.json b/ports/charls/vcpkg.json index 0c13af7d24e181..3cbf30ea608166 100644 --- a/ports/charls/vcpkg.json +++ b/ports/charls/vcpkg.json @@ -1,6 +1,6 @@ { "name": "charls", - "version": "2.4.1", + "version": "2.4.2", "description": "CharLS, a C++ JPEG-LS library implementation.", "homepage": "https://github.com/team-charls/charls", "license": "BSD-3-Clause", diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake index d22b18e2d57dd0..05f39bb006d2bf 100644 --- a/ports/chartdir/portfile.cmake +++ b/ports/chartdir/portfile.cmake @@ -12,10 +12,10 @@ if(VCPKG_TARGET_IS_WINDOWS) SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b ) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH + vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE_FILE}" - REF 7.0.0 + SOURCE_BASE 7.0.0 ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") @@ -39,10 +39,10 @@ elseif(VCPKG_TARGET_IS_OSX) SHA512 fd46ac45e8906854ededb9e30ee3ba8bdd05588e6ca7c9fdf140254ee637d32565417d799da33b23228f1ade8111fcae037eed4cf978a11d35e70ab8861214a2 ) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH + vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE_FILE}" - REF 7.0.0 + SOURCE_BASE 7.0.0 ) file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") @@ -70,10 +70,10 @@ elseif(VCPKG_TARGET_IS_LINUX) endif() - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH + vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE_FILE}" - REF 7.0.0 + SOURCE_BASE 7.0.0 ) file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json index 056ed8b96b2200..46ebed2f495243 100644 --- a/ports/chartdir/vcpkg.json +++ b/ports/chartdir/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chartdir", "version": "7.0.0", - "port-version": 6, + "port-version": 7, "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", "homepage": "https://www.advsofteng.com/", "license": null, diff --git a/ports/chipmunk/vcpkg.json b/ports/chipmunk/vcpkg.json index 24e922777e3aad..768c44d33ae00c 100644 --- a/ports/chipmunk/vcpkg.json +++ b/ports/chipmunk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chipmunk", - "version-string": "7.0.3", - "port-version": 3, + "version": "7.0.3", + "port-version": 4, "description": "A fast and lightweight 2D game physics library.", "homepage": "https://github.com/slembcke/Chipmunk2D", "dependencies": [ diff --git a/ports/chmlib/portfile.cmake b/ports/chmlib/portfile.cmake index 7559b7c077e290..88e996ae48523b 100644 --- a/ports/chmlib/portfile.cmake +++ b/ports/chmlib/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_download_distfile( SHA512 ad3b0d49fcf99e724c0c38b9c842bae9508d0e4ad47122b0f489c113160f5344223d311abb79f25cbb0b662bb00e2925d338d60dd20a0c309bda2822cda4cd24 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES all-platforms.patch diff --git a/ports/chmlib/vcpkg.json b/ports/chmlib/vcpkg.json index 1abad01f8dbeb3..0eb4108c125d30 100644 --- a/ports/chmlib/vcpkg.json +++ b/ports/chmlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chmlib", "version": "0.40", - "port-version": 6, + "port-version": 7, "description": "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.", "homepage": "http://www.jedrea.com/chmlib/", "license": "LGPL-2.1-or-later", diff --git a/ports/cialloo-rcon/portfile.cmake b/ports/cialloo-rcon/portfile.cmake new file mode 100644 index 00000000000000..466fba808745b4 --- /dev/null +++ b/ports/cialloo-rcon/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO luckyweNda/rcon + REF 6ea49bbd54bbf7604e4e3f6fc2dbd4e507d7bd90 + SHA512 84fefc80e6c47decd9fedb2df1ce1c2671cf8159eb8d60d9b90e3208dd2bd5786eb1bbd526d1d252cd1fc4c6bbb0377712b224c8a4b7ea66b52c6184c241f85e + HEAD_REF main +) + +# Install include directory +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy usage file +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cialloo-rcon/usage b/ports/cialloo-rcon/usage new file mode 100644 index 00000000000000..9c33607bbdcf56 --- /dev/null +++ b/ports/cialloo-rcon/usage @@ -0,0 +1,4 @@ +The package rcon is header only and can be used from CMake via: + + find_path(RCON_INCLUDE_DIRS "rcon.hpp") + target_include_directories(main PRIVATE ${RCON_INCLUDE_DIRS}) diff --git a/ports/cialloo-rcon/vcpkg.json b/ports/cialloo-rcon/vcpkg.json new file mode 100644 index 00000000000000..ea7d342984109c --- /dev/null +++ b/ports/cialloo-rcon/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cialloo-rcon", + "version": "1.0.0", + "description": "implementation in valve source rcon protocal", + "homepage": "https://github.com/luckyweNda/rcon", + "license": "MIT", + "dependencies": [ + "asio" + ] +} diff --git a/ports/clara/vcpkg.json b/ports/clara/vcpkg.json index 7752fb5201856b..83def794df8fb2 100644 --- a/ports/clara/vcpkg.json +++ b/ports/clara/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clara", - "version-string": "1.1.5", - "port-version": 1, + "version": "1.1.5", + "port-version": 2, "description": "A simple to use command line parser for C++", "homepage": "https://github.com/philsquared/Clara" } diff --git a/ports/cmcstl2/vcpkg.json b/ports/cmcstl2/vcpkg.json index d3834a132d814e..4c8b979fa81704 100644 --- a/ports/cmcstl2/vcpkg.json +++ b/ports/cmcstl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cmcstl2", - "version-string": "2019-07-20", - "port-version": 2, + "version-date": "2019-07-20", + "port-version": 3, "description": "An implementation of C++ Extensions for Ranges", "homepage": "https://github.com/CaseyCarter/cmcstl2", "dependencies": [ diff --git a/ports/cminpack/portfile.cmake b/ports/cminpack/portfile.cmake index 951ffaf3cb7ead..b34977db1cb545 100644 --- a/ports/cminpack/portfile.cmake +++ b/ports/cminpack/portfile.cmake @@ -1,9 +1,19 @@ +# Must be removed on next release +vcpkg_download_distfile(DLLEXPORT_PATCH + URLS https://github.com/devernay/cminpack/commit/0d40c5359674448aa6f78accaddca1d79befff1f.patch?full_index=1 + FILENAME devernay-cminpack-pr-50-dllexport.patch + SHA512 558c21c4d43ff64a38945643810eafaee46c5f61c0e2a98931f9ba2283cf46e234a74f12ce6db4e64289de58f8da190af936f847f42636fd812fdf82ff733763 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO devernay/cminpack REF v1.3.8 SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae + PATCHES + ${DLLEXPORT_PATCH} ) +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" [[ STRING "CMinpack]] [[) # ("CMinpack]]) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -19,5 +29,16 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cminpack-1/cminpack.h" [[!defined(CMINPACK_NO_DLL)]] 0) +endif() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpack.pc" "-lcminpack" "-lcminpack_d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpacks.pc" "-lcminpacks" "-lcminpacks_d") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc" "-lcminpackld" "-lcminpackld_d") + endif() +endif() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/CopyrightMINPACK.txt") diff --git a/ports/cminpack/vcpkg.json b/ports/cminpack/vcpkg.json index 5901d2957e4b59..d286b2062821c6 100644 --- a/ports/cminpack/vcpkg.json +++ b/ports/cminpack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cminpack", "version": "1.3.8", - "port-version": 3, + "port-version": 4, "description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems", "homepage": "http://devernay.free.fr/hacks/cminpack/", "license": null, diff --git a/ports/cmocka/vcpkg.json b/ports/cmocka/vcpkg.json index 89e83af3c1a1f8..dbc6fd5d7a4658 100644 --- a/ports/cmocka/vcpkg.json +++ b/ports/cmocka/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cmocka", - "version-string": "2020-08-01", - "port-version": 2, + "version-date": "2020-08-01", + "port-version": 3, "description": "An elegant unit testing framework for C with support for mock objects", "homepage": "https://cmocka.org/", "license": "Apache-2.0", diff --git a/ports/cnl/vcpkg.json b/ports/cnl/vcpkg.json index cf5d794ac8b80f..2078a2ec90b67a 100644 --- a/ports/cnl/vcpkg.json +++ b/ports/cnl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cnl", - "version-string": "1.1.7", - "port-version": 2, + "version": "1.1.7", + "port-version": 3, "description": "A Compositional Numeric Library for C++", "homepage": "https://github.com/johnmcfarlane/cnl", "dependencies": [ diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index 793206c54d8832..8f7d873c4ff6b6 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coin", - "version-string": "4.0.0", - "port-version": 6, + "version": "4.0.0", + "port-version": 7, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "supports": "!(arm | arm64 | uwp)", diff --git a/ports/collada-dom/use-vcpkg-minizip.patch b/ports/collada-dom/use-vcpkg-minizip.patch index daaaf0f487c01d..e696f702b83928 100644 --- a/ports/collada-dom/use-vcpkg-minizip.patch +++ b/ports/collada-dom/use-vcpkg-minizip.patch @@ -1,13 +1,14 @@ -diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp -index 4536275..77651f9 100644 ---- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp -+++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp -@@ -32,7 +32,7 @@ - #include - using namespace std; - --#include // for saving compressed files -+#include // for saving compressed files - #ifdef _WIN32 - #include - #else +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f6c2bb6..3351ab0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,8 @@ else() + endif() + endif() + +-pkg_check_modules(minizip minizip) ++find_package(minizip NAMES unofficial-minizip REQUIRED) ++add_library(minizip ALIAS unofficial::minizip::minizip) + if(minizip_FOUND) + set(MINIZIP_INCLUDE_DIR ${minizip_INCLUDE_DIRS}) + else() diff --git a/ports/collada-dom/vcpkg.json b/ports/collada-dom/vcpkg.json index 619cdfd4403076..7321d2f20d255f 100644 --- a/ports/collada-dom/vcpkg.json +++ b/ports/collada-dom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "collada-dom", "version": "2.5.0", - "port-version": 8, + "port-version": 9, "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.", "homepage": "https://github.com/rdiankov/collada-dom", "license": null, diff --git a/ports/constexpr-contracts/vcpkg.json b/ports/constexpr-contracts/vcpkg.json index 4533217c0ff805..5a4e0d75ef363c 100644 --- a/ports/constexpr-contracts/vcpkg.json +++ b/ports/constexpr-contracts/vcpkg.json @@ -1,7 +1,7 @@ { "name": "constexpr-contracts", - "version-string": "2020-08-09", - "port-version": 2, + "version-date": "2020-08-09", + "port-version": 3, "description": "A constexpr-friendly, optimisation-friendly contracts library.", "homepage": "https://github.com/cjdb/constexpr-contracts", "dependencies": [ diff --git a/ports/coolprop/cmake-project-include.cmake b/ports/coolprop/cmake-project-include.cmake new file mode 100644 index 00000000000000..4002296dba5e56 --- /dev/null +++ b/ports/coolprop/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif() diff --git a/ports/coolprop/fix-builderror.patch b/ports/coolprop/fix-builderror.patch index 432f4e18c6f4f7..de07acb3017d5d 100644 --- a/ports/coolprop/fix-builderror.patch +++ b/ports/coolprop/fix-builderror.patch @@ -1,3 +1,15 @@ +diff --git a/include/CPmsgpack.h b/include/CPmsgpack.h +index e11f6be..948cc65 100644 +--- a/include/CPmsgpack.h ++++ b/include/CPmsgpack.h +@@ -6,7 +6,6 @@ + + // Workaround MSVC endiannes issues + #if defined(_MSC_VER) && ( defined(_M_ARM) || defined(_M_ARM64) ) +-# define MSGPACK_ENDIAN_LITTLE_BYTE + #endif + + #include "msgpack.hpp" diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp index 23bd4c4..beab710 100644 --- a/src/ODEIntegrators.cpp diff --git a/ports/coolprop/fix-dependency.patch b/ports/coolprop/fix-dependency.patch index ccae2cd46b0915..e89ccba465b7e7 100644 --- a/ports/coolprop/fix-dependency.patch +++ b/ports/coolprop/fix-dependency.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bbf8d6..617ac93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -247,13 +247,11 @@ list(REMOVE_ITEM APP_SOURCES +@@ -247,13 +247,10 @@ list(REMOVE_ITEM APP_SOURCES list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp") set(APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}") @@ -16,8 +16,7 @@ index 7bbf8d6..617ac93 100644 +find_package(Eigen3 CONFIG REQUIRED) +find_package(msgpack-cxx CONFIG REQUIRED) +find_package(fmt CONFIG REQUIRED) -+link_libraries(Eigen3::Eigen fmt::fmt) -+include_directories(msgpackc-cxx) ++link_libraries(Eigen3::Eigen msgpack-cxx fmt::fmt) list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include") list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src") diff --git a/ports/coolprop/fmt-fix.patch b/ports/coolprop/fmt-fix.patch index 1d5cc4778b3912..805437741ce712 100644 --- a/ports/coolprop/fmt-fix.patch +++ b/ports/coolprop/fmt-fix.patch @@ -1,5 +1,5 @@ diff --git a/include/CPstrings.h b/include/CPstrings.h -index 711981c..9d379d2 100644 +index 711981cd..fda2f055 100644 --- a/include/CPstrings.h +++ b/include/CPstrings.h @@ -6,6 +6,8 @@ @@ -11,30 +11,146 @@ index 711981c..9d379d2 100644 #if !defined(NO_FMTLIB) # ifndef FMT_HEADER_ONLY -@@ -14,9 +16,6 @@ - # include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib - # include "fmt/printf.h" // For sprintf - # undef FMT_HEADER_ONLY --#else --# include --# include - #endif - - #include "Exceptions.h" -@@ -75,11 +74,12 @@ inline bool endswith(const std::string& s1, const std::string& s2) { +@@ -74,17 +76,16 @@ inline bool endswith(const std::string& s1, const std::string& s2) { + #if defined(NO_FMTLIB) // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks inline std::string format(const char* fmt, ...); ++#elif FMT_VERSION >= 50000 ++template ++inline std::string format(const char* format_str, const Args&... args) { ++ return fmt::sprintf(format_str, args...); ++} #else -// Missing std::string formatting function - provided by the fmtlib library --inline std::string format(const char* format, fmt::ArgList args) { -- return fmt::sprintf(format, args); -+template -+std::string format(const Args & ... args) -+{ -+ return fmt::sprintf(args...); + inline std::string format(const char* format, fmt::ArgList args) { + return fmt::sprintf(format, args); } --FMT_VARIADIC(std::string, format, const char*) + FMT_VARIADIC(std::string, format, const char*) +-// For latest FMTLIB +-/*template +- inline std::string format(const char *format_str, const Args & ... args) { +- return fmt::sprintf(format_str, args); +- }*/ + #endif + + // Missing string split - like in Python +diff --git a/include/CoolPropFluid.h b/include/CoolPropFluid.h +index 80fb9ff3..093bd294 100644 +--- a/include/CoolPropFluid.h ++++ b/include/CoolPropFluid.h +@@ -562,5 +562,19 @@ class CoolPropFluid + }; + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++static int format_as(ViscosityDiluteVariables::ViscosityDiluteType type) { ++ return fmt::underlying(type); ++} ++ ++static int format_as(TransportPropertyData::ViscosityHardcodedEnum viscosity) { ++ return fmt::underlying(viscosity); ++} ++ ++static int format_as(TransportPropertyData::ConductivityHardcodedEnum conductivity) { ++ return fmt::underlying(conductivity); ++} ++#endif ++ + } /* namespace CoolProp */ + #endif /* COOLPROPFLUID_H_ */ +diff --git a/include/DataStructures.h b/include/DataStructures.h +index 0aebc0b4..5265ac82 100644 +--- a/include/DataStructures.h ++++ b/include/DataStructures.h +@@ -473,5 +473,40 @@ void extract_backend_families(std::string backend_string, backend_families& f1, + void extract_backend_families_string(std::string backend_string, backend_families& f1, std::string& f2); + std::string get_backend_string(backends backend); + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++/// Allows enums to be formatted ++static int format_as(parameters parameter) { ++ return fmt::underlying(parameter); ++} ++ ++static int format_as(phases phase) { ++ return fmt::underlying(phase); ++} ++ ++static int format_as(schemes scheme) { ++ return fmt::underlying(scheme); ++} ++ ++static int format_as(composition_types type) { ++ return fmt::underlying(type); ++} ++ ++static int format_as(fluid_types type) { ++ return fmt::underlying(type); ++} ++ ++static int format_as(input_pairs pair) { ++ return fmt::underlying(pair); ++} ++ ++static int format_as(backend_families family) { ++ return fmt::underlying(family); ++} ++ ++static int format_as(backends backend) { ++ return fmt::underlying(backend); ++} ++#endif ++ + } /* namespace CoolProp */ + #endif /* DATASTRUCTURES_H_ */ +diff --git a/include/IncompressibleFluid.h b/include/IncompressibleFluid.h +index 1ea41775..b641d2e0 100644 +--- a/include/IncompressibleFluid.h ++++ b/include/IncompressibleFluid.h +@@ -44,6 +44,12 @@ struct IncompressibleData + }; + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++static int format_as(IncompressibleData::IncompressibleTypeEnum type) { ++ return fmt::underlying(type); ++} ++#endif ++ + /// A property provider for incompressible solutions and pure fluids + /** + This fluid instance is populated using an entry from a JSON file +diff --git a/src/Backends/Helmholtz/VLERoutines.h b/src/Backends/Helmholtz/VLERoutines.h +index e13c0295..c63d0cbc 100644 +--- a/src/Backends/Helmholtz/VLERoutines.h ++++ b/src/Backends/Helmholtz/VLERoutines.h +@@ -97,6 +97,12 @@ struct saturation_PHSU_pure_options + } + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++static int format_as(saturation_PHSU_pure_options::specified_variable_options option) { ++ return fmt::underlying(option); ++} ++#endif ++ + void saturation_PHSU_pure(HelmholtzEOSMixtureBackend& HEOS, CoolPropDbl specified_value, saturation_PHSU_pure_options& options); + + /* \brief This is a backup saturation_p solver for the case where the Newton solver cannot approach closely enough the solution +diff --git a/src/HumidAirProp.cpp b/src/HumidAirProp.cpp +index 640bd843..eb586a63 100644 +--- a/src/HumidAirProp.cpp ++++ b/src/HumidAirProp.cpp +@@ -76,6 +76,12 @@ enum givens + GIVEN_ISENTROPIC_EXPONENT + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++int format_as(givens given) { ++ return fmt::underlying(given); ++} ++#endif + - // For latest FMTLIB - /*template - inline std::string format(const char *format_str, const Args & ... args) { + void _HAPropsSI_inputs(double p, const std::vector& input_keys, const std::vector& input_vals, double& T, double& psi_w); + double _HAPropsSI_outputs(givens OuputType, double p, double T, double psi_w); + double MoleFractionWater(double, double, int, double); diff --git a/ports/coolprop/portfile.cmake b/ports/coolprop/portfile.cmake index 245cd6730fe022..146e1dbfd03b99 100644 --- a/ports/coolprop/portfile.cmake +++ b/ports/coolprop/portfile.cmake @@ -11,59 +11,14 @@ vcpkg_from_github( fix-dependency.patch fix-install.patch ) +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "CACHE LIST" "CACHE STRING") -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(${PYTHON3_DIR}) - -file(REMOVE_RECURSE ${SOURCE_PATH}/externals) - -# Patch up the file locations -file(COPY - ${CURRENT_INSTALLED_DIR}/include/catch.hpp - DESTINATION ${SOURCE_PATH}/externals/Catch/single_include -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/eigen3/Eigen - DESTINATION ${SOURCE_PATH}/externals/Eigen -) -file(COPY - ${CURRENT_INSTALLED_DIR}/include/eigen3/unsupported/Eigen - DESTINATION ${SOURCE_PATH}/externals/Eigen/unsupported -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/rapidjson - DESTINATION ${SOURCE_PATH}/externals/rapidjson/include -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/IF97.h - DESTINATION ${SOURCE_PATH}/externals/IF97 -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/msgpack.hpp - ${CURRENT_INSTALLED_DIR}/include/msgpack - DESTINATION ${SOURCE_PATH}/externals/msgpack-c/include -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/fmt - DESTINATION ${SOURCE_PATH}/externals/cppformat -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h - DESTINATION ${SOURCE_PATH}/externals/REFPROP-headers/ -) - -# Use a nasty hack to include the correct header -file(APPEND - ${SOURCE_PATH}/externals/msgpack-c/include/fmt/format.h - "#include \"fmt/printf.h\"" -) +file(REMOVE_RECURSE "${SOURCE_PATH}/externals") +file(COPY "${CURRENT_INSTALLED_DIR}/include/IF97.h" DESTINATION "${SOURCE_PATH}/externals/IF97") +file(COPY "${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h" DESTINATION "${SOURCE_PATH}/externals/REFPROP-headers/") +file(COPY "${CURRENT_INSTALLED_DIR}/include/rapidjson" DESTINATION "${SOURCE_PATH}/externals/rapidjson/include") +# Fix GCC warning when thread_local is substitude as __thread +vcpkg_replace_string("${SOURCE_PATH}/externals/rapidjson/include/rapidjson/document.h" "thread_local static " "static thread_local ") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" COOLPROP_SHARED_LIBRARY) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY) @@ -71,17 +26,22 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" COOLPROP_MSVC_DYNAMIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" COOLPROP_MSVC_STATIC) +vcpkg_find_acquire_program(PYTHON3) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY} -DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY} -DCOOLPROP_MSVC_DYNAMIC=${COOLPROP_MSVC_DYNAMIC} -DCOOLPROP_MSVC_STATIC=${COOLPROP_MSVC_STATIC} + "-DPYTHON_EXECUTABLE=${PYTHON3}" OPTIONS_RELEASE - -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} + "-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" OPTIONS_DEBUG - -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug + "-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" ) vcpkg_cmake_install() diff --git a/ports/coolprop/vcpkg.json b/ports/coolprop/vcpkg.json index f514ce886f8a04..bf69e28b5fb92a 100644 --- a/ports/coolprop/vcpkg.json +++ b/ports/coolprop/vcpkg.json @@ -1,17 +1,15 @@ { "name": "coolprop", "version-semver": "6.4.3", - "port-version": 1, + "port-version": 3, "description": "Thermophysical properties for the masses", "homepage": "https://github.com/CoolProp/CoolProp", "license": "MIT", "dependencies": [ - "catch", "eigen3", "fmt", "if97", "msgpack", - "pybind11", "rapidjson", "refprop-headers", { diff --git a/ports/cpp-async/portfile.cmake b/ports/cpp-async/portfile.cmake new file mode 100644 index 00000000000000..a9ef1265910e98 --- /dev/null +++ b/ports/cpp-async/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/cpp-async + REF "v${VERSION}" + SHA512 c3a6700c86d6bec2680c9d0edfe3ed02e83f8ecec134163243a7bfa4e12d4867a47d64eadd377de9b2a69401b8b512e0ee274275895a8f301c266db24b6e0a4b + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/include/async" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cpp-async/usage b/ports/cpp-async/usage new file mode 100644 index 00000000000000..13d5608235909d --- /dev/null +++ b/ports/cpp-async/usage @@ -0,0 +1,4 @@ +cpp-async is header-only and can be used from CMake via: + + find_path(CPP_ASYNC_INCLUDE_DIRS "async/task.h") + target_include_directories(main PRIVATE ${CPP_ASYNC_INCLUDE_DIRS}) diff --git a/ports/cpp-async/vcpkg.json b/ports/cpp-async/vcpkg.json new file mode 100644 index 00000000000000..476d22cb1a579b --- /dev/null +++ b/ports/cpp-async/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cpp-async", + "version": "1.0.0", + "description": "Support types and functions for C++20 coroutines", + "homepage": "https://github.com/microsoft/cpp-async", + "license": "MIT" +} diff --git a/ports/cpp-httplib/fix-find-brotli.patch b/ports/cpp-httplib/fix-find-brotli.patch index e64712689293c3..087e47daee9bbf 100644 --- a/ports/cpp-httplib/fix-find-brotli.patch +++ b/ports/cpp-httplib/fix-find-brotli.patch @@ -1,8 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 709390a..3fd83aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -127,9 +127,9 @@ endif() +@@ -131,9 +131,9 @@ endif() # Adds our cmake folder to the search path for find_package list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") if(HTTPLIB_REQUIRE_BROTLI) @@ -14,9 +13,9 @@ index 709390a..3fd83aa 100644 endif() # Just setting this variable here for people building in-tree if(Brotli_FOUND) -@@ -206,9 +206,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} - $<$:crypt32> - $<$:cryptui> +@@ -216,9 +216,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} + # Needed for API from MacOS Security framework + "$<$,$,$>:-framework CoreFoundation -framework Security>" # Can't put multiple targets in a single generator expression or it bugs out. - $<$:Brotli::common> - $<$:Brotli::encoder> @@ -27,7 +26,7 @@ index 709390a..3fd83aa 100644 $<$:ZLIB::ZLIB> $<$:OpenSSL::SSL> $<$:OpenSSL::Crypto> -@@ -265,9 +265,6 @@ install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE) +@@ -274,9 +274,6 @@ install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index a1fe9c3ed96044..05d31c8cb3a4f6 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF v0.11.3 - SHA512 b0c46bf11c8bc84ab52143559ff1c4682b02504921855e5cd7e82bc65a04b192281ef7a124c7c7dfe928ae3842d5065097b6a4608be1c74dc51b563b15b93d0f + REF "v${VERSION}" + SHA512 3465e5c843ad4087bababadf8fe9f3e6961213301540053bb47f242f958280f43c85b03b8cf6f955a6b91bf9511a81669feeb9989344caf2a1e42ff587b3a460 HEAD_REF master PATCHES fix-find-brotli.patch diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index dbd31d85fc2229..b8cb1d9e3b35ed 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpp-httplib", - "version": "0.11.3", - "port-version": 1, + "version": "0.12.3", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib", "license": "MIT", diff --git a/ports/cpp-netlib/vcpkg.json b/ports/cpp-netlib/vcpkg.json index c6b65a738cb304..78a5844be5cd25 100644 --- a/ports/cpp-netlib/vcpkg.json +++ b/ports/cpp-netlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpp-netlib", - "version-string": "0.13.0", - "port-version": 7, + "version": "0.13.0", + "port-version": 8, "description": "A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library", "homepage": "https://cpp-netlib.org/", "supports": "!uwp", diff --git a/ports/cpp-taskflow/vcpkg.json b/ports/cpp-taskflow/vcpkg.json index ca690bb21f0996..2a1da640b21043 100644 --- a/ports/cpp-taskflow/vcpkg.json +++ b/ports/cpp-taskflow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpp-taskflow", - "version-string": "2.6.0", - "port-version": 1, + "version": "2.6.0", + "port-version": 2, "description": "Fast Parallel Tasking Programming Library using Modern C++.", "homepage": "https://github.com/taskflow/taskflow", "dependencies": [ diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 4642f320b62d1e..8d13d570e969ad 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v4.5.1 - SHA512 a4539d09eabecc7dc0c6715796db4915c8ac602fc1650b8a212b2a09168be15eb0992646fd5b577b7c7c06d8f77e808dae2481027ceb053c96e5b5eabd560103 + REF "v${VERSION}" + SHA512 0a41306862bc9f370fb369bd0cdc015fd15b95179ac2de60d8d412a26d385044177d1ca6e730e96e2ff0b0ffabcfe0246fdd3d926348641a145cd2894eb9cb7f HEAD_REF main ) diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index 87a2f745436728..7b0f0279e5e4d8 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppgraphqlgen", - "version": "4.5.1", + "version": "4.5.3", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/ports/cppkafka/0001-Fix-static-lib.patch b/ports/cppkafka/0001-Fix-static-lib.patch new file mode 100644 index 00000000000000..be5d7c30addb01 --- /dev/null +++ b/ports/cppkafka/0001-Fix-static-lib.patch @@ -0,0 +1,38 @@ +From fb7cbb0648948b51f71aefaa6b2354846f72439f Mon Sep 17 00:00:00 2001 +From: Nikita Vakula +Date: Mon, 1 May 2023 23:12:09 +0200 +Subject: [PATCH 1/2] Use correct rdkafka .pc + +Signed-off-by: Nikita Vakula +--- + CMakeLists.txt | 1 + + cmake/cppkafka.pc.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4e44e6..e34c071 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,6 +92,7 @@ endif() + + if (CPPKAFKA_RDKAFKA_STATIC_LIB) + add_definitions("-DLIBRDKAFKA_STATICLIB") ++ set(RDKAFKA_STATIC "-static") + endif() + + if (NOT CPPKAFKA_CONFIG_DIR) +diff --git a/cmake/cppkafka.pc.in b/cmake/cppkafka.pc.in +index b5d432c..4e50860 100644 +--- a/cmake/cppkafka.pc.in ++++ b/cmake/cppkafka.pc.in +@@ -9,6 +9,6 @@ Url: https://github.com/mfontanini/cppkafka + Description: C++ wrapper library on top of RdKafka + Version: @CPPKAFKA_VERSION@ + Requires: +-Requires.private: rdkafka >= 0.9.4 ++Requires.private: rdkafka@RDKAFKA_STATIC@ >= 0.9.4 + Libs: -L${libdir} -L${sharedlibdir} -lcppkafka + Cflags: -I${includedir} -I${includedir}/cppkafka -I@Boost_INCLUDE_DIRS@ +-- +2.37.1 (Apple Git-137.1) + diff --git a/ports/cppkafka/0002-Remove-min-max-macros.patch b/ports/cppkafka/0002-Remove-min-max-macros.patch new file mode 100644 index 00000000000000..c06277c888da0c --- /dev/null +++ b/ports/cppkafka/0002-Remove-min-max-macros.patch @@ -0,0 +1,27 @@ +From e2c9c0a1cee07c6cacedd682d3506b447c2c561b Mon Sep 17 00:00:00 2001 +From: Nikita Vakula +Date: Mon, 1 May 2023 23:11:19 +0200 +Subject: [PATCH 2/2] Remove min/max macros + +Signed-off-by: Nikita Vakula +--- + src/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5b8649b..5c818ee 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -36,6 +36,9 @@ set(NAMESPACE "${PROJECT_NAME}::") + set(TARGET_EXPORT_NAME ${PROJECT_NAME}Targets) + + add_library(${TARGET_NAME} ${CPPKAFKA_LIBRARY_TYPE} ${SOURCES}) ++if (MSVC) ++ target_compile_definitions(${TARGET_NAME} PRIVATE NOMINMAX) ++endif () + target_include_directories(${TARGET_NAME} PUBLIC $) + set_target_properties(${TARGET_NAME} PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}" +-- +2.37.1 (Apple Git-137.1) + diff --git a/ports/cppkafka/fix-dynamic.patch b/ports/cppkafka/fix-dynamic.patch deleted file mode 100644 index f18a0fbf76e731..00000000000000 --- a/ports/cppkafka/fix-dynamic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5d31078..b1d3634 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -43,6 +43,7 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include) - - install( - TARGETS cppkafka -+ RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - COMPONENT dev diff --git a/ports/cppkafka/portfile.cmake b/ports/cppkafka/portfile.cmake index 49f712266552ce..5fb7f55d1a983b 100644 --- a/ports/cppkafka/portfile.cmake +++ b/ports/cppkafka/portfile.cmake @@ -1,32 +1,47 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mfontanini/cppkafka - REF "v${VERSION}" - SHA512 60d01ce1dd9bd9119676be939ed5ab03539abb1f945c1b31e432edfe0f06542778f7fef37696f5ff19c53024f44d5cbd8aeddbbb231c38b098e05285d3ff0cab + REF "${VERSION}" + SHA512 86ac1500bdf6746a5e44e9ca4a4063eabcacec68b26c6846f7e7d47fe947309fc98a47986ab060d793096665d1cdc24044334267eb579cdb191f539bf96a3294 HEAD_REF master - PATCHES fix-dynamic.patch + PATCHES + 0001-Fix-static-lib.patch + 0002-Remove-min-max-macros.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(CPPKAFKA_BUILD_SHARED OFF) + set(CPPKAFKA_RDKAFKA_STATIC_LIB ON) else() set(CPPKAFKA_BUILD_SHARED ON) + set(CPPKAFKA_RDKAFKA_STATIC_LIB OFF) endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS + -DCMAKE_CXX_STANDARD=11 -DCPPKAFKA_BUILD_SHARED=${CPPKAFKA_BUILD_SHARED} -DCPPKAFKA_DISABLE_TESTS=ON -DCPPKAFKA_DISABLE_EXAMPLES=ON + -DCPPKAFKA_PKGCONFIG_DIR=lib/pkgconfig + -DCPPKAFKA_RDKAFKA_STATIC_LIB=${CPPKAFKA_RDKAFKA_STATIC_LIB} ) vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/CppKafka +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) # Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_fixup_pkgconfig() diff --git a/ports/cppkafka/vcpkg.json b/ports/cppkafka/vcpkg.json index 58525c463d57cd..f9be36ab9768fd 100644 --- a/ports/cppkafka/vcpkg.json +++ b/ports/cppkafka/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cppkafka", - "version": "0.3.1", - "port-version": 5, + "version": "0.4.0", "description": "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.", "homepage": "https://github.com/mfontanini/cppkafka", "license": "BSD-2-Clause", @@ -11,6 +10,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/cppunit/portfile.cmake b/ports/cppunit/portfile.cmake index 5daefd732252bf..8eefa5a0602ac7 100644 --- a/ports/cppunit/portfile.cmake +++ b/ports/cppunit/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" ) diff --git a/ports/cppunit/vcpkg.json b/ports/cppunit/vcpkg.json index 15fef69b685a57..354fd4065bee7d 100644 --- a/ports/cppunit/vcpkg.json +++ b/ports/cppunit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppunit", "version": "1.15.1", - "port-version": 3, + "port-version": 4, "description": "Unit testing framework module for the C++ programming language", "homepage": "https://www.freedesktop.org/wiki/Software/cppunit", "supports": "!uwp", diff --git a/ports/cppzmq/vcpkg.json b/ports/cppzmq/vcpkg.json index be1541be7584c2..a76d194ee89ac5 100644 --- a/ports/cppzmq/vcpkg.json +++ b/ports/cppzmq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cppzmq", "version": "4.9.0", + "port-version": 1, "description": "Header-only C++ binding for ZeroMQ", "homepage": "https://github.com/zeromq/cppzmq", "license": "MIT", @@ -17,7 +18,16 @@ ], "features": { "draft": { - "description": "Build and install draft" + "description": "Build and install draft", + "dependencies": [ + { + "name": "zeromq", + "default-features": false, + "features": [ + "draft" + ] + } + ] } } } diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 6b7a19142b02f4..bd106bb2bfeeb5 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF a2d35a1cb9f3f7e2f1469d6a189751331dc99f96 #v1.9.3 - SHA512 5df799fa53d51ba020a860ff928123921ed0ba59152de2b7e9d88b54ace820f5881fc72d056fca5679a7710357aa25854fa6dd6f9d230338b5378aebfe2bd957 + REF 0445800cd2cace404ac37eb3e78ec5d1431a4f30 #1.10.2 + SHA512 77723343b2ce89a10b8622cf54127edd6639412e3d457caed31b4fa1d3935d79846b4be695c327001fc2228313591e320c9080dbf8c09e3b69265f81641b9973 HEAD_REF master PATCHES 001-cpr-config.patch @@ -31,4 +31,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 5e5f3ec97f0f26..2f23201989e9eb 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpr", - "version-semver": "1.9.3", + "version-semver": "1.10.2+3", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "license": "MIT", diff --git a/ports/cr/vcpkg.json b/ports/cr/vcpkg.json index a80ef70595a9d8..5385b51a87f290 100644 --- a/ports/cr/vcpkg.json +++ b/ports/cr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cr", - "version-string": "2020-04-26", - "port-version": 1, + "version-date": "2020-04-26", + "port-version": 2, "description": "cr.h: A Simple C Hot Reload Header-only Library", "homepage": "https://fungos.github.io/cr-simple-c-hot-reload/" } diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 5962f284f72b02..b370f22a406fc2 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -30,6 +30,15 @@ checkout_in_path( "5654edb4225bcad13901155c819febb5748e502b" ) +if(VCPKG_TARGET_IS_LINUX) + # fetch lss + checkout_in_path( + "${SOURCE_PATH}/third_party/lss/lss" + https://chromium.googlesource.com/linux-syscall-support + 9719c1e1e676814c456b55f5f070eabad6709d31 + ) +endif() + function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES) unset(_LIBRARY_DEB CACHE) find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES} diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 8330d3e46a6269..1045e792911b8a 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,14 +1,14 @@ { "name": "crashpad", "version-date": "2022-09-05", - "port-version": 3, + "port-version": 4, "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." ], "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md", "license": "Apache-2.0", - "supports": "osx | (windows & !uwp)", + "supports": "linux | osx | (windows & !uwp)", "dependencies": [ { "name": "vcpkg-cmake-get-vars", diff --git a/ports/cspice/portfile.cmake b/ports/cspice/portfile.cmake index 33d481d7b056a9..a0bd3bb7e5e205 100644 --- a/ports/cspice/portfile.cmake +++ b/ports/cspice/portfile.cmake @@ -35,8 +35,8 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) set(PATCHES ${PATCHES} mktemp.patch) endif() -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL PATCHES ${PATCHES} diff --git a/ports/cspice/vcpkg.json b/ports/cspice/vcpkg.json index d84c24ae016695..726655884c9d81 100644 --- a/ports/cspice/vcpkg.json +++ b/ports/cspice/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cspice", "version": "67", - "port-version": 2, + "port-version": 3, "description": "NASA C SPICE toolkit", "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html", "license": null, diff --git a/ports/ctbignum/vcpkg.json b/ports/ctbignum/vcpkg.json index 4c517ec653c1ea..eeb145c861b2c4 100644 --- a/ports/ctbignum/vcpkg.json +++ b/ports/ctbignum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ctbignum", - "version-string": "2019-08-02", - "port-version": 2, + "version-date": "2019-08-02", + "port-version": 3, "description": "This is a header-only template library for fixed-width \"small big-integer\" computations, for use during run-time as well as compile-time.", "homepage": "https://github.com/niekbouman/ctbignum", "dependencies": [ diff --git a/ports/ctp/portfile.cmake b/ports/ctp/portfile.cmake index 2c291b8ab6d3e3..077deedbc6c519 100644 --- a/ports/ctp/portfile.cmake +++ b/ports/ctp/portfile.cmake @@ -17,15 +17,15 @@ if("datacollect" IN_LIST FEATURES) ) endif() -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH TRADEAPI_UNPACK_PATH +vcpkg_extract_source_archive( + TRADEAPI_UNPACK_PATH ARCHIVE ${TRADEAPI_ARCHIVE} NO_REMOVE_ONE_LEVEL ) if("datacollect" IN_LIST FEATURES) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH DATACOLLECT_UNPACK_PATH + vcpkg_extract_source_archive( + DATACOLLECT_UNPACK_PATH ARCHIVE ${DATACOLLECT_ARCHIVE} NO_REMOVE_ONE_LEVEL ) @@ -37,8 +37,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(TRADEAPI_SOURCE_PATH "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_winApi/tradeapi/20210406_tradeapi64_se_windows") elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH TRADEAPI_LINUX_TAR_PATH + vcpkg_extract_source_archive( + TRADEAPI_LINUX_TAR_PATH ARCHIVE "${TRADEAPI_UNPACK_PATH}/v6.6.1_P1_20210406_api_tradeapi_linux64.tar" ) set(TRADEAPI_SOURCE_PATH "${TRADEAPI_LINUX_TAR_PATH}/v6.6.1_P1_20210406_api_tradeapi_se_linux64") @@ -52,8 +52,8 @@ if("datacollect" IN_LIST FEATURES) elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_winApi/20200106_clientdll64_windows") elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH DATACOLLECT_LINUX_TAR_PATH + vcpkg_extract_source_archive( + DATACOLLECT_LINUX_TAR_PATH ARCHIVE "${DATACOLLECT_UNPACK_PATH}/v6.3.19_P1_20200106_api.tar" ) set(DATACOLLECT_SOURCE_PATH "${DATACOLLECT_LINUX_TAR_PATH}/v6.3.19_P1_20200106_api_clientdatacollectdll_linux64") diff --git a/ports/ctp/vcpkg.json b/ports/ctp/vcpkg.json index 4893cae5f3122e..5549d01379b738 100644 --- a/ports/ctp/vcpkg.json +++ b/ports/ctp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ctp", "version-string": "6.6.1_P1_20210406_se", - "port-version": 3, + "port-version": 4, "description": "The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading.", "homepage": "http://www.sfit.com.cn/index.htm", "supports": "!osx & !uwp & !arm & !(static & staticcrt)", diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index e52da2585b61ea..7f29e35d9e501b 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -1,7 +1,7 @@ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 1d71e14..62b7b33 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 1d71e14..62b7b33 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt @@ -125,7 +125,6 @@ if(WIN32) if(MSVC) # Add "_imp" as a suffix before the extension to avoid conflicting with @@ -9,4 +9,4 @@ index 1d71e14..62b7b33 100644 - set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") endif() endif() - endif() + elseif(NOT CMAKE_CROSSCOMPILING) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 988c9b7697e3ca..77f83c46fd1089 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -2,8 +2,8 @@ string(REPLACE "." "_" curl_version "curl-${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF ${curl_version} - SHA512 4a7aa0091ac1e0f1d4366277d585c19bd9ad786fa49329a96d43eb6aebd1b366c1c2144436c243686d9ad430e7d3f4137ea0764c7759198f0eb29107a5d86569 + REF "${curl_version}" + SHA512 d3c0bd113c772249c7e4e83cc26c6e2a1ff5644486c96318de6ab035300c52aca10756af665d91c5ce71f9d4afa4afbf7fbb756e9e4c800869b50c8a653bd519 HEAD_REF master PATCHES 0002_fix_uwp.patch @@ -14,7 +14,6 @@ vcpkg_from_github( mbedtls-ws2_32.patch export-components.patch 0023-fix-find-cares.patch - version-major-7-8.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -73,6 +72,7 @@ vcpkg_cmake_configure( -DENABLE_MANUAL=OFF -DCURL_CA_FALLBACK=ON -DCURL_USE_LIBPSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON OPTIONS_DEBUG -DENABLE_DEBUG=ON ) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index f1ad8f7f3c7888..0a08a1a9d21c37 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "curl", - "version": "8.0.1", + "version": "8.1.2", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/ports/curl/version-major-7-8.patch b/ports/curl/version-major-7-8.patch deleted file mode 100644 index 6d3bdf95965813..00000000000000 --- a/ports/curl/version-major-7-8.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed60f07bc..270a562d9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1609,6 +1609,15 @@ write_basic_package_version_file( - VERSION ${CURL_VERSION} - COMPATIBILITY SameMajorVersion - ) -+file(READ "${version_config}" generated_version_config) -+file(WRITE "${version_config}" " -+if(NOT PACKAGE_FIND_VERSION_RANGE AND PACKAGE_FIND_VERSION_MAJOR STREQUAL \"7\") -+ # Version 8 satisfies version 7... requirements -+ set(PACKAGE_FIND_VERSION_MAJOR 8) -+ set(PACKAGE_FIND_VERSION_COUNT 1) -+endif() -+${generated_version_config}" -+) - - # Use: - # * TARGETS_EXPORT_NAME diff --git a/ports/cute-headers/vcpkg.json b/ports/cute-headers/vcpkg.json index bd12b94b48cb45..145333c8584a32 100644 --- a/ports/cute-headers/vcpkg.json +++ b/ports/cute-headers/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cute-headers", - "version-string": "2019-09-20", - "port-version": 1, + "version-date": "2019-09-20", + "port-version": 2, "description": "Collection of cross-platform one-file C/C++ libraries with no dependencies", "homepage": "https://github.com/RandyGaul/cute_headers" } diff --git a/ports/darknet/vcpkg.json b/ports/darknet/vcpkg.json index 5a99f7547b7f90..ff05fd5a26b63e 100644 --- a/ports/darknet/vcpkg.json +++ b/ports/darknet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "darknet", "version-date": "2022-03-06", - "port-version": 2, + "port-version": 3, "description": "Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.", "homepage": "https://github.com/alexeyab/darknet", "license": null, diff --git a/ports/dbg-macro/portfile.cmake b/ports/dbg-macro/portfile.cmake index 15fd2aabd7c4e3..acdcf728c755c0 100644 --- a/ports/dbg-macro/portfile.cmake +++ b/ports/dbg-macro/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sharkdp/dbg-macro - REF 4db61805d90cb66d91bcc56c2703591a0127ed11 - SHA512 68afaedce857f6007edbb65527745aa07ab3dd736e65602b4c6da04646730ef4c09d9a239a9bcae1806c5a0bc0f70b5766edf245b2fd5f84d64cc03a5cadc5c8 + REF "v${VERSION}" + SHA512 4f785919843026996ffeb3cd8e3494ecd77f42bee104b6659b664b21a3e518739707f5bd006fc8128c99eef241fc6650ad629444f7005df89100a16d8918d05f HEAD_REF master ) -file(COPY ${SOURCE_PATH}/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/dbg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/dbg-macro/vcpkg.json b/ports/dbg-macro/vcpkg.json index 77d5be57ef0162..3bede55fa0c1a1 100644 --- a/ports/dbg-macro/vcpkg.json +++ b/ports/dbg-macro/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dbg-macro", - "version-date": "2021-11-02", + "version": "0.5.0", "description": "A dbg(...) macro for C++", - "homepage": "https://github.com/sharkdp/dbg-macro" + "homepage": "https://github.com/sharkdp/dbg-macro", + "license": "MIT" } diff --git a/ports/dbow2/vcpkg.json b/ports/dbow2/vcpkg.json index 954bd3785840b2..d71ae20bc59f10 100644 --- a/ports/dbow2/vcpkg.json +++ b/ports/dbow2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dbow2", - "version-string": "2019-08-05", - "port-version": 2, + "version-date": "2019-08-05", + "port-version": 3, "description": "DBoW2 is an improved version of the DBow library, an open source C++ library for indexing and converting images into a bag-of-word representation.", "homepage": "https://github.com/dorian3d/DBoW2", "dependencies": [ diff --git a/ports/debug-assert/vcpkg.json b/ports/debug-assert/vcpkg.json index 2ed950c2c42ec1..e3bded5ba373b1 100644 --- a/ports/debug-assert/vcpkg.json +++ b/ports/debug-assert/vcpkg.json @@ -1,7 +1,7 @@ { "name": "debug-assert", - "version-string": "1.3.3", - "port-version": 1, + "version": "1.3.3", + "port-version": 2, "description": "Provides flexible DEBUG_ASSERT() macro.", "homepage": "https://github.com/foonathan/debug_assert", "dependencies": [ diff --git a/ports/decimal-for-cpp/vcpkg.json b/ports/decimal-for-cpp/vcpkg.json index 0aec858a597307..d54b2139814180 100644 --- a/ports/decimal-for-cpp/vcpkg.json +++ b/ports/decimal-for-cpp/vcpkg.json @@ -1,5 +1,6 @@ { "name": "decimal-for-cpp", - "version-string": "1.18", + "version": "1.18", + "port-version": 1, "description": "Decimal data type support, for COBOL-like fixed-point operations on currency values." } diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 0c781650eb7362..6b09cb0aa762c0 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers - REF v1.608.2b - SHA512 d4e82615751d9ee46c456c676bfd6831c47d159ee58634531fc1acd09927f00c4e8d379cb233a1f89e3489a6a30d8edc0552b76945071badaed6a9c8591cbb0c + REF v${VERSION} + SHA512 37781f20b533c68d2adacda36936e70d43cf83b108ec76b224b0633760f8e993467618e40b21dd4a71ff314f1b35e3812d7ec85663696bab7132222d1fb5b987 HEAD_REF main ) diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index b749b81231342f..be90d0c0db52e2 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directx-headers", - "version": "1.608.2", - "port-version": 1, + "version": "1.610.2", "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 6f90c864fe0e1f..0534dd8b01f75a 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXMESH_TAG mar2023) +set(DIRECTXMESH_TAG apr2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh REF ${DIRECTXMESH_TAG} - SHA512 a017f022945a078a27c19815100f466714b9cbdad067dfa36b8e457ec78b8febcb7661dee55e3d7ee41461325f0af9c442c04c0e8e406c268062ce96b46b7af8 + SHA512 cd6608fafaa6d53c2f9ff9e7f316b0a79c8715e355d7362c83b08cae9a7add2561ce74e3350f41d71b1d2e99e61a3377e97073a562499a52677a22a87ba48f9b HEAD_REF main ) @@ -40,7 +40,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe" - SHA512 bb7ab1014f99f3c2a9c0b6b22333fa2aaeed952fa1fe0f675a5b53cf227385e6492a73dc34f0df9a80f0cde2ba3353d0ceca2520c3ca8efb61e2dcbe42065d40 + SHA512 afe3d2ee57d933740ab380d3577d10511b4ca7e33ddd6eafc9408fbbabe6295c676c6313916a9bdb94f1708a3565675e23212cc7f237e2007407c8948e934d86 ) file(INSTALL @@ -55,7 +55,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert_arm64.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}-arm64.exe" - SHA512 401a132d6c70dd07c1377cbef3bce53cb27bfa48344409cbb4ace9f266f17ea3221ea43f45f0e502f6a26608e108251eda89900dd2ae88eb3894ac54176d152a + SHA512 a28bc4c3aced8ac59fee80cd734ef44127499ab14e7cd680276accd74dcea2dee382282889cb3f565a21d446bfc3b097f986d72b69e7a19b5a7d6e43252e5abc ) file(INSTALL @@ -76,4 +76,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index f5191560d7cb33..878dce55971d1a 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2023-03-30", + "version-date": "2023-04-28", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxsdk/portfile.cmake b/ports/directxsdk/portfile.cmake index 3e38e42e1ed4bd..b6c8afe6a5e3d5 100644 --- a/ports/directxsdk/portfile.cmake +++ b/ports/directxsdk/portfile.cmake @@ -10,8 +10,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 24e1e9bda319b780124b865f4640822cfc44e4d18fbdcc8456d48fe54081652ce4ddb63d3bd8596351057cbae50fc824b8297e99f0f7c97547153162562ba73f ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/directxsdk/vcpkg.json b/ports/directxsdk/vcpkg.json index b4ff91fc35245f..d92de898dfeb04 100644 --- a/ports/directxsdk/vcpkg.json +++ b/ports/directxsdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directxsdk", "version-string": "jun10", - "port-version": 6, + "port-version": 7, "description": "Legacy DirectX SDK", "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", "license": null, diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index ff5f6d21b7d987..2f5f2263bb97aa 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTEX_TAG mar2023) +set(DIRECTXTEX_TAG apr2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex REF ${DIRECTXTEX_TAG} - SHA512 2e3a0b6830988d1ca137f462d4eedde53d07f30b5eb4bbc8fc588819a1a4e2a220dd4d23efaf08dae225e23286a21c3054560485a6578037c6b355a9450901cd + SHA512 112e25a61ff04dea82e0e6c695df8bf6a480008a2f6f68239b7393696f960b5fa5e42b93ba2043c652c34565f9b0ac9b3ac855204a0dc5f9b62e147ad5bacfbc HEAD_REF main ) @@ -30,7 +30,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF -DBC_USE_OPENMP=ON + OPTIONS ${FEATURE_OPTIONS} -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF ) vcpkg_cmake_install() @@ -46,21 +46,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}.exe" - SHA512 0d22ca97567333142ebb612b16093270907853a6eb4ee583d497d62a2e11de0930144760c1674c3acd775fdaca2cf611dfa7878bf4634bd5913d9196c7dd4155 + SHA512 758c3a99befca251ad0f05e6d9467dffef75868e541c027960c007406e55d10dbf5b09d4c4cf4f013a8c188d7a6a6dafecfd146d19a12ad520bfd47378adc331 ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe" FILENAME "texconv-${DIRECTXTEX_TAG}.exe" - SHA512 b2dff6c3f4195c9cb25436b8fe9be467d5a6a07567f42d736532de90aad04b947e6a14d72c5fd2e9db3eaf33fcabb23dc13b1c604191b5fd51d544040e0107a9 + SHA512 a652debd8b6204fdf35bac968e6fcc3815202b6a858f2999566c4c5151574b7bc5b0a190c172f91b2bdea75d4873423b089894c640928807ee43dac2ecaf7cfd ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}.exe" - SHA512 b2617e12de22cb3369d29a2b1dc6f26275d2c325f4d0b388f05e7901c1d8d92fe029d73d24113c30a60729526f664f7d90234a4b0014185a9eadf88e09bc22fa + SHA512 60b5b2d07ca686964b39f21f6433cb11ac5da009dee18c8c0fee6cf60ccaa531056f2efafe14096eaaf530f7293fd395f46c7d9509013f4ff08f0b42a41dc69e ) file(INSTALL @@ -79,21 +79,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble_arm64.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 b5a8b53e2f481286ca8f1fdac5f03c0ccc07f282b0cdc83350e967a9e707adb6d3acd03c5edfb635f707a3044732ca942b490ed704bb869f5e7c21781cce7453 + SHA512 9365a3b15a17ec42bac19bf48a2bfba524191347e845ca0d79adf94771cc6f3d608ac0c41654cf3eb76e32ccce4f5dc3fd309eb7d6420669dc2f8015a71555f7 ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv_arm64.exe" FILENAME "texconv-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 3217719114eae1dabca27ab921574cee562e5e74e076a6fbf14d63ebd3e64d5d76948c926b2c2f15d6d4a6f26e5a0e57bbd3ad4075be0e7616b90d99db87d6e4 + SHA512 b479b725b78f2acf5a22958af85ce04eeb62bc25ea5eaaa7c2bc10b7161d2be103e13112c2f55e8da13ce260f8a62e7cfb951d0c7cc08cb23f3aafe4ebe8fec7 ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag_arm64.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 5425a8fa6aa7e806a14f5d10bcc78cb6c687b675bad98e4308aeec9daaf2babc5b57f33a8c83ea8db286716d52ae26219ab830552f5c26bcdfe75e4196cd274d + SHA512 9226643fd9ec57de8f7d57d225c0d07d6f250975c1e04c15cec078678e1a24c3cafa8483138b7966015e4fdc7a53bd53043376a9ae157e98876d842f2ede9d37 ) file(INSTALL @@ -118,4 +118,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index f46968c1a50fcd..125f7d142950de 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directxtex", - "version-date": "2023-03-30", + "version-date": "2023-04-28", + "port-version": 1, "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 ea175fba018c38..67c5b8217e614d 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG mar2023) +set(DIRECTXTK_TAG apr2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK REF ${DIRECTXTK_TAG} - SHA512 ed0ec9e11ed88432a43d62dff4319ed0cc5ad98e9e4ee5a29313fb06beee38d4b86243603bd041fb90e93142aa60f65db88b09c53d363b32923e54fa17575a39 + SHA512 161f647199479cdd79231717b963e2c28c40fe62f2d7e3e8aa16baeceac083645e68d4bbd993b1fb5ddf9ab8efc2a6606b037e922725bd0c74fbb83cba451111 HEAD_REF main ) @@ -38,7 +38,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 2a7c21356599846f10bc8adb1ec3e3ce509c9a446567ab7195e998a428e3a62629e8f6d4b7bd9fc3793a51f6eb61597b5feba49f3464ea3e4529d0991701e780 + SHA512 f014172f127a00aa3b51f33c17062772e75271f57fbade4db8c2da634cbc090c0f4eb8dd2771f6faead624054244469705f195fe10d643570df3ba95dbcb119f ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -53,7 +53,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 9bc9279767d6379501ec9d851cda52556eb1e96f583a162b4fad93f96985b18b2fe9d9c6eeb3f5f16b42ce2655ae3045bfe0ea0cb4aca425fe09bc079ad6a70d + SHA512 2bb9f9ecfe65e373dadd84b1550e499de5507fcf57257379e3da1f4d4325df686ec5e784754990c89da0a2915c12578424f5b66009ebc14d969c5c92db50b09a ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -66,7 +66,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 b49cbe9823182b600496a449a2ff5acd08491615584c523ede4506880cb9b293cedf0b350f186ed4ef53e4795a89d1b0331559fee59ee533751086d7bb4c9e54 + SHA512 453a5504074f43104d77d79ab2824b7091302a0339361a433e56acc854594a3413f9675aaaa6be518329e2ab9c3cacb50a25293787d3f944e74d1a8eebc23a33 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -85,4 +85,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index b5d9d8386f0220..fae2ddecb816ba 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2023-03-30", + "version-date": "2023-04-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 e8518cb8140712..fed26341506acd 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG mar2023) +set(DIRECTXTK_TAG apr2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 REF ${DIRECTXTK_TAG} - SHA512 dc88aaa08085a9d2751d3d943ddb05804e25461dbd04c6fb678cff56e859f90b8df3256812a7abe03e793d04772f1c645937ce8953ebaf2edf382613d0a7b6c1 + SHA512 ab8d9db145e8342e473e5b23d3ce0a396408c42db53ba38882e57f461b15694d291a98a55e2db19724c82ef1baef6ee1dc3c5ff3861684e9aeed296e352d7e7a HEAD_REF main ) @@ -39,7 +39,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 2a7c21356599846f10bc8adb1ec3e3ce509c9a446567ab7195e998a428e3a62629e8f6d4b7bd9fc3793a51f6eb61597b5feba49f3464ea3e4529d0991701e780 + SHA512 f014172f127a00aa3b51f33c17062772e75271f57fbade4db8c2da634cbc090c0f4eb8dd2771f6faead624054244469705f195fe10d643570df3ba95dbcb119f ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -54,7 +54,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 9bc9279767d6379501ec9d851cda52556eb1e96f583a162b4fad93f96985b18b2fe9d9c6eeb3f5f16b42ce2655ae3045bfe0ea0cb4aca425fe09bc079ad6a70d + SHA512 2bb9f9ecfe65e373dadd84b1550e499de5507fcf57257379e3da1f4d4325df686ec5e784754990c89da0a2915c12578424f5b66009ebc14d969c5c92db50b09a ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -67,7 +67,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 b49cbe9823182b600496a449a2ff5acd08491615584c523ede4506880cb9b293cedf0b350f186ed4ef53e4795a89d1b0331559fee59ee533751086d7bb4c9e54 + SHA512 453a5504074f43104d77d79ab2824b7091302a0339361a433e56acc854594a3413f9675aaaa6be518329e2ab9c3cacb50a25293787d3f944e74d1a8eebc23a33 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -80,4 +80,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 36aba0d5f45618..350d98a6a895ac 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2023-03-30", + "version-date": "2023-04-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/dirent/vcpkg.json b/ports/dirent/vcpkg.json index 82a21b2ced5ca7..cba6c1168a5cc9 100644 --- a/ports/dirent/vcpkg.json +++ b/ports/dirent/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dirent", - "version-string": "1.23.2", - "port-version": 1, + "version": "1.23.2", + "port-version": 2, "description": "Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.", "homepage": "https://github.com/tronkko/dirent" } diff --git a/ports/discord-game-sdk/include-cstdint.patch b/ports/discord-game-sdk/include-cstdint.patch index 6e61c4c252d915..05df0232e8109b 100644 --- a/ports/discord-game-sdk/include-cstdint.patch +++ b/ports/discord-game-sdk/include-cstdint.patch @@ -1,6 +1,6 @@ From 91fab7c4b8f7da3182f07f5392ebe9388f979157 Mon Sep 17 00:00:00 2001 -From: Maki -Date: Wed, 3 Jun 2020 01:40:58 +0100 +From: l3nn0x +Date: Wed, 17 Mai 2023 11:40:58 +0100 Subject: [PATCH] Include cstdint --- @@ -11,15 +11,12 @@ diff --git a/cpp/types.h b/cpp/types.h index 8c7cc2b..122dc71 100644 --- a/cpp/types.h +++ b/cpp/types.h -@@ -3,6 +3,8 @@ - #include "ffi.h" - #include "event.h" - -+#include +@@ -6,6 +6,8 @@ + #include + #include + #endif + - namespace discord { ++#include - enum class Result { --- -2.26.2 + namespace discord { diff --git a/ports/discord-game-sdk/portfile.cmake b/ports/discord-game-sdk/portfile.cmake index c65e660c7faa2f..b39e770999166f 100644 --- a/ports/discord-game-sdk/portfile.cmake +++ b/ports/discord-game-sdk/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS https://dl-game-sdk.discordapp.net/2.5.6/discord_game_sdk.zip + URLS https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip FILENAME discord_game_sdk.zip - SHA512 4c8f72c7bdf92bc969fb86b96ea0d835e01b9bab1a2cc27ae00bdac1b9733a1303ceadfe138c24a7609b76d61d49999a335dd596cf3f335d894702e2aa23406f + SHA512 4851cb70f428eb391959018aa7206e11232348189f7e47f9b8e15535f02a8b114ef825198b0d772979b77ca47061ee7fa764ca90a1dc39370eb9802e8bf04541 ) vcpkg_extract_source_archive( @@ -20,6 +20,8 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(ARCH_FOLDER "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(ARCH_FOLDER "x86_64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(ARCH_FOLDER "aarch64") endif() if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/discord-game-sdk/vcpkg.json b/ports/discord-game-sdk/vcpkg.json index 249c1bab8910d1..2fba2a0d280d08 100644 --- a/ports/discord-game-sdk/vcpkg.json +++ b/ports/discord-game-sdk/vcpkg.json @@ -1,10 +1,9 @@ { "name": "discord-game-sdk", - "version": "2.5.6", - "port-version": 5, + "version": "3.2.1", "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide", - "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static", + "supports": "((x64 & (windows | osx | linux)) | (x86 & windows) | (arm64 & osx)) & !uwp & !static", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/discord-rpc/vcpkg.json b/ports/discord-rpc/vcpkg.json index 129d0d9fb29732..44924ea70185cf 100644 --- a/ports/discord-rpc/vcpkg.json +++ b/ports/discord-rpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "discord-rpc", - "version-string": "3.4.0", - "port-version": 2, + "version": "3.4.0", + "port-version": 3, "description": "Rich Presence allows you to leverage the totally overhauled \"Now Playing\" section in a Discord user's profile to help people play your game together.", "homepage": "https://github.com/discordapp/discord-rpc", "dependencies": [ diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 68ccf788e21e1d..61231c3b92b933 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,11 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF c8d4698d2c0ee818def85d63562585a218b2da70 - SHA512 82a2bada44d1e2c2cc4638b885011a95189febd77bc4d3c26ce8c25005b8202d6c7cbb1f580dbcc1556dd0919f33cfb25127774f37cea17a544fbe31970618b5 + REF 8b54cf9 + SHA512 1ee042939f09b58d20f0a432ae83c696847cdf30922bc6345d76634f32c78706f3fa38a64eae259b592312f4af25af26883c76d5eb3866b08ff7f0dd42dd0ff9 HEAD_REF main - PATCHES - 0001-Add-extern-C-to-avcodec.patch ) vcpkg_cmake_configure( diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index e62f11928f1b6d..e6c07c042d2c56 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,16 +1,16 @@ { "name": "discordcoreapi", - "version-date": "2023-01-02", + "version-date": "2023-05-30", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "LGPL-2.1-or-later", "supports": "(windows & x64 & !static) | (linux & x64)", "dependencies": [ "ffmpeg", + "jsonifier", "libsodium", "openssl", "opus", - "simdjson", { "name": "vcpkg-cmake", "host": true diff --git a/ports/discount/vcpkg.json b/ports/discount/vcpkg.json index ca994332f89d15..b22550e6a89861 100644 --- a/ports/discount/vcpkg.json +++ b/ports/discount/vcpkg.json @@ -1,7 +1,7 @@ { "name": "discount", - "version-string": "2.2.6", - "port-version": 2, + "version": "2.2.6", + "port-version": 3, "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.", "homepage": "https://github.com/Orc/discount", "dependencies": [ diff --git a/ports/discreture/vcpkg.json b/ports/discreture/vcpkg.json index 629b3e6543fd65..84e04896aaad01 100644 --- a/ports/discreture/vcpkg.json +++ b/ports/discreture/vcpkg.json @@ -1,7 +1,7 @@ { "name": "discreture", - "version-string": "2020-01-29", - "port-version": 2, + "version-date": "2020-01-29", + "port-version": 3, "description": "A modern C++ library for efficiently and easily iterating through common combinatorial objects, such as combinations, permutations, partitions and more.", "homepage": "https://github.com/mraggi/discreture", "dependencies": [ diff --git a/ports/docopt/vcpkg.json b/ports/docopt/vcpkg.json index df30626d73cafd..c04ddd51882ee5 100644 --- a/ports/docopt/vcpkg.json +++ b/ports/docopt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "docopt", - "version-string": "2018-11-01", - "port-version": 2, + "version-date": "2018-11-01", + "port-version": 3, "description": "Command line arguments parser that will make you smile (C++11 port).", "dependencies": [ { diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index 94ff5e24c704c4..225202319901bb 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -# Rename exported target files into something vcpkg_fixup_cmake_targets expects +# Rename exported target files into something vcpkg_cmake_config_fixup expects if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") endif() diff --git a/ports/double-conversion/vcpkg.json b/ports/double-conversion/vcpkg.json index 08df1f4129b390..d96afe57c3e194 100644 --- a/ports/double-conversion/vcpkg.json +++ b/ports/double-conversion/vcpkg.json @@ -1,6 +1,7 @@ { "name": "double-conversion", "version": "3.2.1", + "port-version": 1, "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.", "homepage": "https://github.com/google/double-conversion", "dependencies": [ diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index baa1c840c8fbcb..99c8e6052736be 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -2,10 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP REF "v${VERSION}" - SHA512 18bbb7d2c1385d179cac9ded31d1b11e8d24f172e7ffe2ba79071203e1e2f277657e21d660b18ee4b849bc093d350f4bc5401702400084b56c3ebd6f03ce28df - HEAD_REF master - PATCHES - remove-wrong-header.patch + SHA512 2f1e5415c121d5f19d2abb1b389512ad22c3cac6779ed897403d430b2c4e62c758ab25d46a3fd02538add711073fadd616a690b4981f3782e46c18ff05d116dc ) vcpkg_cmake_configure( @@ -27,4 +24,3 @@ endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - diff --git a/ports/dpp/remove-wrong-header.patch b/ports/dpp/remove-wrong-header.patch deleted file mode 100644 index a1ae8fb5044298..00000000000000 --- a/ports/dpp/remove-wrong-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp -index 0f5bce1..cdd7903 100644 ---- a/src/dpp/user.cpp -+++ b/src/dpp/user.cpp -@@ -22,7 +22,7 @@ - #include - #include - #include --#include "user.h" -+// #include "user.h" - - using json = nlohmann::json; - diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 74348aaaf50e09..016e2b4faadea1 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dpp", - "version": "10.0.23", - "port-version": 1, + "version": "10.0.24", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/ports/draco/disable-symlinks.patch b/ports/draco/disable-symlinks.patch index feca85f15a03fc..df39449e23c127 100644 --- a/ports/draco/disable-symlinks.patch +++ b/ports/draco/disable-symlinks.patch @@ -1,10 +1,10 @@ diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake -index f96dbb1..179b9f9 100644 +index c8c79f5..1cec5b8 100644 --- a/cmake/draco_targets.cmake +++ b/cmake/draco_targets.cmake -@@ -103,9 +103,6 @@ macro(draco_add_executable) - add_executable(${exe_NAME} ${exe_SOURCES}) - target_compile_features(${exe_NAME} PRIVATE cxx_std_11) +@@ -111,9 +111,6 @@ macro(draco_add_executable) + + target_compile_features(${exe_NAME} PUBLIC cxx_std_11) - if(NOT EMSCRIPTEN) - set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) @@ -12,16 +12,16 @@ index f96dbb1..179b9f9 100644 if(exe_OUTPUT_NAME) set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) -@@ -340,14 +337,6 @@ macro(draco_add_library) +@@ -364,14 +361,6 @@ macro(draco_add_library) set_target_properties(${lib_NAME} PROPERTIES PREFIX "") endif() - if(NOT EMSCRIPTEN) - # VERSION and SOVERSION as necessary - if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC) -- set_target_properties(${lib_NAME} -- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION -- ${DRACO_SOVERSION_MAJOR}) +- set_target_properties( +- ${lib_NAME} PROPERTIES VERSION ${DRACO_SOVERSION} +- SOVERSION ${DRACO_SOVERSION_MAJOR}) - endif() - endif() diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index 0b62512bcdf9c9..ca68cb5986e585 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -1,18 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0362420..2b09073 100644 +index a93267d..3a3ccf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -86,6 +86,10 @@ draco_set_cxx_flags() +@@ -85,6 +85,9 @@ draco_set_cxx_flags() draco_set_exe_linker_flags() draco_generate_features_h() +if (MSVC) + add_compile_options(/wd4996) +endif() -+ # Draco source file listing variables. - list(APPEND draco_attributes_sources - "${draco_src_root}/attributes/attribute_octahedron_transform.cc" + list( + APPEND draco_attributes_sources diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc index 378de73..be7e032 100644 --- a/src/draco/io/parser_utils.cc diff --git a/ports/draco/fix-pkgconfig.patch b/ports/draco/fix-pkgconfig.patch new file mode 100644 index 00000000000000..b4e3f2100907e6 --- /dev/null +++ b/ports/draco/fix-pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/draco.pc.template b/cmake/draco.pc.template +index 050219c..2886bfc 100644 +--- a/cmake/draco.pc.template ++++ b/cmake/draco.pc.template +@@ -1,6 +1,6 @@ + Name: @PROJECT_NAME@ + Description: Draco geometry de(com)pression library. + Version: @DRACO_VERSION@ +-Cflags: -I@includes_path@ +-Libs: -L@libs_path@ -ldraco ++Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -ldraco + Libs.private: @CMAKE_THREAD_LIBS_INIT@ diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index d34619dde7ae55..e05f9c0a06b5c8 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.5.3 - SHA512 8575ea78e0d8025facddbd42453b0251387f4e31eb0854135e050fc26aaf0d28ed30ccc3f93578fdc6cdb50369c2ef735291f1f5fb60238b289e0ee019446e1d + REF "${VERSION}" + SHA512 d4bc48aeac23aba377d1770a46e6676cb01596a436493385fb0c4ef9ba3f0fae42027232131a3d438250909aff4311353e114925753d045cc585af42660be0b1 HEAD_REF master PATCHES fix-compile-error-uwp.patch fix-uwperror.patch + fix-pkgconfig.patch disable-symlinks.patch ) diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 3fedb46f23d339..636f863eaa4dcd 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "draco", - "version": "1.5.3", + "version": "1.5.6", "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.", "homepage": "https://github.com/google/draco", "license": "Apache-2.0", diff --git a/ports/dstorage/portfile.cmake b/ports/dstorage/portfile.cmake index 7d5bcccc2b80d7..a0c36a349e135a 100644 --- a/ports/dstorage/portfile.cmake +++ b/ports/dstorage/portfile.cmake @@ -1,10 +1,11 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +# Set VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY instead of using `vcpkg_check_linkage` because +# these DLLs don't link with a CRT. +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/${VERSION}" FILENAME "directstorage.${VERSION}.zip" - SHA512 2c2cf6486220f99e7447c1a4406cea6fcaea69edccf790df6887acfde9a684e102547016adadd1ca23f17f8f02bfbd39095892ed63fba3e806bfa44ca9fe0fe6 + SHA512 5be6219888c89c5f590709d1528b3e6854eabd7b733af5c8f665aa9d7e987fa3bac34472362f845eb902b88d2d6e8afbbcead15e892d72678861a14b0bc13c41 ) vcpkg_extract_source_archive( diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index 70c3d8b7967755..0e62ec9bd93356 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,10 +1,9 @@ { "name": "dstorage", - "version": "1.1.0", - "port-version": 2, + "version": "1.2.0", "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "documentation": "https://github.com/microsoft/DirectStorage", "license": null, - "supports": "windows & !uwp & !xbox & !staticcrt" + "supports": "windows & !uwp & !xbox" } diff --git a/ports/duktape/vcpkg.json b/ports/duktape/vcpkg.json index cada97aea081af..2f2f0f2004507a 100644 --- a/ports/duktape/vcpkg.json +++ b/ports/duktape/vcpkg.json @@ -1,7 +1,7 @@ { "name": "duktape", - "version-string": "2.5.0", - "port-version": 3, + "version": "2.5.0", + "port-version": 4, "description": "Embeddable Javascript engine with a focus on portability and compact footprint.", "homepage": "https://github.com/svaarala/duktape", "dependencies": [ diff --git a/ports/dumb/check-for-math-lib.patch b/ports/dumb/check-for-math-lib.patch new file mode 100644 index 00000000000000..7365dad3e71afd --- /dev/null +++ b/ports/dumb/check-for-math-lib.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a793bba..6fd094c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -223,7 +223,10 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set_target_properties(dumb PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}) + ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + ++find_library(HAS_MATH_LIB NAMES "m") ++if(HAS_MATH_LIB) + target_link_libraries(dumb m) ++endif() + + install(FILES ${PKG_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + diff --git a/ports/dumb/do-not-overwrite-cflags.patch b/ports/dumb/do-not-overwrite-cflags.patch new file mode 100644 index 00000000000000..acc685595c0738 --- /dev/null +++ b/ports/dumb/do-not-overwrite-cflags.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a793bba..585ef78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,17 +29,17 @@ check_and_add_c_compiler_flag("-Wall" CMAKE_C_FLAGS) + add_definitions("-D_FILE_OFFSET_BITS=64") + add_definitions("-DDUMB_DECLARE_DEPRECATED") + +-set(CMAKE_C_FLAGS_DEBUG "-DDEBUGMODE=1 -D_DEBUG") ++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUGMODE=1 -D_DEBUG") + check_and_add_c_compiler_flag("-ggdb" CMAKE_C_FLAGS_DEBUG) + check_and_add_c_compiler_flag("-Zi" CMAKE_C_FLAGS_DEBUG) + +-set(CMAKE_C_FLAGS_RELEASE "-ffast-math -O2 -DNDEBUG") ++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math -O2 -DNDEBUG") + +-set(CMAKE_C_FLAGS_RELWITHDEBINFO "-ffast-math -O2 -DNDEBUG") ++set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math -O2 -DNDEBUG") + check_and_add_c_compiler_flag("-g" CMAKE_C_FLAGS_RELWITHDEBINFO) + check_and_add_c_compiler_flag("-Zi" CMAKE_C_FLAGS_RELWITHDEBINFO) + +-set(CMAKE_C_FLAGS_MINSIZEREL "-ffast-math -Os -DNDEBUG") ++set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -ffast-math -Os -DNDEBUG") + + if(USE_SSE) + check_c_compiler_flag("-msse" "CC_HAS_MSSE") diff --git a/ports/dumb/portfile.cmake b/ports/dumb/portfile.cmake new file mode 100644 index 00000000000000..6b723d0712fcf2 --- /dev/null +++ b/ports/dumb/portfile.cmake @@ -0,0 +1,44 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kode54/dumb + REF "${VERSION}" + SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf + HEAD_REF master + PATCHES + "check-for-math-lib.patch" + "do-not-overwrite-cflags.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_ALLEGRO4=OFF +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/dumb.pc" "-llibdumb" "-ldumb") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/dumb.pc" "-llibdumb" "-ldumbd") +endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/dumb.pc" " -lm" "") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/dumb.pc" " -lm" "") + endif() +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/dumb/vcpkg.json b/ports/dumb/vcpkg.json new file mode 100644 index 00000000000000..3a96b5aef7d560 --- /dev/null +++ b/ports/dumb/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "dumb", + "version": "2.0.3", + "description": "Module/tracker based music format parser and player library", + "homepage": "https://github.com/kode54/dumb", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/dx/vcpkg.json b/ports/dx/vcpkg.json index ddee4841024627..8d1eefd905e7d9 100644 --- a/ports/dx/vcpkg.json +++ b/ports/dx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dx", - "version-string": "1.0.1", - "port-version": 2, + "version": "1.0.1", + "port-version": 3, "description": "A modern C++ library for DirectX programming", "homepage": "https://github.com/sdcb/dx" } diff --git a/ports/dxsdk-d3dx/portfile.cmake b/ports/dxsdk-d3dx/portfile.cmake index 30bd0351fc3475..b406a6735f8a19 100644 --- a/ports/dxsdk-d3dx/portfile.cmake +++ b/ports/dxsdk-d3dx/portfile.cmake @@ -14,8 +14,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 9f6a95ed858555c1c438a85219ede32c82729068b21dd7ecf11de01cf3cdd525b2f04a58643bfcc14c48a29403dc1c80246f0a12a1ef4377b91b855f6d6d7986 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH PACKAGE_PATH +vcpkg_extract_source_archive( + PACKAGE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL ) diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index 758df63a6a1316..66641861475496 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 5, + "port-version": 6, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "license": null, diff --git a/ports/easycl/vcpkg.json b/ports/easycl/vcpkg.json index 2df4f360900dbf..c97eaf6655ec18 100644 --- a/ports/easycl/vcpkg.json +++ b/ports/easycl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easycl", - "version-string": "0.3", - "port-version": 1, + "version": "0.3", + "port-version": 2, "description": "OpenCL based lightweight c++ computing library", "homepage": "https://github.com/architector1324/EasyCL", "dependencies": [ diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index d67dc1d8fd5926..0e4e62c5d2ba11 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -9,14 +9,6 @@ vcpkg_from_github( PATCHES fix-build.patch ) -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" foreach(VCXPROJ IN ITEMS "${SOURCE_PATH}/EasyHookDll/EasyHookDll.vcxproj" @@ -78,7 +70,6 @@ vcpkg_install_msbuild( TARGET EasyHookDll RELEASE_CONFIGURATION "netfx4-Release" DEBUG_CONFIGURATION "netfx4-Debug" - PLATFORM ${BUILD_ARCH} ) # Remove the mismatch rebuild library diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json index 0a894137ad4d21..44ba815c74fd98 100644 --- a/ports/easyhook/vcpkg.json +++ b/ports/easyhook/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easyhook", "version": "2.7.7097.0", - "port-version": 5, + "port-version": 6, "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", "supports": "windows & !static & !uwp & (x86 | x64)" diff --git a/ports/easyloggingpp/0001_add_cmake_options.patch b/ports/easyloggingpp/0001_add_cmake_options.patch new file mode 100644 index 00000000000000..b20745f1d49b2d --- /dev/null +++ b/ports/easyloggingpp/0001_add_cmake_options.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 538cc8a..9221dab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,10 @@ option(test "Build all tests" OFF) + option(build_static_lib "Build easyloggingpp as a static library" OFF) + option(lib_utc_datetime "Build library with UTC date/time logging" OFF) + ++option(no_default_logfile "Do not write to default log file \"myeasylog.log\" (define ELPP_NO_DEFAULT_LOG_FILE)" OFF) ++option(thread_safe "Build easyloggingpp thread safe (define ELPP_THREAD_SAFE)" OFF) ++option(use_std_threads "Use standard library thread synchronization (define ELPP_FORCE_USE_STD_THREAD)" OFF) ++ + set(ELPP_MAJOR_VERSION "9") + set(ELPP_MINOR_VERSION "96") + set(ELPP_PATCH_VERSION "7") +@@ -57,6 +61,18 @@ if (build_static_lib) + add_definitions(-DELPP_UTC_DATETIME) + endif() + ++ if (no_default_logfile) ++ add_definitions(-DELPP_NO_DEFAULT_LOG_FILE) ++ endif() ++ ++ if (thread_safe) ++ add_definitions(-DELPP_THREAD_SAFE) ++ endif() ++ ++ if (use_std_threads) ++ add_definitions(-DELPP_FORCE_USE_STD_THREAD) ++ endif() ++ + require_cpp11() + add_library(easyloggingpp STATIC src/easylogging++.cc) + set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index 22f8b5ab9f3ecc..1e84b372483ea7 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -6,11 +6,21 @@ vcpkg_from_github( REF v9.97.0 SHA512 e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d HEAD_REF master + PATCHES + 0001_add_cmake_options.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + std-locking use_std_threads + thread-safe thread_safe + no-defaultfile no_default_logfile ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -Dbuild_static_lib=ON ) vcpkg_cmake_install() diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json index 8a5e5bbe1d965a..4ebffddaf3799a 100644 --- a/ports/easyloggingpp/vcpkg.json +++ b/ports/easyloggingpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easyloggingpp", "version": "9.97.0", - "port-version": 2, + "port-version": 3, "description": "Easylogging++ is a single header efficient logging library for C++ applications.", "homepage": "https://github.com/amrayn/easyloggingpp", "dependencies": [ @@ -13,5 +13,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "no-defaultfile": { + "description": "Do not write to default log file \"myeasylog.log\" (compile with ELPP_NO_DEFAULT_LOG_FILE)" + }, + "std-locking": { + "description": "Use std::mutex for thread synchronization (compile with ELPP_FORCE_USE_STD_THREAD)" + }, + "thread-safe": { + "description": "Make easyloggingpp thread safe (compile with ELPP_THREAD_SAFE)" + } + } } diff --git a/ports/eathread/portfile.cmake b/ports/eathread/portfile.cmake index 421f7c591a7e01..04f7e998d017f8 100644 --- a/ports/eathread/portfile.cmake +++ b/ports/eathread/portfile.cmake @@ -10,23 +10,22 @@ vcpkg_from_github( fix_cmake_install.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DEATHREAD_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EAThread) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EAThread) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/3RDPARTYLICENSES.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/eathread") diff --git a/ports/eathread/vcpkg.json b/ports/eathread/vcpkg.json index 4f18b4c7a326a8..dd634f9193e5ee 100644 --- a/ports/eathread/vcpkg.json +++ b/ports/eathread/vcpkg.json @@ -1,12 +1,20 @@ { "name": "eathread", "version-string": "1.32.09", - "port-version": 3, + "port-version": 5, "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.", "homepage": "https://github.com/electronicarts/EAThread", "supports": "!uwp & x64", "dependencies": [ "eabase", - "eastl" + "eastl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/ebml/include-limits.patch b/ports/ebml/include-limits.patch deleted file mode 100644 index 3d548edd3b30c3..00000000000000 --- a/ports/ebml/include-limits.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp -index 27e55fd..4c05fcf 100644 ---- a/src/EbmlString.cpp -+++ b/src/EbmlString.cpp -@@ -34,6 +34,7 @@ - \author Steve Lhomme - */ - #include -+#include - - #include "ebml/EbmlString.h" - -diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp -index 496a16a..99fc073 100644 ---- a/src/EbmlUnicodeString.cpp -+++ b/src/EbmlUnicodeString.cpp -@@ -36,6 +36,7 @@ - */ - - #include -+#include - - #include "ebml/EbmlUnicodeString.h" - diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index e92897923bc19f..41588f5a8ad375 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -1,15 +1,9 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libebml - REF release-1.4.2 - SHA512 2A03CA1D82A41EE05CFE4DD2726CC79295FA06A4D8ECEB93FE8F41BDFF09F04897B434B49DD1F496E1C014289B14C3F3416EAB4C8B1E745652FF1AB4A620BF83 + REF release-1.4.4 + SHA512 4a7926f56de211b8431105e37045a13d5e0576151326c87bc3168821c10342acee2aa6447438296f1d56893b3ebbc60851cb0c310f5561127612f0cd2477743f HEAD_REF master - PATCHES - include-limits.patch ) vcpkg_cmake_configure( @@ -25,3 +19,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/ebml/vcpkg.json b/ports/ebml/vcpkg.json index 18e817f2603d44..71cde02a43a227 100644 --- a/ports/ebml/vcpkg.json +++ b/ports/ebml/vcpkg.json @@ -1,10 +1,9 @@ { "name": "ebml", - "version": "1.4.2", + "version": "1.4.4", "port-version": 1, "description": "A C++ library to parse EBML files", "homepage": "https://github.com/Matroska-Org/libebml", - "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/ecos/portfile.cmake b/ports/ecos/portfile.cmake index 213d3266f5a37b..618a4d14a50248 100644 --- a/ports/ecos/portfile.cmake +++ b/ports/ecos/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF develop ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecos RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/ecos") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH "share/ecos") \ No newline at end of file diff --git a/ports/ecos/vcpkg.json b/ports/ecos/vcpkg.json index a6e6dfbe0b517b..7b276e11466158 100644 --- a/ports/ecos/vcpkg.json +++ b/ports/ecos/vcpkg.json @@ -1,6 +1,16 @@ { "name": "ecos", - "version-string": "2.0.8", - "port-version": 1, - "description": "A lightweight conic solver for second-order cone programming." + "version": "2.0.8", + "port-version": 3, + "description": "A lightweight conic solver for second-order cone programming.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 98f5c2e134500a..438ad5f9e44b1e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM x86) -endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) @@ -24,22 +20,22 @@ vcpkg_from_github( ) vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ECSUtil.sln - PLATFORM ${PLATFORM} + PLATFORM "${TRIPLET_SYSTEM_ARCH}" LICENSE_SUBPATH license.txt TARGET ECSUtil - RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} + RELEASE_CONFIGURATION "${ECSUtil_CONFIGURATION_RELEASE}" + DEBUG_CONFIGURATION "${ECSUtil_CONFIGURATION_DEBUG}" ) 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() -file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +file(COPY "${SOURCE_PATH}/ECSUtil" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/ECSUtil/res" "${CURRENT_PACKAGES_DIR}/tools") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll") 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() diff --git a/ports/ecsutil/vcpkg.json b/ports/ecsutil/vcpkg.json index 9439868dd89237..835190bebb16cd 100644 --- a/ports/ecsutil/vcpkg.json +++ b/ports/ecsutil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ecsutil", "version": "1.0.7.15", - "port-version": 3, + "port-version": 4, "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.", "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp", "supports": "windows & (x64 | x86) & !uwp", diff --git a/ports/edflib/CMakeLists.txt b/ports/edflib/CMakeLists.txt index 6a60fa5104968b..8358e27a9c1961 100644 --- a/ports/edflib/CMakeLists.txt +++ b/ports/edflib/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(EDFlib VERSION 1.21 LANGUAGES C) +project(EDFlib LANGUAGES C) option(BUILD_TOOLS "Build EDFlib tools." OFF) @@ -10,6 +10,15 @@ set(sources edflib.h edflib.c) add_library(EDFlib ${sources}) +if(BUILD_SHARED_LIBS) + target_compile_definitions(EDFlib + PUBLIC + EDFLIB_SO_DLL + PRIVATE + $ + ) +endif() + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_definitions(EDFlib PRIVATE _LARGEFILE64_SOURCE _LARGEFILE_SOURCE) target_compile_options(EDFlib PRIVATE -Wall -Wextra -Wshadow -Wformat-nonliteral -Wformat-security) @@ -21,6 +30,8 @@ install(TARGETS EDFlib EXPORT EDFlibTargets PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) diff --git a/ports/edflib/portfile.cmake b/ports/edflib/portfile.cmake index 2987b5919abe83..ec397bedecadbd 100644 --- a/ports/edflib/portfile.cmake +++ b/ports/edflib/portfile.cmake @@ -1,11 +1,9 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO Teuniz/EDFlib - REF v1.21 - SHA512 6153cec44e26c0b9cd2f7e00d014f38ee7bdc444015eaf6169fecaf4aa16b04a552d3755ac83d48728de8dac7fe22cb2d0c9566f0fdc967e15bc3f000f456106 + REF "v${VERSION}" + SHA512 3994d108efa45f49c4b9b68e6cfd10997b0c379631c1096dad7dd637cabe69c946d02e4204883308439ee5c9fe2382fc2f533ea14fe36bbbe6cedbaf04736b67 HEAD_REF master ) @@ -25,8 +23,18 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +vcpkg_copy_pdbs() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/edflib.h" + "#if defined(EDFLIB_SO_DLL)" + "#if 1 // defined(EDFLIB_SO_DLL)" + ) +endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-EDFlib) if ("tools" IN_LIST FEATURES) diff --git a/ports/edflib/vcpkg.json b/ports/edflib/vcpkg.json index e13eccddb10c4d..1b9b16be36e8e8 100644 --- a/ports/edflib/vcpkg.json +++ b/ports/edflib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "edflib", - "version": "1.21", + "version": "1.24", "description": "A C library to read/write EDF/EDF+/BDF/BDF+ files", "homepage": "https://www.teuniz.net/edflib/", "license": "BSD-3-Clause", diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index d0f83eef4f08d3..2d77a8b2f17723 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -8,19 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DENTITYX_BUILD_TESTING=false -DENTITYX_BUILD_SHARED=0 ) -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}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/entityx) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/entityx/COPYING ${CURRENT_PACKAGES_DIR}/share/entityx/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/entityx" RENAME copyright) diff --git a/ports/entityx/vcpkg.json b/ports/entityx/vcpkg.json index 101eb1fa0b6cfa..3b918ff5791af6 100644 --- a/ports/entityx/vcpkg.json +++ b/ports/entityx/vcpkg.json @@ -1,7 +1,13 @@ { "name": "entityx", - "version-string": "1.3.0", - "port-version": 3, + "version": "1.3.0", + "port-version": 5, "description": "EntityX - A fast, type-safe C++ Entity-Component system.", - "homepage": "https://github.com/alecthomas/entityx" + "homepage": "https://github.com/alecthomas/entityx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/fadbad/portfile.cmake b/ports/fadbad/portfile.cmake index 35c0ff8f5cb698..8892c48f13a7eb 100644 --- a/ports/fadbad/portfile.cmake +++ b/ports/fadbad/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 7a82c51c03acb0806d673853f391379ea974e304c831ee15ef05a90c30661736ff572481b5b8254b2646c63968043ee90a06cba88261b87fc34d01f92403360a ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/fadbad/vcpkg.json b/ports/fadbad/vcpkg.json index 162be37066f264..a559df4ab276bf 100644 --- a/ports/fadbad/vcpkg.json +++ b/ports/fadbad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fadbad", - "version-string": "2.1.0", - "port-version": 1, + "version": "2.1.0", + "port-version": 2, "description": "FADBAD++ Templates for Automatic Differentiation", "homepage": "https://www.fadbad.com/" } diff --git a/ports/fast-float/portfile.cmake b/ports/fast-float/portfile.cmake index 9d4ef884f1d716..d0b860c7d627f6 100644 --- a/ports/fast-float/portfile.cmake +++ b/ports/fast-float/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fastfloat/fast_float - REF "v${VERSION}" - SHA512 b2037a24ab6c9a9162f93e7a636def33270f48906e879dd7bb3064787c606d763aaa381eb310975a510d3a801f6a16a2050940f8592f94f336bc8f48f412d6c2 + REF "v${VERSION}" + SHA512 e3a1941364413f008d4bff190df45f95d7100263e57e714a907dba85b705fd19dcd34ac6db3fc332e5232fd4b67442542f2344a81d296ef04282e3d615dfe0fb HEAD_REF master ) diff --git a/ports/fast-float/vcpkg.json b/ports/fast-float/vcpkg.json index 7b46732b8ef6fc..63ff24daca5fa1 100644 --- a/ports/fast-float/vcpkg.json +++ b/ports/fast-float/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fast-float", - "version": "3.11.0", + "version": "4.0.0", "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod", "homepage": "https://github.com/fastfloat/fast_float", "license": "Apache-2.0 OR MIT", diff --git a/ports/fastfeat/portfile.cmake b/ports/fastfeat/portfile.cmake index 18ec525ca25e7d..d76f392e439b60 100644 --- a/ports/fastfeat/portfile.cmake +++ b/ports/fastfeat/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( file(COPY -${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/fastfeat.def -DESTINATION ${SOURCE_PATH} +"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" +"${CMAKE_CURRENT_LIST_DIR}/fastfeat.def" +DESTINATION "${SOURCE_PATH}" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastfeat RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fastfeat" RENAME copyright) diff --git a/ports/fastfeat/vcpkg.json b/ports/fastfeat/vcpkg.json index 550c8b70822556..597ce506f729df 100644 --- a/ports/fastfeat/vcpkg.json +++ b/ports/fastfeat/vcpkg.json @@ -1,6 +1,12 @@ { "name": "fastfeat", "version-string": "391d5e9", - "port-version": 2, - "description": "FAST feature detectors in C" + "port-version": 4, + "description": "FAST feature detectors in C", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/fastgltf/find_package.patch b/ports/fastgltf/find_package.patch new file mode 100644 index 00000000000000..fb2a533962b208 --- /dev/null +++ b/ports/fastgltf/find_package.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a311b65..bfbfbb3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,6 +74,8 @@ if (FASTGLTF_DOWNLOAD_SIMDJSON) + NAMESPACE fastgltf:: + DESTINATION lib/cmake/fastgltf + ) ++else() ++ find_package(simdjson CONFIG REQUIRED) + endif() + + # Create the library target diff --git a/ports/fastgltf/portfile.cmake b/ports/fastgltf/portfile.cmake index c4bad4e528ccaa..c2c42c8ac38639 100644 --- a/ports/fastgltf/portfile.cmake +++ b/ports/fastgltf/portfile.cmake @@ -2,8 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO spnda/fastgltf REF "v${VERSION}" - SHA512 a1456790a44b8d172e19425835d28e5a48994b8494b3f4b197dbab77c049816eead73cfc978e3ef6d41084799f4875b15ef88020357404d278f35189969d69d2 + SHA512 85b946f9ea849bcbbb77ff5d4dc8196d3348757cf6a940be1a50923158a31aa7b43aebed2799256cb3d303a81fa28e5eaeb000b6ecca3ab15f6a7a20908d8e8f HEAD_REF main + PATCHES find_package.patch ) vcpkg_cmake_configure( diff --git a/ports/fastgltf/vcpkg.json b/ports/fastgltf/vcpkg.json index 2ae4ba43d9bc35..febb0b262b9a49 100644 --- a/ports/fastgltf/vcpkg.json +++ b/ports/fastgltf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastgltf", - "version": "0.4.0", + "version": "0.5.0", "description": "Blazing fast C++17 glTF 2.0 loader powered by SIMD", "homepage": "https://github.com/spnda/fastgltf", "license": "MIT", diff --git a/ports/fastlz/portfile.cmake b/ports/fastlz/portfile.cmake index b9923d374d6d57..2826af500abcea 100644 --- a/ports/fastlz/portfile.cmake +++ b/ports/fastlz/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fastlz/vcpkg.json b/ports/fastlz/vcpkg.json index c27e1a60124250..04e23e869e2473 100644 --- a/ports/fastlz/vcpkg.json +++ b/ports/fastlz/vcpkg.json @@ -1,6 +1,13 @@ { "name": "fastlz", "version-date": "2021-05-10", + "port-version": 2, "description": "A lightning-fast lossless compression library", - "homepage": "https://github.com/ariya/FastLZ" + "homepage": "https://github.com/ariya/FastLZ", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/fastrtps/fix-xtime.patch b/ports/fastrtps/fix-xtime.patch new file mode 100644 index 00000000000000..9a8b4e3495887a --- /dev/null +++ b/ports/fastrtps/fix-xtime.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ca47ae..632c38b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,6 +42,18 @@ message(STATUS "Version: ${PROJECT_VERSION}") + ############################################################################### + option(EPROSIMA_BUILD "Activate internal building" OFF) + ++############################################################################### ++# Replace xtime with _timespec64. As a workround of the unreleased version of ++# MSVC, it will be deleted after release. ++############################################################################### ++if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") ++ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.36.32528.95") ++ file(READ "${PROJECT_SOURCE_DIR}/include/fastrtps/utils/TimedMutex.hpp" _contents) ++ string(REPLACE "xtime*" "_timespec64*" _contents "${_contents}") ++ file(WRITE "${PROJECT_SOURCE_DIR}/include/fastrtps/utils/TimedMutex.hpp" "${_contents}") ++ endif() ++endif() ++ + ############################################################################### + # Warning level + ############################################################################### diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 4bcf76b0ea7f09..a1c3c9f7108c18 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-find-package-asio.patch disable-symlink.patch + fix-xtime.patch ) vcpkg_cmake_configure( @@ -69,4 +70,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index 117a007c832655..c44fca36ad4992 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fastrtps", "version": "2.7.0", + "port-version": 1, "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", "homepage": "https://www.eprosima.com/", "license": "Apache-2.0", diff --git a/ports/fbgemm/fix-cmakelists.patch b/ports/fbgemm/fix-cmakelists.patch index 3f0b9015c71850..d209c795eeec64 100644 --- a/ports/fbgemm/fix-cmakelists.patch +++ b/ports/fbgemm/fix-cmakelists.patch @@ -1,146 +1,146 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6f19a16..3c758d2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") - include(GNUInstallDirs) - - # function to extract filelists from defs.bzl file --find_package(PythonInterp) - function(get_filelist name outputvar) - execute_process( - COMMAND "${PYTHON_EXECUTABLE}" -c -@@ -19,9 +18,6 @@ endfunction() - - project(fbgemm VERSION 0.1 LANGUAGES CXX C) - --set(FBGEMM_LIBRARY_TYPE "default" CACHE STRING -- "Type of library (shared, static, or default) to build") --set_property(CACHE FBGEMM_LIBRARY_TYPE PROPERTY STRINGS default static shared) - option(FBGEMM_BUILD_TESTS "Build fbgemm unit tests" ON) - option(FBGEMM_BUILD_BENCHMARKS "Build fbgemm benchmarks" ON) - option(FBGEMM_BUILD_DOCS "Build fbgemm documentation" OFF) -@@ -101,18 +97,11 @@ set_target_properties(fbgemm_generic fbgemm_avx2 fbgemm_avx512 PROPERTIES - #2) MSVC uses /MD in default cxx compiling flags, - #need to change it to /MT in static case - if(MSVC) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309") -- if(FBGEMM_LIBRARY_TYPE STREQUAL "static") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309 /wd4703") -+ if(NOT BUILD_SHARED_LIBS) - target_compile_definitions(fbgemm_generic PRIVATE ASMJIT_STATIC) - target_compile_definitions(fbgemm_avx2 PRIVATE ASMJIT_STATIC) - target_compile_definitions(fbgemm_avx512 PRIVATE ASMJIT_STATIC) -- foreach(flag_var -- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE -- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) -- if(${flag_var} MATCHES "/MD") -- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") -- endif(${flag_var} MATCHES "/MD") -- endforeach(flag_var) - endif() - target_compile_options(fbgemm_avx2 PRIVATE "/arch:AVX2") - target_compile_options(fbgemm_avx512 PRIVATE "/arch:AVX512") -@@ -145,7 +134,8 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") - message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") - message(WARNING "==========") - --if(NOT TARGET asmjit) -+find_package(asmjit CONFIG REQUIRED) # target 'asmjit::asmjit' -+if(FALSE) - #Download asmjit from github if ASMJIT_SRC_DIR is not specified. - if(NOT DEFINED ASMJIT_SRC_DIR) - set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" -@@ -164,7 +154,8 @@ if(NOT TARGET asmjit) - set_property(TARGET asmjit PROPERTY POSITION_INDEPENDENT_CODE ON) - endif() - --if(NOT TARGET cpuinfo) -+find_package(cpuinfo CONFIG REQUIRED) # target 'cpuinfo::cpuinfo' -+if(FALSE) - #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. - if(NOT DEFINED CPUINFO_SOURCE_DIR) - set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" -@@ -185,49 +176,38 @@ endif() - target_include_directories(fbgemm_generic BEFORE - PUBLIC $ - PUBLIC $ -- PRIVATE "${ASMJIT_SRC_DIR}/src" -- PRIVATE "${CPUINFO_SOURCE_DIR}/include") -+) -+target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit cpuinfo::cpuinfo) - - target_include_directories(fbgemm_avx2 BEFORE - PUBLIC $ - PUBLIC $ -- PRIVATE "${ASMJIT_SRC_DIR}/src" -- PRIVATE "${CPUINFO_SOURCE_DIR}/include") -+) -+target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) - - target_include_directories(fbgemm_avx512 BEFORE - PUBLIC $ - PUBLIC $ -- PRIVATE "${ASMJIT_SRC_DIR}/src" -- PRIVATE "${CPUINFO_SOURCE_DIR}/include") -- --if(FBGEMM_LIBRARY_TYPE STREQUAL "default") -- add_library(fbgemm -- $ -- $ -- $) --elseif(FBGEMM_LIBRARY_TYPE STREQUAL "shared") -- add_library(fbgemm SHARED -- $ -- $ -- $) -+) -+target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) -+ -+add_library(fbgemm -+ $ -+ $ -+ $) -+if(BUILD_SHARED_LIBS) - set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON) - set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON) - set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON) - set_target_properties(fbgemm PROPERTIES - CXX_VISIBILITY_PRESET hidden) --elseif(FBGEMM_LIBRARY_TYPE STREQUAL "static") -- add_library(fbgemm STATIC -- $ -- $ -- $) -+else() - #MSVC need to define FBGEMM_STATIC for fbgemm_generic also to - #avoid generating _dllimport functions. - target_compile_definitions(fbgemm_generic PRIVATE FBGEMM_STATIC) - target_compile_definitions(fbgemm_avx2 PRIVATE FBGEMM_STATIC) - target_compile_definitions(fbgemm_avx512 PRIVATE FBGEMM_STATIC) - target_compile_definitions(fbgemm PRIVATE FBGEMM_STATIC) --else() -- message(FATAL_ERROR "Unsupported library type ${FBGEMM_LIBRARY_TYPE}") - endif() - - if(USE_SANITIZER) -@@ -239,9 +219,7 @@ target_include_directories(fbgemm BEFORE - PUBLIC $ - PUBLIC $) - --target_link_libraries(fbgemm $ -- $) --add_dependencies(fbgemm asmjit cpuinfo) -+target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo) - - install(TARGETS fbgemm EXPORT fbgemmLibraryConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -254,7 +232,7 @@ install(FILES ${FBGEMM_PUBLIC_HEADERS} - install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm - FILE fbgemmLibraryConfig.cmake) - --if(MSVC) -+if(FALSE) - if(FBGEMM_LIBRARY_TYPE STREQUAL "shared") - install( - FILES $ $ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 58dcb9a..513a152 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + include(GNUInstallDirs) + + # function to extract filelists from defs.bzl file +-find_package(PythonInterp) + function(get_filelist name outputvar) + execute_process( + COMMAND "${PYTHON_EXECUTABLE}" -c +@@ -43,9 +42,6 @@ endfunction() + + project(fbgemm VERSION 0.1 LANGUAGES CXX C) + +-set(FBGEMM_LIBRARY_TYPE "default" CACHE STRING +- "Type of library (shared, static, or default) to build") +-set_property(CACHE FBGEMM_LIBRARY_TYPE PROPERTY STRINGS default static shared) + option(FBGEMM_BUILD_TESTS "Build fbgemm unit tests" ON) + option(FBGEMM_BUILD_BENCHMARKS "Build fbgemm benchmarks" ON) + option(FBGEMM_BUILD_DOCS "Build fbgemm documentation" OFF) +@@ -126,18 +122,11 @@ set_target_properties(fbgemm_generic fbgemm_avx2 fbgemm_avx512 PROPERTIES + #2) MSVC uses /MD in default cxx compiling flags, + #need to change it to /MT in static case + if(MSVC) +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309") +- if(FBGEMM_LIBRARY_TYPE STREQUAL "static") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267 /wd4305 /wd4309 /wd4703 /bigobj") ++ if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(fbgemm_generic PRIVATE ASMJIT_STATIC) + target_compile_definitions(fbgemm_avx2 PRIVATE ASMJIT_STATIC) + target_compile_definitions(fbgemm_avx512 PRIVATE ASMJIT_STATIC) +- foreach(flag_var +- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE +- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) +- if(${flag_var} MATCHES "/MD") +- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") +- endif(${flag_var} MATCHES "/MD") +- endforeach(flag_var) + endif() + target_compile_options(fbgemm_avx2 PRIVATE "/arch:AVX2") + target_compile_options(fbgemm_avx512 PRIVATE "/arch:AVX512") +@@ -189,7 +178,8 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") + message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") + message(WARNING "==========") + +-if(NOT TARGET asmjit) ++find_package(asmjit CONFIG REQUIRED) # target 'asmjit::asmjit' ++if(FALSE) + #Download asmjit from github if ASMJIT_SRC_DIR is not specified. + if(NOT DEFINED ASMJIT_SRC_DIR) + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" +@@ -218,7 +208,8 @@ if(NOT TARGET asmjit) + endif() + endif() + +-if(NOT TARGET cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) # target 'cpuinfo::cpuinfo' ++if(FALSE) + #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. + if(NOT DEFINED CPUINFO_SOURCE_DIR) + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" +@@ -239,49 +230,38 @@ endif() + target_include_directories(fbgemm_generic BEFORE + PUBLIC $ + PUBLIC $ +- PRIVATE "${ASMJIT_SRC_DIR}/src" +- PRIVATE "${CPUINFO_SOURCE_DIR}/include") ++) ++target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + + target_include_directories(fbgemm_avx2 BEFORE + PUBLIC $ + PUBLIC $ +- PRIVATE "${ASMJIT_SRC_DIR}/src" +- PRIVATE "${CPUINFO_SOURCE_DIR}/include") ++) ++target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + + target_include_directories(fbgemm_avx512 BEFORE + PUBLIC $ + PUBLIC $ +- PRIVATE "${ASMJIT_SRC_DIR}/src" +- PRIVATE "${CPUINFO_SOURCE_DIR}/include") +- +-if(FBGEMM_LIBRARY_TYPE STREQUAL "default") +- add_library(fbgemm +- $ +- $ +- $) +-elseif(FBGEMM_LIBRARY_TYPE STREQUAL "shared") +- add_library(fbgemm SHARED +- $ +- $ +- $) ++) ++target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) ++ ++add_library(fbgemm ++ $ ++ $ ++ $) ++if(BUILD_SHARED_LIBS) + set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON) + set_target_properties(fbgemm PROPERTIES + CXX_VISIBILITY_PRESET hidden) +-elseif(FBGEMM_LIBRARY_TYPE STREQUAL "static") +- add_library(fbgemm STATIC +- $ +- $ +- $) ++else() + #MSVC need to define FBGEMM_STATIC for fbgemm_generic also to + #avoid generating _dllimport functions. + target_compile_definitions(fbgemm_generic PRIVATE FBGEMM_STATIC) + target_compile_definitions(fbgemm_avx2 PRIVATE FBGEMM_STATIC) + target_compile_definitions(fbgemm_avx512 PRIVATE FBGEMM_STATIC) + target_compile_definitions(fbgemm PRIVATE FBGEMM_STATIC) +-else() +- message(FATAL_ERROR "Unsupported library type ${FBGEMM_LIBRARY_TYPE}") + endif() + + if(USE_SANITIZER) +@@ -293,9 +273,7 @@ target_include_directories(fbgemm BEFORE + PUBLIC $ + PUBLIC $) + +-target_link_libraries(fbgemm $ +- $) +-add_dependencies(fbgemm asmjit cpuinfo) ++target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + + install(TARGETS fbgemm EXPORT fbgemmLibraryConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -308,7 +286,7 @@ install(FILES ${FBGEMM_PUBLIC_HEADERS} + install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm + FILE fbgemmLibraryConfig.cmake) + +-if(MSVC) ++if(FALSE) + if(FBGEMM_LIBRARY_TYPE STREQUAL "shared") + install( + FILES $ $ diff --git a/ports/fbgemm/portfile.cmake b/ports/fbgemm/portfile.cmake index d7c443c0afebea..b03555175799bf 100644 --- a/ports/fbgemm/portfile.cmake +++ b/ports/fbgemm/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/fbgemm - REF 51bc2ecc7086980fd9e6190163b04486cd37ac2a - SHA512 43e59ff25ec9365061be6a8db7ec592f096e74897e338dd3e17401f2188986cf3b7e26f82f7c1e2adf34496fb32cb4b50d40731bee3bf9fa5b1f2ac92a09e671 + REF 64833b5185893cbc71ea80c9b01443f762b5cba4 + SHA512 f256177f22d3a4abd9c861bafd96e12df33e7604416c26ac06c9e480fd5f1e0b4149132b3216790704ebf73d47a7277235f058d58f0ecafa8de23360022f202d PATCHES fix-cmakelists.patch ) diff --git a/ports/fbgemm/vcpkg.json b/ports/fbgemm/vcpkg.json index 40cef65267b7e1..b399dbf34e5ff5 100644 --- a/ports/fbgemm/vcpkg.json +++ b/ports/fbgemm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fbgemm", - "version-date": "2021-03-18", - "port-version": 4, + "version": "0.4.1", "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)", "homepage": "https://code.fb.com/ml-applications/fbgemm/", "license": "BSD-3-Clause", diff --git a/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch b/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch deleted file mode 100644 index f189e8777fe8bd..00000000000000 --- a/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5bd55f11e1b6cc2cb08a0001f9c77f56fb8ac649 Mon Sep 17 00:00:00 2001 -From: Kevin Lin -Date: Mon, 18 Apr 2022 12:17:40 -0700 -Subject: [PATCH] thrift/compiler/compiler.cc: Include fstream to fix - compatibility with Boost 1.79.0 (#494) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary: -This patch fixes fbthrift build compatibility with Boost 1.79.0. The symptom is the following compiler error: - -``` -/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc: In function ‘bool apache::thrift::compiler::{anonymous}::generate(const apache::thrift::compiler::{anonymous}::gen_params&, apache::thrift::compiler::t_program*, std::set >&)’: -/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc:331:19: error: aggregate ‘std::ofstream genfile’ has incomplete type and cannot be defined - 331 | std::ofstream genfile; - | ^~~~~~~ -make[2]: *** [thrift/compiler/CMakeFiles/thrift1.dir/build.make:76: thrift/compiler/CMakeFiles/thrift1.dir/compiler.cc.o] Error 1 -make[1]: *** [CMakeFiles/Makefile2:253: thrift/compiler/CMakeFiles/thrift1.dir/all] Error 2 -make: *** [Makefile:152: all] Error 2 -``` - -To reproduce, install the standard fbthrift dependencies, but with Boost 1.79.0 compiled from source, followed by: - -``` -$ mkdir build && cd build -$ cmake -DCMAKE_BUILD_TYPE=RELEASE CXXFLAGS="-fPIC" .. -$ make -j -``` - -Adding an include on `fstream` allows for the build to complete successfully. - -Pull Request resolved: https://github.com/facebook/fbthrift/pull/494 - -Reviewed By: iahs - -Differential Revision: D35709922 - -Pulled By: vitaut - -fbshipit-source-id: 96f0764c7b33047acb7b5ad26b21076757aaa5e7 ---- - thrift/compiler/compiler.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc -index 721ff7dbf3..da944c2950 100644 ---- a/thrift/compiler/compiler.cc -+++ b/thrift/compiler/compiler.cc -@@ -32,6 +32,7 @@ - #include - #endif - #include -+#include - - #include - #include --- -2.34.1.windows.1 - diff --git a/ports/fbthrift/0002-fix-dependency.patch b/ports/fbthrift/0002-fix-dependency.patch new file mode 100644 index 00000000000000..d06d2d79d51473 --- /dev/null +++ b/ports/fbthrift/0002-fix-dependency.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2b69ad..84b2bf8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,22 +96,24 @@ endif () + + # Find required dependencies for thrift/lib + if (THRIFT_LIB_ONLY OR build_all) +- find_package(Gflags REQUIRED) ++ find_package(gflags CONFIG REQUIRED) ++ set(LIBGFLAGS_LIBRARY gflags::gflags) + find_package(glog CONFIG REQUIRED) + set (GLOG_LIBRARIES glog::glog) + find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) + find_package(ZLIB REQUIRED) +- find_package(Zstd REQUIRED) ++ find_package(zstd CONFIG REQUIRED) ++ if(TARGET zstd::libzstd_shared) ++ set(ZSTD_LIBRARIES zstd::libzstd_shared) ++ elseif(TARGET zstd::libzstd_static) ++ set(ZSTD_LIBRARIES zstd::libzstd_static) ++ endif() + # https://cmake.org/cmake/help/v3.9/module/FindThreads.html + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads) + include_directories( +- ${LIBGFLAGS_INCLUDE_DIR} +- ${GLOG_INCLUDE_DIRS} +- ${OPENSSL_INCLUDE_DIR} +- ${ZSTD_INCLUDE_DIRS} + ) + add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0") + if (THRIFT_LIB_ONLY) +diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in +index e1297ed..c7d9d59 100644 +--- a/thrift/cmake/FBThriftConfig.cmake.in ++++ b/thrift/cmake/FBThriftConfig.cmake.in +@@ -28,7 +28,14 @@ else() + set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") + endif() + +-find_dependency(ZLIB REQUIRED) ++find_dependency(fizz CONFIG ) ++find_dependency(fmt CONFIG ) ++find_dependency(folly CONFIG ) ++find_dependency(gflags CONFIG) ++find_dependency(glog CONFIG ) ++find_dependency(wangle CONFIG ) ++find_dependency(ZLIB) ++find_dependency(zstd CONFIG) + + if (NOT TARGET FBThrift::thriftcpp2) + include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake") diff --git a/ports/fbthrift/fix-glog.patch b/ports/fbthrift/fix-glog.patch index 6429171b4ab25d..362e1d1eed09a2 100644 --- a/ports/fbthrift/fix-glog.patch +++ b/ports/fbthrift/fix-glog.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b248a0..beae7d7 100644 +index 7d9a1e7..d2b69ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -101,7 +101,8 @@ endif () +@@ -97,7 +97,8 @@ endif () # Find required dependencies for thrift/lib - if(lib_only OR build_all) + if (THRIFT_LIB_ONLY OR build_all) find_package(Gflags REQUIRED) - find_package(Glog REQUIRED) + find_package(glog CONFIG REQUIRED) + set (GLOG_LIBRARIES glog::glog) find_package(folly CONFIG REQUIRED) find_package(fizz CONFIG REQUIRED) - find_package(fmt CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 2781261bb69862..5c2b0411bbe63c 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -4,14 +4,23 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF v2022.03.21.00 - SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab + REF "v${VERSION}" + SHA512 b9f7bb7037cbc24ba18928cfad8673fd321ec095dec5fa6ca5b6c51b468873bbefde4326d39faa916747f4273b5a4003d60c0f6f755bfce095f9d3e8946bcb46 HEAD_REF master PATCHES - 0001-fix-compatibility-with-boost-1.79.0.patch fix-glog.patch + 0002-fix-dependency.patch ) +file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake") +file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindOpenSSL.cmake") +file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindZstd.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -41,6 +50,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/gtest/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index c491882e6b214d..fe7f39aea1db39 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fbthrift", - "version-string": "2022.03.21.00", - "port-version": 2, + "version-string": "2023.05.15.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/fdlibm/portfile.cmake b/ports/fdlibm/portfile.cmake index f822cef95bd944..0f673e9f2a8ed8 100644 --- a/ports/fdlibm/portfile.cmake +++ b/ports/fdlibm/portfile.cmake @@ -4,19 +4,18 @@ vcpkg_from_git( REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/libm5.def" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Handle copyright -configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY) +configure_file("${SOURCE_PATH}/NOTICE" "${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright" COPYONLY) diff --git a/ports/fdlibm/vcpkg.json b/ports/fdlibm/vcpkg.json index f90a637c991e71..cbe67e7bbe34ed 100644 --- a/ports/fdlibm/vcpkg.json +++ b/ports/fdlibm/vcpkg.json @@ -1,6 +1,12 @@ { "name": "fdlibm", - "version-string": "5.3", - "port-version": 5, - "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic" + "version": "5.3", + "port-version": 7, + "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index e6a50f1d31e64f..62c3861b8c001a 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES omp_test.patch diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index db34dea94e29aa..e1c6aae6076dbd 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 5, + "port-version": 6, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "license": "GPL-2.0-or-later", diff --git a/ports/fineftp/asio.patch b/ports/fineftp/asio.patch new file mode 100644 index 00000000000000..a5d008f4be62f6 --- /dev/null +++ b/ports/fineftp/asio.patch @@ -0,0 +1,13 @@ +diff --git a/fineftp-server/CMakeLists.txt b/fineftp-server/CMakeLists.txt +index e4e3152..9e609d9 100644 +--- a/fineftp-server/CMakeLists.txt ++++ b/fineftp-server/CMakeLists.txt +@@ -10,7 +10,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) + set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + + find_package(Threads REQUIRED) +-find_package(asio REQUIRED) ++find_package(asio CONFIG REQUIRED) + + # Include GenerateExportHeader that will create export macros for us + include(GenerateExportHeader) diff --git a/ports/fineftp/portfile.cmake b/ports/fineftp/portfile.cmake new file mode 100644 index 00000000000000..c8738520fc87e4 --- /dev/null +++ b/ports/fineftp/portfile.cmake @@ -0,0 +1,26 @@ +#Get release from GitHub +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eclipse-ecal/fineftp-server + REF "v${VERSION}" + SHA512 dcced2cf743434a55314ad661ca729efc1c4883ae0c0883335f43a12ed47568ebcb50d233dab8a1410bb526587b24f1cf19938241bf649cfe54b11ffe264124b + HEAD_REF master + PATCHES + asio.patch +) + +# Configure +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME fineftp + CONFIG_PATH lib/cmake/fineftp +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fineftp/vcpkg.json b/ports/fineftp/vcpkg.json new file mode 100644 index 00000000000000..60b9832f29905e --- /dev/null +++ b/ports/fineftp/vcpkg.json @@ -0,0 +1,20 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "fineftp", + "version": "1.3.4", + "description": "FineFTP is a minimal FTP server library for Windows and Unix flavors.", + "homepage": "https://github.com/eclipse-ecal/fineftp-server", + "license": "MIT", + "supports": "!uwp & !android", + "dependencies": [ + "asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/fizz/0003-fix-deps.patch b/ports/fizz/0003-fix-deps.patch new file mode 100644 index 00000000000000..0ef7605358eb65 --- /dev/null +++ b/ports/fizz/0003-fix-deps.patch @@ -0,0 +1,175 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index 64eec10..6c5a934 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -50,10 +50,9 @@ find_package(folly CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) +-find_package(DoubleConversion REQUIRED) ++find_package(glog CONFIG REQUIRED) ++find_package(double-conversion CONFIG REQUIRED) + find_package(Threads REQUIRED) +-find_package(Zstd REQUIRED) + if (UNIX AND NOT APPLE) + find_package(Librt) + endif() +@@ -66,37 +65,17 @@ SET(FIZZ_SHINY_DEPENDENCIES "") + SET(FIZZ_LINK_LIBRARIES "") + SET(FIZZ_INCLUDE_DIRECTORIES "") + +-find_package(gflags CONFIG QUIET) +-if (gflags_FOUND) +- message(STATUS "Found gflags from package config") +- if (TARGET gflags-shared) +- list(APPEND FIZZ_SHINY_DEPENDENCIES gflags-shared) +- elseif (TARGET gflags) +- list(APPEND FIZZ_SHINY_DEPENDENCIES gflags) +- else() +- message(FATAL_ERROR "Unable to determine the target name for the GFlags package.") +- endif() +- list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES}) +- list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR}) +-else() +- find_package(Gflags REQUIRED MODULE) +- list(APPEND FIZZ_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY}) +- list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR}) +- list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY}) +- list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR}) ++find_package(zstd CONFIG REQUIRED) ++if(TARGET zstd::libzstd_shared) ++ list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_shared) ++elseif(TARGET zstd::libzstd_static) ++ list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_static) + endif() + ++find_package(gflags CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + + find_package(Libevent CONFIG REQUIRED) +-if(TARGET libevent::core) +- message(STATUS "Found libevent from package config") +- list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core) +-else() +- find_package(Libevent MODULE REQUIRED) +- list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB}) +- list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) +-endif() + + configure_file(fizz-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h DESTINATION ${INCLUDE_INSTALL_DIR}/fizz/) +@@ -243,30 +222,25 @@ target_include_directories( + $ + $ + $ +- ${FOLLY_INCLUDE_DIR} +- ${OPENSSL_INCLUDE_DIR} +- ${sodium_INCLUDE_DIR} +- ${ZSTD_INCLUDE_DIR} + PRIVATE +- ${GLOG_INCLUDE_DIRS} + ${FIZZ_INCLUDE_DIRECTORIES} +- ${DOUBLE_CONVERSION_INCLUDE_DIR} + ) + + + target_link_libraries(fizz + PUBLIC +- ${FOLLY_LIBRARIES} +- ${OPENSSL_LIBRARIES} ++ Folly::folly ++ OpenSSL::SSL ++ OpenSSL::Crypto + unofficial-sodium::sodium + Threads::Threads + ZLIB::ZLIB +- ${ZSTD_LIBRARY} + PRIVATE +- ${GLOG_LIBRARIES} +- ${GFLAGS_LIBRARIES} ++ glog::glog ++ gflags::gflags + ${FIZZ_LINK_LIBRARIES} +- ${DOUBLE_CONVERSION_LIBRARY} ++ libevent::core ++ double-conversion::double-conversion + ${CMAKE_DL_LIBS} + ${LIBRT_LIBRARIES}) + +@@ -323,8 +297,7 @@ ENDIF(CMAKE_CROSSCOMPILING) + SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) + + if(BUILD_TESTS) +- find_package(GMock 1.8.0 MODULE REQUIRED) +- find_package(GTest 1.8.0 MODULE REQUIRED) ++ find_package(GTest CONFIG REQUIRED) + endif() + + add_library(fizz_test_support +@@ -337,21 +310,9 @@ add_library(fizz_test_support + target_link_libraries(fizz_test_support + PUBLIC + fizz +- ${LIBGMOCK_LIBRARIES} +- ${GLOG_LIBRARY} ++ glog::glog + ) + +-target_compile_definitions(fizz_test_support +- PUBLIC +- ${LIBGMOCK_DEFINES} +-) +- +-target_include_directories(fizz_test_support +- SYSTEM +- PUBLIC +- ${LIBGMOCK_INCLUDE_DIR} +- ${LIBGTEST_INCLUDE_DIRS} +-) + + # export fizz headers and targets for unit tests utils + # since other projects such as mvfst and proxygen use them +@@ -375,14 +336,13 @@ macro(add_gtest test_source test_name) + add_executable(${test_name} ${test_source} test/CMakeTestMain.cpp) + + set_property(TARGET ${test_name} PROPERTY ENABLE_EXPORTS true) +- target_include_directories( +- ${test_name} PUBLIC ${LIBGMOCK_INCLUDE_DIR} ${LIBGTEST_INCLUDE_DIR}) +- target_compile_definitions(${test_name} PUBLIC ${LIBGMOCK_DEFINES}) + target_link_libraries( + ${test_name} + fizz + fizz_test_support +- ${LIBGMOCK_LIBRARIES}) ++ GTest::gtest ++ GTest::gmock ++ ) + + if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) + # GMOCK_MOCK_METHOD() will complain otherwise +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index 3fb48b2..baa43a6 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -26,10 +26,19 @@ endif() + set(FIZZ_LIBRARIES fizz::fizz) + + include(CMakeFindDependencyMacro) +-find_dependency(unofficial-sodium CONFIG REQUIRED) ++find_dependency(unofficial-sodium CONFIG) + find_dependency(folly CONFIG) + find_dependency(ZLIB) + find_dependency(Libevent CONFIG) ++find_dependency(fmt CONFIG) ++find_dependency(OpenSSL) ++find_dependency(glog CONFIG) ++find_dependency(double-conversion CONFIG) ++find_dependency(Threads) ++find_dependency(gflags CONFIG) ++find_dependency(zstd CONFIG) ++find_dependency(GTest CONFIG) ++ + + if (NOT fizz_FIND_QUIETLY) + message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 31aea2d7cea5c8..cd386f2ed5959d 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF 47948342be43ddb951e12a53770278be52d479e7 #v2022.10.31.00 - SHA512 b91fbbe008bbd6ee5e865a585cd51f1a1b69360eba32231f0b585b836e5591ee4cc9ffe1d747a82267f21736056fc97932b35212016e614928c13de7c5a64f55 + REF "v${VERSION}" + SHA512 6b057a0610e12e1bbfa668f0233d0daf0ce872247deaa9301bd8b842c7c01afd78812fe2170479b128852c4bf22dffd4a5d84b1970e59e4e82f35b0fb7e54e5e HEAD_REF master PATCHES 0001-fix-libsodium.patch 0002-fix-libevent.patch + 0003-fix-deps.patch ) # Prefer installed config files diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index a87e01bd62b31d..35e5c5cf47ee51 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2022.10.31.00", + "version-string": "2023.05.15.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", @@ -8,6 +8,9 @@ "double-conversion", "fmt", "folly", + "gflags", + "glog", + "gtest", "libevent", "libsodium", "openssl", diff --git a/ports/flashlight-cpu/portfile.cmake b/ports/flashlight-cpu/portfile.cmake index cf4f1cdcc3a987..11459b6d055e84 100644 --- a/ports/flashlight-cpu/portfile.cmake +++ b/ports/flashlight-cpu/portfile.cmake @@ -35,20 +35,19 @@ vcpkg_check_features( ) # Build and install -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FEATURE_OPTIONS} OPTIONS_DEBUG - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight" OPTIONS_RELEASE - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight) +vcpkg_cmake_config_fixup(PACKAGE_NAME flashlight) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -85,4 +84,4 @@ if (NUM_TOOLS GREATER 0) endif() # Copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/flashlight-cpu/vcpkg.json b/ports/flashlight-cpu/vcpkg.json index 03ef5e957d6c11..2794691a6158c0 100644 --- a/ports/flashlight-cpu/vcpkg.json +++ b/ports/flashlight-cpu/vcpkg.json @@ -1,11 +1,21 @@ { "name": "flashlight-cpu", "version": "0.3", - "port-version": 3, + "port-version": 5, "description": "A C++ standalone library for machine learning. CPU backend.", "homepage": "https://github.com/facebookresearch/flashlight", "license": "MIT", "supports": "!(windows | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "fl" ], diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index 9935ea94eb1914..49582ffb691cb9 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -34,20 +34,19 @@ vcpkg_check_features( ) # Build and install -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FEATURE_OPTIONS} OPTIONS_DEBUG - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight" OPTIONS_RELEASE - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight) +vcpkg_cmake_config_fixup(PACKAGE_NAME flashlight) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -84,4 +83,4 @@ if (NUM_TOOLS GREATER 0) endif() # Copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index 0f0afd07551030..e950197c888c45 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,11 +1,21 @@ { "name": "flashlight-cuda", "version": "0.3", - "port-version": 4, + "port-version": 6, "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", "license": "MIT", "supports": "!(windows | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "fl" ], diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index acdeb70ffe13f4..afb8009e264dfb 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers REF "v${VERSION}" - SHA512 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 + SHA512 6eb5417984782208e0fcc33285d02bb13cda526d4029e0dd58e27c4f813eb39f26105ab0ed0880f7c02614985b96a241aad5086dd4f2d131c534a44a2884d08e HEAD_REF master PATCHES fix-uwp-build.patch @@ -36,7 +36,7 @@ if(flatc_path) vcpkg_copy_tools(TOOL_NAMES flatc AUTO_CLEAN) else() file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/flatbuffers-config.cmake" -"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n") +"\ninclude(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json index b603a4588b9bd7..6c8746376b6a82 100644 --- a/ports/flatbuffers/vcpkg.json +++ b/ports/flatbuffers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flatbuffers", - "version": "23.3.3", + "version": "23.5.9", "description": [ "Memory Efficient Serialization Library", "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility." diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 261a8f7d1bd9ee..8d5eed2fbf69f8 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 9de0a2d37df14db322ef5efc0270e940d1c7cffaa780a3e6fc91a3671dfde5428bc46608065d0fc25268527774c846efdc7756e4bf17a83d8242ed34ce8a4ee7 + SHA512 7daa7e1c984b59e749e9e8bed0ddc0d6e848206cc804c29792ae7d2090d685eba279bf0dd9463cfc9577e2c10c66b9fa0c473947828b865652b15d806d50ac91 HEAD_REF master ) @@ -31,6 +31,7 @@ endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/flecs/usage b/ports/flecs/usage new file mode 100644 index 00000000000000..c513e501903f58 --- /dev/null +++ b/ports/flecs/usage @@ -0,0 +1,4 @@ +The package flecs provides CMake targets: + + find_package(flecs CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,flecs::flecs,flecs::flecs_static>) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index ca7c64c07502e6..2f102932e5e514 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.0", + "version": "3.2.3", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/ports/flint/portfile.cmake b/ports/flint/portfile.cmake index cd8c8ed0366954..f43f78e0ab0be4 100644 --- a/ports/flint/portfile.cmake +++ b/ports/flint/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_find_acquire_program(PYTHON3) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES fix-cmakelists.patch diff --git a/ports/flint/vcpkg.json b/ports/flint/vcpkg.json index 9c85c6007f95a0..82fd2fb5201224 100644 --- a/ports/flint/vcpkg.json +++ b/ports/flint/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flint", "version-semver": "2.8.0", - "port-version": 1, + "port-version": 2, "description": "Fast Library for Number Theory", "homepage": "https://www.flintlib.org/", "supports": "!uwp", diff --git a/ports/fluidlite/fix-dependencies.patch b/ports/fluidlite/fix-dependencies.patch new file mode 100644 index 00000000000000..4d3bd691790f6c --- /dev/null +++ b/ports/fluidlite/fix-dependencies.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4aead6c369f129f50d79d77e6ac8f58afba91fa5..83f3f5026861dd904060293be8754c9e265047ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,7 +113,7 @@ endif() + + set(FLUIDLITE_VENDORED FALSE) + if (ENABLE_SF3 AND NOT STB_VORBIS) +- find_package(Vorbis QUIET) ++ find_package(Vorbis CONFIG REQUIRED) + if (NOT TARGET Vorbis::vorbisfile) + message(WARNING "Using vendored libogg/libvorbis") + +diff --git a/fluidlite-config.cmake.in b/fluidlite-config.cmake.in +index 8c40ff0eb077fc0fd530f052500214d75e96899d..46940e4cd218d245014f40f1097f7193cc8952b3 100644 +--- a/fluidlite-config.cmake.in ++++ b/fluidlite-config.cmake.in +@@ -15,7 +15,7 @@ endif() + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-static-targets.cmake") + include(CMakeFindDependencyMacro) + if("${FLUIDLITE_SF3_SUPPORT}" STREQUAL "SF3_XIPH_VORBIS" AND NOT FLUIDLITE_VENDORED AND NOT TARGET Vorbis::vorbisfile) +- find_dependency(Vorbis) ++ find_dependency(Vorbis CONFIG) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-static-targets.cmake") diff --git a/ports/fluidlite/portfile.cmake b/ports/fluidlite/portfile.cmake index ab9fab94e0f2fc..b6d2e8ee7e5d6e 100644 --- a/ports/fluidlite/portfile.cmake +++ b/ports/fluidlite/portfile.cmake @@ -1,32 +1,38 @@ -if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fluidsynth/copyright") - message(FATAL_ERROR "Can't build fluidlite if fluidsynth is installed. Please remove fluidsynth, and try to install fluidlite again if you need it.") -endif() - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO divideconcept/FluidLite - REF fdd05bad03cdb24d1f78b5fe3453842890c1b0e8 - SHA512 8118bec2cb5ee48b8064ed2111610f1917ee8e6f1dc213121b2311d056da21d7f618ef50735e7653d2cccf1e96652f3ccf026101fccb9863448008918add53e0 - HEAD_REF master + REF d59d2328818f913b7d1a6a59aed695c47a8ce388 + SHA512 d08ddd0b61dc16c26e5ebc8e54e2efef163f8d0b4da6ce4a040b49756feb105220d48ec6238568b00c68dfa244fac0ab53e3c59c066d4b92dc248df3715c388c + PATCHES + fix-dependencies.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLUIDLITE_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLUIDLITE_BUILD_SHARED) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sf3 ENABLE_SF3 +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DFLUIDLITE_BUILD_STATIC=${FLUIDLITE_BUILD_STATIC} - -DFLUIDLITE_BUILD_SHARED=${FLUIDLITE_BUILD_SHARED} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME fluidlite + CONFIG_PATH lib/cmake/fluidlite +) + vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fluidlite/usage b/ports/fluidlite/usage new file mode 100644 index 00000000000000..d408e9cd56bb78 --- /dev/null +++ b/ports/fluidlite/usage @@ -0,0 +1,4 @@ +fluidlite provides CMake targets: + + find_package(fluidlite CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,fluidlite::fluidlite,fluidlite::fluidlite-static>) diff --git a/ports/fluidlite/vcpkg.json b/ports/fluidlite/vcpkg.json index 51c3a0bc7cbb5f..a0d05e9ac4c833 100644 --- a/ports/fluidlite/vcpkg.json +++ b/ports/fluidlite/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fluidlite", - "version-date": "2020-08-27", - "port-version": 3, + "version-date": "2023-04-18", "description": "FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant.", "homepage": "https://github.com/divideconcept/FluidLite", "license": "LGPL-2.1-or-later", @@ -9,6 +8,21 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "sf3" + ], + "features": { + "sf3": { + "description": "Enable SF3 files (ogg/vorbis compressed samples)", + "dependencies": [ + "libvorbis" + ] } - ] + } } diff --git a/ports/fluidsynth/add-usage-requirements.patch b/ports/fluidsynth/add-usage-requirements.patch deleted file mode 100644 index e5b63eebc8a61f..00000000000000 --- a/ports/fluidsynth/add-usage-requirements.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/FluidSynthConfig.cmake.in b/FluidSynthConfig.cmake.in -index 1ffdf598..0be65e0e 100644 ---- a/FluidSynthConfig.cmake.in -+++ b/FluidSynthConfig.cmake.in -@@ -6,5 +6,16 @@ - # define variables for configuration options: - # set(network-enabled @enable-network@) - -+include(CMakeFindDependencyMacro) -+find_dependency(PkgConfig) -+pkg_check_modules(GLIB IMPORTED_TARGET glib-2.0>=2.6.5 gthread-2.0>=2.6.5) -+set(ALSA_SUPPORT @ALSA_SUPPORT@) -+if(ALSA_SUPPORT) -+ pkg_check_modules(ALSA IMPORTED_TARGET alsa>=0.9.1) -+endif() -+set(LIBSNDFILE_SUPPORT @LIBSNDFILE_SUPPORT@) -+if(LIBSNDFILE_SUPPORT) -+ pkg_check_modules(LIBSNDFILE IMPORTED_TARGET sndfile>=1.0.0) -+endif() - # finally, include the targets file - include("${CMAKE_CURRENT_LIST_DIR}/FluidSynthTargets.cmake") diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index 4b6823719708c1..cdf2d316071cdc 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -1,12 +1,19 @@ +if("pulseaudio" IN_LIST FEATURES) + message( + "${PORT} with pulseaudio feature currently requires the following from the system package manager: + libpulse-dev pulseaudio + These can be installed on Ubuntu systems via sudo apt install libpulse-dev pulseaudio" + ) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth REF "v${VERSION}" - SHA512 1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22 + SHA512 21798b5a80a7edd8ef02b983d9b230af45cc66b98b32d593228e12dbec15b12c6cf6c0f3692c12af66de1ba2049fa9d6ad2b68c7d1579347eec14d24870b0025 HEAD_REF master PATCHES gentables.patch - add-usage-requirements.patch ) vcpkg_check_features( @@ -14,29 +21,40 @@ vcpkg_check_features( FEATURES buildtools VCPKG_BUILD_MAKE_TABLES sndfile enable-libsndfile + pulseaudio enable-pulseaudio ) -set(feature_list dbus jack libinstpatch midishare opensles oboe openmp oss sdl2 pulseaudio readline lash systemd dart) -foreach(_feature IN LISTS feature_list) - list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) -endforeach() +# enable platform-specific features, force the build to fail if the required libraries are not found, +# and disable all other features to avoid system libraries to be picked up +set(WINDOWS_OPTIONS enable-dsound enable-wasapi enable-waveout enable-winmidi HAVE_MMSYSTEM_H HAVE_DSOUND_H HAVE_OBJBASE_H) +set(MACOS_OPTIONS enable-coreaudio enable-coremidi COREAUDIO_FOUND COREMIDI_FOUND) +set(LINUX_OPTIONS enable-alsa ALSA_FOUND) +set(ANDROID_OPTIONS enable-opensles OpenSLES_FOUND) +set(IGNORED_OPTIONS enable-coverage enable-dbus enable-floats enable-fpe-check enable-framework enable-jack enable-lash + enable-libinstpatch enable-midishare enable-oboe enable-openmp enable-oss enable-pipewire enable-portaudio + enable-profiling enable-readline enable-sdl2 enable-systemd enable-trap-on-fpe enable-ubsan) -# enable platform-specific features, and force the build to fail if the -# required libraries are not found -list(APPEND FEATURE_OPTIONS -Denable-dsound=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -Denable-wasapi=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -Denable-waveout=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -Denable-winmidi=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -DHAVE_MMSYSTEM_H=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -DHAVE_DSOUND_H=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -DHAVE_WASAPI_HEADERS=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -DHAVE_OBJBASE_H=${VCPKG_TARGET_IS_WINDOWS}) -list(APPEND FEATURE_OPTIONS -Denable-coreaudio=${VCPKG_TARGET_IS_OSX}) -list(APPEND FEATURE_OPTIONS -Denable-coremidi=${VCPKG_TARGET_IS_OSX}) -list(APPEND FEATURE_OPTIONS -DCOREAUDIO_FOUND=${VCPKG_TARGET_IS_OSX}) -list(APPEND FEATURE_OPTIONS -DCOREMIDI_FOUND=${VCPKG_TARGET_IS_OSX}) -list(APPEND FEATURE_OPTIONS -Denable-alsa=${VCPKG_TARGET_IS_LINUX}) -list(APPEND FEATURE_OPTIONS -DALSA_FOUND=${VCPKG_TARGET_IS_LINUX}) +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS_TO_ENABLE ${WINDOWS_OPTIONS}) + set(OPTIONS_TO_DISABLE ${MACOS_OPTIONS} ${LINUX_OPTIONS} ${ANDROID_OPTIONS}) +elseif(VCPKG_TARGET_IS_OSX) + set(OPTIONS_TO_ENABLE ${MACOS_OPTIONS}) + set(OPTIONS_TO_DISABLE ${WINDOWS_OPTIONS} ${LINUX_OPTIONS} ${ANDROID_OPTIONS}) +elseif(VCPKG_TARGET_IS_LINUX) + set(OPTIONS_TO_ENABLE ${LINUX_OPTIONS}) + set(OPTIONS_TO_DISABLE ${WINDOWS_OPTIONS} ${MACOS_OPTIONS} ${ANDROID_OPTIONS}) +elseif(VCPKG_TARGET_IS_ANDROID) + set(OPTIONS_TO_ENABLE ${ANDROID_OPTIONS}) + set(OPTIONS_TO_DISABLE ${WINDOWS_OPTIONS} ${MACOS_OPTIONS} ${LINUX_OPTIONS}) +endif() + +foreach(_option IN LISTS OPTIONS_TO_ENABLE) + list(APPEND ENABLED_OPTIONS "-D{_option}:BOOL=ON") +endforeach() + +foreach(_option IN LISTS OPTIONS_TO_DISABLE IGNORED_OPTIONS) + list(APPEND DISABLED_OPTIONS "-D${_option}:BOOL=OFF") +endforeach() vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( @@ -44,17 +62,15 @@ vcpkg_cmake_configure( OPTIONS "-DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}" ${FEATURE_OPTIONS} - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - -Denable-framework=OFF # Needs system permission to install framework + ${ENABLED_OPTIONS} + ${DISABLED_OPTIONS} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" MAYBE_UNUSED_VARIABLES - enable-coreaudio - enable-coremidi - enable-dart - ALSA_FOUND - COREAUDIO_FOUND - COREMIDI_FOUND + ${OPTIONS_TO_DISABLE} VCPKG_BUILD_MAKE_TABLES + enable-coverage enable-framework + enable-ubsan ) vcpkg_cmake_install() diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index df3631c6815ec9..2f55fe8c85311b 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fluidsynth", - "version": "2.3.1", + "version": "2.3.2", "port-version": 2, "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", @@ -32,6 +32,10 @@ "buildtools": { "description": "Build tools gentables" }, + "pulseaudio": { + "description": "Build with PulseAudio support", + "supports": "linux" + }, "sndfile": { "description": "Enable rendering to file and SF3 support", "dependencies": [ diff --git a/ports/fmem/portfile.cmake b/ports/fmem/portfile.cmake index 36e4e45f3bb41e..de0c0bb6d40f25 100644 --- a/ports/fmem/portfile.cmake +++ b/ports/fmem/portfile.cmake @@ -6,18 +6,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmem RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fmem" RENAME copyright) diff --git a/ports/fmem/vcpkg.json b/ports/fmem/vcpkg.json index 17d54850a86e42..52d0dc2a041a5e 100644 --- a/ports/fmem/vcpkg.json +++ b/ports/fmem/vcpkg.json @@ -1,6 +1,12 @@ { "name": "fmem", "version-string": "c-libs-2ccee3d2fb", - "port-version": 1, - "description": "A cross-platform library for opening memory-backed libc streams." + "port-version": 3, + "description": "A cross-platform library for opening memory-backed libc streams.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/fmilib/devendor-sublibs.diff b/ports/fmilib/devendor-sublibs.diff index 02c39dbdab3a41..8845c35de848b9 100644 --- a/ports/fmilib/devendor-sublibs.diff +++ b/ports/fmilib/devendor-sublibs.diff @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b01aba5..583e15b 100644 +index 690ee5f..2816987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,7 @@ configure_file ( @@ -7,7 +7,7 @@ index b01aba5..583e15b 100644 ) -set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} expat minizip zlib c99snprintf) -+set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} c99snprintf) ++set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} minizip c99snprintf) set(FMILIB_SUBLIBS ${FMIIMPORT_LIBRARIES} ${JMUTIL_LIBRARIES} ${FMILIB_SHARED_SUBLIBS}) set(FMILIB_SHARED_SRC ${FMIIMPORTSOURCE} ${JMUTILSOURCE} ${FMIIMPORTHEADERS}) @@ -35,16 +35,20 @@ index ddd3c1f..3bafac3 100644 include_directories("${EXPAT_INCLUDE_DIRS}" "${FMILIB_THIRDPARTYLIBS}/FMI/" "${FMIXMLGENDIR}/FMI1" "${FMIXMLGENDIR}/FMI2") diff --git a/Config.cmake/fmizip.cmake b/Config.cmake/fmizip.cmake -index 091fc4d..c53555f 100644 +index c046d47..50e82b3 100644 --- a/Config.cmake/fmizip.cmake +++ b/Config.cmake/fmizip.cmake -@@ -20,7 +20,8 @@ if(NOT FMIZIPDIR) +@@ -20,7 +20,12 @@ if(NOT FMIZIPDIR) set(FMIZIP_LIBRARIES fmizip) - add_subdirectory(Config.cmake/Minizip) -+ find_package(minizip CONFIG REQUIRED) -+ add_library(minizip ALIAS minizip::minizip) ++ add_library(minizip OBJECT ++ "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/miniunz.c" ++ "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/minizip.c" ++ ) ++ find_package(unofficial-minizip CONFIG REQUIRED) ++ target_link_libraries(minizip PRIVATE unofficial::minizip::minizip) include_directories("${FMIZIPDIR}/include" "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip" "${FMILIB_THIRDPARTYLIBS}/FMI" "${FMILIB_THIRDPARTYLIBS}/Zlib/zlib-1.2.6" "${FMILibrary_BINARY_DIR}/zlib") diff --git a/ports/fmilib/minizip.patch b/ports/fmilib/minizip.patch new file mode 100644 index 00000000000000..abd3ec131892d2 --- /dev/null +++ b/ports/fmilib/minizip.patch @@ -0,0 +1,52 @@ +diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c +index 1931161..d7a8be1 100644 +--- a/ThirdParty/Minizip/minizip/miniunz.c ++++ b/ThirdParty/Minizip/minizip/miniunz.c +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + + #ifdef _WIN32 +@@ -107,7 +108,7 @@ void change_file_date(filename,dosdate,tmu_date) + SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); + CloseHandle(hFile); + #else +-#ifdef unix || __APPLE__ ++#if defined(unix) || defined(__APPLE__) + struct utimbuf ut; + struct tm newdate; + newdate.tm_sec = tmu_date.tm_sec; +@@ -137,7 +138,7 @@ int mymkdir(dirname) + int ret=0; + #ifdef _WIN32 + ret = _mkdir(dirname); +-#elif unix ++#elif 1 + ret = mkdir (dirname,0775); + #elif __APPLE__ + ret = mkdir (dirname,0775); +diff --git a/ThirdParty/Minizip/minizip/minizip.c b/ThirdParty/Minizip/minizip/minizip.c +index e22f80d..548b6ca 100644 +--- a/ThirdParty/Minizip/minizip/minizip.c ++++ b/ThirdParty/Minizip/minizip/minizip.c +@@ -101,7 +101,7 @@ uLong filetime(f, tmzip, dt) + return ret; + } + #else +-#ifdef unix || __APPLE__ ++#if defined(unix) || defined(__APPLE__) + uLong filetime(f, tmzip, dt) + char *f; /* name of file to get info on */ + tm_zip *tmzip; /* return value: access, modific. and creation times */ +@@ -453,7 +453,7 @@ int minizip(argc,argv) + } + if( lastslash != NULL ) + { +- savefilenameinzip = lastslash+1; // base filename follows last slash. ++ savefilenameinzip = lastslash+1; + } + } + diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index 374c43f3d932bc..7556110492e5cd 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -8,13 +8,16 @@ vcpkg_from_github( HEAD_REF master PATCHES devendor-sublibs.diff + minizip.patch fix-mergestaticlibs.diff unofficial-export.diff ) -file(REMOVE RECURSE +file(GLOB vendored_minizip "${SOURCE_PATH}/ThirdParty/Minizip/minizip/*") +list(FILTER vendored_minizip EXCLUDE REGEX "/minizip.[ch]\$|/miniunz.[ch]\$") +file(REMOVE_RECURSE + ${vendored_minizip} "${SOURCE_PATH}/ThirdParty/Expat" - "${SOURCE_PATH}/ThirdParty/Minizip" "${SOURCE_PATH}/ThirdParty/Zlib" ) diff --git a/ports/fmilib/unofficial-fmilib-config.cmake b/ports/fmilib/unofficial-fmilib-config.cmake index 154b57aec962f5..3ad246ef9ac006 100644 --- a/ports/fmilib/unofficial-fmilib-config.cmake +++ b/ports/fmilib/unofficial-fmilib-config.cmake @@ -1,4 +1,4 @@ include(CMakeFindDependencyMacro) find_dependency(expat CONFIG) -find_dependency(minizip CONFIG) +find_dependency(unofficial-minizip CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/unofficial-fmilib-targets.cmake") diff --git a/ports/fmilib/vcpkg.json b/ports/fmilib/vcpkg.json index d2dac18800e5f9..55a9744902b446 100644 --- a/ports/fmilib/vcpkg.json +++ b/ports/fmilib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fmilib", "version": "2.4.1", - "port-version": 1, + "port-version": 2, "description": "FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.", "homepage": "https://www.fmi-standard.org/", "license": "BSD-3-Clause", diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index f5f819a01a94f5..d5b73076657f83 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 9.1.0 - SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be + REF "${VERSION}" + SHA512 6188508d74ca1ed75bf6441b152c07ca83971d3104b37f33784a7b55dfcc614d6243e77e0a14220018586fdb86207cc033eece834e7acd5e0907ed4c97403f3b HEAD_REF master PATCHES fix-write-batch.patch @@ -18,49 +18,21 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll") - endif() - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll") - endif() - endif() - endif() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h "defined(FMT_SHARED)" "1" ) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup() -vcpkg_fixup_pkgconfig() - -if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake - "lib/fmtd.dll" - "bin/fmtd.dll" - ) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake - "lib/fmt.dll" - "bin/fmt.dll" - ) - endif() -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) -# Handle post-build CMake instructions -vcpkg_copy_pdbs() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.rst") diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index a768a4e960d918..71db2116205851 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "9.1.0", - "port-version": 1, + "version": "10.0.0", "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", "license": "MIT", diff --git a/ports/folly/fix-deps.patch b/ports/folly/fix-deps.patch index 20cd752d5fd7e4..64973de8307043 100644 --- a/ports/folly/fix-deps.patch +++ b/ports/folly/fix-deps.patch @@ -57,7 +57,7 @@ index 4b78e9f..ac83c99 100644 thread REQUIRED ) -+set (Boost_LIBRARIES Boost::context Boost::filesystem Boost::program_options Boost::regex Boost::system Boost::thread ++set (Boost_LIBRARIES Boost::boost Boost::context Boost::filesystem Boost::program_options Boost::regex Boost::system Boost::thread + ) list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES}) -list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 9b421a6203f748..afb46e4ce47517 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF d8ed9cd2869c74b00fa6f1a7603301183f5c2249 #v2022.10.31.00 - SHA512 55040dadb8a847f0d04c37a2dce920bb456a59decebc90920831998df9671feb33daf1f4235115adcce5eb9c469b97b9d96fa7a67a5914c434ebc1efc04f4770 + REF "v${VERSION}" + SHA512 311cc6dfebfdfb49bfdd54e66c5dffabb16090610a3b0f05286aadb0e9d6b8b5b27f4bf3400cf74ba35b88f97d6ed7a79a6f32c093c78b8667684d4cbd8baedb HEAD_REF main PATCHES reorder-glog-gflags.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index b37ee2a26180aa..05b48346e2b26b 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2022.10.31.00", - "port-version": 4, + "version-string": "2023.05.15.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", @@ -19,6 +18,7 @@ "boost-smart-ptr", "boost-system", "boost-thread", + "boost-variant", "double-conversion", "fmt", "gflags", diff --git a/ports/fontconfig/fix-mingw-gperf-fallback.patch b/ports/fontconfig/fix-mingw-gperf-fallback.patch deleted file mode 100644 index d62e4e6f5c9079..00000000000000 --- a/ports/fontconfig/fix-mingw-gperf-fallback.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index e5096bf..51c289f 100644 ---- a/meson.build -+++ b/meson.build -@@ -268,7 +268,7 @@ sh = find_program('sh', required : false) - - if not sh.found() # host_machine.system() == 'windows' or not sh.found() - # TODO: This is not always correct -- if cc.get_id() == 'msvc' -+ if host_machine.system() == 'windows' - gperf_len_type = 'size_t' - else - gperf_len_type = 'unsigned' diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 0f482b303ff434..2b35e1fab138c2 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -1,16 +1,13 @@ -set(FONTCONFIG_VERSION 2.14.1) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO fontconfig/fontconfig - REF ${FONTCONFIG_VERSION} - SHA512 39d25e2fde5085cf66230e18621c1b7ab33935c78771dcc9d6b9e514ddd39af53fcdb0d89a8c7f582d476f431ccf61adde427509256c49cd9d09d249d2d736f7 + REF ${VERSION} + SHA512 b6cbb4ad7db224dabfb8a96c1d0743bab5bbe8f403e49d9b9a44effd161fd97062a2f7205a700308a1f805655038538ba2fb1b65169faa2d69ea88e477230849 HEAD_REF master PATCHES no-etc-symlinks.patch libgetopt.patch - fix-mingw-gperf-fallback.patch fix-preprocessor-clang-cl.patch ) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index bc6babfe5359ef..25f9d8d3b3769e 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fontconfig", - "version": "2.14.1", - "port-version": 2, + "version": "2.14.2", "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index 170eb43692f439..ee298c35b70d7e 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -18,27 +18,26 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${COMP_SOURCE_PATH}/comp_base.cmake DESTINATION ${SOURCE_PATH}/cmake/comp) +file(COPY "${COMP_SOURCE_PATH}/comp_base.cmake" DESTINATION "${SOURCE_PATH}/cmake/comp") -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tool FOONATHAN_MEMORY_BUILD_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DFOONATHAN_MEMORY_BUILD_EXAMPLES=OFF -DFOONATHAN_MEMORY_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/foonathan_memory) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/foonathan_memory/cmake TARGET_PATH share/foonathan_memory) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME foonathan_memory) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH share/foonathan_memory/cmake PACKAGE_NAME foonathan_memory) endif() vcpkg_copy_pdbs() @@ -46,26 +45,26 @@ vcpkg_copy_pdbs() # Place header files into the right folders # The original layout is not a problem for CMake-based project. file(COPY - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan - DESTINATION ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) file(GLOB COMP_INCLUDE_FILES - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp" ) file(COPY ${COMP_INCLUDE_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan + DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan" ) file(COPY - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp - DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan/memory + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan/memory" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory" ) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake + "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake" "\${_IMPORT_PREFIX}/include/foonathan_memory/comp;\${_IMPORT_PREFIX}/include/foonathan_memory" "\${_IMPORT_PREFIX}/include" ) @@ -77,21 +76,21 @@ vcpkg_replace_string( # #define FOONATHAN_MEMORY_DEBUG_FILL 0 # We only have the Release version header files installed, however. vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/foonathan/memory/detail/debug_helpers.hpp + "${CURRENT_PACKAGES_DIR}/include/foonathan/memory/detail/debug_helpers.hpp" "#if FOONATHAN_MEMORY_DEBUG_FILL" "#ifndef NDEBUG //#if FOONATHAN_MEMORY_DEBUG_FILL" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/LICENSE - ${CURRENT_PACKAGES_DIR}/debug/README.md - ${CURRENT_PACKAGES_DIR}/LICENSE - ${CURRENT_PACKAGES_DIR}/README.md + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README.md" ) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR @@ -101,25 +100,25 @@ else() set(EXECUTABLE_SUFFIX "") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}") file(COPY - ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} + "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) else() file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/nodesize_dbg${EXECUTABLE_SUFFIX} + "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/nodesize_dbg${EXECUTABLE_SUFFIX}" ) endif() endif() # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/foonathan-memory/vcpkg.json b/ports/foonathan-memory/vcpkg.json index e668bd94f54734..333df5096d3220 100644 --- a/ports/foonathan-memory/vcpkg.json +++ b/ports/foonathan-memory/vcpkg.json @@ -1,9 +1,19 @@ { "name": "foonathan-memory", - "version-string": "2019-07-21", - "port-version": 2, + "version-date": "2019-07-21", + "port-version": 4, "description": "STL compatible C++ memory allocator library", "homepage": "https://foonathan.net/doc/memory/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "tool" ], diff --git a/ports/forge/vcpkg.json b/ports/forge/vcpkg.json index b2d7898e06ec2e..7346d40c598723 100644 --- a/ports/forge/vcpkg.json +++ b/ports/forge/vcpkg.json @@ -1,13 +1,13 @@ { "name": "forge", "version-semver": "1.0.8", - "port-version": 2, + "port-version": 3, "description": "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.", "homepage": "https://github.com/arrayfire/forge", "license": "BSD-3-Clause", "supports": "!(windows & (arm | uwp))", "dependencies": [ - "boost-functional", + "boost-container-hash", { "name": "fontconfig", "platform": "!windows" diff --git a/ports/fp16/portfile.cmake b/ports/fp16/portfile.cmake index 101255b8b908bf..d292128e7841f6 100644 --- a/ports/fp16/portfile.cmake +++ b/ports/fp16/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_from_github( PATCHES find-psimd.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFP16_BUILD_TESTS=OFF -DFP16_BUILD_BENCHMARKS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/fp16/vcpkg.json b/ports/fp16/vcpkg.json index 76eac902f7e055..4e5bc35af6466c 100644 --- a/ports/fp16/vcpkg.json +++ b/ports/fp16/vcpkg.json @@ -1,9 +1,14 @@ { "name": "fp16", "version-date": "2021-02-21", + "port-version": 2, "description": "Header-only library for conversion to/from half-precision floating point formats", "homepage": "https://github.com/Maratyszcza/FP16", "dependencies": [ - "psimd" + "psimd", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake index 566c7a52744fe3..47450efcf8e74b 100644 --- a/ports/freeopcua/portfile.cmake +++ b/ports/freeopcua/portfile.cmake @@ -15,9 +15,8 @@ vcpkg_from_github( fix-std-headers.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_PYTHON=OFF -DBUILD_TESTING=OFF @@ -25,12 +24,12 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") #Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeopcua RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freeopcua" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/freeopcua/vcpkg.json b/ports/freeopcua/vcpkg.json index 02da47e65d08bc..91498a4013e7a9 100644 --- a/ports/freeopcua/vcpkg.json +++ b/ports/freeopcua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeopcua", - "version-string": "20190125", - "port-version": 5, + "version": "20190125", + "port-version": 7, "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.", "dependencies": [ "boost-asio", @@ -12,6 +12,14 @@ "boost-program-options", "boost-property-tree", "boost-system", - "boost-thread" + "boost-thread", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index 36c0282bc104cd..6632f01f6c2992 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -14,6 +14,12 @@ vcpkg_from_github( 0005-add-version.patch ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "glad" freetype-gl_WITH_GLAD +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -21,6 +27,7 @@ vcpkg_cmake_configure( -Dfreetype-gl_BUILD_DEMOS=OFF -Dfreetype-gl_BUILD_TESTS=OFF -Dfreetype-gl_BUILD_MAKEFONT=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -32,6 +39,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freetype-gl" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json index 3acfe4cbb6aaff..80d4541f7be1dc 100644 --- a/ports/freetype-gl/vcpkg.json +++ b/ports/freetype-gl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype-gl", "version-date": "2022-01-17", - "port-version": 1, + "port-version": 2, "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ @@ -15,5 +15,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "glad": { + "description": "Use the GLAD gl loader", + "dependencies": [ + "glad" + ] + } + } } diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake index 0e2e405d10921f..49c7d4c5cfaea0 100644 --- a/ports/freexl/portfile.cmake +++ b/ports/freexl/portfile.cmake @@ -6,9 +6,9 @@ vcpkg_download_distfile(ARCHIVE SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-makefiles.patch fix-sources.patch diff --git a/ports/freexl/vcpkg.json b/ports/freexl/vcpkg.json index ccb91f1f1f0149..557a9f5847c774 100644 --- a/ports/freexl/vcpkg.json +++ b/ports/freexl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freexl", "version": "1.0.6", - "port-version": 1, + "port-version": 2, "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet", "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources", "dependencies": [ diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index 33bb04364a3cc6..264d280be0d5b0 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArthurSonzogni/FTXUI REF "v${VERSION}" - SHA512 989afc109e31fa083f5d953d199dc7f4515daaee7014ec1616b48bc66ff49643bc32e5cdd273016a1d44f6921f6031d1e7e41fc2375cfee44fc719223baaaa7b + SHA512 14de98770e8a23707455f9197e9ef3b41effc1b5b8a594a7270b1378034720f58b5a81b99653d8b1f04e003565ae4778a1e5a3d756c8cbf297e2d09e327f608e HEAD_REF master ) @@ -21,6 +21,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ftxui.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ftxui.pc") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ftxui.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ftxui.pc") +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json index e4ea817f44655d..b2043bb3c223ed 100644 --- a/ports/ftxui/vcpkg.json +++ b/ports/ftxui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ftxui", - "version-semver": "4.0.0", + "version-semver": "4.1.1", "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index 89123d06a96060..3752d5fc5ebca2 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -9,23 +9,22 @@ vcpkg_from_github( HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(PACKAGE_NAME functions_framework_cpp CONFIG_PATH lib/cmake/functions_framework_cpp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json index 162cb6b8aa4806..9056bd1641fc9b 100644 --- a/ports/functions-framework-cpp/vcpkg.json +++ b/ports/functions-framework-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "functions-framework-cpp", "version": "1.1.0", - "port-version": 1, + "port-version": 4, "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", @@ -11,6 +11,14 @@ "boost-beast", "boost-program-options", "boost-serialization", - "nlohmann-json" + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/fxdiv/portfile.cmake b/ports/fxdiv/portfile.cmake index a62cefcd8e261d..06eaa4b7ec84c3 100644 --- a/ports/fxdiv/portfile.cmake +++ b/ports/fxdiv/portfile.cmake @@ -5,14 +5,14 @@ vcpkg_from_github( REF 63058eff77e11aa15bf531df5dd34395ec3017c8 SHA512 da33eab4d006645f383a1f24fc3e747db3aeb0613219297ec0ae69aa2617f07ba050ebd6a64a8cbde6d25481f176d0ec3b9753a95d1fbcead2136595f3e50e97 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFXDIV_BUILD_TESTS=OFF -DFXDIV_BUILD_BENCHMARKS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/fxdiv/vcpkg.json b/ports/fxdiv/vcpkg.json index e120815ee41831..444f5243edc1a5 100644 --- a/ports/fxdiv/vcpkg.json +++ b/ports/fxdiv/vcpkg.json @@ -1,6 +1,13 @@ { "name": "fxdiv", - "version-string": "2021-02-21", + "version-date": "2021-02-21", + "port-version": 2, "description": "C99/C++ header-only library for division via fixed-point multiplication by inverse", - "homepage": "https://github.com/Maratyszcza/FXdiv" + "homepage": "https://github.com/Maratyszcza/FXdiv", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 010a10ccf255a1..d5efce4c30c44b 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_LGPL_SHARED_LIBS=${BUILD_LGPL_SHARED_LIBS} -DG2O_BUILD_EXAMPLES=OFF -DG2O_BUILD_APPS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g2o) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/g2o) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/*") @@ -32,12 +31,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endforeach() endif() -file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe") +file(GLOB DEBUG_EXE "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") if(EXE OR DEBUG_EXE) file(REMOVE ${EXE} ${DEBUG_EXE}) endif() -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") -file(INSTALL ${SOURCE_PATH}/doc/license-bsd.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/doc/license-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index b81b5d65c9f8fc..9afc73a9d127df 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -1,13 +1,21 @@ { "name": "g2o", - "version-string": "2020-02-07", - "port-version": 2, + "version-date": "2020-02-07", + "port-version": 4, "description": "g2o: A General Framework for Graph Optimization", "homepage": "https://openslam.org/g2o.html", "dependencies": [ "ceres", "eigen3", "lapack", - "suitesparse" + "suitesparse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/gamma/portfile.cmake b/ports/gamma/portfile.cmake index 0437842d85219d..f004b443a79f9c 100644 --- a/ports/gamma/portfile.cmake +++ b/ports/gamma/portfile.cmake @@ -10,16 +10,15 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gamma/vcpkg.json b/ports/gamma/vcpkg.json index 3fcba5d20dc3ac..1b4606b4f28fe2 100644 --- a/ports/gamma/vcpkg.json +++ b/ports/gamma/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gamma", "version-string": "gamma-2018-01-27", - "port-version": 4, + "port-version": 6, "description": "Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be \"light-footed\" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects.", "homepage": "https://github.com/LancePutnam/Gamma", "license": "MIT", @@ -13,6 +13,10 @@ "external-libs" ] }, - "portaudio" + "portaudio", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/gasol/portfile.cmake b/ports/gasol/portfile.cmake index b535229653f7ec..25a61d45edf04d 100644 --- a/ports/gasol/portfile.cmake +++ b/ports/gasol/portfile.cmake @@ -11,13 +11,13 @@ vcpkg_from_github( fix-install.patch ) -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() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gasol/vcpkg.json b/ports/gasol/vcpkg.json index aa06ae3c218dfc..ad2c96493e8507 100644 --- a/ports/gasol/vcpkg.json +++ b/ports/gasol/vcpkg.json @@ -1,8 +1,14 @@ { "name": "gasol", "version-date": "2018-01-04", - "port-version": 2, + "port-version": 4, "description": "A general Genetic Algorithm Solver in C++", "homepage": "https://github.com/PytLab/GASol", - "supports": "!uwp & !arm" + "supports": "!uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/gaussianlib/vcpkg.json b/ports/gaussianlib/vcpkg.json index 81ed9e4467c035..8b666f5a51aa83 100644 --- a/ports/gaussianlib/vcpkg.json +++ b/ports/gaussianlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gaussianlib", - "version-string": "2019-08-04", - "port-version": 1, + "version-date": "2019-08-04", + "port-version": 2, "description": "Basic linear algebra C++ library for 2D and 3D applications", "homepage": "https://github.com/LukasBanana/GaussianLib" } diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index d2f8c7aec939ee..511fe7f17e5e2b 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 1bbaf3a6731a105241cc666afe9c9a0b82e9d46245435d597a7372f928e6966c0e746e94fdd86a8f24c3277912a8c19e76906ee88e5d946ac1c25dd7dd38fdf2 + SHA512 dfc7ccf5c1a3184fa93be762a880b7631faa4cd178cd72df8f5fd8a6296edafc56de2594617bebcb75ddf19ed4471dafcb574b22d7e9217dedfd7ea72c9247f2 HEAD_REF master PATCHES find-link-libraries.patch @@ -137,6 +137,7 @@ if (BUILD_APPS) gdalmdimtranslate gnmanalyse gnmmanage + sozip AUTO_CLEAN ) endif() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 74bf310f7d36f8..9f678b98cd6306 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", - "version-semver": "3.6.3", - "port-version": 1, + "version-semver": "3.7.0", + "port-version": 2, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -13,8 +13,17 @@ "name": "pkgconf", "host": true }, - "proj", - "tiff", + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + }, + { + "name": "tiff", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/gdcm/fix-dependence-getopt.patch b/ports/gdcm/fix-dependence-getopt.patch index 556df7350ee230..935be24aefd0eb 100644 --- a/ports/gdcm/fix-dependence-getopt.patch +++ b/ports/gdcm/fix-dependence-getopt.patch @@ -19,11 +19,11 @@ index 4cdc999..c6ede41 100644 # you could be running mingw32 on linux in which case you do NOT want the gdcmuuid lib APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING) diff --git a/Utilities/VTK/Applications/CMakeLists.txt b/Utilities/VTK/Applications/CMakeLists.txt -index c7f1ad9..20883a2 100644 +index a7f7e7e..ab89a73 100644 --- a/Utilities/VTK/Applications/CMakeLists.txt +++ b/Utilities/VTK/Applications/CMakeLists.txt -@@ -45,7 +45,13 @@ foreach(app ${GDCM_VTK_APPS}) - target_link_libraries(${app} ${VTK_LIBRARIES} vtkIOXML) +@@ -60,7 +60,12 @@ foreach(app ${GDCM_VTK_APPS}) + endif() endif() if(WIN32 AND NOT CYGWIN) - target_link_libraries(${app} gdcmgetopt) @@ -33,7 +33,6 @@ index c7f1ad9..20883a2 100644 + else() + target_link_libraries(${app} gdcmgetopt) + endif() -+else() endif() if(NOT GDCM_INSTALL_NO_RUNTIME) install(TARGETS ${app} diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake index 0f6b8786624559..cfba4b23c3cd51 100644 --- a/ports/gdcm/portfile.cmake +++ b/ports/gdcm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO malaterre/GDCM - REF 1f94bafc929db3648612848836f7899f101d6641 # v3.0.12 - SHA512 cec050c61d9880880b8b72234f8b0824a1f1fa8f9b2419fec85a0f27fe3bca4f9f80aa735b35775ac098f5827fde454aba700ebea17f5f8657894d26f5140f4a + REF "v${VERSION}" + SHA512 f4fd81db731b60eebd7d67b8a7f2aa67f44d788f4c0a3f2cef9490fd4f0f1ae9caea1a9a8727619edab6aeda815ae6ace5266b1428b9bea81b7c984deb78bbac HEAD_REF master PATCHES use-openjpeg-config.patch @@ -37,6 +37,8 @@ vcpkg_cmake_configure( -DGDCM_USE_SYSTEM_OPENJPEG=ON -DGDCM_BUILD_TESTING=OFF -DUSE_VCPKG_GETOPT=${USE_VCPKG_GETOPT} + MAYBE_UNUSED_VARIABLES + USE_VCPKG_GETOPT ) vcpkg_cmake_install() diff --git a/ports/gdcm/vcpkg.json b/ports/gdcm/vcpkg.json index f14294e4b1fc5d..cc17ffc43349ff 100644 --- a/ports/gdcm/vcpkg.json +++ b/ports/gdcm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdcm", - "version": "3.0.12", - "port-version": 1, + "version": "3.0.22", "description": "Grassroots DICOM library", "homepage": "https://github.com/malaterre/GDCM", "license": "BSD-3-Clause", diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index cfbff59b592a89..5df66aaf53d912 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gdk-pixbuf REF "${VERSION}" - SHA512 3406f47b413fe3860df410a0cc0076ce47d10605b39347105690c85616739e67e5dfd0804efcad758614b0c8d1369e410b9efaa704a234bfd19686b82595b9e1 + SHA512 5b7ddb6e816a88ffd2b7f85583c841ea92719bef7da1acbd6f5714afebf8538660c5d391809f959eb1887613f9579cf51c85d6796c84335cedbf7af975d790c9 HEAD_REF master PATCHES fix_build_error_windows.patch diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index e4a2548a2a3e8c..d0d2e7e6acf6ba 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdk-pixbuf", - "version": "2.42.9", - "port-version": 5, + "version": "2.42.10", "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-or-later", diff --git a/ports/genann/portfile.cmake b/ports/genann/portfile.cmake index 56bcd4aeefc31b..8f83bc0c86cede 100644 --- a/ports/genann/portfile.cmake +++ b/ports/genann/portfile.cmake @@ -8,18 +8,16 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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}" OPTIONS_RELEASE -DINSTALL_HEADERS=ON OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/genann) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/genann/LICENSE ${CURRENT_PACKAGES_DIR}/share/genann/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/genann/vcpkg.json b/ports/genann/vcpkg.json index 7e9de881533bc8..9a75adceef84cc 100644 --- a/ports/genann/vcpkg.json +++ b/ports/genann/vcpkg.json @@ -1,7 +1,13 @@ { "name": "genann", - "version-string": "2019-07-10", - "port-version": 1, + "version-date": "2019-07-10", + "port-version": 3, "description": "Genann is a minimal, well-tested library for training and using feedforward artificial neural networks (ANN) in C.", - "homepage": "https://github.com/codeplea/genann" + "homepage": "https://github.com/codeplea/genann", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/geos/fix-exported-config.patch b/ports/geos/fix-exported-config.patch index 1069bc2815a2ca..3476cfcb1d3310 100644 --- a/ports/geos/fix-exported-config.patch +++ b/ports/geos/fix-exported-config.patch @@ -65,12 +65,12 @@ index 6eff1eb14..8827f6ac6 100644 + echo -L${libdir} -lgeos $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "@EXTRA_LIBS@"; fi) ;; --static-clibs) -- echo -L${libdir} -lgeos_c -lgeos -lm -+ echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@ +- echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm ++ echo -L${libdir} -lgeos_c -lgeos -lstdc++ @EXTRA_LIBS@ ;; --static-cclibs) -- echo -L${libdir} -lgeos -lm -+ echo -L${libdir} -lgeos @EXTRA_LIBS@ +- echo -L${libdir} -lgeos -lstdc++ -lm ++ echo -L${libdir} -lgeos -lstdc++ @EXTRA_LIBS@ ;; --cflags) echo -I${includedir} diff --git a/ports/geos/gcc-13-fix-backport.patch b/ports/geos/gcc-13-fix-backport.patch new file mode 100644 index 00000000000000..9344a426488998 --- /dev/null +++ b/ports/geos/gcc-13-fix-backport.patch @@ -0,0 +1,12 @@ +diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h +index 61c0010d4..eba5bba8f 100644 +--- a/include/geos/shape/fractal/HilbertEncoder.h ++++ b/include/geos/shape/fractal/HilbertEncoder.h +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + // Forward declarations + namespace geos { diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 179dd94e1cf70a..c5b03880ddbd6d 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_download_distfile(ARCHIVE URLS "https://download.osgeo.org/geos/geos-${VERSION}.tar.bz2" FILENAME "geos-${VERSION}.tar.bz2" - SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3 + SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" @@ -11,6 +11,7 @@ vcpkg_extract_source_archive(SOURCE_PATH disable-warning-4996.patch fix-exported-config.patch fix-dll-builds.patch + gcc-13-fix-backport.patch ) vcpkg_cmake_configure( diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index e4929d3c9ce963..7de5c672afa144 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geos", - "version": "3.11.1", + "version": "3.11.2", "description": "Geometry Engine Open Source", "homepage": "https://libgeos.org/", "license": "LGPL-2.1-only", diff --git a/ports/getopt/vcpkg.json b/ports/getopt/vcpkg.json index 4626df7279809f..3c36900f22bc1a 100644 --- a/ports/getopt/vcpkg.json +++ b/ports/getopt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "getopt", - "version-string": "0", - "port-version": 2, + "version": "0", + "port-version": 3, "description": "The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.", "supports": "!uwp", "dependencies": [ diff --git a/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch b/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch new file mode 100644 index 00000000000000..e15e08755fa59b --- /dev/null +++ b/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch @@ -0,0 +1,62 @@ +diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c +index d5a5fe1..5c47f48 100644 +--- a/gettext-runtime/intl/loadmsgcat.c ++++ b/gettext-runtime/intl/loadmsgcat.c +@@ -390,9 +390,56 @@ char *alloca (); + # define munmap(addr, len) __munmap (addr, len) + #elif defined _WIN32 && !defined __CYGWIN__ + /* On native Windows, don't require linking with '-loldnames'. */ +-# define open _open ++# define open(name, flags) _open_utf8_windows_wrapper(name, flags) + # define read _read + # define close _close ++ ++/* Provide wrapper of "open" for Windows that supports UTF-8 filenames. */ ++# ifndef WIN32_LEAN_AND_MEAN ++# define WIN32_LEAN_AND_MEAN ++# endif ++# ifndef WIN32_EXTRA_LEAN ++# define WIN32_EXTRA_LEAN ++# endif ++# ifndef NOMINMAX ++# define NOMINMAX ++# endif ++# include // For: MultiByteToWideChar ++# include ++# include ++ ++int _open_utf8_windows_wrapper( ++ const char *filename, ++ int flags ++) ++{ ++ int wstr_len = -1; ++ wchar_t* pUtf16FileName = NULL; ++ int fh = -1; ++ ++ // on Windows, convert the filename from UTF-8 to UTF-16 ++ wstr_len = MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0); ++ if (wstr_len <= 0) ++ { ++ // MultiByteToWideChar failed ++ errno = ENOENT; ++ return -1; ++ } ++ pUtf16FileName = malloc(wstr_len * sizeof(wchar_t)); ++ if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, pUtf16FileName, wstr_len) == 0) ++ { ++ // MultiByteToWideChar failed ++ free(pUtf16FileName); ++ errno = ENOENT; ++ return -1; ++ } ++ ++ // and call _wopen ++ fh = _wopen(pUtf16FileName, flags); ++ ++ free(pUtf16FileName); ++ return fh; ++} + #endif + + /* For those losing systems which don't have `alloca' we have to add diff --git a/ports/gettext-libintl/android.patch b/ports/gettext-libintl/android.patch new file mode 100644 index 00000000000000..6f2a7d43faf95f --- /dev/null +++ b/ports/gettext-libintl/android.patch @@ -0,0 +1,12 @@ +diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c +--- a/gettext-runtime/intl/dcigettext.c 2021-05-26 16:27:55.420544597 +0200 ++++ src/gettext-runtime/intl/dcigettext.c 2021-05-26 16:29:14.546516701 +0200 +@@ -143,7 +143,7 @@ + # else + # if VMS + # define getcwd(buf, max) (getcwd) (buf, max, 0) +-# else ++# elif !(defined(__clang__) && defined(__BIONIC_FORTIFY)) + char *getcwd (); + # endif + # endif diff --git a/ports/gettext-libintl/bashify.cmake b/ports/gettext-libintl/bashify.cmake new file mode 100644 index 00000000000000..8b3d87e7b80b50 --- /dev/null +++ b/ports/gettext-libintl/bashify.cmake @@ -0,0 +1,16 @@ +# By using bash builtin expansion, we can avoid +# expensively spawing three sub-processes (bash, echo, sed). +foreach(dir IN LISTS SOURCE_DIRS) + file(READ "${dir}/configure" script) + string(REGEX REPLACE + "(\n[a-zA-Z0-9_]*)='`[\$]ECHO \"[\$]([^\"]*)\" \\| [\$]SED \"[\$]delay_single_quote_subst\"`'" + [[\1='${\2//\\'/\\'\\\\\\'\\'}']] + script "${script}" + ) + string(REPLACE + [[ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in]] + [[ case "\${!var}" in]] + script "${script}" + ) + file(WRITE "${dir}/configure" "${script}") +endforeach() diff --git a/ports/gettext-libintl/portfile.cmake b/ports/gettext-libintl/portfile.cmake new file mode 100644 index 00000000000000..e65edae63d4c60 --- /dev/null +++ b/ports/gettext-libintl/portfile.cmake @@ -0,0 +1,123 @@ +if(VCPKG_TARGET_IS_LINUX) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + if(NOT EXISTS "/usr/include/libintl.h") + message(FATAL_ERROR + "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " + "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." + ) + endif() + file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + return() +endif() + +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz" + "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz" + FILENAME "gettext-${VERSION}.tar.gz" + SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05 +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + # Shared with port gettext + android.patch + uwp.patch + 0003-Fix-win-unicode-paths.patch +) + +if(VCPKG_HOST_IS_WINDOWS) + message(STATUS "Modifying 'configure' to use fast bash variable expansion") + set(ENV{CONFIG_SHELL} "/usr/bin/bash") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" + "-DSOURCE_DIRS=gettext-runtime" + -P "${CMAKE_CURRENT_LIST_DIR}/bashify.cmake" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "bashify-${TARGET_TRIPLET}" + ) +endif() + +set(OPTIONS + --no-recursion + --enable-relocatable #symbol duplication with glib-init.c? + --enable-c++ + --disable-acl + --disable-csharp + --disable-curses + --disable-java + --disable-libasprintf + --disable-openmp + --with-included-gettext + --without-libintl-prefix + --disable-dependency-tracking # Faster ? + ac_cv_path_DVIPS=: + ac_cv_path_GMSGFMT=: + ac_cv_path_MSGFMT=: + ac_cv_path_MSGMERGE=: + ac_cv_path_TEXI2PDF=: + ac_cv_path_XGETTEXT=: + ac_cv_prog_INTLBISON=: +) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + # Avoid unnecessary tests. + am_cv_func_iconv_works=yes + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" + ## This is required. For some reason these do not get correctly identified for release builds. + ac_cv_func_wcslen=yes + ac_cv_func_memmove=yes + ) + if(NOT VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS + # Don't take from port getopt-win32 + ac_cv_header_getopt_h=no + # Don't take from port pthreads + ac_cv_header_pthread_h=no + # Detected 'no' everywhere except x64-windows-static + ac_cv_func_snprintf=no + # Detected x64 values for gnulib, overriding guesses for cross builds + gl_cv_func_mbrtowc_empty_input=no + # Detected x64 values for gettext, overriding guesses for x86 & x64-uwp + gt_cv_int_divbyzero_sigfpe=no + ) + endif() +endif() + +file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log") +file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log") +vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + OPTIONS + ${OPTIONS} + OPTIONS_RELEASE + "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log" + OPTIONS_DEBUG + "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log" + ) + +# This helps with Windows build times, but should work everywhere in vcpkg. +# - Avoid an extra command to move a temporary file, we are building out of source. +# - Avoid a subshell just to add comments, the build dir is temporary. +# - Avoid cygpath -w when other tools handle this for us. +file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/intl/Makefile") +foreach(file IN LISTS makefiles) + file(READ "${file}" rules) + string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}") + string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}") + string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}") + string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}") + file(WRITE "${file}" "${rules}") +endforeach() + +vcpkg_install_make(SUBPATH intl) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/gettext-runtime/intl/COPYING.LIB") diff --git a/ports/gettext-libintl/usage b/ports/gettext-libintl/usage new file mode 100644 index 00000000000000..35472de10fecd0 --- /dev/null +++ b/ports/gettext-libintl/usage @@ -0,0 +1,4 @@ +gettext-libintl is compatible with built-in CMake targets: + + find_package(Intl REQUIRED) + target_link_libraries(main PRIVATE Intl::Intl) # since CMake 3.20 diff --git a/ports/gettext-libintl/uwp.patch b/ports/gettext-libintl/uwp.patch new file mode 100644 index 00000000000000..416e2ea3c5e361 --- /dev/null +++ b/ports/gettext-libintl/uwp.patch @@ -0,0 +1,72 @@ +diff --git a/gettext-runtime/gnulib-lib/fcntl.c b/gettext-runtime/gnulib-lib/fcntl.c +index f9753c4..3a3caee 100644 +--- a/gettext-runtime/gnulib-lib/fcntl.c ++++ b/gettext-runtime/gnulib-lib/fcntl.c +@@ -38,6 +38,12 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++# if defined(WINAPI_FAMILY_PARTITION) ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++# define HANDLE_FLAG_INHERIT 0 ++# endif ++# endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c +index f774ba2..f488b7f 100644 +--- a/gettext-runtime/intl/langprefs.c ++++ b/gettext-runtime/intl/langprefs.c +@@ -38,6 +38,11 @@ extern void _nl_locale_name_canonicalize (char *name); + + #if defined _WIN32 + # define WIN32_NATIVE ++# if defined(WINAPI_FAMILY_PARTITION) ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++# undef WIN32_NATIVE ++# endif ++# endif + #endif + + #ifdef WIN32_NATIVE +diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c +index ec75427..9e063e4 100644 +--- a/gettext-runtime/intl/localcharset.c ++++ b/gettext-runtime/intl/localcharset.c +@@ -34,6 +34,9 @@ + #if defined _WIN32 && !defined __CYGWIN__ + # define WINDOWS_NATIVE + # include ++# if !defined(WINAPI_FAMILY_PARTITION) ++# define WINAPI_FAMILY_PARTITION(x) (0) ++# endif + #endif + + #if defined __EMX__ +@@ -912,6 +915,8 @@ locale_charset (void) + /* The canonical name cannot be determined. */ + codeset = ""; + ++# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++ codeset = ""; + # elif defined WINDOWS_NATIVE + + char buf[2 + 10 + 1]; +diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c +index d77bb81..3c6e055 100644 +--- a/gettext-runtime/intl/localename.c ++++ b/gettext-runtime/intl/localename.c +@@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t); + + #if defined _WIN32 && !defined __CYGWIN__ + # define WINDOWS_NATIVE ++# if defined(WINAPI_FAMILY_PARTITION) ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++# undef WIN32_NATIVE ++# endif ++# endif + # if !defined IN_LIBINTL + # include "glthread/lock.h" + # endif diff --git a/ports/gettext/vcpkg-cmake-wrapper.cmake b/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake similarity index 100% rename from ports/gettext/vcpkg-cmake-wrapper.cmake rename to ports/gettext-libintl/vcpkg-cmake-wrapper.cmake diff --git a/ports/gettext-libintl/vcpkg.json b/ports/gettext-libintl/vcpkg.json new file mode 100644 index 00000000000000..810149a54dd050 --- /dev/null +++ b/ports/gettext-libintl/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "gettext-libintl", + "version": "0.21.1", + "description": "The libintl C library from GNU gettext-runtime.", + "homepage": "https://www.gnu.org/software/gettext/", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "libiconv", + "platform": "!linux" + } + ] +} diff --git a/ports/gettext/Makefile b/ports/gettext/Makefile deleted file mode 100644 index b2b36d2ab5658c..00000000000000 --- a/ports/gettext/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -all: build-gettext-runtime-intl build-gettext-runtime-po build-gettext-runtime-src -all: build-gettext-tools build-gettext-tools-gnulib build-gettext-tools-its build-gettext-tools-m4 build-gettext-tools-misc build-gettext-tools-po build-gettext-tools-projects build-gettext-tools-styles -all: build-libtextstyle - -install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext-runtime-src -install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles -install: install-libtextstyle - -build-intl: - $(MAKE) -C intl all -install-intl: - $(MAKE) -C intl install - -build-gettext-runtime-gnulib: build-gettext-runtime-intl - $(MAKE) -C gettext-runtime/gnulib-lib all -build-gettext-runtime-intl: - $(MAKE) -C gettext-runtime/intl all -build-gettext-runtime-po: - $(MAKE) -C gettext-runtime/po all -build-gettext-runtime-src: build-gettext-runtime-intl build-gettext-runtime-gnulib - $(MAKE) -C gettext-runtime/src all -build-gettext-tools: build-gettext-runtime-intl build-libtextstyle build-gettext-tools-gnulib build-gettext-tools-intl build-gettext-tools-libgrep build-gnulib-local - $(MAKE) -C gettext-tools/src all -build-gettext-tools-gnulib: build-gettext-tools-intl - $(MAKE) -C gettext-tools/gnulib-lib all -build-gettext-tools-libgrep: build-gettext-tools-gnulib - $(MAKE) -C gettext-tools/libgrep all -build-gettext-tools-intl: - $(MAKE) -C gettext-tools/intl all -build-gettext-tools-its: - $(MAKE) -C gettext-tools/its all -build-gettext-tools-m4: - $(MAKE) -C gettext-tools/m4 all -build-gettext-tools-misc: - $(MAKE) -C gettext-tools/misc all -build-gettext-tools-po: - $(MAKE) -C gettext-tools/po all -build-gettext-tools-projects: - $(MAKE) -C gettext-tools/projects all -build-gettext-tools-styles: - $(MAKE) -C gettext-tools/styles all -build-gnulib-local: - $(MAKE) -C gnulib-local all -build-libtextstyle: - $(MAKE) -C libtextstyle/lib all - -install-gettext-runtime-intl: - $(MAKE) -C gettext-runtime/intl install -install-gettext-runtime-po: - $(MAKE) -C gettext-runtime/po install -install-gettext-runtime-src: - $(MAKE) -C gettext-runtime/src install -install-gettext-tools: - $(MAKE) -C gettext-tools/src install -install-gettext-tools-gnulib: - $(MAKE) -C gettext-tools/gnulib-lib install -install-gettext-tools-its: - $(MAKE) -C gettext-tools/its install -install-gettext-tools-m4: - $(MAKE) -C gettext-tools/m4 install -install-gettext-tools-misc: - $(MAKE) -C gettext-tools/misc install -install-gettext-tools-po: - $(MAKE) -C gettext-tools/po install -install-gettext-tools-projects: - $(MAKE) -C gettext-tools/projects install -install-gettext-tools-styles: - $(MAKE) -C gettext-tools/styles install -install-libtextstyle: - $(MAKE) -C libtextstyle/lib install diff --git a/ports/gettext/bashify.cmake b/ports/gettext/bashify.cmake new file mode 100644 index 00000000000000..8b3d87e7b80b50 --- /dev/null +++ b/ports/gettext/bashify.cmake @@ -0,0 +1,16 @@ +# By using bash builtin expansion, we can avoid +# expensively spawing three sub-processes (bash, echo, sed). +foreach(dir IN LISTS SOURCE_DIRS) + file(READ "${dir}/configure" script) + string(REGEX REPLACE + "(\n[a-zA-Z0-9_]*)='`[\$]ECHO \"[\$]([^\"]*)\" \\| [\$]SED \"[\$]delay_single_quote_subst\"`'" + [[\1='${\2//\\'/\\'\\\\\\'\\'}']] + script "${script}" + ) + string(REPLACE + [[ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in]] + [[ case "\${!var}" in]] + script "${script}" + ) + file(WRITE "${dir}/configure" "${script}") +endforeach() diff --git a/ports/gettext/macosx-libs.patch b/ports/gettext/macosx-libs.patch new file mode 100644 index 00000000000000..c8936492b40707 --- /dev/null +++ b/ports/gettext/macosx-libs.patch @@ -0,0 +1,13 @@ +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index c21955a..902729a 100755 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -26819,7 +26819,7 @@ else $as_nop + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" +- LIBS="$LIBS $LIBINTL" ++ LIBS="$LIBS $LIBINTL $INTL_MACOSX_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/ports/gettext/parallel-gettext-tools.patch b/ports/gettext/parallel-gettext-tools.patch new file mode 100644 index 00000000000000..65199bc1281da8 --- /dev/null +++ b/ports/gettext/parallel-gettext-tools.patch @@ -0,0 +1,25 @@ +diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in +index 5d60b99..d86232d 100644 +--- a/gettext-tools/src/Makefile.in ++++ b/gettext-tools/src/Makefile.in +@@ -3625,7 +3625,10 @@ USEJAVA_no = 0 + + # Version information according to Woe32 conventions. + @WOE32_TRUE@WOE32_LDADD = gettext.res +-all: $(BUILT_SOURCES) ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@all: textstyle.h ++all: ++ $(MAKE) $(AM_MAKEFLAGS) all-parallel ++all-parallel: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: +@@ -5045,7 +5048,7 @@ uninstall-tcl: + # namely those which build textstyle.h, po-gram-gen.c, cldr-plural.c. + # See . + # So, turn off parallel execution in this Makefile. +-.NOTPARALLEL: ++# .NOTPARALLEL: + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 3016d982ae111c..b40a2642b95e9d 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -1,10 +1,16 @@ -if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/include/libintl.h") - message(FATAL_ERROR "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " - "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." - ) -endif() - -set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) +# This port is just to provide gettext tools and build data, not libs. +# The "core" feature depends on port gettext-libintl which provides libintl. +# The "core" feature also installs enough for running autoreconf. +# The actual tools are only enabled by opt-in features. +# These features are typically used as a host dependency. +# For fast builds in particular on Windows, the following choices are made: +# - only release build type +# - namespacing disabled (windows only) +# - configuration cache +# - using preinstalled gettext-libintl +# - skipping some subdirs +set(VCPKG_BUILD_TYPE release) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz" @@ -16,137 +22,168 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES + # shared with port gettext-libintl android.patch uwp.patch - win-gethostname.patch 0003-Fix-win-unicode-paths.patch + # unique to port gettext + win-gethostname.patch rel_path.patch + subdirs.patch + parallel-gettext-tools.patch + macosx-libs.patch ) -vcpkg_find_acquire_program(BISON) -get_filename_component(BISON_PATH "${BISON}" DIRECTORY) -vcpkg_add_to_path("${BISON_PATH}") +set(subdirs "") +if("runtime-tools" IN_LIST FEATURES) + string(APPEND subdirs " gettext-runtime") +endif() +if("tools" IN_LIST FEATURES) + string(APPEND subdirs " libtextstyle gettext-tools") +endif() +if(subdirs) + set(ENV{VCPKG_GETTEXT_SUBDIRS} "${subdirs}") -set(OPTIONS - --enable-relocatable #symbol duplication with glib-init.c? - --enable-c++ - --disable-acl - --disable-csharp - --disable-curses - --disable-java - --disable-openmp -) -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND OPTIONS - # Avoid unnecessary test. + vcpkg_find_acquire_program(BISON) + get_filename_component(BISON_PATH "${BISON}" DIRECTORY) + vcpkg_add_to_path("${BISON_PATH}") + + if(VCPKG_HOST_IS_WINDOWS) + message(STATUS "Modifying build system for less forks") + set(ENV{CONFIG_SHELL} "/usr/bin/bash") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" + "-DSOURCE_DIRS=.;gettext-runtime;libtextstyle;gettext-tools" + -P "${CMAKE_CURRENT_LIST_DIR}/bashify.cmake" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "bashify-${TARGET_TRIPLET}" + ) + endif() + + set(OPTIONS + --enable-relocatable #symbol duplication with glib-init.c? + --enable-c++ + --disable-acl + --disable-csharp + --disable-curses + --disable-java + --disable-openmp + --disable-dependency-tracking + # Avoiding system dependencies and unnecessary tests --with-included-glib - # This is required. For some reason these do not get correctly identified for release builds. - ac_cv_func_wcslen=yes - ac_cv_func_memmove=yes - # The following are required for a full gettext built (libintl and tools). - gl_cv_func_printf_directive_n=no # segfaults otherwise with popup window - ac_cv_func_memset=yes # not detected in release builds - ac_cv_header_pthread_h=no - ac_cv_header_dirent_h=no - ac_cv_header_getopt_h=no + --with-included-libxml # libtextstyle won't use external libxml + --with-included-libunistring + --with-installed-libtextstyle=no + --without-cvs + --without-emacs + --without-git + --without-libcurses-prefix + --without-libncurses-prefix + --without-libtermcap-prefix + --without-libxcurses-prefix ) -endif() - -# These functions scope any changes to VCPKG_BUILD_TYPE -function(build_libintl_and_tools) - cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) - if(DEFINED arg_BUILD_TYPE) - set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + # Faster, but not for export + --disable-namespacing + # Avoid unnecessary tests. + am_cv_func_iconv_works=yes + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" + "--with-libintl-prefix=${CURRENT_INSTALLED_DIR}" + # This is required. For some reason these do not get correctly identified for release builds. + ac_cv_func_wcslen=yes + ac_cv_func_memmove=yes + # The following are required for a full gettext built (libintl and tools). + gl_cv_func_printf_directive_n=no # segfaults otherwise with popup window + ac_cv_func_memset=yes # not detected in release builds + ) + if(NOT VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS + # Don't take from port dirent + ac_cv_header_dirent_h=no + # Don't take from port getopt-win32 + ac_cv_header_getopt_h=no + # Don't take from port pthreads + ac_cv_header_pthread_h=no + ac_cv_header_sched_h=no + ac_cv_header_semaphore_h=no + # Detected 'no' everywhere except x64-windows-static + ac_cv_func_snprintf=no + # Detected x64 values for gnulib, overriding guesses for cross builds + gl_cv_func_fopen_mode_x=yes + gl_cv_func_frexpl_works=yes + gl_cv_func_getcwd_null=yes + gl_cv_func_mbrtowc_empty_input=no + gl_cv_func_mbsrtowcs_works=yes + gl_cv_func_printf_flag_zero=yes + gl_cv_func_printf_infinite_long_double=yes + gl_cv_func_printf_precision=yes + gl_cv_func_snprintf_truncation_c99=yes + # Detected x64 values for gettext, overriding guesses for x86 & x64-uwp + gt_cv_int_divbyzero_sigfpe=no + ) + endif() endif() + + file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log") vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" DETERMINE_BUILD_TRIPLET USE_WRAPPERS - ADD_BIN_TO_PATH # So configure can check for working iconv ADDITIONAL_MSYS_PACKAGES gzip OPTIONS ${OPTIONS} + OPTIONS_RELEASE + "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log" ) - vcpkg_install_make(MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") -endfunction() -function(build_libintl_only) - cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) - if(DEFINED arg_BUILD_TYPE) - set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") - endif() - vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" - DETERMINE_BUILD_TRIPLET - USE_WRAPPERS - ADD_BIN_TO_PATH # So configure can check for working iconv - OPTIONS - ${OPTIONS} - ) - vcpkg_install_make( - MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile" - BUILD_TARGET build-intl - INSTALL_TARGET install-intl - ) -endfunction() + # This helps with Windows build times, but should work everywhere in vcpkg. + # - Avoid an extra command to move a temporary file, we are building out of source. + # - Avoid a subshell just to add comments, the build dir is temporary. + # - Avoid cygpath -w when other tools handle this for us. + file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/*Makefile") + foreach(file IN LISTS makefiles) + file(READ "${file}" rules) + string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}") + string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}") + string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}") + string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}") + file(WRITE "${file}" "${rules}") + endforeach() -if("tools" IN_LIST FEATURES) - # Minimization of gettext tools build time by: - # - building tools only for release configuration - # - custom top-level Makefile - # - configuration cache - list(APPEND OPTIONS "--cache-file=../config.cache-${TARGET_TRIPLET}") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}") - build_libintl_and_tools(BUILD_TYPE "release") + vcpkg_install_make() + vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - file(GLOB tool_libs - LIST_DIRECTORIES false - "${CURRENT_PACKAGES_DIR}/bin/*" - "${CURRENT_PACKAGES_DIR}/lib/*" - ) - list(FILTER tool_libs EXCLUDE REGEX "intl[^/\\\\]*$") - file(REMOVE ${tool_libs}) - file(GLOB tool_includes - LIST_DIRECTORIES true - "${CURRENT_PACKAGES_DIR}/include/*" - ) - list(FILTER tool_includes EXCLUDE REGEX "intl[^/\\\\]*$") - file(REMOVE_RECURSE ${tool_includes}) - if(VCPKG_TARGET_IS_LINUX) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - elseif(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}.release") - file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}.release") - file(READ "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" config_cache) - string(REGEX REPLACE "\nac_cv_env[^\n]*" "" config_cache "${config_cache}") # Eliminate build type flags - file(WRITE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" "${config_cache}") - build_libintl_only(BUILD_TYPE "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}.release/debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}") - file(RENAME "${CURRENT_PACKAGES_DIR}.release" "${CURRENT_PACKAGES_DIR}") - endif() + file(GLOB link_libs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/*" "${CURRENT_PACKAGES_DIR}/bin/*.dll") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include" ${link_libs}) +endif() + +if("tools" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") else() - if(VCPKG_TARGET_IS_LINUX) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - else() - list(APPEND OPTIONS "--config-cache") - build_libintl_only() - endif() - # A fast installation of the autopoint tool and data, needed for autotools + # A fast installation of the autopoint tool and data, needed for autoconfig include("${CMAKE_CURRENT_LIST_DIR}/install-autopoint.cmake") install_autopoint() endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() +# These files can be needed to run `autoreconf`. +# We want to install these files also for fast "core" builds without "tools". +# Cf. PACKAGING for the file list. +file(INSTALL + "${SOURCE_PATH}/gettext-runtime/m4/gettext.m4" + "${SOURCE_PATH}/gettext-runtime/m4/iconv.m4" + "${SOURCE_PATH}/gettext-runtime/m4/intlmacosx.m4" + "${SOURCE_PATH}/gettext-runtime/m4/nls.m4" + "${SOURCE_PATH}/gettext-runtime/m4/po.m4" + "${SOURCE_PATH}/gettext-runtime/m4/progtest.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/host-cpu-c-abi.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-ld.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-link.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-prefix.m4" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext/aclocal" +) -if(NOT VCPKG_TARGET_IS_LINUX) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl") -endif() -if("tools" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +if(NOT VCPKG_CROSSCOMPILING) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext") endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/gettext-runtime/COPYING" "${SOURCE_PATH}/COPYING") diff --git a/ports/gettext/subdirs.patch b/ports/gettext/subdirs.patch new file mode 100644 index 00000000000000..21964d6e5475c6 --- /dev/null +++ b/ports/gettext/subdirs.patch @@ -0,0 +1,115 @@ +diff --git a/configure b/configure +index 904bdf5..e751ffc 100755 +--- a/configure ++++ b/configure +@@ -2797,7 +2797,7 @@ am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' + + + +-subdirs="$subdirs gettext-runtime libtextstyle gettext-tools" ++subdirs="$subdirs $VCPKG_GETTEXT_SUBDIRS" + + + +diff --git a/Makefile.in b/Makefile.in +index a287d38..075ddc5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -311,7 +311,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools ++SUBDIRS = $(VCPKG_GETTEXT_SUBDIRS) + changelog_etc = \ + gettext-runtime/ChangeLog.0 \ + gettext-runtime/doc/ChangeLog.0 \ +diff --git a/gettext-runtime/Makefile.in b/gettext-runtime/Makefile.in +index 8b8b5bc..bb75447 100644 +--- a/gettext-runtime/Makefile.in ++++ b/gettext-runtime/Makefile.in +@@ -1487,7 +1487,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnulib-m4 + # The list of subdirectories depends on whether --disable-libasprintf was + # specified. + @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf +-SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests ++SUBDIRS = $(VCPKG_INTL) gnulib-lib src po + + # Allow users to use "gnulib-tool --update". + +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index a7594ed..296f3b7 100644 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -26906,7 +26906,7 @@ printf "%s\n" "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ ++ && test "$PACKAGE" != pristine-gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else +diff --git a/gettext-runtime/libasprintf/configure b/gettext-runtime/libasprintf/configure +--- a/gettext-runtime/libasprintf/configure ++++ b/gettext-runtime/libasprintf/configure +index ff1c212..0c0dbcd 100644 +@@ -11,6 +11,7 @@ + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++exit 0; + ## -------------------- ## + ## M4sh Initialization. ## + ## -------------------- ## +diff --git a/gettext-tools/Makefile.in b/gettext-tools/Makefile.in +index 59e81a8..107856d 100644 +--- a/gettext-tools/Makefile.in ++++ b/gettext-tools/Makefile.in +@@ -2872,7 +2872,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 +-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc ++SUBDIRS = intl gnulib-lib libgrep src po its projects styles misc + + # Allow users to use "gnulib-tool --update". + +diff --git a/gettext-tools/configure b/gettext-tools/configure +index 056a830..9abca7e 100644 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -29661,7 +29661,7 @@ printf "%s\n" "$ac_res" >&6; } + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools; }; then ++ && test "$PACKAGE" != pristine-gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= +diff --git a/gettext-tools/examples/configure b/gettext-tools/examples/configure +--- a/gettext-tools/examples/configure ++++ b/gettext-tools/examples/configure +index ff1c212..0c0dbcd 100644 +@@ -11,6 +11,7 @@ + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++exit 0; + ## -------------------- ## + ## M4sh Initialization. ## + ## -------------------- ## +diff --git a/libtextstyle/Makefile.in b/libtextstyle/Makefile.in +index ff1c212..0c0dbcd 100644 +--- a/libtextstyle/Makefile.in ++++ b/libtextstyle/Makefile.in +@@ -1667,7 +1667,7 @@ AUTOMAKE_OPTIONS = 1.13 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4 + + # The list of subdirectories containing Makefiles. +-SUBDIRS = lib tests adhoc-tests doc ++SUBDIRS = lib + + # Allow users to use "gnulib-tool --update". + diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index f4d58963b20253..016286d600e476 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,16 +1,24 @@ { "name": "gettext", "version": "0.21.1", - "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", + "port-version": 1, + "description": "A GNU framework to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", - "license": null, + "license": "GPL-3.0-only", "dependencies": [ - "libiconv" + "gettext-libintl" ], "features": { + "runtime-tools": { + "description": "Build runtime tools for internationalization of scripts", + "supports": "!uwp" + }, "tools": { "description": "Build gettext tools", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + "libiconv" + ] } } } diff --git a/ports/gettimeofday/portfile.cmake b/ports/gettimeofday/portfile.cmake index 0d08bacc8197f9..0b4d4b8158d109 100644 --- a/ports/gettimeofday/portfile.cmake +++ b/ports/gettimeofday/portfile.cmake @@ -1,9 +1,8 @@ -vcpkg_configure_cmake( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gettimeofday/vcpkg.json b/ports/gettimeofday/vcpkg.json index 9528e9a2c57b4b..c4b387f8ee31b2 100644 --- a/ports/gettimeofday/vcpkg.json +++ b/ports/gettimeofday/vcpkg.json @@ -1,6 +1,12 @@ { "name": "gettimeofday", - "version-string": "2017-10-14", - "port-version": 4, - "description": "An implementation of gettimeofday for WIN32" + "version-date": "2017-10-14", + "port-version": 6, + "description": "An implementation of gettimeofday for WIN32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index f1c22ff1aa6055..fed9053482a6b7 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -13,9 +13,8 @@ vcpkg_from_github( fix_cmake_config.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF -DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF @@ -24,15 +23,15 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gflags) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gflags) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -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") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json index 3b8d22a06ff163..f39eebb7a3a938 100644 --- a/ports/gflags/vcpkg.json +++ b/ports/gflags/vcpkg.json @@ -1,8 +1,18 @@ { "name": "gflags", - "version-string": "2.2.2", - "port-version": 5, + "version": "2.2.2", + "port-version": 7, "description": "A C++ library that implements commandline flags processing", "homepage": "https://github.com/gflags/gflags", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/gl2ps/portfile.cmake b/ports/gl2ps/portfile.cmake index d18d2fcb4ba401..2095809c3ccfa8 100644 --- a/ports/gl2ps/portfile.cmake +++ b/ports/gl2ps/portfile.cmake @@ -8,14 +8,13 @@ vcpkg_from_gitlab( PATCHES separate-static-dynamic-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.GL2PS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright.LGPL) +file(INSTALL "${SOURCE_PATH}/COPYING.GL2PS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright.LGPL) diff --git a/ports/gl2ps/vcpkg.json b/ports/gl2ps/vcpkg.json index 4230bc45cbd86a..32105b0ecf505e 100644 --- a/ports/gl2ps/vcpkg.json +++ b/ports/gl2ps/vcpkg.json @@ -1,12 +1,16 @@ { "name": "gl2ps", - "version-string": "1.4.2", - "port-version": 1, + "version": "1.4.2", + "port-version": 3, "description": "OpenGL to PostScript Printing Library", "homepage": "https://gitlab.onelab.info/gl2ps/gl2ps", "dependencies": [ "freeglut", "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake new file mode 100644 index 00000000000000..e487688bf3c525 --- /dev/null +++ b/ports/glaze/portfile.cmake @@ -0,0 +1,24 @@ +if(VCPKG_TARGET_IS_LINUX) + message("Warning: `glaze` requires Clang or GCC 10+ on Linux") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stephenberry/glaze + REF "v${VERSION}" + SHA512 456b49a86dddb5949991050daa8dcfbe47ca55db6746539e14995a19bd2623ab46ac72e08af29f64cb1f3ff79265fb8d824bf9b7744f3cf94e568f27467b6185 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dglaze_DEVELOPER_MODE=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json new file mode 100644 index 00000000000000..8bbaae3886e3c8 --- /dev/null +++ b/ports/glaze/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "glaze", + "version": "1.2.3", + "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", + "homepage": "https://github.com/stephenberry/glaze", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/glew/base_address.patch b/ports/glew/base_address.patch new file mode 100644 index 00000000000000..466381efe95178 --- /dev/null +++ b/ports/glew/base_address.patch @@ -0,0 +1,13 @@ +--- a/build/cmake/CMakeLists.txt Mon Apr 24 15:54:00 2023 ++++ b/build/cmake/CMakeLists.txt Mon Apr 24 16:06:57 2023 +@@ -143,7 +143,9 @@ + # add options from visual studio project + target_compile_definitions (glew PRIVATE "GLEW_BUILD;VC_EXTRALEAN") + target_compile_definitions (glew_s PRIVATE "GLEW_STATIC;VC_EXTRALEAN") +- target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000) ++ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i?86|x86|x86_32)$") ++ target_link_libraries (glew LINK_PRIVATE -BASE:0x62AA0000) ++ endif() + # kill security checks which are dependent on stdlib + target_compile_options (glew PRIVATE -GS-) + target_compile_options (glew_s PRIVATE -GS-) diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index dc64a2aca978e1..0757e2cd95dd7d 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -10,12 +10,13 @@ vcpkg_download_distfile(ARCHIVE SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF glew + SOURCE_BASE glew PATCHES fix-LNK2019.patch + base_address.patch # Accepted upstream as https://github.com/nigels-com/glew/commit/ef7d12ecb7f1f336f6d3a80cebd6163b2c094108 ) vcpkg_cmake_configure( diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json index 7468ecadf894a3..0f7e83a8718797 100644 --- a/ports/glew/vcpkg.json +++ b/ports/glew/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glew", - "version-string": "2.2.0", + "version": "2.2.0", + "port-version": 3, "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", "homepage": "https://github.com/nigels-com/glew", "dependencies": [ diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake index 5168aca1e5d738..e4a4edb42223ec 100644 --- a/ports/gli/portfile.cmake +++ b/ports/gli/portfile.cmake @@ -10,19 +10,18 @@ vcpkg_from_github( disable-test.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gli) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt") # Put the license file where vcpkg expects it # manual.md contains the "licenses" section for the project -file(INSTALL ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/manual.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/gli/vcpkg.json b/ports/gli/vcpkg.json index e1d746619608c9..732f3c25a01816 100644 --- a/ports/gli/vcpkg.json +++ b/ports/gli/vcpkg.json @@ -1,9 +1,18 @@ { "name": "gli", "version-date": "2021-07-06", + "port-version": 2, "description": "OpenGL Image (GLI)", "homepage": "https://gli.g-truc.net", "dependencies": [ - "glm" + "glm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 6bfd1ad97a3d76..a2cb255d6fc69d 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIB_ARCHIVE URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" FILENAME "glib-${VERSION}.tar.xz" - SHA512 812834ca6d840dd9c15c0689685d8bd96f4acd69a89213f807a75732d1aa5efadbed0e0073f05a56a09beb2d4f0be1b83a4642259682aac84302632da2d62370 + SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 ) vcpkg_extract_source_archive(SOURCE_PATH diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 835074b4cf3656..782e3eaa6aa46a 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.76.0", - "port-version": 1, + "version": "2.76.2", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 2a271f6fa54fb5..050ba47f31cc12 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -1,9 +1,9 @@ # Glib uses winapi functions not available in WindowsStore - +string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIBMM_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIBMM_ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.74/glibmm-2.74.0.tar.xz" - FILENAME "glibmm-2.74.0.tar.xz" - SHA512 29c16a6c921fb135721c39b5328e0b45e09c500c65175199c1ec5ee75bdd5fb907072389c6980da3bf8fac0846235af5580f692706eb00d26947804daa1c99c9 + URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/${GLIBMM_MAJOR_MINOR}/glibmm-${VERSION}.tar.xz" + FILENAME "glibmm-${VERSION}.tar.xz" + SHA512 be49599f5eb8eb5a1cef015cdb37af2564fcd1ea845aa4344804ca5f0f61468949711e25cefebb93219e1be37128ebfdd2a816324e752ac4395b4b87c072fc78 ) vcpkg_extract_source_archive( diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index 8aa57402192955..fabca11f99cabd 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glibmm", - "version": "2.74.0", + "version": "2.76.0", "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "license": "LGPL-2.1-or-later", diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake index 4103fd3ab44e5e..1ecdbb1003a0a1 100644 --- a/ports/globjects/portfile.cmake +++ b/ports/globjects/portfile.cmake @@ -9,22 +9,21 @@ vcpkg_from_github( fix-dependency-glm.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DOPTION_BUILD_TESTS=OFF -DOPTION_BUILD_GPU_TESTS=OFF -DGIT_REV=0 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects) +vcpkg_cmake_config_fixup(CONFIG_PATH share/globjects/cmake/globjects) -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") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake "include(CMakeFindDependencyMacro) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake" "include(CMakeFindDependencyMacro) find_dependency(glm) find_dependency(glbinding) @@ -32,6 +31,6 @@ include(\${CMAKE_CURRENT_LIST_DIR}/globjects-export.cmake) ") # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/globjects/LICENSE ${CURRENT_PACKAGES_DIR}/share/globjects/copyright) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") vcpkg_copy_pdbs() diff --git a/ports/globjects/vcpkg.json b/ports/globjects/vcpkg.json index 8878d28659a741..6dd9aa1379b29f 100644 --- a/ports/globjects/vcpkg.json +++ b/ports/globjects/vcpkg.json @@ -1,11 +1,19 @@ { "name": "globjects", - "version-string": "1.1.0", - "port-version": 4, + "version": "1.1.0", + "port-version": 6, "description": "C++ library strictly wrapping OpenGL objects", "homepage": "https://github.com/cginternals/globjects", "dependencies": [ "glbinding", - "glm" + "glm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake index cc168af4a3ce59..e9ed2af43f2da6 100644 --- a/ports/gloo/portfile.cmake +++ b/ports/gloo/portfile.cmake @@ -18,15 +18,15 @@ if ("cuda" IN_LIST FEATURES) list(APPEND GLOO_FEATURE_OPTIONS "-DUSE_CUDA=1" "-DUSE_NCCL=1") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${GLOO_FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Gloo) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Gloo) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gloo/vcpkg.json b/ports/gloo/vcpkg.json index 15c4593c1d3c43..7ded7731d02f81 100644 --- a/ports/gloo/vcpkg.json +++ b/ports/gloo/vcpkg.json @@ -1,9 +1,20 @@ { "name": "gloo", - "version-string": "20201203", + "version": "20201203", + "port-version": 2, "description": "Collective communications library with various primitives for multi-machine training.", "homepage": "https://github.com/facebookincubator/gloo", "supports": "x64 & linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "cuda": { "description": "for CUDA aware algorithms", diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 8ac7a6fd3c5096..3099574096027f 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang REF "${VERSION}" - SHA512 1d40518d09579eb925b1e4375c9a581736cdb79aaf60d1ca6117e394386a8d2dc1dafd9a4a30d9381f063c1ea1f65fc0d5d9fcbbefa87a85423f87fd925747b0 + SHA512 999ee0a4324263f6c12126b76bb098fc7009ea444be5cb052bd3fd7109589b52180acd8e7a90735ef7dc4be1e29aab5d98845e1aeae874b7d2ccc9279063ab50 HEAD_REF master ) diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index c82ff19dc79747..e0989df08aa271 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glslang", - "version": "12.1.0", + "version": "12.2.0", "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", @@ -14,9 +14,6 @@ "host": true } ], - "default-features": [ - "tools" - ], "features": { "tools": { "description": "Build the glslangValidator and spirv-remap binaries", diff --git a/ports/glui/portfile.cmake b/ports/glui/portfile.cmake index a3b37a597141b3..00a1ae192cee8e 100644 --- a/ports/glui/portfile.cmake +++ b/ports/glui/portfile.cmake @@ -8,30 +8,29 @@ vcpkg_from_github( install-one-flavor.patch ) -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_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/GL/glui.h + "${CURRENT_PACKAGES_DIR}/include/GL/glui.h" "ifdef GLUIDLL" "if 1 //ifdef GLUIDLL" ) endif() -file(INSTALL ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glui/vcpkg.json b/ports/glui/vcpkg.json index c585a4f2bfbc88..40fe8892f0013a 100644 --- a/ports/glui/vcpkg.json +++ b/ports/glui/vcpkg.json @@ -1,10 +1,18 @@ { "name": "glui", - "version-string": "2019-11-30", - "port-version": 1, + "version-date": "2019-11-30", + "port-version": 3, "description": "GLUI is a GLUT-based C++ user interface library", "homepage": "https://github.com/libglui/glui", "dependencies": [ - "freeglut" + "freeglut", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index d1e145a8381afa..dbdc226e4e342b 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -9,31 +9,30 @@ vcpkg_download_distfile(ARCHIVE SHA512 a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${LIB_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${LIB_VERSION}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") # We can use file supplied with original sources -configure_file(${SOURCE_PATH}/build/vs2017/unistd.h ${SOURCE_PATH} COPYONLY) -configure_file(${SOURCE_PATH}/build/vs2017/config.h ${SOURCE_PATH} COPYONLY) -configure_file(${SOURCE_PATH}/build/vs2017/gmime.def ${SOURCE_PATH} COPYONLY) +configure_file("${SOURCE_PATH}/build/vs2017/unistd.h" "${SOURCE_PATH}" COPYONLY) +configure_file("${SOURCE_PATH}/build/vs2017/config.h" "${SOURCE_PATH}" COPYONLY) +configure_file("${SOURCE_PATH}/build/vs2017/gmime.def" "${SOURCE_PATH}" COPYONLY) vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # License and man -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${LIB_NAME} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${LIB_NAME}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/gmime/vcpkg.json b/ports/gmime/vcpkg.json index 527bf5659b316d..d92dfe61ccfa21 100644 --- a/ports/gmime/vcpkg.json +++ b/ports/gmime/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmime", "version": "3.2.6", - "port-version": 3, + "port-version": 5, "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).", "homepage": "https://developer.gnome.org/gmime/", "license": "LGPL-2.1-or-later", @@ -10,6 +10,10 @@ "glib", "libiconv", "libidn2", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 127bbda073a724..09ebd530456b4b 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -65,6 +65,10 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") elseif(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # not exporting asm functions set(disable_assembly ON) +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + vcpkg_list(APPEND OPTIONS "ABI=32") + string(APPEND asmflags " -m32") else() set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") endif() diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 463ba1de211322..2960c09f35f648 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 17, + "port-version": 18, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "license": "LGPL-3.0-only OR GPL-2.0-only", diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake index 24458ac628b16f..1d64ab1ec36a50 100644 --- a/ports/gobject-introspection/portfile.cmake +++ b/ports/gobject-introspection/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES 0001-g-ir-tool-template.in.patch @@ -34,10 +34,7 @@ vcpkg_configure_meson( ${OPTIONS_DEBUG} OPTIONS_RELEASE ${OPTIONS_RELEASE} - ADDITIONAL_NATIVE_BINARIES - flex='${FLEX}' - bison='${BISON}' - ADDITIONAL_CROSS_BINARIES + ADDITIONAL_BINARIES flex='${FLEX}' bison='${BISON}' g-ir-annotation-tool='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-annotation-tool' diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index ed8a0fa75f17b3..a391c9db8ebf28 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gobject-introspection", "version": "1.72.0", - "port-version": 1, + "port-version": 3, "description": "A middleware layer between C libraries (using GObject) and language bindings.", "homepage": "https://gi.readthedocs.io/en/latest/", "license": null, diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 6e88fb1cd58b01..859e71f91c481e 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF v${VERSION} - SHA512 b6d75d1810bad9cfd9c0271d895324dd432c3275ccdce2fe8e4ee886da56577f06d778101b935b4084a876d957f3d45289c2ebd971a3ced42b12dfa5f2e5b916 + SHA512 1ccc0163fcc34e4e8c74af0193d6402d115809a8421b8c78ce527ae934051b71401bd66df84174b405c3ab83aeabbc2ef5eefc66b241f6f4f0a82e2c7acf0428 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 0b5079de134942..1e1fdfcee443e5 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.9.0", + "version": "2.10.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -307,6 +307,18 @@ } ] }, + "confidentialcomputing": { + "description": "Confidential Computing API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "connectors": { "description": "Connectors API C++ Client Library", "dependencies": [ @@ -1069,6 +1081,18 @@ "nlohmann-json" ] }, + "storageinsights": { + "description": "Storage Insights API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "storagetransfer": { "description": "Storage Transfer API C++ Client Library", "dependencies": [ @@ -1260,6 +1284,18 @@ ] } ] + }, + "workstations": { + "description": "Workstations API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] } } } diff --git a/ports/gperf/portfile.cmake b/ports/gperf/portfile.cmake index 34644af1b936d4..6a8281cd1daa52 100644 --- a/ports/gperf/portfile.cmake +++ b/ports/gperf/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/gperf/vcpkg.json b/ports/gperf/vcpkg.json index 02f6116f1ff0b2..c3e790cd00d0ed 100644 --- a/ports/gperf/vcpkg.json +++ b/ports/gperf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gperf", "version": "3.1", - "port-version": 4, + "port-version": 5, "description": "GNU perfect hash function generator", "homepage": "https://www.gnu.org/software/gperf/", "dependencies": [ diff --git a/ports/gperftools/portfile.cmake b/ports/gperftools/portfile.cmake index 4d03e0e0758706..7e3f8528e0feec 100644 --- a/ports/gperftools/portfile.cmake +++ b/ports/gperftools/portfile.cmake @@ -18,8 +18,9 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - override GPERFTOOLS_WIN32_OVERRIDE - tools GPERFTOOLS_BUILD_TOOLS + FEATURES + override GPERFTOOLS_WIN32_OVERRIDE + tools GPERFTOOLS_BUILD_TOOLS ) vcpkg_cmake_configure( diff --git a/ports/gperftools/vcpkg.json b/ports/gperftools/vcpkg.json index 556db9a29149ae..bfd064adb4ccd4 100644 --- a/ports/gperftools/vcpkg.json +++ b/ports/gperftools/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gperftools", "version-date": "2019-09-02", - "port-version": 3, + "port-version": 4, "description": "A set of tools for performance profiling and memory checking", "homepage": "https://github.com/gperftools/gperftools", "supports": "!(arm | arm64 | uwp)", diff --git a/ports/graphene/portfile.cmake b/ports/graphene/portfile.cmake index 94afb9f967442a..9b420b66d7145d 100644 --- a/ports/graphene/portfile.cmake +++ b/ports/graphene/portfile.cmake @@ -39,12 +39,7 @@ vcpkg_configure_meson( ${OPTIONS_DEBUG} OPTIONS_RELEASE ${OPTIONS_RELEASE} - ADDITIONAL_NATIVE_BINARIES - glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' - g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' - g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner' - ADDITIONAL_CROSS_BINARIES + ADDITIONAL_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json index 936babe8afb7ce..b024349d824e0e 100644 --- a/ports/graphene/vcpkg.json +++ b/ports/graphene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphene", "version": "1.10.8", - "port-version": 1, + "port-version": 2, "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", "license": "MIT", diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index 142364ea9dbd32..921e19fc48c68e 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -17,31 +17,30 @@ vcpkg_from_sourceforge( disable_graphicsmagick_modules.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/magick_types.h DESTINATION ${SOURCE_PATH}/magick) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/magick_types.h" DESTINATION "${SOURCE_PATH}/magick") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-graphicsmagick) # copy license -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # copy config -file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) -file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) -file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) +file(COPY "${SOURCE_PATH}/config/colors.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config") +file(COPY "${SOURCE_PATH}/config/log.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config") +file(COPY "${SOURCE_PATH}/config/modules.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config") -file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK) +file(READ "${SOURCE_PATH}/config/type-windows.mgk.in" TYPE_MGK) string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk" "${TYPE_MGK}") -configure_file(${SOURCE_PATH}/config/delegates.mgk.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk @ONLY) +configure_file("${SOURCE_PATH}/config/delegates.mgk.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk" @ONLY) vcpkg_copy_pdbs() diff --git a/ports/graphicsmagick/vcpkg.json b/ports/graphicsmagick/vcpkg.json index e343f1eb45924c..90e01917de474b 100644 --- a/ports/graphicsmagick/vcpkg.json +++ b/ports/graphicsmagick/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphicsmagick", "version": "1.3.37", - "port-version": 1, + "port-version": 3, "description": "Image processing library", "homepage": "https://sourceforge.net/projects/graphicsmagick/", "dependencies": [ @@ -11,6 +11,14 @@ "libpng", "libwebp", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/gsl-lite/portfile.cmake b/ports/gsl-lite/portfile.cmake index 1cc23b2c7c0c72..eb0355b61b80d9 100644 --- a/ports/gsl-lite/portfile.cmake +++ b/ports/gsl-lite/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gsl-lite/gsl-lite - REF 4b5e9ab7474841fc2d7efc2e0064ef81785535d1 - SHA512 d5678743f2aebf9b8311e1484d8d22d995f4920632c55ff2f45e463f435a087d25bbf79749c179cfa2f96e799a55e5ee2e59eb2cc6962b8f5922ea56789e16b1 + REF 755ba124b54914e672737acace6a9314f59e8d6f + SHA512 d0b8397afc7704c5c9510fb62ce01f35faf9cc1cfd05ac3853bdc4b9fc4874aaa85aa70e93ff37867dc263b97926b15af2316e49a5787b246984fa086bf85563 HEAD_REF master ) diff --git a/ports/gsl-lite/vcpkg.json b/ports/gsl-lite/vcpkg.json index 0fdc05f4195ec2..b62ab3f8112d35 100644 --- a/ports/gsl-lite/vcpkg.json +++ b/ports/gsl-lite/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gsl-lite", - "version": "0.40.0", + "version": "0.41.0", "description": "A single-file header-only implementation of ISO C++ Guidelines Support Library (GSL) for C++98, C++11 and later.", "homepage": "https://github.com/gsl-lite/gsl-lite/", "dependencies": [ diff --git a/ports/gsl/CMakeLists.txt b/ports/gsl/CMakeLists.txt index 7e522cc5cea23c..5bc98746e961d4 100644 --- a/ports/gsl/CMakeLists.txt +++ b/ports/gsl/CMakeLists.txt @@ -40,7 +40,7 @@ foreach(DIR IN LISTS FOLDERS) endforeach() file(READ gsl_types.h GSLTYPES_H) -string(REPLACE "#ifdef WIN32" "#if 1 /*WIN32*/" GSLTYPES_H "${GSLTYPES_H}") +string(REPLACE "#ifdef WIN32" "#ifdef _WIN32" GSLTYPES_H "${GSLTYPES_H}") if(BUILD_SHARED_LIBS) string(REPLACE "# ifdef GSL_DLL" "# if 1 /*GSL_DLL*/" GSLTYPES_H "${GSLTYPES_H}") endif() diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index a107ce7b74cf84..fe441823b62e67 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES 0001-configure.patch diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index 44c14d97f405ed..1284ab30accf7a 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,10 +1,10 @@ { "name": "gsl", "version": "2.7.1", - "port-version": 1, + "port-version": 3, "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", "homepage": "https://www.gnu.org/software/gsl/", - "license": "GPL-3.0", + "license": "GPL-3.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/gst-rtsp-server/portfile.cmake b/ports/gst-rtsp-server/portfile.cmake index 89eb6e48383636..b945e716334aaf 100644 --- a/ports/gst-rtsp-server/portfile.cmake +++ b/ports/gst-rtsp-server/portfile.cmake @@ -24,16 +24,21 @@ vcpkg_configure_meson( vcpkg_install_meson() -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll - ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(NOT VCPKG_BUILD_TYPE) + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer") + endif() + file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb" ) - file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll - ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb - ) - file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/gstreamer") file(REMOVE ${DBG_BINS} ${REL_BINS}) + if(NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0") + endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index a94dd082238047..624f5f5c3ddb23 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gst-rtsp-server", "version": "1.20.5", + "port-version": 1, "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.1-only", diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index ce892b9b89fdc4..4727201beba745 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -142,6 +142,12 @@ endif() # Good optional plugins +if("bzip2-good" IN_LIST FEATURES) + set(PLUGIN_GOOD_BZ2 enabled) +else() + set(PLUGIN_GOOD_BZ2 disabled) +endif() + if("cairo" IN_LIST FEATURES) set(PLUGIN_GOOD_CAIRO enabled) else() @@ -226,6 +232,12 @@ else() set(PLUGIN_BAD_ASSRENDER disabled) endif() +if("bzip2-bad" IN_LIST FEATURES) + set(PLUGIN_BAD_BZ2 enabled) +else() + set(PLUGIN_BAD_BZ2 disabled) +endif() + if("chromaprint" IN_LIST FEATURES) set(PLUGIN_BAD_CHROMAPRINT enabled) else() @@ -412,7 +424,7 @@ vcpkg_configure_meson( -Dlibav=${LIBAV} -Dlibnice=disabled -Ddevtools=disabled - -Dges=disabled + -Dges=enabled -Drtsp_server=disabled -Domx=disabled -Dvaapi=disabled @@ -459,7 +471,7 @@ vcpkg_configure_meson( # gst-plugins-good -Dgood=${PLUGIN_GOOD_SUPPORT} -Dgst-plugins-good:aalib=disabled - -Dgst-plugins-good:bz2=disabled + -Dgst-plugins-good:bz2=${PLUGIN_GOOD_BZ2} -Dgst-plugins-good:directsound=auto -Dgst-plugins-good:dv=disabled -Dgst-plugins-good:dv1394=disabled @@ -508,7 +520,7 @@ vcpkg_configure_meson( -Dgst-plugins-bad:assrender=${PLUGIN_BAD_ASSRENDER} -Dgst-plugins-bad:bluez=disabled -Dgst-plugins-bad:bs2b=disabled - -Dgst-plugins-bad:bz2=disabled # Error during plugin configuration + -Dgst-plugins-bad:bz2=${PLUGIN_BAD_BZ2} -Dgst-plugins-bad:chromaprint=${PLUGIN_BAD_CHROMAPRINT} -Dgst-plugins-bad:closedcaption=${PLUGIN_BAD_CLOSEDCAPTION} -Dgst-plugins-bad:colormanagement=${PLUGIN_BAD_COLORMANAGEMENT} @@ -550,7 +562,7 @@ vcpkg_configure_meson( -Dgst-plugins-bad:msdk=disabled -Dgst-plugins-bad:musepack=disabled -Dgst-plugins-bad:neon=disabled - -Dgst-plugins-bad:nvcodec=disabled + -Dgst-plugins-bad:nvcodec=enabled -Dgst-plugins-bad:onnx=disabled # libonnxruntime not found -Dgst-plugins-bad:openal=${PLUGIN_BAD_OPENAL} -Dgst-plugins-bad:openaptx=disabled @@ -632,6 +644,7 @@ list(APPEND GST_BIN_TOOLS gst-launch-1.0 gst-stats-1.0 gst-typefind-1.0 + ges-launch-1.0 ) list(APPEND GST_LIBEXEC_TOOLS gst-plugin-scanner @@ -690,18 +703,40 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gstconfig.h" "!defined(GST_STATIC_COMPILATION)" "0") endif() -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # move plugins to ${prefix}/plugins/${PORT} instead of ${prefix}/lib/gstreamer-1.0 if(NOT VCPKG_BUILD_TYPE) - file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" ) - file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}") endif() - file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll" + file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb" ) - file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/${PORT}") file(REMOVE ${DBG_BINS} ${REL_BINS}) + if(NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0") + endif() + + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-1.0.pc") + if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() + + set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-1.0.pc") + if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() endif() vcpkg_fixup_pkgconfig() diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index f7bbf8b7321639..3b968ad524efa8 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.20.5", - "port-version": 3, + "port-version": 8, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -83,6 +83,32 @@ "libass" ] }, + "bzip2-bad": { + "description": "Enable bzip2 stream compression in bad plugins", + "dependencies": [ + "bzip2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "bzip2-good": { + "description": "Enable bzip2 stream compression in good plugins", + "dependencies": [ + "bzip2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + } + ] + }, "cairo": { "description": "Enable support for the cairo graphics library", "dependencies": [ @@ -286,6 +312,13 @@ { "name": "ffmpeg", "default-features": false + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] } ] }, diff --git a/ports/gtk/0001-build.patch b/ports/gtk/0001-build.patch index f0e2d2e87462cf..2835f2b5baeb9b 100644 --- a/ports/gtk/0001-build.patch +++ b/ports/gtk/0001-build.patch @@ -1,44 +1,26 @@ diff --git a/meson.build b/meson.build -index 41cf592..cb4d638 100644 +index 13517714b7..2132611c88 100644 --- a/meson.build +++ b/meson.build -@@ -897,24 +897,24 @@ subdir('po-properties') - subdir('docs/tools') +@@ -857,15 +857,15 @@ subdir('po') + subdir('docs/reference') -if not meson.is_cross_build() -- if meson.version().version_compare('>=0.57.0') -- gnome.post_install( -- glib_compile_schemas: true, -- gio_querymodules: gio_module_dirs, -- gtk_update_icon_cache: get_option('demos'), -- ) -- else -- meson.add_install_script('build-aux/meson/post-install.py', -- gtk_api_version, -- gtk_binary_version, -- gtk_libdir, -- gtk_datadir, -- gtk_bindir) -- endif +- gnome.post_install( +- glib_compile_schemas: true, +- gio_querymodules: gio_module_dirs, +- gtk_update_icon_cache: get_option('demos'), +- ) -else - message('Not executing post-install steps automatically when cross compiling') -endif +#if not meson.is_cross_build() -+# if meson.version().version_compare('>=0.57.0') -+# gnome.post_install( -+# glib_compile_schemas: true, -+# gio_querymodules: gio_module_dirs, -+# gtk_update_icon_cache: get_option('demos'), -+# ) -+# else -+# meson.add_install_script('build-aux/meson/post-install.py', -+# gtk_api_version, -+# gtk_binary_version, -+# gtk_libdir, -+# gtk_datadir, -+# gtk_bindir) -+# endif ++ gnome.post_install( ++ glib_compile_schemas: true, ++ gio_querymodules: gio_module_dirs, ++ gtk_update_icon_cache: get_option('demos'), ++ ) +#else +# message('Not executing post-install steps automatically when cross compiling') +#endif diff --git a/ports/gtk/0002-windows-build.patch b/ports/gtk/0002-windows-build.patch deleted file mode 100644 index 27f6680ce2b4a0..00000000000000 --- a/ports/gtk/0002-windows-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru /gdk/win32/gdkinput-winpointer.c b/gdk/win32/gdkinput-winpointer.c ---- a/gdk/win32/gdkinput-winpointer.c -+++ b/gdk/win32/gdkinput-winpointer.c -@@ -18,6 +18,7 @@ - #include "config.h" - - #include -+#include "gdk-private.h" - #include "gdkwin32.h" - #include "gdkprivate-win32.h" - #include "gdkdevicemanager-win32.h" diff --git a/ports/gtk/0004-macos-build.patch b/ports/gtk/0004-macos-build.patch deleted file mode 100644 index e49086cedcb393..00000000000000 --- a/ports/gtk/0004-macos-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u a/gdk/macos/gdkmacoseventsource-private.h b/gdk/macos/gdkmacoseventsource-private.h ---- a/gdk/macos/gdkmacoseventsource-private.h -+++ b/gdk/macos/gdkmacoseventsource-private.h -@@ -24,6 +24,8 @@ - - #include "gdkmacosdisplay.h" - -+#include "gdk-private.h" -+ - G_BEGIN_DECLS - - typedef enum diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 80bd9f79c2d0ef..f02521e5f93bcb 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -2,13 +2,11 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF 73bea05c3386075528542c2714790199f2bb5861 #v4.6.8 - SHA512 5e7b994d1e26a4d97bd5788b61ca3a43a04c96c10161d29e185d5854b925e07b1bba5f1e35509d4df078f918bb6cc7149bcb720aaec8c04e5d8254280c0076ed + REF 06b3ced8e7fc936caed43379b120d75be09713ca #v4.10.3 + SHA512 3fe7da84993bab8afbd0725b06e10546fbbb550a1e2b356431c152b5392fc1e94e400430f1b6a2c39bdddf8fecbe34fb65794bd1bf41c9bdca4e40e12136ac91 HEAD_REF master # branch name PATCHES 0001-build.patch - 0002-windows-build.patch - 0004-macos-build.patch ) vcpkg_find_acquire_program(PKGCONFIG) @@ -55,9 +53,9 @@ vcpkg_configure_meson( OPTIONS ${OPTIONS} -Ddemos=false + -Dbuild-testsuite=false -Dbuild-examples=false -Dbuild-tests=false - -Dinstall-tests=false -Dgtk_doc=false -Dman-pages=false -Dmedia-ffmpeg=disabled # Build the ffmpeg media backend @@ -68,20 +66,12 @@ vcpkg_configure_meson( -Dsysprof=disabled # include tracing support for sysprof -Dtracker=disabled # Enable Tracker3 filechooser search -Dcolord=disabled # Build colord support for the CUPS printing backend + -Df16c=disabled # Enable F16C fast paths (requires F16C) OPTIONS_DEBUG ${OPTIONS_DEBUG} OPTIONS_RELEASE ${OPTIONS_RELEASE} - ADDITIONAL_NATIVE_BINARIES - glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' - glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' - gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' - glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' - sassc='${CURRENT_HOST_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' - g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' - g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner' - ADDITIONAL_CROSS_BINARIES + ADDITIONAL_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' @@ -94,40 +84,6 @@ vcpkg_configure_meson( vcpkg_install_meson(ADD_BIN_TO_PATH) -# If somebody finds out how to access and forward env variables to -# the meson install script be my guest. Nevertheless the script still -# needs manual execution in the crosscompiling case. -vcpkg_find_acquire_program(PYTHON3) -foreach(_config release debug) - if(_config STREQUAL "release") - set(_short rel) - set(_path_suffix) - else() - set(_short dbg) - set(_path_suffix /debug) - endif() - if(NOT EXISTS "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib") - continue() - endif() - message(STATUS "Running post install script: ${TARGET_TRIPLET}-${_short}") - - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${_path_suffix}/lib/pkgconfig/") - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}") - #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/media") - #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules") - #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends") - vcpkg_execute_required_process( - COMMAND "${PYTHON3}" "${SOURCE_PATH}/build-aux/meson/post-install.py" 4.0 4.0.0 "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib" "${CURRENT_PACKAGES_DIR}${_path_suffix}/share" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME post-install-${TARGET_TRIPLET}-${_short} - ) - unset(ENV{PKG_CONFIG_PATH}) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0") - #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0") - #file(RENAME "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0") - message(STATUS "Post install ${TARGET_TRIPLET}-${_short} done") -endforeach() - vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 5388bfd596f5f7..88c72157b0eae4 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gtk", - "version": "4.6.8", - "port-version": 1, + "version": "4.10.3", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", @@ -38,6 +37,12 @@ "host": true }, "graphene", + { + "name": "harfbuzz", + "features": [ + "glib" + ] + }, "libepoxy", "pango", { diff --git a/ports/gtk3/0001-build.patch b/ports/gtk3/0001-build.patch index 0f3d7b4fffabbe..a6881182689586 100644 --- a/ports/gtk3/0001-build.patch +++ b/ports/gtk3/0001-build.patch @@ -8,6 +8,6 @@ index c599843..0cafd79 100644 -if not meson.is_cross_build() +if false - if meson.version().version_compare('>=0.57.0') - gnome.post_install( - glib_compile_schemas: true, + gnome.post_install( + glib_compile_schemas: true, + gio_querymodules: gio_module_dirs, diff --git a/ports/gtk3/cairo-cpp-linkage.patch b/ports/gtk3/cairo-cpp-linkage.patch index 84260f9e8d9359..ac7341551725d1 100644 --- a/ports/gtk3/cairo-cpp-linkage.patch +++ b/ports/gtk3/cairo-cpp-linkage.patch @@ -55,8 +55,8 @@ index 287f0cb..d35106f 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ --project('gtk+-3.0', 'c', -+project('gtk+-3.0', 'c', 'cpp', - version: '3.24.34', - default_options: [ - 'buildtype=debugoptimized', +-project('gtk+', 'c', ++project('gtk+', 'c', 'cpp', + version: '3.24.37', + default_options: [ + 'buildtype=debugoptimized', diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index cad4bcba97a2af..9d95ec093e70e9 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -6,13 +6,12 @@ if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32) ) endif() -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH GITLAB_URL https://gitlab.gnome.org REPO GNOME/gtk REF "${VERSION}" - SHA512 20a91e30a89070461af06b33829bc723b348806b4a785d0743af8bd4789b55dade24686e08bf1b2f0335240463aacc040134babb0605b809186b15de9cf261e4 + SHA512 3021b65649c29d390a21580dc39ca1e7fa845d760c95a6178213cd890f5d8c6d68fe8a5600b283001e279a4bb2ec99f9b210c7abfa493701f7276f015059a9a1 PATCHES 0001-build.patch cairo-cpp-linkage.patch @@ -25,22 +24,24 @@ vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf") vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") + +vcpkg_list(SET ADDITIONAL_BINARIES) if("introspection" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature introspection currently only supports dynamic build.") - endif() list(APPEND OPTIONS_DEBUG -Dintrospection=false) list(APPEND OPTIONS_RELEASE -Dintrospection=true) + if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(GIR_TOOL_DIR "${CURRENT_INSTALLED_DIR}") + else() + set(GIR_TOOL_DIR "${CURRENT_HOST_INSTALLED_DIR}") + endif() + vcpkg_list(APPEND ADDITIONAL_BINARIES + "g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'" + "g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'" + ) else() list(APPEND OPTIONS -Dintrospection=false) endif() -if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(GIR_TOOL_DIR ${CURRENT_INSTALLED_DIR}) -else() - set(GIR_TOOL_DIR ${CURRENT_HOST_INSTALLED_DIR}) -endif() - vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -66,8 +67,7 @@ vcpkg_configure_meson( "glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'" "gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'" "glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'" - "g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'" - "g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'" + ${ADDITIONAL_BINARIES} ) # Reduce command line lengths, in particular for static windows builds. diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index 636da909c506b4..596564e475ce69 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gtk3", - "version": "3.24.34", - "port-version": 2, + "version": "3.24.37", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, @@ -55,6 +54,7 @@ "features": { "introspection": { "description": "build with introspection", + "supports": "!windows | !static", "dependencies": [ { "name": "atk", diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 634367eae07f83..78652a8c9b93e7 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -1,11 +1,12 @@ +string(REGEX MATCH "^([0-9]*[.][0-9]*)" GTKMM_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.6/gtkmm-4.6.0.tar.xz" - FILENAME "gtkmm-4.6.0.tar.xz" - SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199 + URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/${GTKMM_MAJOR_MINOR}/gtkmm-${VERSION}.tar.xz" + FILENAME "gtkmm-${VERSION}.tar.xz" + SHA512 ee40cce37c34814884ffc06e614013d23fa31cac51ea9d98ea5689a08acc2ff58bb2ca80ba822d6fe3c0f3bdcb9ce2596ede3c05c69a702b524c4e38afc3d9ab ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) @@ -15,8 +16,8 @@ vcpkg_configure_meson( -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 -Dbuild-tests=false -Dbuild-demos=false - ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' - ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_BINARIES + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' ) vcpkg_install_meson() diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json index 47cbec9f5f7f7d..4ce750b67cbf09 100644 --- a/ports/gtkmm/vcpkg.json +++ b/ports/gtkmm/vcpkg.json @@ -1,26 +1,16 @@ { "name": "gtkmm", - "version": "4.6.0", + "version": "4.10.0", "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", "homepage": "https://www.gtkmm.org/", "license": "LGPL-3.0-or-later", "supports": "!uwp", "dependencies": [ - "atk", - "atkmm", - "cairo", "cairomm", "gdk-pixbuf", - "gettext", - "glib", - { - "name": "glib", - "host": true - }, "glibmm", "gtk", "libepoxy", - "pango", "pangomm", { "name": "vcpkg-tool-meson", diff --git a/ports/gtl/portfile.cmake b/ports/gtl/portfile.cmake index 50956ea2457461..7574a81c3d183f 100644 --- a/ports/gtl/portfile.cmake +++ b/ports/gtl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/gtl - REF v1.1.5 - SHA512 87666a975d3e355d24463f31bd7fe9796eb9e90b557b678807432fc3797a2b501e76acefae490cbaa503f993efe7f44c04a7cc8bd48662c38293c90741c8f7df + REF "v${VERSION}" + SHA512 c6ab1ae6bfdee7f4fa49ab6ea27138cfe7159b5b0fb918a65f27cc7fff74e632f2567508453d1767bc406ac6286ff3a12edeffd185b5b2acf0ef304d4175b86e HEAD_REF main ) diff --git a/ports/gtl/vcpkg.json b/ports/gtl/vcpkg.json index f67c086d2f7eb8..ddf392373726f4 100644 --- a/ports/gtl/vcpkg.json +++ b/ports/gtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtl", - "version": "1.1.5", + "version": "1.1.8", "description": "Greg's Template Library of useful classes.", "homepage": "https://github.com/greg7mdp/gtl", "license": "Apache-2.0", diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake new file mode 100644 index 00000000000000..1a881c4eb7d9a3 --- /dev/null +++ b/ports/gz-cmake3/portfile.cmake @@ -0,0 +1,11 @@ +set(PACKAGE_NAME cmake) + +ignition_modular_library(NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 99fb6a137b8a913b49e7881e9b2c96ca1ae03fb48cfa30f635a69396ccb0eb108abb8a925fd85dc46f3b10f88758675da53eb6cae3325eabeac5e6bee6f54d91 + PATCHES + ) + +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/gz-cmake3/usage b/ports/gz-cmake3/usage new file mode 100644 index 00000000000000..58c1899f0db3f5 --- /dev/null +++ b/ports/gz-cmake3/usage @@ -0,0 +1,3 @@ +The package gz-cmake3 provides CMake integration: + + find_package(gz-cmake3 CONFIG REQUIRED) diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json new file mode 100644 index 00000000000000..e2e444dd5fe50f --- /dev/null +++ b/ports/gz-cmake3/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "gz-cmake3", + "version": "3.0.1", + "description": "CMake helper functions for building robotic applications", + "homepage": "https://ignitionrobotics.org/libs/cmake", + "license": null, + "dependencies": [ + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/ports/gz-math7/portfile.cmake b/ports/gz-math7/portfile.cmake new file mode 100644 index 00000000000000..f64aa64517f3cc --- /dev/null +++ b/ports/gz-math7/portfile.cmake @@ -0,0 +1,12 @@ +set(PACKAGE_NAME math) + +ignition_modular_library( + NAME "${PACKAGE_NAME}" + REF "${PORT}_${VERSION}" + VERSION "${VERSION}" + SHA512 84617eeb6840b0bad8f94c38e8af11bf010c2e3166042541d0d79c44f60a70ee6fde395b2a1b801abedb36aa024f7fb14bbb993eb7be2949c72d8756ba4b3196 + OPTIONS + -DSKIP_SWIG=ON + -DSKIP_PYBIND11=ON + -DBUILD_DOCS=OFF +) diff --git a/ports/gz-math7/vcpkg.json b/ports/gz-math7/vcpkg.json new file mode 100644 index 00000000000000..9eb5c8cdcfc1a2 --- /dev/null +++ b/ports/gz-math7/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gz-math7", + "version": "7.0.2", + "port-version": 1, + "description": "Math API for robotic applications", + "homepage": "https://ignitionrobotics.org/libs/math", + "license": null, + "dependencies": [ + "eigen3", + "gz-cmake3", + "gz-utils2", + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/ports/gz-tools2/portfile.cmake b/ports/gz-tools2/portfile.cmake new file mode 100644 index 00000000000000..3b47a0ad5e99cd --- /dev/null +++ b/ports/gz-tools2/portfile.cmake @@ -0,0 +1,13 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +set(PACKAGE_NAME tools) + +ignition_modular_library(NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 1b89048d09821db5a902758e133e6e73052941fdb9838daed5540267ef9203512170a031cf94a29564cac15133489609e83e965f31f930f7d7be477a8d9c2667 + PATCHES + ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/gz-tools2/vcpkg.json b/ports/gz-tools2/vcpkg.json new file mode 100644 index 00000000000000..aaed20b351f143 --- /dev/null +++ b/ports/gz-tools2/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "gz-tools2", + "version": "2.0.0", + "port-version": 1, + "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.", + "homepage": "https://gazebosim.org", + "license": "Apache-2.0", + "supports": "!(arm & windows) & !uwp", + "dependencies": [ + "gz-cmake3", + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/ports/gz-utils2/portfile.cmake b/ports/gz-utils2/portfile.cmake new file mode 100644 index 00000000000000..8f3eef2e90a0cd --- /dev/null +++ b/ports/gz-utils2/portfile.cmake @@ -0,0 +1,8 @@ +set(PACKAGE_NAME utils) + +ignition_modular_library(NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 2e896e7106591a427fd5a732ba7dbfb329a3c0ec70601f5bf9b2390907e37b41837fd06696f4a93fb4ccc16a94a0221e4734e59f9fb1c7e5a016a076800d8214 + PATCHES + ) diff --git a/ports/gz-utils2/vcpkg.json b/ports/gz-utils2/vcpkg.json new file mode 100644 index 00000000000000..d546673ffc3b18 --- /dev/null +++ b/ports/gz-utils2/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "gz-utils2", + "version": "2.0.0", + "description": "Ignition Utils, a component of Ignition Robotics, provides general purpose classes and functions designed for robotic applications.", + "homepage": "https://gazebosim.org", + "license": "Apache-2.0", + "dependencies": [ + "gz-cmake3", + { + "name": "ignition-modularscripts", + "host": true + } + ] +} diff --git a/ports/gzip-hpp/vcpkg.json b/ports/gzip-hpp/vcpkg.json index 96cb8d6f073b10..792eb14b7b3e11 100644 --- a/ports/gzip-hpp/vcpkg.json +++ b/ports/gzip-hpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gzip-hpp", - "version-string": "0.1.0", - "port-version": 1, + "version": "0.1.0", + "port-version": 2, "description": "Gzip header-only C++ library", "homepage": "https://github.com/mapbox/gzip-hpp/", "dependencies": [ diff --git a/ports/h5py-lzf/portfile.cmake b/ports/h5py-lzf/portfile.cmake index 71b4709b8627ff..2ab6ee701e7d52 100644 --- a/ports/h5py-lzf/portfile.cmake +++ b/ports/h5py-lzf/portfile.cmake @@ -16,19 +16,18 @@ vcpkg_from_github( 0001-disable-H5PLget_plugin-api.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/lzf) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/lzf") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/lzf - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/lzf" OPTIONS -Dlink_hdf5_SHARED=${link_hdf5_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) -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}/lzf/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/lzf/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/h5py-lzf/vcpkg.json b/ports/h5py-lzf/vcpkg.json index eb203ee5fdd13c..0f61c61fb5330b 100644 --- a/ports/h5py-lzf/vcpkg.json +++ b/ports/h5py-lzf/vcpkg.json @@ -1,10 +1,18 @@ { "name": "h5py-lzf", - "version-string": "2019-12-04", - "port-version": 1, + "version-date": "2019-12-04", + "port-version": 3, "description": "The LZF filter is an alternative DEFLATE-style compressor for HDF5 datasets, using the free LZF library by Marc Alexander Lehmann.", "homepage": "https://github.com/h5py/h5py/tree/master/lzf", "dependencies": [ - "hdf5" + "hdf5", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index a5c818e27e0834..49ec9e99a07b07 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_check_features( target-amdgpu TARGET_AMDGPU target-arm TARGET_ARM target-d3d12compute TARGET_D3D12COMPUTE + target-opengl-compute TARGET_OPENGLCOMPUTE target-hexagon TARGET_HEXAGON target-metal TARGET_METAL target-mips TARGET_MIPS diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index 3d4334d2516639..57a4ff2deaa391 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,11 +1,43 @@ { "name": "halide", "version": "15.0.0", + "port-version": 1, "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", "license": "MIT", "supports": "!uwp", "dependencies": [ + { + "name": "halide", + "default-features": false, + "features": [ + "target-arm" + ], + "platform": "arm32" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-aarch64" + ], + "platform": "arm64" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-x86" + ], + "platform": "x86 | x64" + }, + { + "name": "halide", + "features": [ + "target-all" + ], + "platform": "!x86 & !x64 & !arm" + }, { "name": "llvm", "default-features": false, @@ -24,46 +56,7 @@ "host": true } ], - "default-features": [ - "jit" - ], "features": { - "jit": { - "description": "Include targets required for jit compilation", - "dependencies": [ - { - "name": "halide", - "default-features": false, - "features": [ - "target-aarch64" - ], - "platform": "arm64" - }, - { - "name": "halide", - "default-features": false, - "features": [ - "target-x86" - ], - "platform": "x86 | x64" - }, - { - "name": "halide", - "default-features": false, - "features": [ - "target-arm" - ], - "platform": "arm & !arm64" - }, - { - "name": "halide", - "features": [ - "target-all" - ], - "platform": "!x86 & !x64 & !arm & !arm64" - } - ] - }, "target-aarch64": { "description": "Include AArch64 target", "dependencies": [ @@ -92,6 +85,7 @@ "target-mips", "target-nvptx", "target-opencl", + "target-opengl-compute", "target-powerpc", "target-riscv", "target-x86" @@ -168,6 +162,9 @@ "target-opencl": { "description": "Include OpenCL-C target" }, + "target-opengl-compute": { + "description": "Include OpenGL Compute target" + }, "target-powerpc": { "description": "Include PowerPC target", "dependencies": [ diff --git a/ports/harfbuzz/fix-linux-error.patch b/ports/harfbuzz/fix-linux-error.patch deleted file mode 100644 index cd9b2263c3af3b..00000000000000 --- a/ports/harfbuzz/fix-linux-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/util/hb-info.cc b/util/hb-info.cc -index b3a8b35..e386124 100644 ---- a/util/hb-info.cc -+++ b/util/hb-info.cc -@@ -847,6 +847,7 @@ struct info_t : - { - hb_codepoint_t gid = 0; - bool b = hb_font_get_variation_glyph (font, u, vs, &gid); -+ (void)b; - assert (b); - - char glyphname[64]; diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index dfbcef4ac7e407..e18f5436835708 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 d7382cda95ac215fafe52d6fc0361affe3d9569a0faa178a553547a5baa168a42550a5918a0bbe30630559200c155839078ae26e7fca8bf32fa45c90ed79248f + SHA512 da9596b55a12fa5b721947012090018b4676573d8687850617cd67a07af539ddf2a7bb6bdf7245dfcf70547209296f46737600328c096f27f660f0f303fa622c HEAD_REF master - PATCHES - fix-linux-error.patch ) if("icu" IN_LIST FEATURES) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 5296a59713dca0..5a67f97f438fbc 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "7.0.0", + "version": "7.2.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/ports/hayai/portfile.cmake b/ports/hayai/portfile.cmake index 4fa698d18f9a71..19d0c4ace0f309 100644 --- a/ports/hayai/portfile.cmake +++ b/ports/hayai/portfile.cmake @@ -13,53 +13,52 @@ if(VCPKG_TARGET_IS_UWP) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DINSTALL_HAYAI=ON -DBUILD_HAYAI_TESTS=OFF -DBUILD_HAYAI_SAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/CMake/${PORT}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle manual-link libraries -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/hayai_main.lib + "${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/hayai_main.lib" ) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-debug.cmake + "${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-debug.cmake" "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/hayai_main.lib" "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/manual-link/hayai_main.lib" ) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib - ${CURRENT_PACKAGES_DIR}/lib/manual-link/hayai_main.lib + "${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib" + "${CURRENT_PACKAGES_DIR}/lib/manual-link/hayai_main.lib" ) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-release.cmake + "${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-release.cmake" "\${CMAKE_CURRENT_LIST_DIR}/../../lib/hayai_main.lib" "\${CMAKE_CURRENT_LIST_DIR}/../../lib/manual-link/hayai_main.lib" ) endif() # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/hayai/vcpkg.json b/ports/hayai/vcpkg.json index 847c0d2fc1d704..c69698cffd6014 100644 --- a/ports/hayai/vcpkg.json +++ b/ports/hayai/vcpkg.json @@ -1,7 +1,17 @@ { "name": "hayai", - "version-string": "2019-08-10", - "port-version": 1, + "version-date": "2019-08-10", + "port-version": 3, "description": "C++ benchmarking framework", - "homepage": "https://github.com/nickbruun/hayai" + "homepage": "https://github.com/nickbruun/hayai", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/healpix/vcpkg.json b/ports/healpix/vcpkg.json index 15b383f089fb74..998ddfe92477a2 100644 --- a/ports/healpix/vcpkg.json +++ b/ports/healpix/vcpkg.json @@ -1,7 +1,7 @@ { "name": "healpix", - "version-string": "1.12.10", - "port-version": 8, + "version": "1.12.10", + "port-version": 9, "description": "HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere.", "homepage": "http://healpix.sourceforge.net/", "supports": "linux", diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 212d585934c97b..12d98903a478e7 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,14 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi - REF hidapi-0.13.1 - SHA512 07b224b9b5146caf693e6d67514fed236436ed68f38a3ada98ebf8352dfaa4e175f576902affb4b79da1bb8c9b47a1ee0831a93c7d3d210e93faee24632f7d53 + REF hidapi-${VERSION} + SHA512 66a045144f90b41438898b82f0398e80223323ebfe6e4f197d2713696bb3ae60f36aea5a37a9999b34b12294783fd7e4c28c6e785462559cbe21276009da1eac HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "pp-data-dump" HIDAPI_BUILD_PP_DATA_DUMP +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DHIDAPI_BUILD_HIDTEST=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -16,6 +22,10 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() +if ("pp-data-dump" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES pp_data_dump AUTO_CLEAN) +endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/libhidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json index 3bb2b328aa4060..5473ce745c6310 100644 --- a/ports/hidapi/vcpkg.json +++ b/ports/hidapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hidapi", - "version-semver": "0.13.1", + "version-semver": "0.14.0", "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", "homepage": "https://github.com/libusb/hidapi", "license": "BSD-3-Clause-Clear", @@ -18,5 +18,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "pp-data-dump": { + "description": "Build pp_data_dump.exe tool, to store WIN32 HidD Preparsed Data as file", + "supports": "windows" + } + } } diff --git a/ports/hiredis/fix-feature-example.patch b/ports/hiredis/fix-feature-example.patch index eecca4086bfa9f..bff713d2225e3b 100644 --- a/ports/hiredis/fix-feature-example.patch +++ b/ports/hiredis/fix-feature-example.patch @@ -2,33 +2,26 @@ diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index dd3a313..8c69d3a 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt -@@ -19,16 +19,25 @@ if (LIBEV) +@@ -19,16 +19,16 @@ if (LIBEV) TARGET_LINK_LIBRARIES(example-libev hiredis ev) ENDIF() -FIND_PATH(LIBEVENT event.h) -if (LIBEVENT) -+FIND_PACKAGE(Libevent CONFIG REQUIRED) -+FIND_PATH(LIBEVENT_INCLUDES evutil.h) -+if (UNIX) ++find_package(Libevent CONFIG REQUIRED) ++if (1) ADD_EXECUTABLE(example-libevent example-libevent) - TARGET_LINK_LIBRARIES(example-libevent hiredis event) -+ TARGET_LINK_LIBRARIES(example-libevent hiredis ${LIBEVENT_LIBRARIES}) -+ TARGET_INCLUDE_DIRECTORIES(example-libevent PRIVATE ${LIBEVENT_INCLUDES}) ++ TARGET_LINK_LIBRARIES(example-libevent hiredis libevent::core) ENDIF() -+FIND_LIBRARY(UV_LIBRARY libuv) - FIND_PATH(LIBUV uv.h) - IF (LIBUV) +-FIND_PATH(LIBUV uv.h) +-IF (LIBUV) ++find_package(libuv CONFIG REQUIRED) ++IF (1) ADD_EXECUTABLE(example-libuv example-libuv.c) - TARGET_LINK_LIBRARIES(example-libuv hiredis uv) -+ if(WIN32) -+ set(LIB_LISTS Iphlpapi.lib Psapi.lib Userenv.lib) -+ else() -+ set(LIB_LISTS) -+ endif() -+ TARGET_LINK_LIBRARIES(example-libuv hiredis ${UV_LIBRARY} ${LIB_LISTS}) -+ TARGET_INCLUDE_DIRECTORIES(example-libuv PRIVATE ${LIBUV}) ++ TARGET_LINK_LIBRARIES(example-libuv hiredis $,uv_a,uv>) ENDIF() IF (APPLE) diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index b8cbfc8e4f97b6..8e0ecadab0a018 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hiredis", "version": "1.0.2", - "port-version": 4, + "port-version": 5, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", "license": "BSD-3-Clause", diff --git a/ports/hnswlib/cmake.patch b/ports/hnswlib/cmake.patch new file mode 100644 index 00000000000000..7e5be49eec08e2 --- /dev/null +++ b/ports/hnswlib/cmake.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7cebe60..b2aecc8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,11 +1,36 @@ +-cmake_minimum_required (VERSION 2.6) +-project(hnsw_lib ++cmake_minimum_required(VERSION 3.0...3.26) ++ ++project(hnswlib + LANGUAGES CXX) + ++include(GNUInstallDirs) ++ + add_library(hnswlib INTERFACE) +-target_include_directories(hnswlib INTERFACE .) ++add_library(hnswlib::hnswlib ALIAS hnswlib) ++ ++target_include_directories(hnswlib INTERFACE ++ $ ++ $) ++ ++# Install ++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hnswlib ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + ++install(TARGETS hnswlib ++ EXPORT hnswlibTargets) ++ ++install(EXPORT hnswlibTargets ++ FILE hnswlibConfig.cmake ++ NAMESPACE hnswlib:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hnswlib) ++ ++# Examples and tests + if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ++ option(HNSWLIB_EXAMPLES "Build examples and tests." ON) ++else() ++ option(HNSWLIB_EXAMPLES "Build examples and tests." OFF) ++endif() ++if(HNSWLIB_EXAMPLES) + set(CMAKE_CXX_STANDARD 11) + + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/ports/hnswlib/portfile.cmake b/ports/hnswlib/portfile.cmake index cf150d766bc9f9..4d1379ef4fe1ca 100644 --- a/ports/hnswlib/portfile.cmake +++ b/ports/hnswlib/portfile.cmake @@ -1,12 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nmslib/hnswlib - REF 359b2ba87358224963986f709e593d799064ace6 # v0.7.0 - SHA512 59a0c02bbe8f7389a2ecad9188a76eb3847b719a213d306093753c04e4eeb11d95e8e310aa03888364be475a2f2e6e7976bd81117517eef81eff2983379ac743 + REF "v${VERSION}" + SHA512 fd74c23040598973d7e0b5a6af73eb884ee2d30703187d1702fdd48eaf8f7f96d8fbb125d3763f90111d9fb7c5ab3434ebdb818da8717d35c5571e99083c812b HEAD_REF master + PATCHES + cmake.patch # Backport CMake targets from nmslib/hnswlib #446 to 0.7.0 release. ) -file(COPY "${SOURCE_PATH}/hnswlib" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DHNSWLIB_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hnswlib) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/hnswlib/usage b/ports/hnswlib/usage deleted file mode 100644 index 3ef3d72f9ba64e..00000000000000 --- a/ports/hnswlib/usage +++ /dev/null @@ -1,4 +0,0 @@ -hnswlib is header-only and can be used from CMake via: - - find_path(HNSWLIB_INCLUDE_DIRS "hnswlib/hnswlib.h") - target_include_directories(main PRIVATE ${HNSWLIB_INCLUDE_DIRS}) diff --git a/ports/hnswlib/vcpkg.json b/ports/hnswlib/vcpkg.json index 94e35819276942..72b6c82932af74 100644 --- a/ports/hnswlib/vcpkg.json +++ b/ports/hnswlib/vcpkg.json @@ -1,7 +1,18 @@ { "name": "hnswlib", "version": "0.7.0", + "port-version": 1, "description": "Header-only library for fast approximate nearest neighbors", "homepage": "https://github.com/nmslib/hnswlib", - "license": "Apache-2.0" + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/http-parser/portfile.cmake b/ports/http-parser/portfile.cmake index 9aa59177357e4d..fd016b910e46e3 100644 --- a/ports/http-parser/portfile.cmake +++ b/ports/http-parser/portfile.cmake @@ -8,19 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-http-parser TARGET_PATH share/unofficial-http-parser) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-http-parser) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/http-parser) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/http-parser/LICENSE-MIT ${CURRENT_PACKAGES_DIR}/share/http-parser/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/http-parser/vcpkg.json b/ports/http-parser/vcpkg.json index bd316b2a24a0ea..943970428405f4 100644 --- a/ports/http-parser/vcpkg.json +++ b/ports/http-parser/vcpkg.json @@ -1,7 +1,17 @@ { "name": "http-parser", - "version-string": "2.9.4", - "port-version": 1, + "version": "2.9.4", + "port-version": 3, "description": "HTTP Parser.", - "homepage": "https://github.com/nodejs/http-parser" + "homepage": "https://github.com/nodejs/http-parser", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/hungarian/portfile.cmake b/ports/hungarian/portfile.cmake index dc02cdb2eb7e48..c988428c546ce3 100644 --- a/ports/hungarian/portfile.cmake +++ b/ports/hungarian/portfile.cmake @@ -1,29 +1,28 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www2.informatik.uni-freiburg.de/~stachnis/misc/libhungarian-v0.1.3.tgz" - FILENAME "libhungarian-v0.1.3.tgz" + URLS "http://www2.informatik.uni-freiburg.de/~stachnis/misc/libhungarian-v${VERSION}.tgz" + FILENAME "libhungarian-v${VERSION}.tgz" SHA512 1fa105e351c307c07bb96892c9d4c44b167d92cbed80962a8653ac35b8afe00fcf5dcc2d920b95671d6c3cd86745362a64dd8dc173623a8179006e2c7b2cbc69 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/hungarian RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hungarian/vcpkg.json b/ports/hungarian/vcpkg.json index 3d74f6cde35d7b..9021ac264ba866 100644 --- a/ports/hungarian/vcpkg.json +++ b/ports/hungarian/vcpkg.json @@ -1,6 +1,16 @@ { "name": "hungarian", - "version-string": "v0.1.3", - "port-version": 1, - "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase" + "version": "0.1.3", + "port-version": 3, + "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake index 665a2873f8cd68..819eabf955c6c2 100644 --- a/ports/hyperscan/portfile.cmake +++ b/ports/hyperscan/portfile.cmake @@ -1,12 +1,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(HYPERSCAN_VERSION 5.4.0) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hyperscan - REF v${HYPERSCAN_VERSION} - SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62 + REF "v${VERSION}" + SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509 HEAD_REF master PATCHES 0001-remove-Werror.patch @@ -24,6 +22,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() diff --git a/ports/hyperscan/vcpkg.json b/ports/hyperscan/vcpkg.json index 767c6b810f94fe..3a4035d6c4b97c 100644 --- a/ports/hyperscan/vcpkg.json +++ b/ports/hyperscan/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hyperscan", - "version": "5.4.0", + "version": "5.4.2", "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.", "homepage": "https://www.hyperscan.io", "license": "BSD-3-Clause", diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index a3f8f97da830ef..355eac58dcf03a 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -85,53 +85,61 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") message(STATUS "setting rpath prefix for macOS dynamic libraries") - # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc - foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio libicutu libicuuc) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) - endforeach() + if("tools" IN_LIST FEATURES) + set(LIBICUTU_RPATH "libicutu") + endif() - # add ID_PREFIX to libicui18n libicuio libicutu dependencies - foreach(LIB_NAME IN ITEMS libicui18n libicuio) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) + #31680: Fix @rpath in both debug and release build + foreach(CONFIG_TRIPLE IN ITEMS ${DEBUG_TRIPLET} ${RELEASE_TRIPLET}) + # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc + foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio ${LIBICUTU_RPATH} libicuuc) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + endforeach() + + # add ID_PREFIX to libicui18n libicuio libicutu dependencies + foreach(LIB_NAME IN ITEMS libicui18n libicuio) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + endforeach() + + # add ID_PREFIX to remaining libicuio libicutu dependencies + foreach(LIB_NAME libicuio libicutu) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + endforeach() + + # add ID_PREFIX to libicuuc dependencies vcpkg_execute_build_process( COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + "libicuuc.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" ) endforeach() - # add ID_PREFIX to remaining libicuio libicutu dependencies - foreach(LIB_NAME libicuio libicutu) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) - endforeach() - - # add ID_PREFIX to libicuuc dependencies - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" - "libicuuc.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) endif() vcpkg_install_make() diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index b8f4af01505eff..21ed9065f93f98 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "72.1", - "port-version": 3, + "port-version": 5, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "license": "ICU", diff --git a/ports/idyntree/portfile.cmake b/ports/idyntree/portfile.cmake new file mode 100644 index 00000000000000..44b6a16f0c88e8 --- /dev/null +++ b/ports/idyntree/portfile.cmake @@ -0,0 +1,55 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO robotology/idyntree + REF "v${VERSION}" + SHA512 4f3b0f14c4b280c3cf1f2d232e40b4ebebbccf241d31e6fdda94a7e2be8b245373c13ef9c99aa6424a37e56e927ef62d38961d02a1b11585a905d4bef47e3045 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "assimp" IDYNTREE_USES_ASSIMP + "irrlicht" IDYNTREE_USES_IRRLICHT +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DIDYNTREE_USES_IPOPT:BOOL=OFF + -DIDYNTREE_USES_OSQPEIGEN:BOOL=OFF + -DIDYNTREE_USES_MATLAB:BOOL=OFF + -DIDYNTREE_USES_PYTHON:BOOL=OFF + -DIDYNTREE_USES_OCTAVE:BOOL=OFF + -DIDYNTREE_USES_LUA:BOOL=OFF + -DIDYNTREE_USES_YARP:BOOL=OFF + -DIDYNTREE_USES_ICUB_MAIN:BOOL=OFF + -DIDYNTREE_USES_ALGLIB:BOOL=OFF + -DIDYNTREE_USES_WORHP:BOOL=OFF + -DIDYNTREE_COMPILE_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME iDynTree + CONFIG_PATH lib/cmake/iDynTree) +vcpkg_copy_pdbs() + +set(TOOL_NAMES_LIST idyntree-model-info) +if ("assimp" IN_LIST FEATURES) + list(APPEND TOOL_NAMES_LIST idyntree-model-simplify-shapes) +endif() +if ("irrlicht" IN_LIST FEATURES) + list(APPEND TOOL_NAMES_LIST idyntree-model-view) +endif() +vcpkg_copy_tools( + TOOL_NAMES ${TOOL_NAMES_LIST} + AUTO_CLEAN +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.LGPL2" "${SOURCE_PATH}/LICENSE.LGPL3") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/idyntree/usage b/ports/idyntree/usage new file mode 100644 index 00000000000000..402e64fba0e906 --- /dev/null +++ b/ports/idyntree/usage @@ -0,0 +1,4 @@ +The package idyntree provides CMake targets: + + find_package(iDynTree CONFIG REQUIRED) + target_link_libraries(main PRIVATE iDynTree::idyntree-core iDynTree::idyntree-model iDynTree::idyntree-modelio iDynTree::idyntree-modelio iDynTree::idyntree-high-level iDynTree::idyntree-estimation) diff --git a/ports/idyntree/vcpkg.json b/ports/idyntree/vcpkg.json new file mode 100644 index 00000000000000..038853de5380ff --- /dev/null +++ b/ports/idyntree/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "idyntree", + "version": "9.0.0", + "description": "Multibody Dynamics Library designed for Free Floating Robots.", + "homepage": "https://github.com/robotology/idyntree", + "license": "LGPL-2.1-or-later", + "dependencies": [ + "eigen3", + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "assimp" + ], + "features": { + "assimp": { + "description": "Add support for loading meshes", + "dependencies": [ + "assimp" + ] + }, + "irrlicht": { + "description": "Add support for irrlicht-based visualizer", + "supports": "!windows", + "dependencies": [ + "glfw3", + "irrlicht" + ] + } + } +} diff --git a/ports/if97/portfile.cmake b/ports/if97/portfile.cmake index 84948c811836cf..da7f1139a68b1d 100644 --- a/ports/if97/portfile.cmake +++ b/ports/if97/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_from_github( REF v2.1.3 SHA512 b29a74f134d69b72ba4bb825b25f0631f2fb335500da5d9016c4e6e417d8c93a5b309e95770eb6a7b723948dd82a7b46d873a1fe4e3f3047a881603442d73eff HEAD_REF master + PATCHES + relax-encoding.diff ) file(INSTALL "${SOURCE_PATH}/IF97.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/if97/relax-encoding.diff b/ports/if97/relax-encoding.diff new file mode 100644 index 00000000000000..e48ae2bb5a9f3b --- /dev/null +++ b/ports/if97/relax-encoding.diff @@ -0,0 +1,48 @@ +diff --git a/IF97.h b/IF97.h +index 864f3a0..4e6cab5 100644 +--- a/IF97.h ++++ b/IF97.h +@@ -52,7 +52,7 @@ namespace IF97 + // IF97 Constants + const double Tcrit = 647.096; // K + const double Pcrit = 22.064*p_fact; // MPa* +- const double Rhocrit = 322.0; // kg/m³ ++ const double Rhocrit = 322.0; // kg/m^3 + const double Scrit = 4.41202148223476*R_fact; // kJ*/kg-K (needed for backward eqn. in Region 3(a)(b) + const double Ttrip = 273.16; // K + const double Ptrip = 0.000611656*p_fact; // MPa* +@@ -2394,7 +2394,7 @@ namespace IF97 + // The equation is rearranged to solve for rho and turned + // into functions f(T,P,rho0) and f'(T,P,rho0) for the + // Newton-Raphson technique. Functions for +- // dphi/ddelta and d²phi/ddelta² were also required. These ++ // dphi/ddelta and d^2phi/ddelta^2 were also required. These + // additional Taylor functions are defined above. + // + double f(double T, double p, double rho0) const{ +@@ -4172,7 +4172,7 @@ namespace IF97 + return RegionOutput( IF97_HMASS,RegionOutputBackward(Pmax,s,IF97_SMASS),Pmax, NONE); + else { + // Determining H(s) along Tmax is difficult because there is no direct p(T,s) formulation. +- // This linear combination fit h(s)=a*ln(s)+b/s+c/s²+d is not perfect, but it's close ++ // This linear combination fit h(s)=a*ln(s)+b/s+c/s^2+d is not perfect, but it's close + // and can serve as a limit along that Tmax boundary. Coefficients in HTmaxdata above. + // There is a better way to do this using Newton-Raphson on Tmax = T(p,s), but it is iterative and slow. + double ETA = Hmax_n[0]*log(sigma) + Hmax_n[1]/sigma + Hmax_n[2]/pow(sigma,2) +Hmax_n[3]; +@@ -4323,14 +4323,14 @@ namespace IF97 + inline double cvmass_Tp(double T, double p){ return RegionOutput( IF97_CVMASS, T, p, NONE); }; + /// Get the speed of sound [m/s] as a function of T [K] and p [Pa] + inline double speed_sound_Tp(double T, double p){ return RegionOutput( IF97_W, T, p, NONE); }; +- /// Get the [d(rho)/d(p)]T [kg/m³/Pa] as a function of T [K] and p [Pa] ++ /// Get the [d(rho)/d(p)]T [kg/m^3/Pa] as a function of T [K] and p [Pa] + inline double drhodp_Tp(double T, double p){ return RegionOutput( IF97_DRHODP, T, p, NONE); }; + + // ******************************************************************************** // + // Transport Properties // + // ******************************************************************************** // + +- /// Get the viscosity [Pa-s] as a function of T [K] and Rho [kg/m³] ++ /// Get the viscosity [Pa-s] as a function of T [K] and Rho [kg/m^3] + inline double visc_TRho(double T, double rho) { + // Since we have density, we don't need to determine the region for viscosity. + static Region1 R1; // All regions use base region equations for visc(T,rho). diff --git a/ports/if97/vcpkg.json b/ports/if97/vcpkg.json index d1acd0cc9ba619..deeb734b015197 100644 --- a/ports/if97/vcpkg.json +++ b/ports/if97/vcpkg.json @@ -1,6 +1,7 @@ { "name": "if97", "version": "2.1.3", + "port-version": 1, "description": "This repository implements the IF97 formulation for the properties of pure water substance.", "homepage": "https://github.com/CoolProp/IF97", "license": "MIT" diff --git a/ports/igloo/vcpkg.json b/ports/igloo/vcpkg.json index 58c0a3c1e41450..56c82ed0a320cd 100644 --- a/ports/igloo/vcpkg.json +++ b/ports/igloo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "igloo", - "version-string": "1.1.1", - "port-version": 1, + "version": "1.1.1", + "port-version": 2, "description": "A framework for unit testing in C++" } diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 7737281d475458..2fb83d6b5d009d 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,34 +1,40 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-config/vcpkg-port-config.cmake") function(ignition_modular_build_library) set(options DISABLE_PKGCONFIG_INSTALL) set(oneValueArgs NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME) set(multiValueArgs OPTIONS) - cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 0 IML "${options}" "${oneValueArgs}" "${multiValueArgs}") vcpkg_find_acquire_program(PKGCONFIG) - vcpkg_configure_cmake( - SOURCE_PATH ${IML_SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${IML_SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DBUILD_DOCS=OFF -DBUILD_TESTING=OFF ${IML_OPTIONS} + MAYBE_UNUSED_VARIABLES + BUILD_DOCS + BUILD_TESTING + PKG_CONFIG_EXECUTABLE ) - vcpkg_install_cmake(ADD_BIN_TO_PATH) + vcpkg_cmake_install(ADD_BIN_TO_PATH) # If necessary, move the CMake config files if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake") # Some ignition libraries install library subcomponents, that are effectively additional cmake packages - # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_fixup_cmake_targets for them as well + # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_cmake_config_fixup for them as well file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES LIST_DIRECTORIES TRUE RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/" "${CURRENT_PACKAGES_DIR}/lib/cmake/*") foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" - TARGET_PATH "share/${COMPONENT_CMAKE_PACKAGE_NAME}" + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" + PACKAGE_NAME "${COMPONENT_CMAKE_PACKAGE_NAME}" DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() @@ -40,20 +46,17 @@ function(ignition_modular_build_library) endif() # Remove unused files files - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") # Make pkg-config files relocatable if(NOT IML_DISABLE_PKGCONFIG_INSTALL) - if(VCPKG_TARGET_IS_LINUX) - set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread) - endif() - vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES}) + vcpkg_fixup_pkgconfig() else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() # Find the relevant license file and install it @@ -62,7 +65,7 @@ function(ignition_modular_build_library) elseif(EXISTS "${SOURCE_PATH}/README.md") set(LICENSE_PATH "${SOURCE_PATH}/README.md") endif() - file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endfunction() ## # ignition_modular_library @@ -120,9 +123,9 @@ function(ignition_modular_library) set(options DISABLE_PKGCONFIG_INSTALL) set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME) set(multiValueArgs PATCHES OPTIONS) - cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 0 IML "${options}" "${oneValueArgs}" "${multiValueArgs}") - string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION}) + string(REPLACE "." ";" IML_VERSION_LIST "${IML_VERSION}") list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION) # If the REF option is omitted, use the canonical one @@ -138,32 +141,33 @@ function(ignition_modular_library) # If the CMAKE_PACKAGE_NAME option is omitted, use the canonical one set(DEFAULT_CMAKE_PACKAGE_NAME "ignition-${IML_NAME}${IML_MAJOR_VERSION}") if(NOT DEFINED IML_CMAKE_PACKAGE_NAME) - set(IML_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME}) + set(IML_CMAKE_PACKAGE_NAME "${DEFAULT_CMAKE_PACKAGE_NAME}") endif() # Download library from github, to support also the --head option vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO ignitionrobotics/ign-${IML_NAME} - REF ${IML_REF} - SHA512 ${IML_SHA512} - HEAD_REF ${IML_HEAD_REF} + REPO "ignitionrobotics/ign-${IML_NAME}" + REF "${IML_REF}" + SHA512 "${IML_SHA512}" + HEAD_REF "${IML_HEAD_REF}" PATCHES ${IML_PATCHES} FILE_DISAMBIGUATOR 1 ) + set(extra_arguments "") if (IML_DISABLE_PKGCONFIG_INSTALL) - set(EXTRA_OPTIONS DISABLE_PKGCONFIG_INSTALL) + list(APPEND extra_arguments DISABLE_PKGCONFIG_INSTALL) endif() # Build library ignition_modular_build_library( - NAME ${IML_NAME} - MAJOR_VERSION ${IML_MAJOR_VERSION} - SOURCE_PATH ${SOURCE_PATH} - CMAKE_PACKAGE_NAME ${IML_CMAKE_PACKAGE_NAME} - DEFAULT_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME} - ${EXTRA_OPTIONS} + NAME "${IML_NAME}" + MAJOR_VERSION "${IML_MAJOR_VERSION}" + SOURCE_PATH "${SOURCE_PATH}" + CMAKE_PACKAGE_NAME "${IML_CMAKE_PACKAGE_NAME}" + DEFAULT_CMAKE_PACKAGE_NAME "${DEFAULT_CMAKE_PACKAGE_NAME}" + ${extra_arguments} OPTIONS ${IML_OPTIONS} ) endfunction() diff --git a/ports/ignition-modularscripts/vcpkg.json b/ports/ignition-modularscripts/vcpkg.json index d7beaa13ff731f..27af10243cb1b3 100644 --- a/ports/ignition-modularscripts/vcpkg.json +++ b/ports/ignition-modularscripts/vcpkg.json @@ -1,7 +1,17 @@ { "name": "ignition-modularscripts", - "version-date": "2022-05-11", - "port-version": 1, + "version-date": "2023-05-05", "description": "Vcpkg helpers to package ignition libraries", - "license": null + "license": null, + "supports": "native", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/ijg-libjpeg/portfile.cmake b/ports/ijg-libjpeg/portfile.cmake index f9771764e6db37..033e12fe95345f 100644 --- a/ports/ijg-libjpeg/portfile.cmake +++ b/ports/ijg-libjpeg/portfile.cmake @@ -14,8 +14,8 @@ vcpkg_download_distfile(ARCHIVE FILENAME "jpegsr9e.zip" SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/ijg-libjpeg/vcpkg.json b/ports/ijg-libjpeg/vcpkg.json index 7c4d96429ce796..8e40a987f34051 100644 --- a/ports/ijg-libjpeg/vcpkg.json +++ b/ports/ijg-libjpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ijg-libjpeg", "version-string": "9e", + "port-version": 1, "description": "Independent JPEG Group's JPEG software", "homepage": "http://www.ijg.org/", "license": null, diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 1994af115b7aed..f7a5f30923882d 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -53,8 +53,10 @@ if(IMGUI_BUILD_DX12_BINDING) endif() if(IMGUI_BUILD_GLFW_BINDING) - find_package(glfw3 CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC glfw) + if(NOT EMSCRIPTEN) + find_package(glfw3 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC glfw) + endif() target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.cpp) endif() diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index 1ea694a10beb46..ab1148fe3f5cae 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -5,7 +5,9 @@ cmake_policy(SET CMP0012 NEW) include(CMakeFindDependencyMacro) if (@IMGUI_BUILD_GLFW_BINDING@) - find_dependency(glfw3 CONFIG) + if (NOT "@EMSCRIPTEN@") + find_dependency(glfw3 CONFIG) + endif() endif() if (@IMGUI_BUILD_GLUT_BINDING@) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index 44b9bda6e0c6bb..a22b2b18618ab1 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.89.4", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", @@ -49,7 +50,10 @@ "glfw-binding": { "description": "Make available GLFW binding", "dependencies": [ - "glfw3" + { + "name": "glfw3", + "platform": "!emscripten" + } ] }, "glut-binding": { diff --git a/ports/indicators/portfile.cmake b/ports/indicators/portfile.cmake index 4a71032b702693..e0e1d461aea74e 100644 --- a/ports/indicators/portfile.cmake +++ b/ports/indicators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/indicators - REF v2.2 - SHA512 7CED2D3C320D51C7E0569104744730C8E2F952350BCAE214A9781EB43EF4002C8314937DB78461351741FC4C3AEE7A1364582B1274991E95EB30006A5F2A7EF9 + REF v2.3 + SHA512 59FB17E93C886CEC2418E93E221FEBD2BF3160691B3473363417F8F8FA3D50D42D1DE0E55D62598EBA800B13C1D5AB1422D0A2C867246006B61340BA32D99232 HEAD_REF master ) @@ -24,5 +24,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE.termcolor" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - - diff --git a/ports/indicators/vcpkg.json b/ports/indicators/vcpkg.json index 80bf1bb012ba6e..c7b54b87c571a5 100644 --- a/ports/indicators/vcpkg.json +++ b/ports/indicators/vcpkg.json @@ -1,6 +1,6 @@ { "name": "indicators", - "version": "2.2", + "version": "2.3", "description": "Activity indicators for modern C++", "homepage": "https://github.com/p-ranav/indicators", "dependencies": [ diff --git a/ports/influxdb-cxx/fix-dllexports.patch b/ports/influxdb-cxx/fix-dllexports.patch new file mode 100644 index 00000000000000..59ec8ec8070776 --- /dev/null +++ b/ports/influxdb-cxx/fix-dllexports.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df7e7a3..4879802 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,10 @@ project(influxdb-cxx + LANGUAGES CXX + ) + ++if (BUILD_SHARED_LIBS) ++ add_definitions(-DInfluxDB_EXPORTS) ++endif() ++ + message(STATUS "~~~ ${PROJECT_NAME} v${PROJECT_VERSION} ~~~") + + diff --git a/ports/influxdb-cxx/portfile.cmake b/ports/influxdb-cxx/portfile.cmake index 41c61daf9aa447..c004ed94a4816d 100644 --- a/ports/influxdb-cxx/portfile.cmake +++ b/ports/influxdb-cxx/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO offa/influxdb-cxx - REF 141ef6c3f9ee933262a35abe3ac5900da821078a #Commit on 2022-08-20 - SHA512 d19a7dfd410375a47e5fcb425045732878b09ec6b5eb01740696d57064c739cebcf4a4141c8f592d0c985f10cd8b05c538cef32193cb7226d74bc3462754b8fa + REF "v${VERSION}" + SHA512 3be45353635df28803bd57927db292fc93db28fbec56007bbf694badcbfa277672b168c3b41cd228c9570a8b8f56212369ce7eabedca581307f4c8488a69ef27 HEAD_REF master + PATCHES fix-dllexports.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,4 +26,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(PACKAGE_NAME InfluxDB CONFIG_PATH lib/cmake/InfluxDB) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index cb5377dbe3521b..0227bc6617cf87 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,11 +1,11 @@ { "name": "influxdb-cxx", - "version-date": "2022-09-02", + "version": "0.7.1", "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", "license": "MIT", "dependencies": [ - "curl", + "cpr", { "name": "vcpkg-cmake", "host": true diff --git a/ports/infoware/cross-build.diff b/ports/infoware/cross-build.diff new file mode 100644 index 00000000000000..bfff45b6c46e6f --- /dev/null +++ b/ports/infoware/cross-build.diff @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 580df83..ac89904 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,6 +93,8 @@ if(INFOWARE_PCI_IDS_PATH) + message(WARNING "The specified pci.ids file INFOWARE_PCI_IDS_PATH=${INFOWARE_PCI_IDS_PATH} doesn't seem to exist.") + endif() + set(infoware_pci_ids_file "${INFOWARE_PCI_IDS_PATH}") ++elseif(HOST_PCI_DATA) ++ # git unused + elseif(NOT Git_FOUND) + message(SEND_ERROR "Couldn't find a usable git executable in the environment, and the CMake variable INFOWARE_PCI_IDS_PATH is empty.\n${infoware_pci_ids_error}") + else() +@@ -122,11 +124,17 @@ set_target_properties(infoware_pci_generator PROPERTIES CXX_STANDARD 14 + set(INFOWARE_PCI_DATA_HPP pci_data.hpp) + set(INFOWARE_PCI_DATA_GEN "infoware_generated/${INFOWARE_PCI_DATA_HPP}") + ++if(HOST_PCI_DATA) ++ set_target_properties(infoware_pci_generator PROPERTIES EXCLUDE_FROM_ALL 1) ++ configure_file("${HOST_PCI_DATA}" "${CMAKE_CURRENT_BINARY_DIR}/${INFOWARE_PCI_DATA_GEN}" COPYONLY) ++else() ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${INFOWARE_PCI_DATA_GEN}" DESTINATION "share/infoware") + add_custom_command(OUTPUT ${INFOWARE_PCI_DATA_GEN} + COMMAND ${CMAKE_COMMAND} -E make_directory infoware_generated/ + COMMAND $ "${infoware_pci_ids_file}" > "infoware_generated/pci_data.hpp" + DEPENDS "${infoware_pci_ids_file}" + COMMENT "Generating ${INFOWARE_PCI_DATA_HPP}") ++endif() + + add_custom_target(infoware_generate_pcis DEPENDS "${INFOWARE_PCI_DATA_GEN}") + add_dependencies(infoware infoware_generate_pcis) diff --git a/ports/infoware/portfile.cmake b/ports/infoware/portfile.cmake index 2e0d4bdaba3d98..7b36bd1074ad49 100644 --- a/ports/infoware/portfile.cmake +++ b/ports/infoware/portfile.cmake @@ -1,36 +1,43 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/infoware - REF 50cb0982aceb32c8eb57aa6bc5011aced2c379df - SHA512 fe8182998a9e9dbed3dc3985a1161da11b340562628a71da8840aa4d4c56382ddc3ddef3d094e5d9c7c06481a2076dcff7fdb561bd169dd9d1849da4b4c6a064 + REF d64a0c948593c0555115f60c79225c0b9ae09510 + SHA512 3794cb78a1422bfc065037abbae81259e6061ba7b12ebd7b88581118e8eeebaf92d80cf7793b0f9f1da6754baf52835a6891663593dd0b0a38009a9cb141082b HEAD_REF master + PATCHES + cross-build.diff ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - x11 INFOWARE_USE_X11 - d3d INFOWARE_USE_D3D - opencl INFOWARE_USE_OPENCL - opengl INFOWARE_USE_OPENGL + d3d INFOWARE_USE_D3D + opencl INFOWARE_USE_OPENCL + opengl INFOWARE_USE_OPENGL + x11 INFOWARE_USE_X11 ) -# git must be injected, because vcpkg isolates the build -# from the environment entirely to have reproducible builds -vcpkg_find_acquire_program(GIT) +if(VCPKG_CROSSCOMPILING) + list(APPEND FEATURE_OPTIONS "-DHOST_PCI_DATA=${CURRENT_HOST_INSTALLED_DIR}/share/${PORT}/pci_data.hpp") +else() + acquire_pciids(pciids_path) + list(APPEND FEATURE_OPTIONS "-DINFOWARE_PCI_IDS_PATH=${pciids_path}") +endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DINFOWARE_EXAMPLES=OFF -DINFOWARE_TESTS=OFF - -DGIT_EXECUTABLE=${GIT} - -DGIT_FOUND=true + -DCMAKE_DISABLE_FIND_PACKAGE_Git=1 ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/infoware/vcpkg.json b/ports/infoware/vcpkg.json index 1836379c9344fb..db5414359351fe 100644 --- a/ports/infoware/vcpkg.json +++ b/ports/infoware/vcpkg.json @@ -1,12 +1,19 @@ { - "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!", "name": "infoware", - "version-date": "2021-06-16", - "port-version": 1, + "version-date": "2023-04-12", "description": "C++ Library for pulling system and hardware information, without hitting the command line.", "homepage": "https://github.com/ThePhD/infoware", - "supports": "!(arm | uwp)", + "license": "CC0-1.0", + "supports": "!android & !uwp & !(windows & arm)", "dependencies": [ + { + "name": "infoware", + "host": true + }, + { + "name": "pciids", + "platform": "native" + }, { "name": "vcpkg-cmake", "host": true @@ -18,16 +25,31 @@ ], "features": { "d3d": { - "description": "Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems)." + "description": [ + "Use Direct3D for GPU detection.", + "This choice has priority over opencl and opengl." + ], + "supports": "windows" }, "opencl": { - "description": "Prefer usage of OpenCL to find graphical capabilities of the system." + "description": [ + "Use OpenCL for GPU detection.", + "This choice has priority over opengl." + ], + "dependencies": [ + "opencl" + ] }, "opengl": { - "description": "Prefer usage of OpenGL to find graphical capabilities (may require additional libraries to be available for linking depending on the system)." + "description": "Use OpenGL for GPU detection.", + "supports": "!osx & !ios", + "dependencies": [ + "opengl" + ] }, "x11": { - "description": "Prefer usage of X11 to find graphical capabilities." + "description": "Use X11 for display detection.", + "supports": "!windows" } } } diff --git a/ports/iniparser/portfile.cmake b/ports/iniparser/portfile.cmake index 30487f815b7648..4688037bc4b948 100644 --- a/ports/iniparser/portfile.cmake +++ b/ports/iniparser/portfile.cmake @@ -10,19 +10,18 @@ vcpkg_from_github( win32_ssize_t.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/iniparser/vcpkg.json b/ports/iniparser/vcpkg.json index e4b515cbfc374b..8ed760ec168182 100644 --- a/ports/iniparser/vcpkg.json +++ b/ports/iniparser/vcpkg.json @@ -1,8 +1,18 @@ { "name": "iniparser", "version-date": "2020-04-06", - "port-version": 3, + "port-version": 5, "description": "C library for parsing INI-style files", "homepage": "https://github.com/ndevilla/iniparser", - "license": "MIT" + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/intel-mkl/copy-from-dmg.cmake b/ports/intel-mkl/copy-from-dmg.cmake new file mode 100644 index 00000000000000..a5aa67cdea9e55 --- /dev/null +++ b/ports/intel-mkl/copy-from-dmg.cmake @@ -0,0 +1,53 @@ +find_program(HDIUTIL NAMES hdiutil REQUIRED) +set(dmg_path "NOTFOUND" CACHE FILEPATH "Where to find the DMG") +set(output_dir "output_dir" CACHE FILEPATH "Where to put the packages") + +if(NOT EXISTS "${dmg_path}") + message(FATAL_ERROR "'dmg_path' (${dmg_path}) does not exist.") +endif() +if(NOT IS_DIRECTORY "${output_dir}") + message(FATAL_ERROR "'output_dir' (${output_dir}) is not a directory.") +endif() + +execute_process( + COMMAND mktemp -d + RESULT_VARIABLE mktemp_result + OUTPUT_VARIABLE mount_point + OUTPUT_STRIP_TRAILING_WHITESPACE +) +if(NOT mktemp_result STREQUAL "0") + message(FATAL_ERROR "mktemp -d failed: ${mktemp_result}") +elseif(NOT IS_DIRECTORY "${mount_point}") + message(FATAL_ERROR "'mount_point' (${mount_point}) is not a directory.") +endif() + +execute_process( + COMMAND "${HDIUTIL}" attach "${dmg_path}" -mountpoint "${mount_point}" -readonly + RESULT_VARIABLE mount_result +) +if(mount_result STREQUAL "0") + set(dmg_packages_dir "${mount_point}/bootstrapper.app/Contents/Resources/packages") + file(GLOB packages + "${dmg_packages_dir}/intel.oneapi.mac.mkl.devel,*" + "${dmg_packages_dir}/intel.oneapi.mac.mkl.runtime,*" + "${dmg_packages_dir}/intel.oneapi.mac.mkl.product,*" + "${dmg_packages_dir}/intel.oneapi.mac.openmp,*" + ) + # Using execute_process to avoid direct errors + execute_process( + COMMAND cp -R ${packages} "${output_dir}/" + RESULT_VARIABLE copy_result + ) +endif() +execute_process( + COMMAND "${HDIUTIL}" detach "${mount_point}" + RESULT_VARIABLE unmount_result +) + +if(NOT mount_result STREQUAL "0") + message(FATAL_ERROR "Mounting ${dmg_path} failed: ${mount_result}") +elseif(NOT copy_result STREQUAL "0") + message(FATAL_ERROR "Coyping packages failed: ${copy_result}") +elseif(NOT unmount_result STREQUAL "0") + message(FATAL_ERROR "Unounting ${dmg_path} failed: ${unmount_result}") +endif() diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 949431e79428e2..0e76f77ecc5a77 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -1,88 +1,83 @@ -# This package installs Intel MKL on Linux and Windows for x64 and on other platforms tries to search for it. -# The installation for the platforms are: -# - Windows: ilp64, intel_thread (!static_crt), sequential(static_crt) -# - Linux: ilp64, intel_thread +# This package installs Intel MKL on Linux, macOS and Windows for x64. +# Configuration: +# - ilp64 +# - dynamic CRT: intel_thread, static CRT: sequential set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(MKL_REQUIRED_VERSION "20200000") - # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19150/w_onemkl_p_2023.0.0.25930_offline.exe # windows # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19116/m_onemkl_p_2023.0.0.25376_offline.dmg # macos # https://registrationcenter-download.intel.com/akdlm/irc_nas/19138/l_onemkl_p_2023.0.0.25398_offline.sh # linux set(sha "") -if(VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + # nop +elseif(VCPKG_TARGET_IS_WINDOWS) set(filename w_onemkl_p_2023.0.0.25930_offline.exe) set(magic_number 19150) set(sha a3eb6b75241a2eccb73ed73035ff111172c55d3fa51f545c7542277a155df84ff72fc826621711153e683f84058e64cb549c030968f9f964531db76ca8a3ed46) -elseif(VCPKG_TARGET_IS_OSX AND 0) + set(package_infix "win") +elseif(VCPKG_TARGET_IS_OSX) set(filename m_onemkl_p_2023.0.0.25376_offline.dmg) set(magic_number 19116) set(sha 7b9b8c004054603e6830fb9b9c049d5a4cfc0990c224cb182ac5262ab9f1863775a67491413040e3349c590e2cca58edcfc704db9f3b9f9faa8b5b09022cd2af) - # This is a disk image: If somebody knows how to extract it please do so. + set(package_infix "mac") + set(package_libdir "lib") + set(compiler_libdir "mac/compiler/lib") elseif(VCPKG_TARGET_IS_LINUX) set(filename l_onemkl_p_2023.0.0.25398_offline.sh) set(magic_number 19138) set(sha b5f2f464675f0fd969dde2faf2e622b834eb1cc406c4a867148116f6c24ba5c709d98b678840f4a89a1778e12cde0ff70ce2ef59faeef3d3f3aa1d0329c71af1) -else() - set(ProgramFilesx86 "ProgramFiles(x86)") - set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows) - set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest) - - find_path(MKL_ROOT include/mkl.h - PATHS - $ENV{MKLROOT} - ${INTEL_ROOT}/mkl - $ENV{ONEAPI_ROOT}/mkl/latest - ${ONEMKL_ROOT} - DOC - "Folder contains MKL") - - if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND") - message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL (${MKL_REQUIRED_VERSION} or higher) from:" - "\n https://registrationcenter.intel.com/en/products/download/3178/\n" - "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)") - endif() + set(package_infix "lin") + set(package_libdir "lib/intel64") + set(compiler_libdir "linux/compiler/lib/intel64_lin") +endif() - file(STRINGS "${MKL_ROOT}/include/mkl_version.h" MKL_VERSION_DEFINITION REGEX "INTEL_MKL_VERSION") - string(REGEX MATCH "([0-9]+)" MKL_VERSION ${MKL_VERSION_DEFINITION}) +if(NOT sha) + message(WARNING "${PORT} is empty for ${TARGET_TRIPLET}.") + return() +endif() - if (MKL_VERSION LESS MKL_REQUIRED_VERSION) - message(FATAL_ERROR "MKL ${MKL_VERSION} is found but ${MKL_REQUIRED_VERSION} is required. Please download and install a more recent version of MKL from:" - "\n https://registrationcenter.intel.com/en/products/download/3178/\n") - endif() +vcpkg_download_distfile(installer_path + URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}" + FILENAME "${filename}" + SHA512 "${sha}" +) + +# Note: intel_thread and lp64 are the defaults. +set(interface "ilp64") # or ilp64; ilp == 64 bit int api +#https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread +else() + set(threading "sequential") +endif() +if(threading STREQUAL "intel_thread") + set(short_thread "iomp") +else() + string(SUBSTRING "${threading}" "0" "3" short_thread) endif() +set(main_pc_file "mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc") -if(sha) - vcpkg_download_distfile(archive_path - URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}" - FILENAME "${filename}" - SHA512 ${sha} - ) +# First extraction level: packages (from offline installer) +set(extract_0_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-extract") +file(REMOVE_RECURSE "${extract_0_dir}") +file(MAKE_DIRECTORY "${extract_0_dir}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") +# Second extraction level: actual files (from packages) +set(extract_1_dir "${CURRENT_PACKAGES_DIR}/intel-extract") +file(REMOVE_RECURSE "${extract_1_dir}") +file(MAKE_DIRECTORY "${extract_1_dir}") - # Note: intel_thread and lp64 are the defaults. - set(interface "ilp64") # or ilp64; ilp == 64 bit int api - #https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread - else() - set(threading "sequential") - endif() - if(threading STREQUAL "intel_thread") - set(short_thread "iomp") - else() - string(SUBSTRING "${threading}" "0" "3" short_thread) - endif() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") - if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(7Z) - vcpkg_execute_in_download_mode( - COMMAND "${7Z}" x "${archive_path}" "-o${CURRENT_PACKAGES_DIR}/intel-extract" "-y" "-bso0" "-bsp0" - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" - ) - + message(STATUS "Extracting offline installer") + vcpkg_execute_required_process( + COMMAND "${7Z}" x "${installer_path}" "-o${extract_0_dir}" "-y" "-bso0" "-bsp0" + WORKING_DIRECTORY "${extract_0_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-0" + ) set(packages "intel.oneapi.win.mkl.devel,v=2023.0.0-25930/oneapi-mkl-devel-for-installer_p_2023.0.0.25930.msi" # has the required libs. @@ -92,186 +87,167 @@ if(sha) #"intel.oneapi.win.tbb.runtime,v=2021.8.0-25874" #TBB ) - set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired - file(MAKE_DIRECTORY "${output_path}") foreach(pack IN LISTS packages) - set(archive_path "${CURRENT_PACKAGES_DIR}/intel-extract/packages/${pack}") + set(package_path "${extract_0_dir}/packages/${pack}") cmake_path(GET pack STEM LAST_ONLY packstem) - cmake_path(NATIVE_PATH archive_path archive_path_native) - vcpkg_execute_in_download_mode( - COMMAND "${LESSMSI}" x "${archive_path_native}" # Using output_path here does not work in bash - WORKING_DIRECTORY "${output_path}" - OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log" - ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log" - RESULT_VARIABLE error_code - ) - file(COPY "${output_path}/${packstem}/SourceDir/" DESTINATION "${output_path}") - file(REMOVE_RECURSE "${output_path}/${packstem}") + cmake_path(NATIVE_PATH package_path package_path_native) + vcpkg_execute_required_process( + COMMAND "${LESSMSI}" x "${package_path_native}" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + file(COPY "${extract_1_dir}/${packstem}/SourceDir/" DESTINATION "${extract_1_dir}") + file(REMOVE_RECURSE "${extract_1_dir}/${packstem}") endforeach() - set(basepath "${output_path}/Intel/Compiler/12.0/mkl/2023.0.0/") - set(basepath2 "${output_path}/Intel/Compiler/12.0/compiler/2023.0.0/") - file(REMOVE_RECURSE "${output_path}/Intel/shared files" - "${output_path}/Intel/Compiler/12.0/conda_channel" - "${basepath}tools" - "${basepath}interfaces" - "${basepath}examples" - "${basepath}bin" - "${basepath}benchmarks" - ) - - file(COPY "${basepath}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + set(mkl_dir "${extract_1_dir}/Intel/Compiler/12.0/mkl/2023.0.0") + file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # see https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl-link-line-advisor.html for linking if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(files "mkl_core_dll.lib" "mkl_${threading}_dll.lib" "mkl_intel_${interface}_dll.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") # "mkl_rt.lib" single dynamic lib with dynamic dispatch - file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all + file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all if(NOT VCPKG_BUILD_TYPE) - file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") endif() else() set(files "mkl_core.lib" "mkl_${threading}.lib" "mkl_intel_${interface}.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") endif() - foreach(file ${files}) - file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure + foreach(file IN LISTS files) + file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure if(NOT VCPKG_BUILD_TYPE) - file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") + file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") endif() endforeach() + file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}") - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") - endif() - + set(compiler_dir "${extract_1_dir}/Intel/Compiler/12.0/compiler/2023.0.0") if(threading STREQUAL "intel_thread") - file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY) + file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") + file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5") if(NOT VCPKG_BUILD_TYPE) - file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") - endif() - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") + file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") endif() endif() - - - file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") - #TODO: Hardcode settings from portfile in config.cmake - #TODO. Give lapack/blas information about the correct BLA_VENDOR depending on settings. - - file(INSTALL "${CURRENT_PACKAGES_DIR}/intel-extract/packages/intel.oneapi.win.mkl.product,v=2023.0.0-25930/licenses/license.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - elseif(VCPKG_TARGET_IS_LINUX) - message(WARNING "This port is still a work on progress on linux. E.g. it is not correctly filtering the libraries in accordance with VCPKG_LIBRARY_LINKAGE. Furthermore it is using the default threading which is Intel OpenMP which is known to segfault if GNU OpenMP is also used elsewhere!") - #./l_onemkl_p_2023.0.0.25398_offline.sh --extract-only -a -s - # cmake -E tar -xf - - set(output_path "${CURRENT_PACKAGES_DIR}/intel-extract") - message(STATUS "${archive_path}") - file(MAKE_DIRECTORY "${output_path}") - vcpkg_execute_in_download_mode( - COMMAND "bash" "--verbose" "--noprofile" "${archive_path}" "--extract-only" "--extract-folder" "${output_path}" - WORKING_DIRECTORY "${output_path}" - OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-out.log" - ERROR_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-err.log" - ) - set(packages - "intel.oneapi.lin.mkl.devel,v=2023.0.0-25398" # has the required staic libs. - "intel.oneapi.lin.mkl.runtime,v=2023.0.0-25398" # has the required dynamic so. - "intel.oneapi.lin.openmp,v=2023.0.0-25370" #OpenMP +else() + message(STATUS "Warning: This port is still a work on progress. + E.g. it is not correctly filtering the libraries in accordance with + VCPKG_LIBRARY_LINKAGE. It is using the default threading (Intel OpenMP) + which is known to segfault when used together with GNU OpenMP. +") + + message(STATUS "Extracting offline installer") + if(VCPKG_TARGET_IS_LINUX) + vcpkg_execute_required_process( + COMMAND "bash" "--verbose" "--noprofile" "${installer_path}" "--extract-only" "--extract-folder" "${extract_0_dir}" + WORKING_DIRECTORY "${extract_0_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-0" ) + file(RENAME "${extract_0_dir}/l_onemkl_p_2023.0.0.25398_offline/packages" "${extract_0_dir}/packages") + elseif(VCPKG_TARGET_IS_OSX) + find_program(HDIUTIL NAMES hdiutil REQUIRED) + file(MAKE_DIRECTORY "${extract_0_dir}/packages") + message(STATUS "... Don't interrupt.") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-Ddmg_path=${installer_path}" + "-Doutput_dir=${extract_0_dir}/packages" + "-DHDIUTIL=${HDIUTIL}" + -P "${CMAKE_CURRENT_LIST_DIR}/copy-from-dmg.cmake" + WORKING_DIRECTORY "${extract_0_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-0" + ) + message(STATUS "... Done.") + endif() - foreach(pack IN LISTS packages) - set(archive_path "${output_path}/l_onemkl_p_2023.0.0.25398_offline/packages/${pack}") - vcpkg_execute_in_download_mode( - COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${archive_path}/cupPayload.cup" - WORKING_DIRECTORY "${output_path}" - OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-out.log" - ERROR_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-err.log" - ) - endforeach() - - set(basepath "${output_path}/_installdir/mkl/2023.0.0/") - set(basepath2 "${output_path}/_installdir/compiler/2023.0.0/") - file(REMOVE_RECURSE "${basepath}../../conda_channel/" - "${basepath}tools" - "${basepath}interfaces" - "${basepath}examples" - "${basepath}bin" - "${basepath}benchmarks" - "${basepath}env" - "${basepath}modulefiles" - ) - - file(COPY "${basepath}include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(COPY "${basepath}lib/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") - + file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.runtime,v=2023.0.0-*") + cmake_path(GET package_path STEM LAST_ONLY packstem) + message(STATUS "Extracting ${packstem}") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup" + "_installdir/mkl/2023.0.0/lib" + "_installdir/mkl/2023.0.0/licensing" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.devel,v=2023.0.0-*") + cmake_path(GET package_path STEM LAST_ONLY packstem) + message(STATUS "Extracting ${packstem}") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup" + "_installdir/mkl/2023.0.0/bin" + "_installdir/mkl/2023.0.0/include" + "_installdir/mkl/2023.0.0/lib" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.openmp,v=2023.0.0-*") + cmake_path(GET package_path STEM LAST_ONLY packstem) + message(STATUS "Extracting ${packstem}") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup" + "_installdir/compiler/2023.0.0" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + + set(mkl_dir "${extract_1_dir}/_installdir/mkl/2023.0.0") + file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${mkl_dir}/${package_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(to_remove_suffix .a) + elseif(VCPKG_TARGET_IS_OSX) + set(to_remove_suffix .dylib) else() set(to_remove_suffix .so) endif() - file(GLOB_RECURSE files_to_remove "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}" "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?") + file(GLOB_RECURSE files_to_remove + "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}" + "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?" + ) file(REMOVE ${files_to_remove}) - - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/lib/intel64" "/../lib/intel64") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") + file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "\${exec_prefix}/${package_libdir}" "\${exec_prefix}/lib/intel64") + + set(compiler_dir "${extract_1_dir}/_installdir/compiler/2023.0.0") + if(threading STREQUAL "intel_thread") + file(COPY "${compiler_dir}/${compiler_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") + file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/${compiler_libdir}/" "/lib/intel64/") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5") endif() +endif() - if(threading STREQUAL "intel_thread") - file(COPY "${basepath2}linux/compiler/lib/intel64_lin/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/../lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") +file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(GLOB pc_files RELATIVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") + foreach(file IN LISTS pc_files) + file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${file}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/include" "/../include") + if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/lib/intel64" "/../lib/intel64") endif() - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") - endif() - endif() + endforeach() +endif() - file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") - #TODO: Hardcode settings from portfile in config.cmake +file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") +#TODO: Hardcode settings from portfile in config.cmake +#TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. - file(INSTALL "${basepath}licensing/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - endif() +file(INSTALL "${mkl_dir}/licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.product,v=2023.0.0-*") +vcpkg_install_copyright(FILE_LIST "${package_path}/licenses/license.htm") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/intel-extract" - "${CURRENT_PACKAGES_DIR}/manual-tools" - ) -endif() +file(REMOVE_RECURSE + "${extract_0_dir}" + "${extract_1_dir}" + "${CURRENT_PACKAGES_DIR}/lib/intel64/cmake" + "${CURRENT_PACKAGES_DIR}/lib/intel64/pkgconfig" +) -if(NOT sha) - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/mkl/vcpkg-cmake-wrapper.cmake" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "bin\${MKL_DLL_GLOB" "bin/\${MKL_DLL_GLOB") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" [["../bincompiler" "../compiler/lib"]] [["bin" "../bincompiler" "../compiler/lib"]]) - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/intel-mkl/vcpkg-cmake-wrapper.cmake b/ports/intel-mkl/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 76592b33d3804a..00000000000000 --- a/ports/intel-mkl/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(MKL_THREADING "@threading@") -if("@VCPKG_TARGET_ARCHITECTURE@" STREQUAL "x64") - set(MKL_INTERFACE "@interface@") -endif() - -_find_package(${ARGS}) \ No newline at end of file diff --git a/ports/intel-mkl/vcpkg-port-config.cmake b/ports/intel-mkl/vcpkg-port-config.cmake deleted file mode 100644 index 09954ce075e36e..00000000000000 --- a/ports/intel-mkl/vcpkg-port-config.cmake +++ /dev/null @@ -1 +0,0 @@ -set(ENV{MKLROOT} "${CURRENT_INSTALLED_DIR}") \ No newline at end of file diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json index 59f36f41807eb6..0773404897ae4b 100644 --- a/ports/intel-mkl/vcpkg.json +++ b/ports/intel-mkl/vcpkg.json @@ -1,10 +1,11 @@ { "name": "intel-mkl", "version": "2023.0.0", + "port-version": 1, "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.", "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html", "license": null, - "supports": "(windows | linux) & x64", + "supports": "(windows | linux | osx) & x64", "dependencies": [ { "name": "vcpkg-tool-lessmsi", diff --git a/ports/intelrdfpmathlib/missing-includes.patch b/ports/intelrdfpmathlib/missing-includes.patch new file mode 100644 index 00000000000000..540be9b946e90d --- /dev/null +++ b/ports/intelrdfpmathlib/missing-includes.patch @@ -0,0 +1,24 @@ +diff --git a/LIBRARY/src/bid_internal.h b/LIBRARY/src/bid_internal.h +index cd08ea7..ea5d0a0 100755 +--- a/LIBRARY/src/bid_internal.h ++++ b/LIBRARY/src/bid_internal.h +@@ -37,6 +37,7 @@ + + #include "bid_conf.h" + #include "bid_functions.h" ++#include + + #define __BID_INLINE__ static __inline + +diff --git a/LIBRARY/float128/dpml_exception.c b/LIBRARY/float128/dpml_exception.c +index d061a4c..c647732 100755 +--- a/LIBRARY/float128/dpml_exception.c ++++ b/LIBRARY/float128/dpml_exception.c +@@ -132,6 +132,7 @@ + !defined(wnt) + + # include ++#include + # define DPML_SIGNAL(p) raise(SIGFPE) + + #else diff --git a/ports/intelrdfpmathlib/portfile.cmake b/ports/intelrdfpmathlib/portfile.cmake index 5b05fd56bd72cb..8f05012d542f77 100644 --- a/ports/intelrdfpmathlib/portfile.cmake +++ b/ports/intelrdfpmathlib/portfile.cmake @@ -6,9 +6,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 4d445855f41b066b784f0c6b4e52f854df4129fa9d43569b1e1518f002b860f69796459c78de46a8ea24fb6e7aefe7f8bc1f253e78971a5ef202dab2a7b1b75a ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH + PATCHES missing-includes.patch ) set(LIB_SOURCE_PATH "${SOURCE_PATH}/LIBRARY") diff --git a/ports/intelrdfpmathlib/vcpkg.json b/ports/intelrdfpmathlib/vcpkg.json index 87415c924a48ed..f16c7e5a2ca132 100644 --- a/ports/intelrdfpmathlib/vcpkg.json +++ b/ports/intelrdfpmathlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "intelrdfpmathlib", "version-string": "20U2", - "port-version": 4, + "port-version": 6, "description": "Intel(R) Decimal Floating-Point Math Library", "supports": "!(arm & windows)", "dependencies": [ diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index d47fc97c854164..16edd25ede580c 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -14,9 +14,8 @@ if (VCPKG_TARGET_IS_OSX) set(IO2D_DEFAULT_OPTION "-DIO2D_DEFAULT=COREGRAPHICS_MAC") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DIO2D_WITHOUT_SAMPLES=1 -DIO2D_WITHOUT_TESTS=1 @@ -24,15 +23,15 @@ vcpkg_configure_cmake( ${IO2D_DEFAULT_OPTION} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/io2d) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/io2d) if (NOT VCPKG_TARGET_IS_OSX) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake) - file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake " + file(RENAME "${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake" " include(CMakeFindDependencyMacro) find_dependency(unofficial-cairo CONFIG) find_dependency(unofficial-graphicsmagick CONFIG) @@ -41,4 +40,4 @@ if (NOT VCPKG_TARGET_IS_OSX) ") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/io2d/vcpkg.json b/ports/io2d/vcpkg.json index 79570f44ba0115..dc654153725e5b 100644 --- a/ports/io2d/vcpkg.json +++ b/ports/io2d/vcpkg.json @@ -1,7 +1,7 @@ { "name": "io2d", "version-date": "2020-09-14", - "port-version": 3, + "port-version": 5, "description": "a lightweight, cross platform drawing library", "dependencies": [ { @@ -18,6 +18,14 @@ { "name": "graphicsmagick", "platform": "!osx" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/irrlicht/fix-osx-compilation.patch b/ports/irrlicht/fix-osx-compilation.patch index 6f623db265e214..a1daf0b5c10c63 100644 --- a/ports/irrlicht/fix-osx-compilation.patch +++ b/ports/irrlicht/fix-osx-compilation.patch @@ -1,28 +1,13 @@ diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp -index 66144326c..4ea224c24 100644 +index 404bd53..71684d8 100644 --- a/source/Irrlicht/CImageLoaderJPG.cpp +++ b/source/Irrlicht/CImageLoaderJPG.cpp @@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo) boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) { - // DO NOTHING -- return 1; -+ return TRUE; + // DO NOTHING +- return 1; ++ return TRUE; } - - -diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -index 53029eb45..e75b707e1 100644 ---- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -+++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -@@ -495,8 +495,8 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key) - if(!CreationParams.WindowId) //load menus if standalone application - { - [[NSAutoreleasePool alloc] init]; -- [NSApplication sharedApplication]; -- [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; -+ [[NSApplication sharedApplication] activateIgnoringOtherApps]; -+ [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; - [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; - [NSApp finishLaunching]; - } + + diff --git a/ports/irrlicht/fix-sysctl.patch b/ports/irrlicht/fix-sysctl.patch deleted file mode 100644 index 98c70273ecbf48..00000000000000 --- a/ports/irrlicht/fix-sysctl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/source/Irrlicht/COSOperator.cpp -+++ b/source/Irrlicht/COSOperator.cpp -@@ -11,8 +11,8 @@ - #else - #include - #include --#ifndef _IRR_SOLARIS_PLATFORM_ - #include -+#ifdef _IRR_OSX_PLATFORM_ - #include - #endif - #endif diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 37f4ee26e888d1..4bea3839d2b14b 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO irrlicht/Irrlicht%20SDK - REF 1.8/1.8.4 - FILENAME "irrlicht-1.8.4.zip" - SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 + REF 1.8/${VERSION} + FILENAME "irrlicht-${VERSION}.zip" + SHA512 d11c7a056bfb8c9737ed583c5bc5794223bc59fb4620411b63bc4d1eedc41db2ed1cab5cb7a37fee42a7f38c0e0645f5fc53fd329fff0f2aa78e0df6804c47c9 PATCHES fix-encoding.patch - fix-sysctl.patch fix-osx-compilation.patch ) @@ -54,4 +53,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht") endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt") diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json index 1815c8040208e3..93bab6e65bec92 100644 --- a/ports/irrlicht/vcpkg.json +++ b/ports/irrlicht/vcpkg.json @@ -1,7 +1,6 @@ { "name": "irrlicht", - "version-string": "1.8.4", - "port-version": 13, + "version": "1.8.5", "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.", "homepage": "http://irrlicht.sourceforge.net", "supports": "!(arm | uwp)", diff --git a/ports/irrxml/vcpkg.json b/ports/irrxml/vcpkg.json index c84eba7b4dc34f..1f04d21b36c1b5 100644 --- a/ports/irrxml/vcpkg.json +++ b/ports/irrxml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "irrxml", - "version-string": "0", + "version": "0", + "port-version": 1, "description": "Alias port for irrlicht", "dependencies": [ "irrlicht" diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake index 696f333824e9d2..db2ee89546a38b 100644 --- a/ports/itpp/portfile.cmake +++ b/ports/itpp/portfile.cmake @@ -14,25 +14,24 @@ vcpkg_from_sourceforge( ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=ON -DCMAKE_DISABLE_FIND_PACKAGE_FFT=ON -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() 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() -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") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json index 972f0cd1998219..5d3d7ce37c928e 100644 --- a/ports/itpp/vcpkg.json +++ b/ports/itpp/vcpkg.json @@ -1,7 +1,13 @@ { "name": "itpp", "version-semver": "4.3.1", - "port-version": 8, + "port-version": 10, "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", - "homepage": "http://itpp.sourceforge.net" + "homepage": "http://itpp.sourceforge.net", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/jasper/fix-library-name.patch b/ports/jasper/fix-library-name.patch new file mode 100644 index 00000000000000..8b4f7173a23763 --- /dev/null +++ b/ports/jasper/fix-library-name.patch @@ -0,0 +1,13 @@ +diff --git a/build/jasper.pc.in b/build/jasper.pc.in +index a4ce38f..a9a7bc4 100644 +--- a/build/jasper.pc.in ++++ b/build/jasper.pc.in +@@ -6,7 +6,7 @@ Name: JasPer + Description: Image Processing/Coding Tool Kit with JPEG-2000 Support + Version: @JAS_VERSION@ + +-Libs: -L${libdir} -ljasper ++Libs: -L${libdir} -ljasper@CMAKE_DEBUG_POSTFIX@ + Requires.private: @JAS_PKGCONFIG_REQUIRES@ + Cflags: -I${includedir}/jasper -I${includedir} + Cflags.private: -DLIBJASPER_STATIC_DEFINE diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake index dadf39d9451d28..f4761abe1e59fa 100644 --- a/ports/jasper/portfile.cmake +++ b/ports/jasper/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES no_stdc_check.patch + fix-library-name.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -42,4 +43,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE.txt) diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json index cbad0a602902e5..7df60a535b0f86 100644 --- a/ports/jasper/vcpkg.json +++ b/ports/jasper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "jasper", "version": "4.0.0", - "port-version": 1, + "port-version": 2, "description": "Open source implementation of the JPEG-2000 Part-1 standard", "homepage": "https://github.com/jasper-software/jasper", "license": null, diff --git a/ports/jbig2dec/portfile.cmake b/ports/jbig2dec/portfile.cmake index 099252b202337a..463c3920811232 100644 --- a/ports/jbig2dec/portfile.cmake +++ b/ports/jbig2dec/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbig2dec RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jbig2dec/vcpkg.json b/ports/jbig2dec/vcpkg.json index a4f145f69ccc47..824b6a3698df37 100644 --- a/ports/jbig2dec/vcpkg.json +++ b/ports/jbig2dec/vcpkg.json @@ -1,7 +1,13 @@ { "name": "jbig2dec", - "version-string": "0.19", - "port-version": 1, + "version": "0.19", + "port-version": 3, "description": "a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.", - "homepage": "https://github.com/ArtifexSoftware/jbig2dec" + "homepage": "https://github.com/ArtifexSoftware/jbig2dec", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake index ba2d6555a08322..e9ed464557acec 100644 --- a/ports/jbigkit/portfile.cmake +++ b/ports/jbigkit/portfile.cmake @@ -9,21 +9,20 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${JBIGKIT_HASH} ) -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbigkit) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/jbigkit/COPYING ${CURRENT_PACKAGES_DIR}/share/jbigkit/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jbigkit/vcpkg.json b/ports/jbigkit/vcpkg.json index 1498be4fa7fc92..0257b912880532 100644 --- a/ports/jbigkit/vcpkg.json +++ b/ports/jbigkit/vcpkg.json @@ -1,7 +1,13 @@ { "name": "jbigkit", - "version-string": "2.1", - "port-version": 5, + "version": "2.1", + "port-version": 7, "description": "A software implementation of the JBIG1 data compression standard (ITU-T T.82)", - "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit" + "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/jinja2cpplight/portfile.cmake b/ports/jinja2cpplight/portfile.cmake index 329020de2c1f02..7f6554ab08ae46 100644 --- a/ports/jinja2cpplight/portfile.cmake +++ b/ports/jinja2cpplight/portfile.cmake @@ -17,21 +17,20 @@ vcpkg_from_github( HEAD_REF master ) -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() -file(GLOB_RECURSE JINJA2CPPLIGHT_EXES ${CURRENT_PACKAGES_DIR}/bin/jinja2cpplight_unittests*) -file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) +file(GLOB_RECURSE JINJA2CPPLIGHT_EXES "${CURRENT_PACKAGES_DIR}/bin/jinja2cpplight_unittests*") +file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools") file(REMOVE_RECURSE ${JINJA2CPPLIGHT_EXES}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/jinja2cpplight/vcpkg.json b/ports/jinja2cpplight/vcpkg.json index 004282a82947ed..cd3c5caf5bce01 100644 --- a/ports/jinja2cpplight/vcpkg.json +++ b/ports/jinja2cpplight/vcpkg.json @@ -1,8 +1,14 @@ { "name": "jinja2cpplight", - "version-string": "2018-05-08", - "port-version": 1, + "version-date": "2018-05-08", + "port-version": 3, "description": "(very) lightweight version of Jinja2 for C++, Lightweight templating engine for C++, based on Jinja2.", "homepage": "https://github.com/hughperkins/Jinja2CppLight", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/joltphysics/disable-warningC5266.patch b/ports/joltphysics/disable-warningC5266.patch deleted file mode 100644 index fb9ce84586c761..00000000000000 --- a/ports/joltphysics/disable-warningC5266.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt -index 27c4c64..78f3947 100644 ---- a/Build/CMakeLists.txt -+++ b/Build/CMakeLists.txt -@@ -53,7 +53,7 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA - endif() - - # Set general compiler flags -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX- /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline /Zi") - - # Remove any existing compiler flag that enables RTTI - string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake index 7f5ebeac0754a6..cb51f23fd956b8 100644 --- a/ports/joltphysics/portfile.cmake +++ b/ports/joltphysics/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jrouwe/JoltPhysics REF "v${VERSION}" - SHA512 c5848fe7a28de1b34259d3d21e4cd35bec4002eee926445e05d902934c43ab4cafcfa24ceb037c59cc66c3dcea5f3a737546f88c20be594dafe6ce6d1f637abb + SHA512 367e5b945e8f91a0c0c9eb699db6f49351aa39b0af9b8fd0be5f474d65b28a7244880eedad10cbd2db0e031daa28bbabb5f9fb8bf9af653dd1f86904bfde44a2 HEAD_REF master - PATCHES - disable-warningC5266.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT) @@ -22,6 +20,7 @@ vcpkg_cmake_configure( -DTARGET_VIEWER=OFF -DCROSS_PLATFORM_DETERMINISTIC=OFF -DUSE_STATIC_MSVC_RUNTIME_LIBRARY=${USE_STATIC_CRT} + -DENABLE_ALL_WARNINGS=OFF OPTIONS_RELEASE -DCMAKE_BUILD_TYPE=Distribution ) diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json index d7fc3986c4b3ac..786bd7f667880a 100644 --- a/ports/joltphysics/vcpkg.json +++ b/ports/joltphysics/vcpkg.json @@ -1,7 +1,6 @@ { "name": "joltphysics", - "version": "2.0.1", - "port-version": 2, + "version": "3.0.1", "description": "A multi core friendly rigid body physics and collision detection library suitable for games and VR applications", "homepage": "https://github.com/jrouwe/JoltPhysics", "license": "MIT", diff --git a/ports/josuttis-jthread/vcpkg.json b/ports/josuttis-jthread/vcpkg.json index 565f8b4e3794f7..f1b9569a3b0a2f 100644 --- a/ports/josuttis-jthread/vcpkg.json +++ b/ports/josuttis-jthread/vcpkg.json @@ -1,7 +1,7 @@ { "name": "josuttis-jthread", - "version-string": "2020-07-21", - "port-version": 2, + "version-date": "2020-07-21", + "port-version": 3, "description": "C++ class for a joining and cooperative interruptible thread (std::jthread) with stop_token helper", "homepage": "https://github.com/josuttis/jthread" } diff --git a/ports/jsmn/vcpkg.json b/ports/jsmn/vcpkg.json index 96956d18d2f735..823643e38c64bb 100644 --- a/ports/jsmn/vcpkg.json +++ b/ports/jsmn/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsmn", - "version-string": "2019-04-27", - "port-version": 1, + "version-date": "2019-04-27", + "port-version": 2, "description": "A minimalistic JSON parser in C." } diff --git a/ports/json-c/fix-build-with-clang.patch b/ports/json-c/fix-build-with-clang.patch new file mode 100644 index 00000000000000..a4fad41819e8f8 --- /dev/null +++ b/ports/json-c/fix-build-with-clang.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 11b3970..66e9d0a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -293,7 +293,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") + if (NOT WIN32) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-prototypes") + endif() + + add_definitions(-D_GNU_SOURCE) diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake index 582a1783cd2f4a..355d83867e38e1 100644 --- a/ports/json-c/portfile.cmake +++ b/ports/json-c/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES pkgconfig.patch fix-clang-cl.patch + fix-build-with-clang.patch #https://github.com/json-c/json-c/pull/783 Remove in next version ) vcpkg_cmake_configure( diff --git a/ports/json-c/vcpkg.json b/ports/json-c/vcpkg.json index 8d6086e875ab32..f4dbf0b1a105b5 100644 --- a/ports/json-c/vcpkg.json +++ b/ports/json-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "json-c", "version-date": "2022-06-26", - "port-version": 2, + "port-version": 3, "description": "A JSON implementation in C", "homepage": "https://github.com/json-c/json-c", "license": "MIT", diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake index 658cb92a4fe5b6..937e2b9f4714bd 100644 --- a/ports/json-spirit/portfile.cmake +++ b/ports/json-spirit/portfile.cmake @@ -9,17 +9,20 @@ vcpkg_from_github( Fix-link-error-C1128.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_STATIC_LIBS=off -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_STATIC_LIBS=OFF + -DJSON_SPIRIT_DEMOS=OFF + -DJSON_SPIRIT_TESTS=OFF +) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json-spirit RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") 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() vcpkg_copy_pdbs() diff --git a/ports/json-spirit/vcpkg.json b/ports/json-spirit/vcpkg.json index 35517305eca6bd..37f23707913274 100644 --- a/ports/json-spirit/vcpkg.json +++ b/ports/json-spirit/vcpkg.json @@ -1,13 +1,17 @@ { "name": "json-spirit", - "version-string": "4.1.0", - "port-version": 2, + "version": "4.1.0", + "port-version": 4, "description": "json parser using boost library", "dependencies": [ "boost-config", "boost-integer", "boost-smart-ptr", "boost-spirit", - "boost-variant" + "boost-variant", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/json11/portfile.cmake b/ports/json11/portfile.cmake index 3ff8b0f2951b1e..fa87e5b209a167 100644 --- a/ports/json11/portfile.cmake +++ b/ports/json11/portfile.cmake @@ -9,22 +9,20 @@ vcpkg_from_github( PATCHES destination.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJSON11_BUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${CURRENT_PORT_DIR}/json11-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11) +file(INSTALL "${CURRENT_PORT_DIR}/json11-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/json11/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/json11/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/json11/vcpkg.json b/ports/json11/vcpkg.json index 70fb4f20971d4c..5dd6065436cc12 100644 --- a/ports/json11/vcpkg.json +++ b/ports/json11/vcpkg.json @@ -1,6 +1,12 @@ { "name": "json11", - "version-string": "2017-06-20", - "port-version": 4, - "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization." + "version-date": "2017-06-20", + "port-version": 6, + "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/json5-parser/portfile.cmake b/ports/json5-parser/portfile.cmake index 79e4d1afc6895b..6d44e304b4deac 100644 --- a/ports/json5-parser/portfile.cmake +++ b/ports/json5-parser/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_github( PATCHES 00001-fix-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/json5_parser - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/json5_parser" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/json5-parser) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/json5-parser) -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") -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/json5-parser/vcpkg.json b/ports/json5-parser/vcpkg.json index 13c1e6bb3568de..7d9113497d86ba 100644 --- a/ports/json5-parser/vcpkg.json +++ b/ports/json5-parser/vcpkg.json @@ -1,10 +1,18 @@ { "name": "json5-parser", - "version-string": "1.0.0", - "port-version": 3, + "version": "1.0.0", + "port-version": 5, "description": "An enhancement of the JSON Spirit C++ library to understand json5.", "homepage": "https://github.com/Caltech-IPAC/json5_parser", "dependencies": [ - "boost-spirit" + "boost-spirit", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index 4d7535efc9f9d3..811fddc0e4fa09 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons REF v${VERSION} - SHA512 0cf84a40d5af574352f7e157647f3b6e676b9c4080108a64e5f05edc6ddf6a0d2409772481d4f502c096f2821b03578643fbea0a5f3b5031189e7ce9f9b3e99b + SHA512 0166b6dbfeb427a07afd74807bc48a0853f3a2f52f9e9415dd7e392cafeed8047f274295663e799ba4808e8c6ea4d79278cce6a5948034009858ed16e63bd27d HEAD_REF master ) diff --git a/ports/jsoncons/vcpkg.json b/ports/jsoncons/vcpkg.json index 1e37fb1bfafeca..cefc84b4ff261c 100644 --- a/ports/jsoncons/vcpkg.json +++ b/ports/jsoncons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsoncons", - "version": "0.170.0", + "version": "0.170.2", "description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON", "homepage": "https://github.com/danielaparker/jsoncons", "license": "BSL-1.0", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 309aa991f8d9e8..d3accbd5f53c50 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - # Auto-generated by release CI action at realtimechris/Jsonifier - SHA512 146a2c899e8280a9a0ad7dfb51f4446c864b0c0a7b3f74685f02d3bfd8fce6a51e0a24dc31cfe47d7f8a6633319515da947be130cdf0afed3382a1528141e2b0 - HEAD_REF main + SHA512 4ba5033315f680d6a5fa29764b4c19ce219e881f2dccef4ede73a8f405fd4ac5d58f543c78fa3c35943601bbfd6922749bd9b086527d057086ec8977c0911d1a + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 4a689f3f0ed461..af3654bd86cfc2 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,9 +1,8 @@ { "name": "jsonifier", - "version": "0.9.0", - "port-version": 1, + "version": "0.9.2", "description": "A few classes for parsing and serializing json - very rapidly.", - "homepage": "https://github.com/RealTimeChris/Jsonifier", + "homepage": "https://github.com/realtimechris/jsonifier", "license": "LGPL-2.1-or-later", "supports": "(windows & x64 & !uwp) | (linux & x64) | (osx & x64)", "dependencies": [ diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index 14d2b77f26b268..93a1f488e1c7f5 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_extract_source_archive( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKDSoap_QT6=ON -DKDSoap_STATIC=${KDSoap_STATIC} @@ -26,12 +26,12 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KDSoap-qt6 CONFIG_PATH lib/cmake/KDSoap-qt vcpkg_copy_tools(TOOL_NAMES kdwsdl2cpp-qt6 AUTO_CLEAN) 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() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -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") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kd-soap/vcpkg.json b/ports/kd-soap/vcpkg.json index f3f797c452c830..c633915a990048 100644 --- a/ports/kd-soap/vcpkg.json +++ b/ports/kd-soap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kd-soap", "version": "2.1.1", + "port-version": 1, "description": "A Qt-based client-side and server-side SOAP component", "homepage": "https://www.kdab.com/products/kd-soap", "license": "MIT", diff --git a/ports/kenlm/include_functional.patch b/ports/kenlm/include_functional.patch new file mode 100644 index 00000000000000..6659b3c0abc39f --- /dev/null +++ b/ports/kenlm/include_functional.patch @@ -0,0 +1,12 @@ +diff --git a/util/string_piece_hash.hh b/util/string_piece_hash.hh +index 6ff6f88..16808cd 100644 +--- a/util/string_piece_hash.hh ++++ b/util/string_piece_hash.hh +@@ -1,6 +1,7 @@ + #ifndef UTIL_STRING_PIECE_HASH_H + #define UTIL_STRING_PIECE_HASH_H + ++#include + #include "util/have.hh" + #include "util/string_piece.hh" + diff --git a/ports/kenlm/portfile.cmake b/ports/kenlm/portfile.cmake index ad0c5c6c9408c0..371929d501428b 100644 --- a/ports/kenlm/portfile.cmake +++ b/ports/kenlm/portfile.cmake @@ -9,28 +9,25 @@ vcpkg_from_github( PATCHES fix-boost.patch fix-const-overloaded.patch + include_functional.patch # Upstream PR https://github.com/kpu/kenlm/pull/428, please remove this patch when updating this port. ) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindEigen3.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindEigen3.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - interpolate ENABLE_INTERPOLATE + FEATURES + interpolate ENABLE_INTERPOLATE ) -if ("interpolate" IN_LIST FEATURES AND VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "The interpolate feature does not support Windows.") -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DFORCE_STATIC=OFF #already handled by vcpkg -DENABLE_PYTHON=OFF # kenlm.lib(bhiksha.cc.obj) : fatal error LNK1000: Internal error during IMAGE::Pass2 -DCOMPILE_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() set(KENLM_TOOLS count_ngrams filter fragment kenlm_benchmark lmplz phrase_table_vocab query build_binary) if (NOT VCPKG_TARGET_IS_WINDOWS) @@ -46,5 +43,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Copyright and License -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME license) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE") diff --git a/ports/kenlm/vcpkg.json b/ports/kenlm/vcpkg.json index 66c218ad92c24e..7d0fde56e6cf5f 100644 --- a/ports/kenlm/vcpkg.json +++ b/ports/kenlm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kenlm", - "version-string": "20200924", - "port-version": 1, + "version": "20200924", + "port-version": 4, "description": "KenLM: Faster and Smaller Language Model Queries", "supports": "!(arm64 & windows)", "dependencies": [ @@ -17,11 +17,16 @@ "platform": "!windows" }, "liblzma", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ], "features": { "interpolate": { "description": "Build interpolation program", + "supports": "!windows", "dependencies": [ { "name": "eigen3", diff --git a/ports/kf5parts/portfile.cmake b/ports/kf5parts/portfile.cmake new file mode 100644 index 00000000000000..1f09bc00a2ceba --- /dev/null +++ b/ports/kf5parts/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kparts + REF "v${VERSION}" + SHA512 07ba359faf15f6bc398b64e0534842532e1a3ade94caa6b8dc7886417aa49526b7e0f54bd29805e64b8661f4c402e022bd211a932ee13b0ac4b97e516ae6dbef + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Parts CONFIG_PATH lib/cmake/KF5Parts) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5parts/vcpkg.json b/ports/kf5parts/vcpkg.json new file mode 100644 index 00000000000000..2b0bea7de9abd6 --- /dev/null +++ b/ports/kf5parts/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "kf5parts", + "version": "5.98.0", + "description": "Plugin framework for user interface component", + "homepage": "https://api.kde.org/frameworks/kparts/html/index.html", + "license": "LGPL-2.0-or-later", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5jobwidgets", + "kf5kio", + "kf5service", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/kissnet/portfile.cmake b/ports/kissnet/portfile.cmake index 6f514f52a7e616..0b1548dced768b 100644 --- a/ports/kissnet/portfile.cmake +++ b/ports/kissnet/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ybalrid/kissnet - REF 6c2bbbc1a114d83f11cea86d4370766ac12fbbd0 # 2022-10-18 - SHA512 40182631e1c32628380369b7f8ca4dbae2049b0c0480396efb6a8197cca5006c8b68bc64553182c129ef8366a52a2434fd4f134bf5ffa1c0303af80b2e2a8cee + REF adbfe52d5147b206dd68c83da15b6e5805fe28dd # 2023-02-04 + SHA512 404eec875f64884ef6256775a63c989cf691c9a3fc5fef77a68713a63a7a1554a78d26ba063c613c9de328e92d6c685a53fff77e89b6bc42056962e282134e84 HEAD_REF master ) diff --git a/ports/kissnet/vcpkg.json b/ports/kissnet/vcpkg.json index 6bcf0fde9122b9..835719eebdd3b6 100644 --- a/ports/kissnet/vcpkg.json +++ b/ports/kissnet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kissnet", - "version-date": "2022-10-18", + "version-date": "2023-02-04", "description": "Keep It Simple Stupid NETwork - C++17 wrapping of your OS's native socket API", "homepage": "https://github.com/Ybalrid/kissnet", "license": "MIT", diff --git a/ports/ktx/0003-libtool.patch b/ports/ktx/0003-libtool.patch deleted file mode 100644 index 1736d8f4b25660..00000000000000 --- a/ports/ktx/0003-libtool.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bc679fd1..13052501 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -826,7 +826,7 @@ set(CLI OFF) # Only build as library not the CLI astcencoder - add_subdirectory(lib/astc-encoder) - set_property(TARGET ${ASTC_LIB_TARGET} PROPERTY POSITION_INDEPENDENT_CODE ON) - --if(KTX_FEATURE_STATIC_LIBRARY AND NOT WIN32 AND NOT EMSCRIPTEN) -+if(KTX_FEATURE_STATIC_LIBRARY AND APPLE) - # Make a single static library to simplify linking. - add_dependencies(ktx ${ASTC_LIB_TARGET}) - add_custom_command( TARGET ktx -@@ -856,7 +856,7 @@ if(KTX_FEATURE_DOC) - endif() - - set(KTX_INSTALL_TARGETS ktx) --if(KTX_FEATURE_STATIC_LIBRARY AND (WIN32 OR EMSCRIPTEN)) -+if(KTX_FEATURE_STATIC_LIBRARY AND NOT APPLE) - list(APPEND KTX_INSTALL_TARGETS ${ASTC_LIB_TARGET}) - endif() - diff --git a/ports/ktx/0003-mkversion.patch b/ports/ktx/0003-mkversion.patch new file mode 100644 index 00000000000000..ee8b3c4afb973a --- /dev/null +++ b/ports/ktx/0003-mkversion.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/version.cmake b/cmake/version.cmake +index 9a90622..0fc3521 100644 +--- a/cmake/version.cmake ++++ b/cmake/version.cmake +@@ -176,7 +176,7 @@ function( create_version_header dest_path target ) + add_custom_command( + OUTPUT ${version_h_output} + # On Windows this command has to be invoked by a shell in order to work +- COMMAND ${BASH_EXECUTABLE} -c "\"./mkversion\" \"-o\" \"version.h\" \"${dest_path}\"" ++ COMMAND "${BASH_EXECUTABLE}" -- ./mkversion -o version.h "${dest_path}" + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + COMMENT "Generate ${version_h_output}" + VERBATIM diff --git a/ports/ktx/0004-quirks.patch b/ports/ktx/0004-quirks.patch new file mode 100644 index 00000000000000..14783cb665dfc6 --- /dev/null +++ b/ports/ktx/0004-quirks.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 068c6bb..84fa624 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ if(MSVC) + # With /W4 VS2015 (V19.0) issues many warnings that VS2017 & 2019 don't + # so only increase warning level for recent versions. + add_compile_options($<$:/W4>) +- add_compile_options( $,/Gz,/O2> ) ++ add_compile_options( $,,/O2> ) + elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" + OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") + add_compile_options(-Wall -Wextra) +@@ -801,6 +801,7 @@ if(EMSCRIPTEN) + endif() + + add_library( objUtil STATIC ++ EXCLUDE_FROM_ALL + utils/argparser.cpp + utils/argparser.h + utils/ktxapp.h diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index c1e508c0af01ae..c6c0e25ea1cbdb 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -1,50 +1,50 @@ -set(PORT_VERSION 4.1.0-rc3) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software - REF f8dc35f0c22b38064c4d1f05830cea69c79f0d38 #v${PORT_VERSION} - SHA512 9af28506141f7f016ef6295ee980907024c591a0ba4704c90713ecdb3accbd82363b42829efadaa3897e154250123bf52152a6f0751166bea84cf6e0f4bd5e79 + REF "v${VERSION}" + SHA512 bb8f728009ba7e15eecd2d9eb7985883a6a85f4ea8fccfa7f25a5567240980d1eb8bcde67d90e56e5c93de910d1bc93704bc5cbd390a8cb660051a698d7fd573 HEAD_REF master - FILE_DISAMBIGUATOR 1 PATCHES 0001-Use-vcpkg-zstd.patch 0002-Fix-versioning.patch - 0003-libtool.patch + 0003-mkversion.patch + 0004-quirks.patch ) +file(REMOVE "${SOURCE_PATH}/other_include/zstd_errors.h") +vcpkg_list(SET OPTIONS) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT PACKAGES bash DIRECT_PACKAGES # Required for "getopt" - "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-1-x86_64.pkg.tar.zst" - ff951c2cd96d0fda87bacb505c93e4aa1f9aeb35f829c52b5a7862d05e167f69605a4927a0e7197b5ee2b2fa5cb56619ad7a6ba293ede4765fdcacedf2ed35da - ) + "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-3-x86_64.pkg.tar.zst" + da26540881cd5734072717133307e5d1a27a60468d3656885507833b80f24088c5382eaa0234b30bdd9e8484a6638b4514623f5327f10b19eed36f12158e8edb + ) vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") - - file(REMOVE - "${SOURCE_PATH}/other_include/zstd.h" - "${SOURCE_PATH}/other_include/zstd_errors.h") + vcpkg_list(APPEND OPTIONS "-DBASH_EXECUTABLE=${MSYS_ROOT}/usr/bin/bash.exe") endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools KTX_FEATURE_TOOLS - vulkan KTX_FEATURE_VULKAN + tools KTX_FEATURE_TOOLS + vulkan KTX_FEATURE_VULKAN ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DKTX_VERSION_FULL=v${PORT_VERSION} + -DKTX_VERSION_FULL=v${VERSION} -DKTX_FEATURE_TESTS=OFF -DKTX_FEATURE_LOADTEST_APPS=OFF -DKTX_FEATURE_STATIC_LIBRARY=${ENABLE_STATIC} ${FEATURE_OPTIONS} + ${OPTIONS} + # Do not regenerate headers (needs more dependencies) + -DCMAKE_DISABLE_FIND_PACKAGE_Vulkan=1 DISABLE_PARALLEL_CONFIGURE ) @@ -61,18 +61,12 @@ if(tools IN_LIST FEATURES) ktx2check AUTO_CLEAN ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ktx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index 8ee67f89612b75..b2005357fe6141 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,11 +1,13 @@ { "name": "ktx", - "version-semver": "4.1.0-rc3", - "port-version": 1, - "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them", + "version-semver": "4.1.0", + "description": [ + "The Khronos KTX library and tools.", + "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them." + ], "homepage": "https://github.com/KhronosGroup/KTX-Software", - "license": "Apache-2.0", - "supports": "!(uwp | x86 | (arm & !arm64))", + "license": null, + "supports": "arm64 | x64 | !windows", "dependencies": [ { "name": "vcpkg-cmake", @@ -19,10 +21,12 @@ ], "features": { "tools": { - "description": "Build tools" + "description": "Build tools", + "supports": "!android" }, "vulkan": { - "description": "Build Vulkan support" + "description": "Build Vulkan support", + "supports": "!emscripten" } } } diff --git a/ports/kuku/portfile.cmake b/ports/kuku/portfile.cmake index 98ff18775720b8..72d97bfe877a3b 100644 --- a/ports/kuku/portfile.cmake +++ b/ports/kuku/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Kuku-2.1) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kuku-2.1) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kuku/vcpkg.json b/ports/kuku/vcpkg.json index 2f7b13515cefff..dfdc17885e3f28 100644 --- a/ports/kuku/vcpkg.json +++ b/ports/kuku/vcpkg.json @@ -1,7 +1,17 @@ { "name": "kuku", - "version-string": "2.1", - "port-version": 1, + "version": "2.1", + "port-version": 3, "description": "Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft.", - "homepage": "https://github.com/microsoft/Kuku" + "homepage": "https://github.com/microsoft/Kuku", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/kvasir-mpl/portfile.cmake b/ports/kvasir-mpl/portfile.cmake index 7208bcc8adb57d..f41ef5c963f2d4 100644 --- a/ports/kvasir-mpl/portfile.cmake +++ b/ports/kvasir-mpl/portfile.cmake @@ -6,24 +6,22 @@ vcpkg_from_github( HEAD_REF development ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES test BUILD_WITH_TEST ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=${BUILD_WITH_TEST} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kvasir_mpl) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kvasir_mpl) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/kvasir-mpl/vcpkg.json b/ports/kvasir-mpl/vcpkg.json index 4d817575a72cb9..0f64a72dc436ce 100644 --- a/ports/kvasir-mpl/vcpkg.json +++ b/ports/kvasir-mpl/vcpkg.json @@ -1,9 +1,19 @@ { "name": "kvasir-mpl", - "version-string": "2019-08-06", - "port-version": 1, + "version-date": "2019-08-06", + "port-version": 3, "description": "This library is part of the Kvasir project. Kvasir is a collection of zero cost statically checked libraries for resource constrained systems including microcontrollers.", "homepage": "https://github.com/kvasir-io/mpl", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "test": { "description": "Build with test" diff --git a/ports/lager/portfile.cmake b/ports/lager/portfile.cmake index ed2bb6da59444b..7c55973bdac7e6 100644 --- a/ports/lager/portfile.cmake +++ b/ports/lager/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/lager - REF c87a4c7fd0368bea346f41191b8bc0b54a3e9d80 - SHA512 788586078fdc07f0bd899148ddb0ad255fc6e18254901de65c2d1e43f9637ed8a8c121e8d0d26f043e86c7764ea1ff6ce323a791ba7d577589b4c80a329619d4 + REF 2016df38be90ee176bcb73ea414be2318bc1ef31 + SHA512 07d9f2cf128ad2e751abbfaa03969524ffba785ac2696e6b94ee8e28166fc3ab427de2fc6a98eba50d2f936879b9e878a011c3ba9a25ba39109e7939d39c4902 HEAD_REF master ) diff --git a/ports/lager/vcpkg.json b/ports/lager/vcpkg.json index ee05059aadf37c..112af413653545 100644 --- a/ports/lager/vcpkg.json +++ b/ports/lager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lager", - "version-date": "2022-02-21", + "version-date": "2023-03-19", "description": "C++ library for value-oriented design using the unidirectional data-flow architecture", "homepage": "https://sinusoid.es/lager/", "dependencies": [ diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 2a59fa7267d7c2..ea9381244793a8 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -1,5 +1,5 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Make sure LAPACK can be found -vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" + OPTIONS "-DCMAKE_PREFIX_PATH=${CURRENT_PACKAGES_DIR}") diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 70a2aabec304fe..5112e419d3b1e3 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lapack", "version-date": "2022-02-22", + "port-version": 2, "description": "Metapackage for packages which provide LAPACK", "license": null, "dependencies": [ @@ -11,6 +12,10 @@ { "name": "lapack-reference", "platform": "!((arm & windows) | uwp)" + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/ports/leaf/vcpkg.json b/ports/leaf/vcpkg.json index 88c24fca5ac3f8..aa842d473315b3 100644 --- a/ports/leaf/vcpkg.json +++ b/ports/leaf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "leaf", - "version-string": "0.2.2", - "port-version": 1, + "version": "0.2.2", + "port-version": 2, "description": "Deprecated boost-leaf port.", "dependencies": [ "boost-leaf" diff --git a/ports/lemon/vcpkg.json b/ports/lemon/vcpkg.json index b75102e5498d87..453d7f2809b87f 100644 --- a/ports/lemon/vcpkg.json +++ b/ports/lemon/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lemon", - "version-string": "0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "Deprecated port, use liblemon instead", "dependencies": [ "liblemon" diff --git a/ports/lest/vcpkg.json b/ports/lest/vcpkg.json index f8b68ff7351350..cd46d0193a3e3b 100644 --- a/ports/lest/vcpkg.json +++ b/ports/lest/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lest", - "version-string": "1.35.1", - "port-version": 2, + "version": "1.35.1", + "port-version": 3, "description": "A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)", "homepage": "https://github.com/martinmoene/lest" } diff --git a/ports/levmar/portfile.cmake b/ports/levmar/portfile.cmake index 1ed0ad75d57292..9efcacf99d8338 100644 --- a/ports/levmar/portfile.cmake +++ b/ports/levmar/portfile.cmake @@ -4,15 +4,14 @@ vcpkg_download_distfile(ARCHIVE SHA512 5b4c64b63be9b29d6ad2df435af86cd2c2e3216313378561a670ac6a392a51bbf1951e96c6b1afb77c570f23dd8e194017808e46929fec2d8d9a7fe6cf37022b ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES add-install.patch # patch just adding the install commands to original CMakeLists.txt ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DHAVE_LAPACK=OFF @@ -20,10 +19,10 @@ vcpkg_configure_cmake( -DBUILD_DEMO=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Handle duplicated debug includes file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/levmar/vcpkg.json b/ports/levmar/vcpkg.json index a72eb4b3f46f2d..217521f44a5f9a 100644 --- a/ports/levmar/vcpkg.json +++ b/ports/levmar/vcpkg.json @@ -1,8 +1,14 @@ { "name": "levmar", "version": "2.6", - "port-version": 1, + "port-version": 3, "description": "Levenberg-Marquardt nonlinear least squares optimization algorithm", "homepage": "http://users.ics.forth.gr/~lourakis/levmar/", - "supports": "windows & !uwp" + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/lexbor/portfile.cmake b/ports/lexbor/portfile.cmake new file mode 100644 index 00000000000000..14127bc6c794dd --- /dev/null +++ b/ports/lexbor/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lexbor/lexbor + REF v${VERSION} + SHA512 26bbca3b41a417cbc59ba8cf736e1611966fc2202de85aabf621b840565d835e7e5ffc1b0294defc16ec883f9fb94e802bd19ed704be35fa79b41566acc05cbc +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLEXBOR_BUILD_SHARED=${BUILD_SHARED} + -DLEXBOR_BUILD_STATIC=${BUILD_STATIC} +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/lexbor/html/tree/insertion_mode" + "${CURRENT_PACKAGES_DIR}/debug/include/lexbor/html/tree/insertion_mode" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/lexbor/vcpkg.json b/ports/lexbor/vcpkg.json new file mode 100644 index 00000000000000..f8d522edea611a --- /dev/null +++ b/ports/lexbor/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lexbor", + "version": "2.2.0", + "description": "Lexbor is development of an open source HTML Renderer library.", + "homepage": "https://github.com/lexbor/lexbor", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libaaplus/portfile.cmake b/ports/libaaplus/portfile.cmake index f7387aa854f9fb..0d88d1df5932aa 100644 --- a/ports/libaaplus/portfile.cmake +++ b/ports/libaaplus/portfile.cmake @@ -7,10 +7,10 @@ vcpkg_download_distfile( SHA512 a7abf20feb49df00b95be987809a3dc8df3e9ff706dd5a873ecfdd695af125f858264e092b6b856e83685e9eb46fd46520cf09dfae892c32cbb71f925ba17b86 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE_FILE} - REF ${VERSION} + SOURCE_BASE ${VERSION} NO_REMOVE_ONE_LEVEL PATCHES fix-cmakelists.patch diff --git a/ports/libaaplus/vcpkg.json b/ports/libaaplus/vcpkg.json index 35572ec24275f4..2282eba6ce18e7 100644 --- a/ports/libaaplus/vcpkg.json +++ b/ports/libaaplus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libaaplus", "version": "2.36", + "port-version": 1, "description": "libaaplus is an astronomical computations library by naughter software", "homepage": "http://www.naughter.com/aa.html", "dependencies": [ diff --git a/ports/libaiff/portfile.cmake b/ports/libaiff/portfile.cmake index 97d8673b6b4f97..38c799e4ce0538 100644 --- a/ports/libaiff/portfile.cmake +++ b/ports/libaiff/portfile.cmake @@ -11,17 +11,16 @@ vcpkg_from_sourceforge( buffer_uninitialized.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/libaiff) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/libaiff") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/libaiff/*.h") foreach(HEADER ${HEADERS}) @@ -34,4 +33,4 @@ foreach(HEADER ${HEADERS}) endforeach() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libaiff/vcpkg.json b/ports/libaiff/vcpkg.json index d8e0abb4cfb84c..d5eaa228a89fae 100644 --- a/ports/libaiff/vcpkg.json +++ b/ports/libaiff/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libaiff", - "version-string": "5.0", - "port-version": 7, + "version": "5.0", + "port-version": 9, "description": "LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features", - "homepage": "https://sourceforge.net/projects/aifftools" + "homepage": "https://sourceforge.net/projects/aifftools", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index 9fb8548cb15a0b..f4f0aa29999b20 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -1,23 +1,20 @@ cmake_minimum_required(VERSION 3.9) -project(libass C CXX) +project(libass C) -set(LIBASS_VERSION 0.16.0) - -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) +set(LIBASS_VERSION 0.17.1) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -add_compile_definitions(CONFIG_FREETYPE) -add_compile_definitions(CONFIG_FRIBIDI) -add_compile_definitions(CONFIG_HARFBUZZ) +set(CONFIG_FREETYPE 1) +set(CONFIG_FRIBIDI 1) +set(CONFIG_HARFBUZZ 1) -file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) +file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) -include(CheckCSourceCompiles) set(PKG_REQUIRES_LIBASS "harfbuzz >= 1.2.3, fribidi >= 0.19.1, freetype2 >= 9.17.3") set(PKG_LIBS_LIBASS) if(WIN32) - add_compile_definitions(CONFIG_DIRECTWRITE) + set(CONFIG_DIRECTWRITE 1) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") @@ -25,10 +22,11 @@ if(WIN32) set(FONT_LIBRARY gdi32) set(PKG_LIBS_LIBASS -lgdi32) elseif(APPLE) - add_compile_definitions(CONFIG_CORETEXT) + set(CONFIG_CORETEXT 1) list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + include(CheckCSourceCompiles) check_c_source_compiles( " #include @@ -39,56 +37,51 @@ elseif(APPLE) " CHECK_OLD_OSX ) - if (CHECK_OLD_OSX) + if(CHECK_OLD_OSX) set(FONT_LIBRARY "-framework ApplicationServices -framework CoreFoundation") set(PKG_LIBS_LIBASS "-framework ApplicationServices -framework CoreFoundation") else() set(FONT_LIBRARY "-framework CoreText -framework CoreFoundation") set(PKG_LIBS_LIBASS "-framework CoreText -framework CoreFoundation") endif() -else() - add_compile_definitions(CONFIG_FONTCONFIG) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(CONFIG_FONTCONFIG 1) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") find_package(Fontconfig REQUIRED) set(FONT_LIBRARY Fontconfig::Fontconfig) set(PKG_REQUIRES_LIBASS "fontconfig >= 2.10.92, ${PKG_REQUIRES_LIBASS}") +else() + list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") + list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") + list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") endif() -if (NOT WIN32) +if(NOT WIN32) set(PKG_LIBS_LIBASS "${PKG_LIBS_LIBASS} -lm") endif() find_package(Freetype REQUIRED) -find_path(FRIBIDI_INCLUDE_DIR - NAMES fribidi.h - PATH_SUFFIXES fribidi) - -find_path(HARFBUZZ_INCLUDE_DIR - NAMES hb.h - PATH_SUFFIXES harfbuzz) +find_package(PkgConfig REQUIRED) +pkg_check_modules(FRIBIDI REQUIRED IMPORTED_TARGET fribidi) +pkg_check_modules(HARFBUZZ REQUIRED IMPORTED_TARGET harfbuzz) # libass use win32 api to open files on windows since https://github.com/libass/libass/commit/f664ced049394e2a5d4300ba526e206df73ec729 # so remove dependency dirent. -find_library(FRIBIDI_LIBRARY NAMES libfribidi fribidi) -find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def) target_include_directories(ass PRIVATE - ${FRIBIDI_INCLUDE_DIR} - ${HARFBUZZ_INCLUDE_DIR}) -if(DIRENT_INCLUDE_DIR) - target_include_directories(ass PRIVATE - ${DIRENT_INCLUDE_DIR}) -endif() + PkgConfig::FRIBIDI + PkgConfig::HARFBUZZ) target_link_libraries(ass PRIVATE Freetype::Freetype - ${FRIBIDI_LIBRARY} - ${HARFBUZZ_LIBRARY} + PkgConfig::FRIBIDI + PkgConfig::HARFBUZZ ${FONT_LIBRARY}) install(TARGETS ass @@ -103,11 +96,11 @@ set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(PACKAGE_VERSION ${LIBASS_VERSION}) if(BUILD_SHARED_LIBS) - set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS}) - set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS}) -else() set(PKG_REQUIRES_PUBLIC ${PKG_REQUIRES_LIBASS}) set(PKG_LIBS_PUBLIC ${PKG_LIBS_LIBASS}) +else() + set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS}) endif() configure_file(libass.pc.in libass.pc @ONLY) install(FILES diff --git a/ports/libass/config.h.in b/ports/libass/config.h.in index ffc4c1b4942b7c..fc2445dde152ba 100644 --- a/ports/libass/config.h.in +++ b/ports/libass/config.h.in @@ -1 +1,14 @@ -#define CONFIG_SOURCEVERSION "tarball: 0.16.0" +#define CONFIG_SOURCEVERSION "tarball: @LIBASS_VERSION@" + +#cmakedefine CONFIG_ICONV +#cmakedefine CONFIG_FREETYPE +#cmakedefine CONFIG_FRIBIDI +#cmakedefine CONFIG_HARFBUZZ +#cmakedefine CONFIG_LIBPNG +#cmakedefine CONFIG_UNIBREAK +#cmakedefine CONFIG_FONTCONFIG +#cmakedefine CONFIG_CORETEXT +#cmakedefine CONFIG_DIRECTWRITE +#cmakedefine01 CONFIG_ASM +#cmakedefine01 ARCH_X86 +#cmakedefine01 CONFIG_LARGE_TILES diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index 45cf6ad5394dd3..0ea90c7fd9f41c 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass - REF 0.16.0 - SHA512 fea93b36d05cd69a5920b603951dd63f46b2434e0dcbb12414bf6e1e584bacc2743fbfc03682d0a672bbfe9bcc057452a942f9967d95a30e535bd3694e40fc7d + REF 0.17.1 + SHA512 8bc83347c87c47577cd52230b3698c34301250e9a23f190a565c913defcd47a05695a4f7d9cd2e9a6ad0cfc6341e8ea2d6d779b1d714b2d6144466d2dea53951 HEAD_REF master ) @@ -15,6 +15,10 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${SOURCE_PATH}/libass/ass.h ${SOURCE_PATH}/libass/ass_types.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ass) +vcpkg_find_acquire_program(PKGCONFIG) +get_filename_component(PKGCONFIG_EXE_PATH ${PKGCONFIG} DIRECTORY) +vcpkg_add_to_path(${PKGCONFIG_EXE_PATH}) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} ) diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index 31d51e293b23de..56aac58a6e2819 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libass", - "version": "0.16.0", + "version": "0.17.1", "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", "homepage": "https://github.com/libass/libass", "license": "ISC", diff --git a/ports/libavif/find-dependency.patch b/ports/libavif/find-dependency.patch new file mode 100644 index 00000000000000..0da39464822392 --- /dev/null +++ b/ports/libavif/find-dependency.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 29d7d60..7e28ba4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -555,7 +555,7 @@ endif() + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + install( + TARGETS avif +- EXPORT ${PROJECT_NAME}-config ++ EXPORT ${PROJECT_NAME}-targets + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" +@@ -563,7 +563,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + + # Enable CMake configs in VCPKG mode + if(BUILD_SHARED_LIBS OR VCPKG_TARGET_TRIPLET) +- install(EXPORT ${PROJECT_NAME}-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) ++ install(EXPORT ${PROJECT_NAME}-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + + include(CMakePackageConfigHelpers) + write_basic_package_version_file( +@@ -572,6 +572,28 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) ++ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "@PACKAGE_INIT@\n") ++ if(UNIX AND NOT BUILD_SHARED_LIBS) ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in " ++ include(CMakeFindDependencyMacro) ++ set(CMAKE_THREAD_PREFER_PTHREADS ON) ++ set(THREADS_PREFER_PTHREAD_FLAG ON) ++ find_dependency(Threads) ++ ") ++ endif() ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}-targets.cmake)") ++ ++ # Install CMake configuration export file. ++ configure_package_config_file( ++ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in ++ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO ++ ) ++ install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ ) + endif() + + configure_file(libavif.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libavif.pc @ONLY) diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index 6ff442f0a91061..6617340bb3cc5a 100644 --- a/ports/libavif/portfile.cmake +++ b/ports/libavif/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES disable-source-utf8.patch fix-compiler-warnings.patch + find-dependency.patch # from https://github.com/AOMediaCodec/libavif/pull/1339 ) vcpkg_cmake_configure( @@ -14,6 +15,7 @@ vcpkg_cmake_configure( OPTIONS -DAVIF_CODEC_AOM=ON -DAVIF_BUILD_APPS=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_libyuv=ON ) vcpkg_cmake_install() diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index 5b97bb38d51bbc..3b0d1d49aa82d9 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libavif", "version-semver": "0.11.1", + "port-version": 1, "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", "license": "BSD-2-Clause AND Apache-2.0", diff --git a/ports/libcaer/portfile.cmake b/ports/libcaer/portfile.cmake index e69687584ec57e..2c3a887191311a 100644 --- a/ports/libcaer/portfile.cmake +++ b/ports/libcaer/portfile.cmake @@ -2,20 +2,28 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com/inivation/ OUT_SOURCE_PATH SOURCE_PATH REPO dv/libcaer - REF 933dfa60a138091afb03014f8c24183bab7bba4e - SHA512 f3ac74bb4cfc4077e5a226307f66a9b8b263201d2342d9e61ee98a23f95e7897895da9f148b4e910535779f779a26f5c192925386a99a70e9d22540a5421d646 + REF "${VERSION}" + SHA512 29f8ac47f97a7640d8102eb5c693259da7506d918975be0f3e4e970ab7135dfff67f1c48dd17240462bf846bf31745d518a421229b8c453b29410ea26e489aa3 HEAD_REF master PATCHES fix-libusb.diff ) +find_program(PKGCONFIG NAMES pkgconf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf" NO_DEFAULT_PATH REQUIRED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + opencv ENABLE_OPENCV +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # writes to include/libcaer/libcaer.h OPTIONS - -DENABLE_OPENCV=ON + ${FEATURE_OPTIONS} -DEXAMPLES_INSTALL=OFF -DBUILD_CONFIG_VCPKG=ON + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) vcpkg_cmake_install() @@ -25,4 +33,6 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +set(stdatomic_license "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/LICENSE for simple-stdatomic (x86,x64 MSVC)") +file(COPY_FILE "${SOURCE_PATH}/thirdparty/simple-stdatomic/LICENSE" "${stdatomic_license}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${stdatomic_license}") diff --git a/ports/libcaer/vcpkg.json b/ports/libcaer/vcpkg.json index e51cc84ffdebf0..8b1a588522cbe2 100644 --- a/ports/libcaer/vcpkg.json +++ b/ports/libcaer/vcpkg.json @@ -1,16 +1,12 @@ { "name": "libcaer", - "version-date": "2022-07-25", - "port-version": 4, + "version": "3.3.15", "description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.", "homepage": "https://gitlab.com/inivation/dv/libcaer", - "license": "BSD-2-Clause", + "license": "BSD-2-Clause AND Apache-2.0", + "supports": "!(arm & windows & !mingw)", "dependencies": [ "libusb", - { - "name": "opencv4", - "default-features": false - }, { "name": "pkgconf", "host": true @@ -23,5 +19,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "opencv": { + "description": "Enable support for frame enhancements using OpenCV", + "dependencies": [ + { + "name": "opencv4", + "default-features": false + } + ] + } + } } diff --git a/ports/libcds/portfile.cmake b/ports/libcds/portfile.cmake index 4cdf9f2671d03c..481d9d1d097dcb 100644 --- a/ports/libcds/portfile.cmake +++ b/ports/libcds/portfile.cmake @@ -12,9 +12,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DISABLE_INSTALL_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_INSTALL_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_UNIT_TEST=OFF -DENABLE_STRESS_TEST=OFF @@ -23,14 +22,14 @@ vcpkg_configure_cmake( "-DLIB_SUFFIX=" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibCDS) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/LibCDS) file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcds RENAME copyright) + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libcds/vcpkg.json b/ports/libcds/vcpkg.json index ceb4e56a2f52b2..ffedd68deb9f5e 100644 --- a/ports/libcds/vcpkg.json +++ b/ports/libcds/vcpkg.json @@ -1,13 +1,21 @@ { "name": "libcds", "version": "2.3.3", - "port-version": 2, + "port-version": 4, "description": "a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR.", "homepage": "https://github.com/khizmax/libcds", "license": "BSL-1.0", "supports": "!(arm & (osx | windows)) & !uwp", "dependencies": [ "boost-system", - "boost-thread" + "boost-thread", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake index aada71bd497d98..d3b5280fc73104 100644 --- a/ports/libcerf/portfile.cmake +++ b/ports/libcerf/portfile.cmake @@ -10,8 +10,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 4df711d3e9fd00de99959c3253a9565d1dc2c41f75a5800ced9c52f89cbd13185fbdca3ad75de788fd16c044082738ab345b7fb6a8820ac588edafe1812944aa ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES 001-fix-static-build.patch ) diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json index 2788bc96d2ab9b..eed2bb6ccd9906 100644 --- a/ports/libcerf/vcpkg.json +++ b/ports/libcerf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcerf", "version": "1.13", - "port-version": 3, + "port-version": 4, "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.", "homepage": "https://jugit.fz-juelich.de/mlz/libcerf", "dependencies": [ diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index 06b4626775866a..a5471ba9034ebd 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -8,35 +8,33 @@ vcpkg_from_github( if (NOT VCPKG_USE_HEAD_VERSION) message("If you would like to use cmake with the port, use `--head` option with vcpkg install.") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") endif() if (NOT VCPKG_USE_HEAD_VERSION) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) else() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF ) endif() -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if (VCPKG_USE_HEAD_VERSION) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libconfig) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig) endif() -foreach(FILE ${CURRENT_PACKAGES_DIR}/include/libconfig.h++ ${CURRENT_PACKAGES_DIR}/include/libconfig.h) +foreach(FILE "${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "${CURRENT_PACKAGES_DIR}/include/libconfig.h") file(READ ${FILE} _contents) string(REPLACE "defined(LIBCONFIGXX_EXPORTS)" "0" _contents "${_contents}") string(REPLACE "defined(LIBCONFIG_EXPORTS)" "0" _contents "${_contents}") @@ -51,4 +49,4 @@ foreach(FILE ${CURRENT_PACKAGES_DIR}/include/libconfig.h++ ${CURRENT_PACKAGES_DI file(WRITE ${FILE} "${_contents}") endforeach() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json index 6acd72878ba263..46e5a2b8161bdc 100644 --- a/ports/libconfig/vcpkg.json +++ b/ports/libconfig/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libconfig", - "version-string": "1.7.3", - "port-version": 1, + "version": "1.7.3", + "port-version": 3, "description": "C/C++ library for processing configuration files", - "homepage": "https://github.com/hyperrealm/libconfig" + "homepage": "https://github.com/hyperrealm/libconfig", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libconfuse/vcpkg.json b/ports/libconfuse/vcpkg.json index 570596daf1e7cb..a193aa2c04f7d7 100644 --- a/ports/libconfuse/vcpkg.json +++ b/ports/libconfuse/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libconfuse", - "version-string": "2019-07-14", - "port-version": 3, + "version-date": "2019-07-14", + "port-version": 4, "description": "Small configuration file parser library for C", "homepage": "https://github.com/martinh/libconfuse", "dependencies": [ diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index 050e7d96f1d085..9fe462a4286d2c 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO owent/libcopp REF "v${VERSION}" - SHA512 0e18641a8d94527417b9c85b3e2ddd60c6c3dc10a9ccf75186cec4344239114245c50ac154a411f3e42a1f9e021a9bcf3c6b71b0cd2f9be82a76b0cd10791589 + SHA512 aa594e1cab9e8489feb864539834a66f700be51000e551840456cbb27971894b3481b300be88a8273f7efc189e3003ecc680eabb3ae8131a90daa2ba90447973 HEAD_REF v2 PATCHES fix-x86-windows.patch ) @@ -11,8 +11,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH ATFRAMEWORK_CMAKE_TOOLSET REPO atframework/cmake-toolset - REF v1.3.5 - SHA512 5048c204eb6358547d99712a06866836e1a6dc20dee44cc33fae77181bdf9ece5686f30062eff6a231e1ec898d5a37ebaddb243e7e3484c002bb96240aa496a5 + REF v1.10.1 + SHA512 7ea18e41fabd35af5fd72fb954a1c60480ba85a9ff820104785d263e719751ba699eeca801ce5155041d8bf51fb2c37ea53f6ed404e4a4e7e810f1eb9bacead4 HEAD_REF main ) diff --git a/ports/libcopp/vcpkg.json b/ports/libcopp/vcpkg.json index 8a82b8b89d59b9..a4f4067193843c 100644 --- a/ports/libcopp/vcpkg.json +++ b/ports/libcopp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcopp", - "version": "2.1.2", + "version": "2.2.0", "maintainers": "owent ", "description": "A cross-platfrom coroutine library for C++", "homepage": "https://github.com/owent/libcopp", diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch deleted file mode 100644 index 25eb2905f97367..00000000000000 --- a/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 28b4566..4347b6a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,7 +28,6 @@ endif() - - list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) --set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static - - if(WIN32) - add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -200,12 +199,14 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - set(THREADS_PREFER_PTHREAD_FLAG TRUE) - find_package(Threads REQUIRED) - --set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) --add_subdirectory(deps/plog EXCLUDE_FROM_ALL) -+find_library(USRSCTP_LIBRARY usrsctp REQUIRED) -+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") - - if(SCTP_DEBUG) - add_definitions(-DSCTP_DEBUG) - endif() -+ -+if(0) - option(sctp_build_shared_lib OFF) - option(sctp_build_programs OFF) - option(sctp_inet OFF) -@@ -219,8 +220,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) - endif() - add_library(Usrsctp::Usrsctp ALIAS usrsctp) -+endif() - --add_library(datachannel SHARED -+add_library(datachannel - ${LIBDATACHANNEL_SOURCES} - ${LIBDATACHANNEL_HEADERS} - ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -244,16 +246,18 @@ target_include_directories(datachannel PUBLIC - $) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel PRIVATE Threads::Threads) --target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) -+target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) - - target_include_directories(datachannel-static PUBLIC - $ - $) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel-static PRIVATE Threads::Threads) --target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) -+target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) - - if(WIN32) - target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 diff --git a/ports/libdatachannel/fix-for-vcpkg.patch b/ports/libdatachannel/fix-for-vcpkg.patch new file mode 100644 index 00000000000000..6511bb13596ef0 --- /dev/null +++ b/ports/libdatachannel/fix-for-vcpkg.patch @@ -0,0 +1,266 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 634f242..c8e2f1e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -28,7 +28,6 @@ endif() + + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +-set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static + + if(WIN32) + add_definitions(-DWIN32_LEAN_AND_MEAN) +@@ -202,12 +201,14 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads REQUIRED) + +-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) +-add_subdirectory(deps/plog EXCLUDE_FROM_ALL) ++find_library(USRSCTP_LIBRARY usrsctp REQUIRED) ++find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") + + if(SCTP_DEBUG) + add_definitions(-DSCTP_DEBUG) + endif() ++ ++if(0) + option(sctp_build_shared_lib OFF) + option(sctp_build_programs OFF) + option(sctp_inet OFF) +@@ -221,7 +222,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) + endif() + add_library(Usrsctp::Usrsctp ALIAS usrsctp) ++endif() + ++if(BUILD_SHARED_LIBS) + add_library(datachannel SHARED + ${LIBDATACHANNEL_SOURCES} + ${LIBDATACHANNEL_HEADERS} +@@ -234,7 +237,8 @@ set_target_properties(datachannel PROPERTIES + CXX_VISIBILITY_PRESET default) + target_compile_definitions(datachannel PRIVATE RTC_EXPORTS) + +-add_library(datachannel-static STATIC EXCLUDE_FROM_ALL ++elseif(BUILD_STATIC_LIBS) ++add_library(datachannel-static STATIC + ${LIBDATACHANNEL_SOURCES} + ${LIBDATACHANNEL_HEADERS} + ${LIBDATACHANNEL_IMPL_SOURCES} +@@ -244,42 +248,63 @@ set_target_properties(datachannel-static PROPERTIES + CXX_STANDARD 17) + target_compile_definitions(datachannel-static PRIVATE RTC_EXPORTS) + target_compile_definitions(datachannel-static PUBLIC RTC_STATIC) ++endif() + ++if(BUILD_SHARED_LIBS) + target_include_directories(datachannel PUBLIC + $ + $) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) + target_link_libraries(datachannel PRIVATE Threads::Threads) +-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) + ++elseif(BUILD_STATIC_LIBS) + target_include_directories(datachannel-static PUBLIC + $ + $) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(datachannel-static PRIVATE ${PLOG_INCLUDE_DIRS}) + target_link_libraries(datachannel-static PRIVATE Threads::Threads) +-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) ++endif() + + if(WIN32) ++ if(BUILD_SHARED_LIBS) + target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 ++ elseif(BUILD_STATIC_LIBS) + target_link_libraries(datachannel-static PUBLIC ws2_32) # winsock2 ++ endif() + endif() + + if (NO_WEBSOCKET) ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=0) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=0) ++ endif() + else() ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=1) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=1) ++ endif() + endif() + + if(NO_MEDIA) ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=0) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=0) ++ endif() + else() ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=1) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=1) ++ endif() + if(USE_SYSTEM_SRTP) + find_package(libSRTP REQUIRED) + if(NOT TARGET libSRTP::srtp2) +@@ -289,10 +314,16 @@ else() + IMPORTED_LINK_INTERFACE_LANGUAGES C + IMPORTED_LOCATION ${SRTP_LIBRARIES}) + endif() ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_SRTP=1) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_SRTP=1) ++ endif() ++ if(BUILD_SHARED_LIBS) + target_link_libraries(datachannel PRIVATE libSRTP::srtp2) ++ elseif(BUILD_STATIC_LIBS) + target_link_libraries(datachannel-static PRIVATE libSRTP::srtp2) ++ endif() + else() + add_subdirectory(deps/libsrtp EXCLUDE_FROM_ALL) + target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_SRTP=0) +@@ -312,15 +343,24 @@ if (USE_GNUTLS) + IMPORTED_LINK_INTERFACE_LANGUAGES C + IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") + endif() ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PRIVATE USE_GNUTLS=1) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=1) ++ endif() ++ if(BUILD_SHARED_LIBS) + target_link_libraries(datachannel PRIVATE GnuTLS::GnuTLS) ++ elseif(BUILD_STATIC_LIBS) + target_link_libraries(datachannel-static PRIVATE GnuTLS::GnuTLS) ++ endif() + if (NOT NO_WEBSOCKET) + # Needed for SHA1, it should be present as GnuTLS cryptography backend + find_package(Nettle REQUIRED) ++ if(BUILD_SHARED_LIBS) + target_link_libraries(datachannel PRIVATE Nettle::Nettle) ++ elseif(BUILD_STATIC_LIBS) + target_link_libraries(datachannel-static PRIVATE Nettle::Nettle) ++ endif() + endif() + else() + if(APPLE) +@@ -340,27 +380,48 @@ else() + endif() + endif() + find_package(OpenSSL REQUIRED) ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PRIVATE USE_GNUTLS=0) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=0) ++ endif() ++ if(BUILD_SHARED_LIBS) + target_link_libraries(datachannel PRIVATE OpenSSL::SSL) ++ elseif(BUILD_STATIC_LIBS) + target_link_libraries(datachannel-static PRIVATE OpenSSL::SSL) ++ endif() + endif() + + if (USE_NICE) + find_package(LibNice REQUIRED) ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PRIVATE USE_NICE=1) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PRIVATE USE_NICE=1) ++ endif() ++ if(BUILD_SHARED_LIBS) + target_link_libraries(datachannel PRIVATE LibNice::LibNice) ++ elseif(BUILD_STATIC_LIBS) + target_link_libraries(datachannel-static PRIVATE LibNice::LibNice) ++ endif() + else() ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PRIVATE USE_NICE=0) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PRIVATE USE_NICE=0) ++ endif() + if(USE_SYSTEM_JUICE) + find_package(LibJuice REQUIRED) ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=1) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=1) ++ endif() ++ if(BUILD_SHARED_LIBS) + target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) ++ elseif(BUILD_STATIC_LIBS) + target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) ++ endif() + else() + add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) + target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) +@@ -371,36 +432,58 @@ else() + endif() + + if(CAPI_STDCALL) ++ if(BUILD_SHARED_LIBS) + target_compile_definitions(datachannel PUBLIC CAPI_STDCALL) ++ elseif(BUILD_STATIC_LIBS) + target_compile_definitions(datachannel-static PUBLIC CAPI_STDCALL) ++ endif() + endif() + ++if(BUILD_SHARED_LIBS) + set_target_properties(datachannel PROPERTIES EXPORT_NAME LibDataChannel) + add_library(LibDataChannel::LibDataChannel ALIAS datachannel) +- ++elseif(BUILD_STATIC_LIBS) + set_target_properties(datachannel-static PROPERTIES EXPORT_NAME LibDataChannelStatic) + add_library(LibDataChannel::LibDataChannelStatic ALIAS datachannel-static) ++endif() + + if(NOT MSVC) ++ if(BUILD_SHARED_LIBS) + target_compile_options(datachannel PRIVATE -Wall -Wextra) ++ elseif(BUILD_STATIC_LIBS) + target_compile_options(datachannel-static PRIVATE -Wall -Wextra) ++ endif() + endif() + + if(WARNINGS_AS_ERRORS) + if(MSVC) ++ if(BUILD_SHARED_LIBS) + target_compile_options(datachannel PRIVATE /WX) ++ elseif(BUILD_STATIC_LIBS) + target_compile_options(datachannel-static PRIVATE /WX) ++ endif() + else() ++ if(BUILD_SHARED_LIBS) + target_compile_options(datachannel PRIVATE -Werror) ++ elseif(BUILD_STATIC_LIBS) + target_compile_options(datachannel-static PRIVATE -Werror) ++ endif() + endif() + endif() + ++if(BUILD_SHARED_LIBS) + install(TARGETS datachannel EXPORT LibDataChannelTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) ++elseif(BUILD_STATIC_LIBS) ++install(TARGETS datachannel-static EXPORT LibDataChannelTargets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++endif() + + install(FILES ${LIBDATACHANNEL_HEADERS} + DESTINATION include/rtc diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 5d96d3effd2741..2e0b4892952614 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,4 +1,4 @@ -set(PATCHES 0001-fix-for-vcpkg.patch) +set(PATCHES fix-for-vcpkg.patch) if(VCPKG_TARGET_IS_UWP) list(APPEND PATCHES uwp-warnings.patch) @@ -14,6 +14,9 @@ vcpkg_from_github( ${PATCHES} ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES stdcall CAPI_STDCALL @@ -30,6 +33,8 @@ vcpkg_cmake_configure( -DUSE_SYSTEM_JUICE=ON -DNO_EXAMPLES=ON -DNO_TESTS=ON + -DBUILD_STATIC_LIBS=${BUILD_STATIC} + -DBUILD_SHARED_LIBS=${BUILD_SHARED} ) vcpkg_cmake_install() diff --git a/ports/libdatachannel/uwp-warnings.patch b/ports/libdatachannel/uwp-warnings.patch index 560040a4e8d391..6885dee0f626ea 100644 --- a/ports/libdatachannel/uwp-warnings.patch +++ b/ports/libdatachannel/uwp-warnings.patch @@ -1,14 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4347b6a..e3d6d19 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -394,6 +394,9 @@ if(WARNINGS_AS_ERRORS) - endif() - endif() - -+target_compile_options(datachannel PRIVATE /wd4996) -+target_compile_options(datachannel-static PRIVATE /wd4996) -+ - install(TARGETS datachannel EXPORT LibDataChannelTargets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8e2f1e..1dfcd62 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -471,6 +471,12 @@ if(WARNINGS_AS_ERRORS) + endif() + endif() + ++if(BUILD_SHARED_LIBS) ++ target_compile_options(datachannel PRIVATE /wd4996) ++elseif(BUILD_STATIC_LIBS) ++ target_compile_options(datachannel-static PRIVATE /wd4996) ++endif() ++ + if(BUILD_SHARED_LIBS) + install(TARGETS datachannel EXPORT LibDataChannelTargets + RUNTIME DESTINATION bin diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index ac0945611e9633..dcd7ef969521c8 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.18.2", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", diff --git a/ports/libde265/fix-interface-include.patch b/ports/libde265/fix-interface-include.patch new file mode 100644 index 00000000000000..1e252c5040b7c9 --- /dev/null +++ b/ports/libde265/fix-interface-include.patch @@ -0,0 +1,13 @@ +diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt +index d0d6762..06e1660 100644 +--- a/libde265/CMakeLists.txt ++++ b/libde265/CMakeLists.txt +@@ -114,7 +114,7 @@ endif() + + add_library(de265 ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS}) + target_link_libraries(de265 PRIVATE Threads::Threads) +-target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) ++target_include_directories(de265 PRIVATE $ PUBLIC $) + + write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion) + diff --git a/ports/libde265/fix-lib-version.patch b/ports/libde265/fix-lib-version.patch new file mode 100644 index 00000000000000..98e5a16e38de07 --- /dev/null +++ b/ports/libde265/fix-lib-version.patch @@ -0,0 +1,11 @@ +diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt +index 2856f90..ccbc8b6 100644 +--- a/libde265/CMakeLists.txt ++++ b/libde265/CMakeLists.txt +@@ -147,5 +147,6 @@ else() + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + endif() + ++set(VERSION ${PROJECT_VERSION}) # so that the replacement in libde265.pc will work with both autotools and CMake + configure_file(../libde265.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/ports/libde265/fix-libde265-headers.patch b/ports/libde265/fix-libde265-headers.patch deleted file mode 100644 index fac2e35a862c2b..00000000000000 --- a/ports/libde265/fix-libde265-headers.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt -index 749c7fb..45e7419 100644 ---- a/libde265/CMakeLists.txt -+++ b/libde265/CMakeLists.txt -@@ -43,7 +43,7 @@ set (libde265_headers - bitstream.h - cabac.h - configparam.h -- de265-version.h -+ ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h - contextmodel.h - de265.h - deblock.h -@@ -119,7 +119,6 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config - ) - - install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) - - install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") - diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 87418395ba5425..856d2176fc0621 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -1,13 +1,12 @@ -# Used for .pc file -set(VERSION "1.0.8") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libde265 - REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8 - SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006 + REF "v${VERSION}" + SHA512 aa744c521fb15e68940956f70997ab969094aee1c129d404ee9a52f318248353bb8d53250b575b4040402645e44701086b78143f1e1122b61a925e9b6cd07566 HEAD_REF master PATCHES - fix-libde265-headers.patch + fix-interface-include.patch + fix-lib-version.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -24,23 +23,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265) -vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN) - -set(prefix "") -set(exec_prefix [[${prefix}]]) -set(libdir [[${prefix}/lib]]) -set(includedir [[${prefix}/include]]) -set(LIBS "") -configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" @ONLY) -# The produced library name is `liblibde265.a` or `libde265.lib` -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265") -# libde265's pc file assumes libstdc++, which isn't always true. -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" " -lstdc++" "") -if(NOT VCPKG_BUILD_TYPE) - configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" " -lstdc++" "") -endif() +vcpkg_copy_tools(TOOL_NAMES dec265 AUTO_CLEAN) vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -51,4 +34,4 @@ else() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index f0882e20270860..c565b31cf911aa 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libde265", - "version": "1.0.8", - "port-version": 7, + "version": "1.0.11", + "port-version": 1, "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", "license": "LGPL-3.0-only", diff --git a/ports/libdisasm/vcpkg.json b/ports/libdisasm/vcpkg.json index ce292684231c03..0a51bb37ef0b51 100644 --- a/ports/libdisasm/vcpkg.json +++ b/ports/libdisasm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libdisasm", - "version-string": "0.23", - "port-version": 9, + "version": "0.23", + "port-version": 10, "description": "x86 Disassembler Library.", "homepage": "https://sourceforge.net/projects/bastard", "dependencies": [ diff --git a/ports/libebur128/vcpkg.json b/ports/libebur128/vcpkg.json index 52dc2718677bcf..5d0f6ace77a860 100644 --- a/ports/libebur128/vcpkg.json +++ b/ports/libebur128/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libebur128", - "version-string": "1.2.6", - "port-version": 1, + "version": "1.2.6", + "port-version": 2, "description": "A library implementing the EBU R128 audio loudness standard", "homepage": "https://github.com/jiixyj/libebur128", "license": "MIT", diff --git a/ports/libeventheader-decode/portfile.cmake b/ports/libeventheader-decode/portfile.cmake new file mode 100644 index 00000000000000..6708c2f2a369ff --- /dev/null +++ b/ports/libeventheader-decode/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 + SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libeventheader-decode-cpp" + OPTIONS + -DBUILD_SAMPLES=OFF + -DBUILD_TOOLS=OFF) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_cmake_config_fixup( + PACKAGE_NAME eventheader-decode + CONFIG_PATH lib/cmake/eventheader-decode) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libeventheader-decode/vcpkg.json b/ports/libeventheader-decode/vcpkg.json new file mode 100644 index 00000000000000..e83b558e554a74 --- /dev/null +++ b/ports/libeventheader-decode/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libeventheader-decode", + "version": "1.0.0", + "description": "EventHeader tracepoint decoding classes for C++", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux | windows", + "dependencies": [ + { + "name": "libeventheader-tracepoint", + "version>=": "1.0.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libeventheader-tracepoint/portfile.cmake b/ports/libeventheader-tracepoint/portfile.cmake new file mode 100644 index 00000000000000..d151d6d643b6a0 --- /dev/null +++ b/ports/libeventheader-tracepoint/portfile.cmake @@ -0,0 +1,37 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_BUILD_TYPE release) # Windows port only includes headers. +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 + SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libeventheader-tracepoint" + OPTIONS + -DBUILD_SAMPLES=OFF + -DBUILD_TOOLS=OFF) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup( + PACKAGE_NAME eventheader-tracepoint + CONFIG_PATH lib/cmake/eventheader-tracepoint + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endif() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME eventheader-headers + CONFIG_PATH lib/cmake/eventheader-headers) + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libeventheader-tracepoint/vcpkg.json b/ports/libeventheader-tracepoint/vcpkg.json new file mode 100644 index 00000000000000..a9e3c7d14a1893 --- /dev/null +++ b/ports/libeventheader-tracepoint/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libeventheader-tracepoint", + "version": "1.0.0", + "description": "EventHeader-encoded Linux tracepoints for C/C++", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux | windows", + "dependencies": [ + { + "name": "libtracepoint", + "version>=": "1.0.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libftdi/vcpkg.json b/ports/libftdi/vcpkg.json index e864124003ddfa..30c851440d665c 100644 --- a/ports/libftdi/vcpkg.json +++ b/ports/libftdi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libftdi", - "version-string": "0.20", - "port-version": 4, + "version": "0.20", + "port-version": 5, "description": "FTDI USB driver with bitbang mode (v0.20)", "dependencies": [ "libusb-win32", diff --git a/ports/libftdi1/portfile.cmake b/ports/libftdi1/portfile.cmake index e294a804cc5dfc..c51808805900d6 100644 --- a/ports/libftdi1/portfile.cmake +++ b/ports/libftdi1/portfile.cmake @@ -4,10 +4,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF 1.5 + SOURCE_BASE 1.5 PATCHES libusb-fix.patch libconfuse-fix.patch diff --git a/ports/libftdi1/vcpkg.json b/ports/libftdi1/vcpkg.json index 42d4123c2feb47..982f2b5e96902d 100644 --- a/ports/libftdi1/vcpkg.json +++ b/ports/libftdi1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libftdi1", "version": "1.5", - "port-version": 3, + "port-version": 4, "description": "FTDI USB driver with bitbang mode", "dependencies": [ "libconfuse", diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json index 6a4f05b5b4ac5a..5305df2f043b7a 100644 --- a/ports/libgeotiff/vcpkg.json +++ b/ports/libgeotiff/vcpkg.json @@ -1,12 +1,18 @@ { "name": "libgeotiff", "version": "1.7.1", - "port-version": 2, + "port-version": 3, "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": [ - "proj", + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + }, { "name": "tiff", "default-features": false diff --git a/ports/libgit2/fix-configcmake.patch b/ports/libgit2/fix-configcmake.patch index 1cc67d89741a11..11b02e89ff4e8d 100644 --- a/ports/libgit2/fix-configcmake.patch +++ b/ports/libgit2/fix-configcmake.patch @@ -19,20 +19,19 @@ index 2a3a91b8c..cbb409350 100644 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() +diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt +index 876a703e8..8283f9585 100644 +--- a/src/libgit2/CMakeLists.txt ++++ b/src/libgit2/CMakeLists.txt +@@ -110,10 +110,28 @@ FILE(WRITE "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h" ${LIBGIT2_INCLU # Install --install(TARGETS git2 -+install(TARGETS git2 EXPORT unofficial-git2Targets + +-install(TARGETS libgit2package ++install(TARGETS libgit2package EXPORT unofficial-git2Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(EXPORT unofficial-git2Targets + NAMESPACE unofficial::git2:: @@ -51,5 +50,6 @@ index e7b54d036..6b549deef 100644 +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 ${PROJECT_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2/ + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}") + install(FILES ${PROJECT_BINARY_DIR}/include/git2/experimental.h diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 867d0b175f3949..f0d056dd79e97f 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.4.2 - SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277 - HEAD_REF maint/v1.4 + REF v1.6.4 + SHA512 fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5 + HEAD_REF maint/v1.6 PATCHES fix-configcmake.patch ) @@ -29,6 +29,10 @@ function(set_tls_backend VALUE) set(USE_HTTPS ${VALUE} PARENT_SCOPE) endfunction() +if("openssl" IN_LIST FEATURES) + list(APPEND GIT_OPTIONS "-DGIT_OPENSSL=1") +endif() + foreach(GIT2_FEATURE ${FEATURES}) if(GIT2_FEATURE STREQUAL "pcre") set_regex_backend("pcre") @@ -37,19 +41,10 @@ foreach(GIT2_FEATURE ${FEATURES}) elseif(GIT2_FEATURE STREQUAL "openssl") set_tls_backend("OpenSSL") elseif(GIT2_FEATURE STREQUAL "winhttp") - if(NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "winhttp is not supported on non-Windows and uwp platforms") - endif() set_tls_backend("WinHTTP") elseif(GIT2_FEATURE STREQUAL "sectransp") - if(NOT VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") - endif() set_tls_backend("SecureTransport") elseif(GIT2_FEATURE STREQUAL "mbedtls") - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "mbedtls is not supported on Windows because a certificate file must be specified at compile time") - endif() set_tls_backend("mbedTLS") endif() endforeach() @@ -72,7 +67,9 @@ vcpkg_cmake_configure( -DUSE_HTTPS=${USE_HTTPS} -DREGEX_BACKEND=${REGEX_BACKEND} -DSTATIC_CRT=${STATIC_CRT} + -DBUILD_CLI=OFF ${GIT2_FEATURES} + ${GIT_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index 1614564db7fb8c..11b59aff5d8014 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libgit2", - "version-semver": "1.4.2", + "version-semver": "1.6.4", "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", @@ -23,6 +23,7 @@ "features": { "mbedtls": { "description": "SSL support (mbedTLS)", + "supports": "!windows", "dependencies": [ "mbedtls" ] @@ -46,18 +47,12 @@ ] }, "sectransp": { - "description": "SSL support (sectransp)" + "description": "SSL support (sectransp)", + "supports": "osx" }, "ssh": { "description": "SSH support via libssh2", "dependencies": [ - { - "name": "libgit2", - "default-features": false, - "features": [ - "openssl" - ] - }, "libssh2" ] }, @@ -91,7 +86,8 @@ ] }, "winhttp": { - "description": "SSL support (WinHTTP)" + "description": "SSL support (WinHTTP)", + "supports": "windows & !uwp" } } } diff --git a/ports/libgpiod/portfile.cmake b/ports/libgpiod/portfile.cmake index bffa9e8b6a5308..291c24bd2bf327 100644 --- a/ports/libgpiod/portfile.cmake +++ b/ports/libgpiod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git - REF dfc5d361e6748d5f48b706e5c4ac949d133b5470 # v1.6.3 - PATCHES + FETCH_REF "v${VERSION}" + REF ae275c375477f207912113e5cf190fada78f3f90 # v2.0.1 ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json index 11d6da3782242f..12175cd7f45778 100644 --- a/ports/libgpiod/vcpkg.json +++ b/ports/libgpiod/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgpiod", - "version": "1.6.3", - "port-version": 2, + "version": "2.0.1", "description": "C library and tools for interacting with the linux GPIO character device", "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", "license": "LGPL-2.1-or-later", diff --git a/ports/libgta/vcpkg.json b/ports/libgta/vcpkg.json index b2fad2ce99c82c..04bd89c949e51a 100644 --- a/ports/libgta/vcpkg.json +++ b/ports/libgta/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgta", - "version-string": "1.0.8", - "port-version": 4, + "version": "1.0.8", + "port-version": 5, "description": "Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.", "homepage": "https://download.savannah.nongnu.org/releases/gta", "dependencies": [ diff --git a/ports/libguarded/vcpkg.json b/ports/libguarded/vcpkg.json index d6bc463967f01b..44ddbb9acc4ac5 100644 --- a/ports/libguarded/vcpkg.json +++ b/ports/libguarded/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libguarded", - "version-string": "2019-08-27", - "port-version": 2, + "version-date": "2019-08-27", + "port-version": 3, "description": "The libGuarded library is a standalone header-only library for multithreaded programming.", "homepage": "https://github.com/copperspice/libguarded" } diff --git a/ports/libgwenhywfar/portfile.cmake b/ports/libgwenhywfar/portfile.cmake index 3ea00a459e822d..a108b76fe99e4d 100644 --- a/ports/libgwenhywfar/portfile.cmake +++ b/ports/libgwenhywfar/portfile.cmake @@ -9,10 +9,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 9875d677f49fc0a46f371fd1954d15d99c7d5994e90b16f1be7a5b8a1cbcd74ae9733e4541afd6d8251a2ba1a0a37c28e0f248952b7c917313fbf5b38b1d8d11 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${VERSION} + SOURCE_BASE ${VERSION} ) if ("libxml2" IN_LIST FEATURES) diff --git a/ports/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json index 6c56ae3f811a1d..6245b6cd285ca3 100644 --- a/ports/libgwenhywfar/vcpkg.json +++ b/ports/libgwenhywfar/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgwenhywfar", "version-semver": "5.6.0", - "port-version": 2, + "port-version": 3, "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", "supports": "!windows", diff --git a/ports/libgxps/portfile.cmake b/ports/libgxps/portfile.cmake index d7dd89ba29b260..234ccffb5a95a7 100644 --- a/ports/libgxps/portfile.cmake +++ b/ports/libgxps/portfile.cmake @@ -7,10 +7,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${LIBGXPS_VERSION} + SOURCE_BASE ${LIBGXPS_VERSION} PATCHES "${CMAKE_CURRENT_LIST_DIR}/libgxps-0.3.2_fix_meson_warnings.patch" # https://gitlab.gnome.org/GNOME/libgxps/-/commit/a18e1260 ) diff --git a/ports/libgxps/vcpkg.json b/ports/libgxps/vcpkg.json index e052c37d9b1f5f..acebb6e8eacb7f 100644 --- a/ports/libgxps/vcpkg.json +++ b/ports/libgxps/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgxps", "version": "0.3.2", - "port-version": 1, + "port-version": 2, "description": "libgxps is a GObject based library for handling and rendering XPS documents.", "homepage": "https://wiki.gnome.org/Projects/libgxps", "dependencies": [ diff --git a/ports/libheif/gdk-pixbuf.patch b/ports/libheif/gdk-pixbuf.patch index 0ecd41d0fdb577..257b466694d0a7 100644 --- a/ports/libheif/gdk-pixbuf.patch +++ b/ports/libheif/gdk-pixbuf.patch @@ -1,11 +1,10 @@ -diff --git a/gdk-pixbuf/CMakeLists.txt b/gdk-pixbuf/CMakeLists.txt -index 85ad59708..d6aa4a5f9 100644 ---- a/gdk-pixbuf/CMakeLists.txt -+++ b/gdk-pixbuf/CMakeLists.txt -@@ -1,13 +1,10 @@ +diff --git "a/gdk-pixbuf/CMakeLists.txt" "b/gdk-pixbuf/CMakeLists.txt" +index eeb2727..20a6b16 100644 +--- "a/gdk-pixbuf/CMakeLists.txt" ++++ "b/gdk-pixbuf/CMakeLists.txt" +@@ -1,12 +1,9 @@ if(UNIX OR MINGW) find_package(PkgConfig) - find_package(Threads) - pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0) + pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET) @@ -18,7 +17,7 @@ index 85ad59708..d6aa4a5f9 100644 add_library(pixbufloader-heif MODULE pixbufloader-heif.c) -@@ -15,7 +12,7 @@ if(UNIX) +@@ -14,7 +11,7 @@ if(UNIX OR MINGW) target_link_directories(pixbufloader-heif PRIVATE ${GDKPIXBUF2_LIBRARY_DIRS}) @@ -27,4 +26,3 @@ index 85ad59708..d6aa4a5f9 100644 install(TARGETS pixbufloader-heif DESTINATION ${GDKPIXBUF2_MODULE_DIR}) endif() - diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 6106aae7f4955e..4c6178eefa0998 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF 06f6acfe735379b9c3bcf865285f6dba80611e90 #v1.15.1 - SHA512 46666ff26c45ed51fdf454fd0be440ac78d6d17571dcf49dd202299248ee28078b1a500b3768b9a391a32e005f021f626e4d0956f9fab6731d17503020c31031 + REF "v${VERSION}" + SHA512 d81f841ac63d58f56414bf8d799a12af0c846148d2c245cd0c0cc3133edd0b3e08e5018efbc82b83fbab00209a6e0806133f63283bf7244cc4e9cf37b4fa8110 HEAD_REF master PATCHES gdk-pixbuf.patch @@ -13,6 +13,7 @@ vcpkg_cmake_configure( OPTIONS -DWITH_EXAMPLES=OFF -DWITH_DAV1D=OFF + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -38,4 +39,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libheif" "${CURRENT_PACKAGES_DI vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif_version.h" "#define LIBHEIF_PLUGIN_DIRECTORY \"${CURRENT_PACKAGES_DIR}/lib/libheif\"" "") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 306e2973024ebb..f2ad6f54d05d0e 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libheif", - "version": "1.15.1", + "version": "1.16.1", "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/ports/libigl/dependencies.patch b/ports/libigl/dependencies.patch index 1a6dc489c23c3c..19091e5c96f8ba 100644 --- a/ports/libigl/dependencies.patch +++ b/ports/libigl/dependencies.patch @@ -1,22 +1,50 @@ -diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake -index 4580c037..b09d762f 100644 ---- a/cmake/igl/modules/opengl.cmake -+++ b/cmake/igl/modules/opengl.cmake -@@ -14,11 +14,10 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/*.cpp") - igl_target_sources(igl_opengl ${INC_FILES} ${SRC_FILES}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 232bc03..8143963 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,7 +64,7 @@ set(MATLAB_ADDITIONAL_VERSIONS + set(LIBIGL_DEFAULT_MATLAB ${LIBIGL_TOPLEVEL_PROJECT}) + set(LIBIGL_DEFAULT_MOSEK ${LIBIGL_TOPLEVEL_PROJECT}) + if(LIBIGL_TOPLEVEL_PROJECT) +- if(NOT WIN32) ++ if(0) + find_package(GMP QUIET) + find_package(MPFR QUIET) + if(NOT (TARGET gmp::gmp AND TARGET mpfr::mpfr)) +diff --git a/cmake/igl/libigl-config.cmake.in b/cmake/igl/libigl-config.cmake.in +index 359e314..6e04af6 100644 +--- a/cmake/igl/libigl-config.cmake.in ++++ b/cmake/igl/libigl-config.cmake.in +@@ -1,3 +1,8 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(Eigen3) ++find_dependency(Threads) ++include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets.cmake") ++ + check_required_components(Libigl) +diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake +index f6abe8c..7ee7d84 100644 +--- a/cmake/igl/modules/copyleft/cgal.cmake ++++ b/cmake/igl/modules/copyleft/cgal.cmake +@@ -14,13 +14,12 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.cpp") + igl_target_sources(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES}) # 4. Dependencies --include(glad) - find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS OpenGL) - target_link_libraries(igl_opengl ${IGL_SCOPE} +-include(cgal) ++find_package(CGAL CONFIG REQUIRED COMPONENTS Core) + igl_include(copyleft core) + target_link_libraries(igl_copyleft_cgal ${IGL_SCOPE} igl::core -- glad::glad -+ glad - # Link against OpenGL::OpenGL if available, or fallback to OpenGL::GL - $,OpenGL::OpenGL,OpenGL::GL> + igl_copyleft::core + CGAL::CGAL +- CGAL::CGAL_Core ) + + # 5. Unit tests diff --git a/cmake/igl/modules/core.cmake b/cmake/igl/modules/core.cmake -index 2aefcd64..137d30bc 100644 +index 2aefcd6..137d30b 100644 --- a/cmake/igl/modules/core.cmake +++ b/cmake/igl/modules/core.cmake @@ -20,7 +20,7 @@ igl_target_sources(igl_core ${INC_FILES} ${SRC_FILES}) @@ -29,7 +57,7 @@ index 2aefcd64..137d30bc 100644 target_link_libraries(igl_core ${IGL_SCOPE} Eigen3::Eigen diff --git a/cmake/igl/modules/embree.cmake b/cmake/igl/modules/embree.cmake -index 6f223192..21ce00e3 100644 +index 6f22319..de85066 100644 --- a/cmake/igl/modules/embree.cmake +++ b/cmake/igl/modules/embree.cmake @@ -14,10 +14,10 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/embree/*.cpp") @@ -41,12 +69,12 @@ index 6f223192..21ce00e3 100644 target_link_libraries(igl_embree ${IGL_SCOPE} igl::core - embree::embree -+ embree ++ $ ) # 5. Unit tests diff --git a/cmake/igl/modules/glfw.cmake b/cmake/igl/modules/glfw.cmake -index 151338e4..77c48e58 100644 +index 151338e..f42d22a 100644 --- a/cmake/igl/modules/glfw.cmake +++ b/cmake/igl/modules/glfw.cmake @@ -14,10 +14,10 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/glfw/*.cpp") @@ -60,61 +88,78 @@ index 151338e4..77c48e58 100644 igl::core igl::opengl - glfw::glfw -+ glfw ++ $ ) -diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake -index 3763b771..31ab979b 100644 ---- a/cmake/igl/modules/xml.cmake -+++ b/cmake/igl/modules/xml.cmake -@@ -14,7 +14,7 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/xml/*.cpp") - igl_target_sources(igl_xml ${INC_FILES} ${SRC_FILES}) - - # 4. Dependencies --include(tinyxml2) -+find_package(tinyxml2 CONFIG REQUIRED) - target_link_libraries(igl_xml ${IGL_SCOPE} - igl::core - tinyxml2::tinyxml2 - diff --git a/cmake/igl/modules/imgui.cmake b/cmake/igl/modules/imgui.cmake -index d7ffb9d4..aac353aa 100644 +index d7ffb9d..f331854 100644 --- a/cmake/igl/modules/imgui.cmake +++ b/cmake/igl/modules/imgui.cmake -@@ -14,8 +14,8 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/glfw/imgui/*.cpp") +@@ -14,14 +14,12 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/glfw/imgui/*.cpp") igl_target_sources(igl_imgui ${INC_FILES} ${SRC_FILES}) # 4. Dependencies -include(imgui) -include(imguizmo) +-include(libigl_imgui_fonts) +find_package(imgui CONFIG REQUIRED) +find_package(imguizmo CONFIG REQUIRED) - include(libigl_imgui_fonts) igl_include(glfw) target_link_libraries(igl_imgui ${IGL_SCOPE} -diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake -index f6abe8c3..125dd701 100644 ---- a/cmake/igl/modules/copyleft/cgal.cmake -+++ b/cmake/igl/modules/copyleft/cgal.cmake -@@ -14,13 +14,18 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.cpp") - igl_target_sources(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES}) + igl::core + igl::glfw + imgui::imgui + imguizmo::imguizmo +- igl::imgui_fonts + ) +diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake +index 4580c03..dfadb38 100644 +--- a/cmake/igl/modules/opengl.cmake ++++ b/cmake/igl/modules/opengl.cmake +@@ -14,7 +14,7 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/*.cpp") + igl_target_sources(igl_opengl ${INC_FILES} ${SRC_FILES}) # 4. Dependencies --include(cgal) -+find_package(cgal CONFIG REQUIRED) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(gmp REQUIRED IMPORTED_TARGET gmp) -+target_link_libraries(igl_copyleft_cgal INTERFACE PkgConfig::gmp) -+pkg_check_modules(mpfr REQUIRED IMPORTED_TARGET mpfr) -+target_link_libraries(igl_copyleft_cgal INTERFACE PkgConfig::mpfr) - igl_include(copyleft core) - target_link_libraries(igl_copyleft_cgal ${IGL_SCOPE} +-include(glad) ++find_package(glad CONFIG REQUIRED) + find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS OpenGL) + target_link_libraries(igl_opengl ${IGL_SCOPE} igl::core - igl_copyleft::core -- CGAL::CGAL -- CGAL::CGAL_Core -+ CGAL -+ CGAL_Core +diff --git a/cmake/igl/modules/png.cmake b/cmake/igl/modules/png.cmake +index b267deb..8d8decc 100644 +--- a/cmake/igl/modules/png.cmake ++++ b/cmake/igl/modules/png.cmake +@@ -14,7 +14,7 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/png/*.cpp") + igl_target_sources(igl_png ${INC_FILES} ${SRC_FILES}) + + # 4. Dependencies +-include(stb) ++find_package(Stb REQUIRED) + igl_include(opengl) + target_link_libraries(igl_png ${IGL_SCOPE} + igl::core +diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake +index 3763b77..31ab979 100644 +--- a/cmake/igl/modules/xml.cmake ++++ b/cmake/igl/modules/xml.cmake +@@ -14,7 +14,7 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/xml/*.cpp") + igl_target_sources(igl_xml ${INC_FILES} ${SRC_FILES}) + + # 4. Dependencies +-include(tinyxml2) ++find_package(tinyxml2 CONFIG REQUIRED) + target_link_libraries(igl_xml ${IGL_SCOPE} + igl::core + tinyxml2::tinyxml2 +diff --git a/cmake/recipes/external/comiso.cmake b/cmake/recipes/external/comiso.cmake +index d2879cb..5a0bd58 100644 +--- a/cmake/recipes/external/comiso.cmake ++++ b/cmake/recipes/external/comiso.cmake +@@ -11,7 +11,7 @@ FetchContent_Declare( + GIT_TAG 536440e714f412e7ef6c0b96b90ba37b1531bb39 ) - # 5. Unit tests - +-include(eigen) ++find_package(Eigen3 CONFIG REQUIRED) + + FetchContent_MakeAvailable(comiso) + diff --git a/ports/libigl/install-extra-targets.patch b/ports/libigl/install-extra-targets.patch new file mode 100644 index 00000000000000..f68ffe60d29965 --- /dev/null +++ b/ports/libigl/install-extra-targets.patch @@ -0,0 +1,164 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8143963..784ac50 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -157,7 +157,7 @@ if(LIBIGL_INSTALL) + set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/LibiglConfigVersion.cmake") + set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/igl") + +- foreach(suffix IN ITEMS "") #"_restricted" "_copyleft") ++ foreach(suffix IN ITEMS "" "_copyleft") # "_restricted" + install(EXPORT LibiglTargets${suffix} + DESTINATION ${export_dest_dir} + NAMESPACE igl${suffix}:: +diff --git a/cmake/igl/libigl-config.cmake.in b/cmake/igl/libigl-config.cmake.in +index 629896d..0b05692 100644 +--- a/cmake/igl/libigl-config.cmake.in ++++ b/cmake/igl/libigl-config.cmake.in +@@ -4,5 +4,30 @@ include(CMakeFindDependencyMacro) + find_dependency(Eigen3) + find_dependency(Threads) + include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets.cmake") ++if(TARGET igl::igl_embree) ++ find_dependency(embree 3) ++endif() ++if(TARGET igl::igl_glfw) ++ find_dependency(glfw3) ++endif() ++if(TARGET igl::igl_imgui) ++ find_dependency(imgui) ++ find_dependency(imguizmo) ++endif() ++if(TARGET igl::igl_opengl) ++ find_dependency(OpenGL) ++ find_dependency(glad) ++endif() ++if(TARGET igl::igl_png) ++ find_dependency(Stb) ++endif() ++if(TARGET igl::igl_xml) ++ find_dependency(tinyxml2) ++endif() ++ ++include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets_copyleft.cmake" OPTIONAL) ++if(TARGET igl_copyleft::igl_copyleft_cgal) ++ find_dependency(CGAL) ++endif() + + check_required_components(Libigl) +diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake +index 7ee7d84..d06c6ee 100644 +--- a/cmake/igl/modules/copyleft/cgal.cmake ++++ b/cmake/igl/modules/copyleft/cgal.cmake +@@ -9,7 +9,7 @@ target_include_directories(igl_copyleft_cgal ${IGL_SCOPE} + ) + + # 3. Target sources +-file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.h") ++file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.h" "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.hpp") + file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.cpp") + igl_target_sources(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES}) + +@@ -22,6 +22,8 @@ target_link_libraries(igl_copyleft_cgal ${IGL_SCOPE} + CGAL::CGAL + ) + ++igl_install(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES}) ++ + # 5. Unit tests + file(GLOB SRC_FILES + "${libigl_SOURCE_DIR}/tests/include/igl/copyleft/boolean/*.cpp" +@@ -31,3 +33,4 @@ igl_add_test(igl_copyleft_cgal ${SRC_FILES}) + if(TARGET test_igl_copyleft_cgal) + igl_copy_dll(test_igl_copyleft_cgal) + endif() ++ +diff --git a/cmake/igl/modules/copyleft/core.cmake b/cmake/igl/modules/copyleft/core.cmake +index 8d03a90..aff8241 100644 +--- a/cmake/igl/modules/copyleft/core.cmake ++++ b/cmake/igl/modules/copyleft/core.cmake +@@ -17,3 +17,5 @@ igl_target_sources(igl_copyleft_core ${INC_FILES} ${SRC_FILES}) + target_link_libraries(igl_copyleft_core ${IGL_SCOPE} + igl::core + ) ++ ++igl_install(igl_copyleft_core ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/core.cmake b/cmake/igl/modules/core.cmake +index 137d30b..597c26b 100644 +--- a/cmake/igl/modules/core.cmake ++++ b/cmake/igl/modules/core.cmake +@@ -12,8 +12,8 @@ target_include_directories(igl_core ${IGL_SCOPE} + ) + + # 3. Target sources +-file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/*.h") +-file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/*.cpp") ++file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/*.h" "${libigl_SOURCE_DIR}/include/igl/*.hpp") ++file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/*.cpp" "${libigl_SOURCE_DIR}/include/igl/*.c") + igl_target_sources(igl_core ${INC_FILES} ${SRC_FILES}) + + # 4. Install target & headers +diff --git a/cmake/igl/modules/embree.cmake b/cmake/igl/modules/embree.cmake +index de85066..052fc76 100644 +--- a/cmake/igl/modules/embree.cmake ++++ b/cmake/igl/modules/embree.cmake +@@ -20,6 +20,9 @@ target_link_libraries(igl_embree ${IGL_SCOPE} + $ + ) + ++igl_install(igl_embree ${INC_FILES} ${SRC_FILES}) ++ + # 5. Unit tests + file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/tests/include/igl/embree/*.cpp") + igl_add_test(igl_embree ${SRC_FILES}) ++ +diff --git a/cmake/igl/modules/glfw.cmake b/cmake/igl/modules/glfw.cmake +index f42d22a..e9930d8 100644 +--- a/cmake/igl/modules/glfw.cmake ++++ b/cmake/igl/modules/glfw.cmake +@@ -21,3 +21,5 @@ target_link_libraries(igl_glfw ${IGL_SCOPE} + igl::opengl + $ + ) ++ ++igl_install(igl_glfw ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/imgui.cmake b/cmake/igl/modules/imgui.cmake +index f331854..7ff9738 100644 +--- a/cmake/igl/modules/imgui.cmake ++++ b/cmake/igl/modules/imgui.cmake +@@ -23,3 +23,5 @@ target_link_libraries(igl_imgui ${IGL_SCOPE} + imgui::imgui + imguizmo::imguizmo + ) ++ ++igl_install(igl_imgui ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake +index dfadb38..185494b 100644 +--- a/cmake/igl/modules/opengl.cmake ++++ b/cmake/igl/modules/opengl.cmake +@@ -22,3 +22,5 @@ target_link_libraries(igl_opengl ${IGL_SCOPE} + # Link against OpenGL::OpenGL if available, or fallback to OpenGL::GL + $,OpenGL::OpenGL,OpenGL::GL> + ) ++ ++igl_install(igl_opengl ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/png.cmake b/cmake/igl/modules/png.cmake +index 8d8decc..293da91 100644 +--- a/cmake/igl/modules/png.cmake ++++ b/cmake/igl/modules/png.cmake +@@ -21,3 +21,5 @@ target_link_libraries(igl_png ${IGL_SCOPE} + igl::opengl + stb::stb + ) ++ ++igl_install(igl_png ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake +index 31ab979..815ea62 100644 +--- a/cmake/igl/modules/xml.cmake ++++ b/cmake/igl/modules/xml.cmake +@@ -19,3 +19,5 @@ target_link_libraries(igl_xml ${IGL_SCOPE} + igl::core + tinyxml2::tinyxml2 + ) ++ ++igl_install(igl_xml ${INC_FILES} ${SRC_FILES}) diff --git a/ports/libigl/portfile.cmake b/ports/libigl/portfile.cmake index cd4132a3af1814..14cdc319318c3b 100644 --- a/ports/libigl/portfile.cmake +++ b/ports/libigl/portfile.cmake @@ -1,4 +1,3 @@ -# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libigl/libigl @@ -8,91 +7,68 @@ vcpkg_from_github( PATCHES dependencies.patch upstream_fixes.patch + install-extra-targets.patch +) +file(REMOVE + "${SOURCE_PATH}/cmake/find/FindGMP.cmake" + "${SOURCE_PATH}/cmake/find/FindMPFR.cmake" + "${SOURCE_PATH}/cmake/recipes/external/boost.cmake" + "${SOURCE_PATH}/cmake/recipes/external/catch2.cmake" + "${SOURCE_PATH}/cmake/recipes/external/cgal.cmake" + "${SOURCE_PATH}/cmake/recipes/external/eigen.cmake" + "${SOURCE_PATH}/cmake/recipes/external/embree.cmake" + "${SOURCE_PATH}/cmake/recipes/external/glad.cmake" + "${SOURCE_PATH}/cmake/recipes/external/glfw.cmake" + "${SOURCE_PATH}/cmake/recipes/external/gmp.cmake" + "${SOURCE_PATH}/cmake/recipes/external/gmp_mpfr.cmake" + "${SOURCE_PATH}/cmake/recipes/external/imgui.cmake" + "${SOURCE_PATH}/cmake/recipes/external/imguizmo.cmake" + "${SOURCE_PATH}/cmake/recipes/external/libigl_imgui_fonts.cmake" + "${SOURCE_PATH}/cmake/recipes/external/mpfr.cmake" + "${SOURCE_PATH}/cmake/recipes/external/stb.cmake" + "${SOURCE_PATH}/cmake/recipes/external/tinyxml2.cmake" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + cgal LIBIGL_COPYLEFT_CGAL embree LIBIGL_EMBREE - opengl LIBIGL_OPENGL glfw LIBIGL_GLFW imgui LIBIGL_IMGUI + opengl LIBIGL_OPENGL png LIBIGL_PNG xml LIBIGL_XML - cgal LIBIGL_COPYLEFT_CGAL + # Features removed: missing binary libs / separate ports + comiso LIBIGL_COPYLEFT_COMISO predicates LIBIGL_PREDICATES - comiso LIBIGL_COMISO - tetgen LIBIGL_TETGEN - triangle LIBIGL_TRIANGLE + tetgen LIBIGL_COPYLEFT_TETGEN + triangle LIBIGL_RESTRICTED_TRIANGLE ) -# External dependencies, which are not packaged by vcpkg -# COMISO -if(LIBIGL_COMISO) - vcpkg_from_github( - OUT_SOURCE_PATH COMISO_SOURCE_PATH - REPO libigl/CoMISo - REF 536440e714f412e7ef6c0b96b90ba37b1531bb39 - SHA512 79824ea7f52dc6d59da491a9df763215285955ad2414c508368bcddd227adced72553476ede6d1ff95d4f0c3df8b4854d1d534dc7d2ab648b13c105f948ca2b3 - HEAD_REF master - ) - list(APPEND ADDITIONAL_OPTIONS "-DFETCHCONTENT_SOURCE_DIR_COMISO=${COMISO_SOURCE_PATH}") -endif() - -# tetgen -if(LIBIGL_TETGEN) - vcpkg_from_github( - OUT_SOURCE_PATH TETGEN_SOURCE_PATH - REPO libigl/tetgen - REF 4f3bfba3997f20aa1f96cfaff604313a8c2c85b6 - SHA512 d847cddd699df4ddca1743d328db8d9f193986f46df668683450b55331d701d6d1f4b9f8aa9d0097856892e3b21bdd5582a41d6ee37f2cf148eb31630e62258e - HEAD_REF master - ) - list(APPEND ADDITIONAL_OPTIONS "-DFETCHCONTENT_SOURCE_DIR_TETGEN=${TETGEN_SOURCE_PATH}") -endif() - - -# triangle -if(LIBIGL_TRIANGLE) - include(FetchContent) - vcpkg_from_github( - OUT_SOURCE_PATH TRIANGLE_SOURCE_PATH - REPO libigl/triangle - REF 3ee6cac2230f0fe1413879574f741c7b6da11221 - SHA512 f668836277585068324a208e0cc445ddda569e048ea99e9a77df1e0027e5efa38882c6fcccee242213adf24127db24d018d3b2eea227762eaab9e1b60292a6fd - HEAD_REF master - ) - list(APPEND ADDITIONAL_OPTIONS "-DFETCHCONTENT_SOURCE_DIR_TRIANGLE=${TRIANGLE_SOURCE_PATH}") -endif() - -# remove custom FindGMP and FildMPFR -file(REMOVE "${SOURCE_PATH}/cmake/find/FindGMP.cmake") -file(REMOVE "${SOURCE_PATH}/cmake/find/FindMPFR.cmake") - +set(VCPKG_BUILD_TYPE release) # header-only vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} - # Build options + OPTIONS + ${FEATURE_OPTIONS} -DLIBIGL_BUILD_TESTS=OFF -DLIBIGL_BUILD_TUTORIALS=OFF -DLIBIGL_INSTALL=ON + -DLIBIGL_RESTRICTED_MATLAB=OFF + -DLIBIGL_RESTRICTED_MOSEK=OFF -DLIBIGL_USE_STATIC_LIBRARY=OFF -DHUNTER_ENABLED=OFF - -DLIBIGL_COPYLEFT_COMISO=${LIBIGL_COMISO} - -DLIBIGL_COPYLEFT_TETGEN=${LIBIGL_TETGEN} - -DLIBIGL_RESTRICTED_TRIANGLE=${LIBIGL_TRIANGLE} ${ADDITIONAL_OPTIONS} - MAYBE_UNUSED_VARIABLES - LIBIGL_COMISO - LIBIGL_TETGEN - LIBIGL_TRIANGLE ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/igl PACKAGE_NAME libigl) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/igl) vcpkg_copy_pdbs() -# libigl is a header-only library. -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(NOT LIBIGL_COPYLEFT_CGAL) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.MPL2") +else() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.MPL2" "${SOURCE_PATH}/LICENSE.GPL" COMMENT "GPL for targets in \"igl_copyleft::\" namespace.") +endif() diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json index a1b2335cffeca0..2c4a7d5ac79895 100644 --- a/ports/libigl/vcpkg.json +++ b/ports/libigl/vcpkg.json @@ -1,15 +1,12 @@ { "name": "libigl", "version": "2.4.0", - "port-version": 2, + "port-version": 4, "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", "homepage": "https://github.com/libigl/libigl", - "license": "GPL-3.0-only", + "license": null, "dependencies": [ "eigen3", - "gmp", - "mpfr", - "pkgconf", { "name": "vcpkg-cmake", "host": true @@ -23,16 +20,12 @@ "cgal": { "description": "Build with cgal", "dependencies": [ - "cgal", { "name": "cgal", "default-features": false } ] }, - "comiso": { - "description": "Build with comiso" - }, "embree": { "description": "Build with embree", "dependencies": [ @@ -84,11 +77,18 @@ "opengl" ] }, - "tetgen": { - "description": "Build with tetgen" - }, - "triangle": { - "description": "Build with triangle" + "png": { + "description": "Install PNG support", + "dependencies": [ + { + "name": "libigl", + "default-features": false, + "features": [ + "opengl" + ] + }, + "stb" + ] }, "xml": { "description": "Build with libxml", diff --git a/ports/libjpeg-turbo/usage b/ports/libjpeg-turbo/usage index ccd47717f7f1c6..c7be47b5aab1b3 100644 --- a/ports/libjpeg-turbo/usage +++ b/ports/libjpeg-turbo/usage @@ -1,5 +1,9 @@ -The package libjpeg-turbo is compatible with built-in CMake targets: +libjpeg-turbo is compatible with built-in implementation-agnostic CMake targets: find_package(JPEG REQUIRED) - target_link_libraries(main PRIVATE ${JPEG_LIBRARIES}) - target_include_directories(main PRIVATE ${JPEG_INCLUDE_DIR}) + target_include_directories(main PRIVATE JPEG::JPEG) + +libjpeg-turbo provides CMake targets for the TurboJPEG C API: + + find_package(libjpeg-turbo CONFIG REQUIRED) + target_link_libraries(main PRIVATE libjpeg-turbo::turbojpeg) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 37cac9ea1238e6..16ac0ff48fcda4 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.1.5.1", + "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", diff --git a/ports/libkeyfinder/portfile.cmake b/ports/libkeyfinder/portfile.cmake index afd3dd1d1a2d3c..c6239987bd717e 100644 --- a/ports/libkeyfinder/portfile.cmake +++ b/ports/libkeyfinder/portfile.cmake @@ -6,14 +6,10 @@ vcpkg_from_github( HEAD_REF main ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - test BUILD_TESTING -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/libkeyfinder/vcpkg.json b/ports/libkeyfinder/vcpkg.json index f362d64ccef439..cb2f71d494bd05 100644 --- a/ports/libkeyfinder/vcpkg.json +++ b/ports/libkeyfinder/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libkeyfinder", "version": "2.2.6", + "port-version": 1, "description": "Musical key detection for digital audio", "homepage": "https://github.com/mixxxdj/libkeyfinder", "license": "GPL-3.0-or-later", @@ -14,13 +15,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "test": { - "description": "Build tests", - "dependencies": [ - "catch2" - ] - } - } + ] } diff --git a/ports/liblas/fix-crosscompiling.diff b/ports/liblas/fix-crosscompiling.diff new file mode 100644 index 00000000000000..4d9eb5a7ff4401 --- /dev/null +++ b/ports/liblas/fix-crosscompiling.diff @@ -0,0 +1,13 @@ +diff --git a/cmake/liblas-config-version.cmake.in b/cmake/liblas-config-version.cmake.in +index f9b7c7cb..5dd2aba1 100644 +--- a/cmake/liblas-config-version.cmake.in ++++ b/cmake/liblas-config-version.cmake.in +@@ -22,7 +22,7 @@ elseif (MSVC AND NOT MSVC_VERSION STREQUAL "@MSVC_VERSION@") + # Reject if there's a mismatch in MSVC compiler versions + set (REASON "_MSC_VER = @MSVC_VERSION@") + set (PACKAGE_VERSION_UNSUITABLE TRUE) +-elseif (NOT CMAKE_CROSSCOMPILING STREQUAL "@CMAKE_CROSSCOMPILING@") ++elseif (0) + # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} + set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") + set (PACKAGE_VERSION_UNSUITABLE TRUE) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index fb843735747fae..66811f4236538b 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -9,13 +9,15 @@ vcpkg_download_distfile(ARCHIVE HEAD_REF master ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-boost-headers.patch fix-cmake-config.patch + fix-crosscompiling.diff misc-fixes.patch + remove_unnecessary_boost_dependency.diff ) file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") @@ -44,8 +46,8 @@ else() endif() vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "_DIR}/.." "_DIR}/../..") -vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "/lib" "$<$:/debug>/lib") -vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "/bin" "/tools/${PORT}") +vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/lib" "\${PROJECT_ROOT_DIR}/$<$:/debug>/lib") +vcpkg_replace_string ("${CURRENT_PACKAGES_DIR}/share/liblas/liblas-config.cmake" "\${PROJECT_ROOT_DIR}/bin" "\${PROJECT_ROOT_DIR}/tools/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/liblas/remove_unnecessary_boost_dependency.diff b/ports/liblas/remove_unnecessary_boost_dependency.diff new file mode 100644 index 00000000000000..9c36bec1517b4a --- /dev/null +++ b/ports/liblas/remove_unnecessary_boost_dependency.diff @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d246a88d..634157c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,11 +190,13 @@ if(WIN32) + endif(WIN32) + + find_package(Threads) +-find_package(Boost 1.42 COMPONENTS program_options thread system iostreams filesystem REQUIRED) ++find_package(Boost 1.42 COMPONENTS iostreams program_options serialization thread REQUIRED) ++ ++# The following header-only and their dependencies are additionally required, ++# but cannot be explicitly requested via find_package, so make sure they exists: ++# - foreach interprocess lambda property_tree uuid + +-if(Boost_FOUND AND Boost_PROGRAM_OPTIONS_FOUND) +- include_directories(${Boost_INCLUDE_DIRS}) +-endif() ++include_directories(${Boost_INCLUDE_DIRS}) + + # make these available for the user to set. + mark_as_advanced(CLEAR Boost_INCLUDE_DIR) diff --git a/ports/liblas/usage b/ports/liblas/usage index 87170054704a89..8626d5a0d8b9f2 100644 --- a/ports/liblas/usage +++ b/ports/liblas/usage @@ -3,7 +3,9 @@ liblas provides CMake targets: # C API find_package(libLAS CONFIG REQUIRED) target_link_libraries(main PRIVATE $<$:lib>las_c) + target_include_directories(main SYSTEM PRIVATE ${libLAS_INCLUDE_DIRS}) # C++ API find_package(libLAS CONFIG REQUIRED) target_link_libraries(main PRIVATE $<$:lib>las) + target_include_directories(main SYSTEM PRIVATE ${libLAS_INCLUDE_DIRS}) diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index 2ec7d4351ee03b..3dfcea005f848b 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -1,20 +1,17 @@ { "name": "liblas", "version": "1.8.1", - "port-version": 11, + "port-version": 13, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", "license": null, "supports": "!arm & !staticcrt", "dependencies": [ - "boost-detail", - "boost-filesystem", + "boost-foreach", "boost-interprocess", "boost-iostreams", "boost-lambda", - "boost-multi-index", "boost-program-options", - "boost-system", - "boost-thread", + "boost-property-tree", "boost-uuid", "libgeotiff", { diff --git a/ports/libleidenalg/portfile.cmake b/ports/libleidenalg/portfile.cmake index 2bedc2c7ab03d5..8e1e7a07f1cbcd 100644 --- a/ports/libleidenalg/portfile.cmake +++ b/ports/libleidenalg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO theAeon/libleidenalg - REF 748dfca386b997fe5a140e21b9ef0f78a6e95ee6 - SHA512 c88f0d9912981b8179d58c7084761e9123e2d7fdd4d971c348f1c0ec066b77914cf5592e0cdff21e371262fd28bbb50f2a09b06404adf2a1468f2f20c228a42f + REPO vtraag/libleidenalg + REF "${VERSION}" + SHA512 a3077592b68cb6fd9bc24127898a64576982b608ff3c123e8b1c7ea1b8da2dfb302123fba64cbf93c16b9310ab42199ddc8de5efa5b6606dd49ee47f074f7f2f HEAD_REF main ) diff --git a/ports/libleidenalg/vcpkg.json b/ports/libleidenalg/vcpkg.json index b67e3e56d4e74d..a6ce8fc04befd9 100644 --- a/ports/libleidenalg/vcpkg.json +++ b/ports/libleidenalg/vcpkg.json @@ -1,13 +1,15 @@ { "name": "libleidenalg", - "version": "0.9.0", - "port-version": 1, + "version": "0.10.0", "maintainers": "Andrew Robbins ", "description": "Leiden is a general algorithm for methods of community detection in large networks.", "homepage": "https://github.com/vtraag/libleidenalg", "license": "GPL-3.0-or-later", "dependencies": [ - "igraph", + { + "name": "igraph", + "version>=": "0.10.1" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json index eaca2c922a507c..794eb9b1d52242 100644 --- a/ports/liblemon/vcpkg.json +++ b/ports/liblemon/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblemon", - "version-string": "2019-06-13", - "port-version": 4, + "version-date": "2019-06-13", + "port-version": 5, "description": "Library for Efficient Modeling and Optimization in Networks", "homepage": "https://lemon.cs.elte.hu/trac/lemon", "dependencies": [ diff --git a/ports/liblo/vcpkg.json b/ports/liblo/vcpkg.json index dca5a031880c32..ec59f54208f9c6 100644 --- a/ports/liblo/vcpkg.json +++ b/ports/liblo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblo", - "version-string": "0.31", - "port-version": 3, + "version": "0.31", + "port-version": 4, "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems", "homepage": "https://github.com/radarsat1/liblo", "dependencies": [ diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index aaf9b2b9dc4762..d862c2a5fb9fc2 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sccn/liblsl REF v${VERSION} - SHA512 d3af9be687c11272f0122585c8ba48c5d7482af6e6f0cecf640e674682da319246b490b536a890407c7511fcc07a59749ed43134bf7683d30304ac4e3989a73c + SHA512 141f364034a7156caf9ffafbb2f43cc9a932116a3ef1c1b76822649996d6b99b3017b18d91d9c25a9cd718419c5c3b037fa97b2845540bda195f55dd9de27ab1 HEAD_REF master PATCHES use-find-package-asio.patch diff --git a/ports/liblsl/vcpkg.json b/ports/liblsl/vcpkg.json index b4f53be8d38d5d..2c2b3db3301a14 100644 --- a/ports/liblsl/vcpkg.json +++ b/ports/liblsl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblsl", - "version": "1.16.1", - "port-version": 1, + "version": "1.16.2", "description": "C++ lsl library for multi-modal time-synched data transmission over the local network", "homepage": "https://github.com/sccn/liblsl", "license": "MIT", diff --git a/ports/liblsquic/fix-found-boringssl.patch b/ports/liblsquic/fix-found-boringssl.patch new file mode 100644 index 00000000000000..a3a632c5ef4fe0 --- /dev/null +++ b/ports/liblsquic/fix-found-boringssl.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5d4086a..e085a83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,10 +120,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug") + SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od") + #SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DFIU_ENABLE=1") + #SET(LIBS ${LIBS} fiu) ++ SET(LIB_NAME ssld cryptod) + ELSE() + SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Ox") + # Comment out the following line to compile out debug messages: + #SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_LOWEST_LOG_LEVEL=LSQ_LOG_INFO") ++ SET(LIB_NAME ssl crypto) + ENDIF() + + ENDIF() #MSVC +@@ -191,7 +193,7 @@ IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR) + ELSE() + + +- FOREACH(LIB_NAME ssl crypto) ++ FOREACH(LIB ${LIB_NAME}) + # If BORINGSSL_LIB is defined, try find each lib. Otherwise, user should define BORINGSSL_LIB_ssl, + # BORINGSSL_LIB_crypto and so on explicitly. For example, including boringssl and lsquic both via + # add_subdirectory: +@@ -201,20 +203,20 @@ ELSE() + # add_subdirectory(third_party/lsquic) + IF (DEFINED BORINGSSL_LIB) + IF (CMAKE_SYSTEM_NAME STREQUAL Windows) +- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME} +- NAMES ${LIB_NAME} ++ FIND_LIBRARY(BORINGSSL_LIB_${LIB} ++ NAMES ${LIB} + PATHS ${BORINGSSL_LIB} + PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo + NO_DEFAULT_PATH) + ELSE() +- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME} +- NAMES lib${LIB_NAME}${LIB_SUFFIX} ++ FIND_LIBRARY(BORINGSSL_LIB_${LIB} ++ NAMES lib${LI}${LIB_SUFFIX} + PATHS ${BORINGSSL_LIB} +- PATH_SUFFIXES ${LIB_NAME} ++ PATH_SUFFIXES ${LIB} + NO_DEFAULT_PATH) + ENDIF() + ENDIF() +- IF(BORINGSSL_LIB_${LIB_NAME}) ++ IF(BORINGSSL_LIB_${LIB}) + MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}") + ELSE() + MESSAGE(FATAL_ERROR "BORINGSSL_LIB_${LIB_NAME} library not found") diff --git a/ports/liblsquic/portfile.cmake b/ports/liblsquic/portfile.cmake index 847500e02eaaae..b0d18b4a505a0c 100644 --- a/ports/liblsquic/portfile.cmake +++ b/ports/liblsquic/portfile.cmake @@ -9,7 +9,10 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REF v3.1.1 SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee HEAD_REF master - PATCHES disable-asan.patch) + PATCHES + disable-asan.patch + fix-found-boringssl.patch +) # Submodules vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH diff --git a/ports/liblsquic/vcpkg.json b/ports/liblsquic/vcpkg.json index 09570d93629e29..cb12234746972d 100644 --- a/ports/liblsquic/vcpkg.json +++ b/ports/liblsquic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblsquic", "version": "3.1.1", - "port-version": 1, + "port-version": 2, "description": "An implementation of the QUIC and HTTP/3 protocols.", "homepage": "https://github.com/litespeedtech/lsquic", "license": "MIT AND BSD-3-Clause", diff --git a/ports/libmad/CMakeLists.txt b/ports/libmad/CMakeLists.txt index 47db84c419fd47..2a692a41316467 100644 --- a/ports/libmad/CMakeLists.txt +++ b/ports/libmad/CMakeLists.txt @@ -30,6 +30,11 @@ set(SOURCES version.h ) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mad.pc.in" "${PROJECT_BINARY_DIR}/mad.pc" @ONLY) +install( + FILES "${PROJECT_BINARY_DIR}/mad.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" +) add_library( mad ${SOURCES} diff --git a/ports/libmad/mad.pc.in b/ports/libmad/mad.pc.in new file mode 100644 index 00000000000000..6dd5792ff29d5e --- /dev/null +++ b/ports/libmad/mad.pc.in @@ -0,0 +1,10 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: mad +Description: MPEG audio decoder library +Version: @VERSION@ +Libs: -L${libdir} -lmad +Cflags: -I${includedir} diff --git a/ports/libmad/portfile.cmake b/ports/libmad/portfile.cmake index 5981c3598a87fa..7dc03c1deca9c9 100644 --- a/ports/libmad/portfile.cmake +++ b/ports/libmad/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_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -12,14 +14,19 @@ vcpkg_from_sourceforge( #The archive only contains a Visual Studio 6.0 era DSP project file, so use a custom CMakeLists.txt file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/mad.pc.in" DESTINATION "${SOURCE_PATH}") + #Use the msvc++ config.h header file(COPY "${SOURCE_PATH}/msvc++/config.h" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmad/vcpkg.json b/ports/libmad/vcpkg.json index 9a03de492b3420..5595b6a687d495 100644 --- a/ports/libmad/vcpkg.json +++ b/ports/libmad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmad", - "version-string": "0.15.1", - "port-version": 10, + "version": "0.15.1", + "port-version": 12, "description": "high-quality MPEG audio decoder", "homepage": "http://www.mars.org/home/rob/proj/mpeg/", "dependencies": [ diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index 9f63ac322314d4..e37a180e755862 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmagic", - "version-string": "5.40", - "port-version": 1, + "version": "5.40", + "port-version": 2, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "dependencies": [ diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json index 142ae74e092cb4..721f1161b0aed9 100644 --- a/ports/libmaxminddb/vcpkg.json +++ b/ports/libmaxminddb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmaxminddb", - "version-string": "1.4.3", - "port-version": 2, + "version": "1.4.3", + "port-version": 3, "description": "C library for the MaxMind DB file format", "homepage": "https://github.com/maxmind/libmaxminddb", "dependencies": [ diff --git a/ports/libmediainfo/dependencies.diff b/ports/libmediainfo/dependencies.diff new file mode 100644 index 00000000000000..be62f855320ba0 --- /dev/null +++ b/ports/libmediainfo/dependencies.diff @@ -0,0 +1,26 @@ +diff --git a/Project/CMake/cmake/modules/FindTinyXML.cmake b/Project/CMake/cmake/modules/FindTinyXML.cmake +index af97107..4667b65 100644 +--- a/Project/CMake/cmake/modules/FindTinyXML.cmake ++++ b/Project/CMake/cmake/modules/FindTinyXML.cmake +@@ -23,7 +23,7 @@ endif(PKG_CONFIG_FOUND) + + set(TinyXML_INCLUDE_DIRS ${PC_TINYXML_INCLUDE_DIRS} CACHE PATH "TinyXML include directory" FORCE) + set(TinyXML_LIBRARY_DIRS ${PC_TINYXML_LIBRARY_DIRS} CACHE PATH "TinyXML library directory" FORCE) +-set(TinyXML_LIBRARIES ${PC_TINYXML_LIBRARIES} CACHE STRING "TinyXML libraries" FORCE) ++set(TinyXML_LIBRARIES ${PC_TINYXML_LINK_LIBRARIES} CACHE STRING "TinyXML libraries" FORCE) + include(FindPackageHandleStandardArgs) + + find_package_handle_standard_args(TinyXML +diff --git a/Project/CMake/libmediainfo.pc.in b/Project/CMake/libmediainfo.pc.in +index 31e53fe..0829d71 100644 +--- a/Project/CMake/libmediainfo.pc.in ++++ b/Project/CMake/libmediainfo.pc.in +@@ -8,6 +8,6 @@ Name: libmediainfo + Version: @MediaInfoLib_VERSION@ + Description: MediaInfoLib + Requires: libzen +-Requires.private:@CURL_PC@ +-Libs: -L${libdir} -lmediainfo -lz ++Requires.private: libcurl tinyxml2 zlib ++Libs: -L${libdir} -lmediainfo + Cflags: -I${includedir} diff --git a/ports/libmediainfo/msvc-arm.diff b/ports/libmediainfo/msvc-arm.diff new file mode 100644 index 00000000000000..c7bef0750090bc --- /dev/null +++ b/ports/libmediainfo/msvc-arm.diff @@ -0,0 +1,25 @@ +diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h +index d3ac0f9..eeefa40 100644 +--- a/Source/ThirdParty/aes-gladman/aesopt.h ++++ b/Source/ThirdParty/aes-gladman/aesopt.h +@@ -183,7 +183,7 @@ Issue Date: 20/12/2007 + AES_REV_DKS must NOT be defined when such assembler files are + built + */ +-#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) ++#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 ) + # define INTEL_AES_POSSIBLE + #endif + +diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h +index b44c5cb..6ba31c1 100644 +--- a/Source/ThirdParty/aes-gladman/brg_endian.h ++++ b/Source/ThirdParty/aes-gladman/brg_endian.h +@@ -101,6 +101,7 @@ Issue Date: 20/12/2007 + defined( __i386__ ) || defined( _M_I86 ) || defined( _M_IX86 ) || \ + defined( __OS2__ ) || defined( sun386 ) || defined( __TURBOC__ ) || \ + defined( vax ) || defined( vms ) || defined( VMS ) || \ ++ defined( _M_ARM64 ) || defined ( _M_ARM ) || \ + defined( __VMS ) || defined( _M_X64 ) + # define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN + diff --git a/ports/libmediainfo/no-windows-namespace.diff b/ports/libmediainfo/no-windows-namespace.diff new file mode 100644 index 00000000000000..6f3918a8733df4 --- /dev/null +++ b/ports/libmediainfo/no-windows-namespace.diff @@ -0,0 +1,56 @@ +diff --git a/Source/MediaInfo/MediaInfo_Internal.cpp b/Source/MediaInfo/MediaInfo_Internal.cpp +index 05e0d53..1da1ef5 100644 +--- a/Source/MediaInfo/MediaInfo_Internal.cpp ++++ b/Source/MediaInfo/MediaInfo_Internal.cpp +@@ -66,12 +66,14 @@ + #if MEDIAINFO_ADVANCED && defined(MEDIAINFO_FILE_YES) + #include + #ifdef WINDOWS +- namespace WindowsNamespace +- { ++ #ifndef WIN32_LEAN_AND_MEAN ++ #define WIN32_LEAN_AND_MEAN ++ #endif ++ #ifndef NOMINMAX ++ #define NOMINMAX ++ #endif + #include + #undef Yield +- #undef max +- } + #else + #include + #include +@@ -973,7 +975,7 @@ static void CtrlC_Received() + } + + #ifdef WINDOWS +-static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD SignalType) ++static BOOL WINAPI SignalHandler(DWORD SignalType) + { + if (SignalType==CTRL_C_EVENT) + { +@@ -986,12 +988,12 @@ static WindowsNamespace::BOOL WINAPI SignalHandler(WindowsNamespace::DWORD Signa + + static void CtrlC_Register() + { +- WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, TRUE); ++ SetConsoleCtrlHandler(SignalHandler, TRUE); + } + + static void CtrlC_Unregister() + { +- WindowsNamespace::SetConsoleCtrlHandler(SignalHandler, FALSE); ++ SetConsoleCtrlHandler(SignalHandler, FALSE); + } + #else //WINDOWS + static void SignalHandler(int SignalType) +@@ -1445,7 +1447,7 @@ void MediaInfo_Internal::Entry() + } + + #ifdef WINDOWS +- WindowsNamespace::Sleep(0); ++ Sleep(0); + #elif defined(_POSIX_PRIORITY_SCHEDULING) + sched_yield(); + #endif //_POSIX_PRIORITY_SCHEDULING diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index 40229288c1c0fb..f2fd10408f9083 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -1,31 +1,34 @@ +string(REGEX REPLACE "^([0-9]+)[.]([1-9])\$" "\\1.0\\2" MEDIAINFO_VERSION "${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/MediaInfoLib - REF v21.03 - SHA512 1317b27dc3ac1ad224ef9b7ca7c08a8f55983ac6984b5e8daf6309fa33094fbad8a0a5fbe0cff086b7a5c9233b3e24e26995b037d16adf83f63877f2c753f811 + REF "v${MEDIAINFO_VERSION}" + SHA512 6bc58f98ac1fc9637db0e8dd3a2e15b62036a2d33763e148cde425fceea798324f7c5f53cd51fc698d5b5b05fe1fc0fbfc4f391d2ec135eba6763eedfa5bd101 HEAD_REF master - PATCHES vcpkg_support_in_cmakelists.patch + PATCHES + msvc-arm.diff + dependencies.diff + no-windows-namespace.diff ) +vcpkg_find_acquire_program(PKGCONFIG) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/Project/CMake" OPTIONS -DBUILD_ZENLIB=0 -DBUILD_ZLIB=0 + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DCMAKE_REQUIRE_FIND_PACKAGE_PkgConfig=1 + -DCMAKE_REQUIRE_FIND_PACKAGE_TinyXML=1 ) - vcpkg_cmake_install() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/share/mediainfolib") - file(RENAME "${CURRENT_PACKAGES_DIR}/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/share/MediaInfoLib") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib") -endif() -vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib) +vcpkg_cmake_config_fixup(PACKAGE_NAME mediainfolib) vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libmediainfo.pc" " -lmediainfo" " -lmediainfod") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index f6832d26565afe..243535c901d221 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmediainfo", - "version-string": "21.03", - "port-version": 2, + "version": "23.4", "description": "Get most relevant technical and tag data from video and audio files", "homepage": "https://github.com/MediaArea/MediaInfoLib", "dependencies": [ diff --git a/ports/libmediainfo/vcpkg_support_in_cmakelists.patch b/ports/libmediainfo/vcpkg_support_in_cmakelists.patch deleted file mode 100644 index c38c919c81a193..00000000000000 --- a/ports/libmediainfo/vcpkg_support_in_cmakelists.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt -index f983343..c6ba5ea 100644 ---- a/Project/CMake/CMakeLists.txt -+++ b/Project/CMake/CMakeLists.txt -@@ -88,7 +88,7 @@ endif() - find_package(TinyXML) - - # use system curl if is present --find_package(CURL) -+find_package(CURL CONFIG REQUIRED) - - include_directories(${MediaInfoLib_SOURCES_PATH}) - include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/) -@@ -400,13 +400,7 @@ endif() - target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES}) - - if(MSVC AND BUILD_SHARED_LIBS) -- get_target_property(LOCATION mediainfo LOCATION_DEBUG) -- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") -- install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug) -- -- get_target_property(LOCATION mediainfo LOCATION_RELWITHDEBINFO) -- string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") -- install(FILES ${LOCATION} DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo) -+ install(FILES $ DESTINATION ${BIN_INSTALL_DIR} OPTIONAL) - endif() - - if (APPLE) -diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h -index d3ac0f9..eeefa40 100644 ---- a/Source/ThirdParty/aes-gladman/aesopt.h -+++ b/Source/ThirdParty/aes-gladman/aesopt.h -@@ -183,7 +183,7 @@ Issue Date: 20/12/2007 - AES_REV_DKS must NOT be defined when such assembler files are - built - */ --#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) -+#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 ) - # define INTEL_AES_POSSIBLE - #endif - -diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h -index b44c5cb..8c34364 100644 ---- a/Source/ThirdParty/aes-gladman/brg_endian.h -+++ b/Source/ThirdParty/aes-gladman/brg_endian.h -@@ -110,7 +110,8 @@ Issue Date: 20/12/2007 - defined( __MRC__ ) || defined( __MVS__ ) || defined( __MWERKS__ ) || \ - defined( sparc ) || defined( __sparc) || defined( SYMANTEC_C ) || \ - defined( __VOS__ ) || defined( __TIGCC__ ) || defined( __TANDEM ) || \ -- defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) -+ defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) || \ -+ defined( _M_ARM64 ) || defined ( _M_ARM ) - # define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN - - #elif 0 /* **** EDIT HERE IF NECESSARY **** */ diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake index 4fcca42aa69e97..c6aa53b0c99285 100644 --- a/ports/libmicrohttpd/portfile.cmake +++ b/ports/libmicrohttpd/portfile.cmake @@ -8,9 +8,9 @@ vcpkg_download_distfile(ARCHIVE SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/libmicrohttpd/vcpkg.json b/ports/libmicrohttpd/vcpkg.json index 1418a7ff40e16e..a43d4d0e735a9b 100644 --- a/ports/libmicrohttpd/vcpkg.json +++ b/ports/libmicrohttpd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmicrohttpd", "version": "0.9.75", + "port-version": 1, "description": "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application", "homepage": "https://www.gnu.org/software/libmicrohttpd/", "supports": "!(arm | uwp)", diff --git a/ports/libmodman/portfile.cmake b/ports/libmodman/portfile.cmake index 816160f3098d9f..82ef06cc851fc1 100644 --- a/ports/libmodman/portfile.cmake +++ b/ports/libmodman/portfile.cmake @@ -11,13 +11,13 @@ vcpkg_download_distfile(ARCHIVE SHA512 1fecc0fa3637c4aa86d114f5bc991605172d39183fa0f39d8c7858ef5d0d894152025bd426de4dd017a41372d800bf73f53b2328c57b77352a508e12792729fa ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tests BUILD_TESTING ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-install-path.patch fix-undefined-typeid.patch diff --git a/ports/libmodman/vcpkg.json b/ports/libmodman/vcpkg.json index 4b00d58511020e..8d9ec11701df1d 100644 --- a/ports/libmodman/vcpkg.json +++ b/ports/libmodman/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodman", - "version-string": "2.0.1", - "port-version": 4, + "version": "2.0.1", + "port-version": 5, "description": "a simple library for managing modules", "homepage": "https://code.google.com/p/libmodman", "supports": "!uwp", diff --git a/ports/libmount/portfile.cmake b/ports/libmount/portfile.cmake index d34ecb7ddad355..30f90c0009c33a 100644 --- a/ports/libmount/portfile.cmake +++ b/ports/libmount/portfile.cmake @@ -8,10 +8,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF ${VERSION} + SOURCE_BASE ${VERSION} ) set(ENV{GTKDOCIZE} true) diff --git a/ports/libmount/vcpkg.json b/ports/libmount/vcpkg.json index 5f0bf183462fa3..559b0169eaf8b4 100644 --- a/ports/libmount/vcpkg.json +++ b/ports/libmount/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmount", "version": "2.38", - "port-version": 1, + "port-version": 2, "description": "Block device identification library from util-linux", "homepage": "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/about/", "license": "GPL-2.0-only", diff --git a/ports/libmspack/vcpkg.json b/ports/libmspack/vcpkg.json index bbdb83f7a804ff..6b57cfd6f8c4ca 100644 --- a/ports/libmspack/vcpkg.json +++ b/ports/libmspack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmspack", - "version-string": "0.10.1", - "port-version": 5, + "version": "0.10.1", + "port-version": 6, "description": "libmspack is a portable library for some loosely related Microsoft compression formats.", "homepage": "https://www.cabextract.org.uk/libmspack", "dependencies": [ diff --git a/ports/libmysql/004-added-limits-include.patch b/ports/libmysql/004-added-limits-include.patch deleted file mode 100644 index d02641ad765328..00000000000000 --- a/ports/libmysql/004-added-limits-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sql-common/sql_string.cc b/sql-common/sql_string.cc -index 40435729..8b6ee827 100644 ---- a/sql-common/sql_string.cc -+++ b/sql-common/sql_string.cc -@@ -23,6 +23,7 @@ - #include "sql_string.h" - - #include -+#include - - #include "my_dbug.h" - #include "my_macros.h" diff --git a/ports/libmysql/Add-target-include-directories.patch b/ports/libmysql/Add-target-include-directories.patch index 87b0ba6406cec8..355ca5314e2669 100644 --- a/ports/libmysql/Add-target-include-directories.patch +++ b/ports/libmysql/Add-target-include-directories.patch @@ -1,20 +1,20 @@ diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index 88b53e7..f49e44d 100644 +index ae13a63dfdc..b450b3c2e4c 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake -@@ -179,6 +179,7 @@ MACRO(MERGE_LIBRARIES_SHARED) +@@ -222,6 +222,7 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) ADD_VERSION_INFO(${TARGET} SHARED SRC) ENDIF() ADD_LIBRARY(${TARGET} SHARED ${SRC}) + TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $) - + IF(ARG_EXCLUDE_FROM_ALL) IF(NOT ARG_SKIP_INSTALL) -@@ -274,6 +275,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) - SET(SOURCE_FILE - ${CMAKE_BINARY_DIR}/archive_output_directory/${TARGET}_depends.c) +@@ -361,6 +362,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) + CONFIGURE_FILE_CONTENT("${SOURCE_FILE_CONTENT}" "${SOURCE_FILE}") + ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE}) + TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $) - - IF(ARG_EXCLUDE_FROM_ALL) - IF(NOT ARG_SKIP_INSTALL) + MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE) + IF(FPROFILE_USE AND HAS_MISSING_PROFILE) + ADD_COMPILE_FLAGS(${SOURCE_FILE} COMPILE_FLAGS ${HAS_MISSING_PROFILE}) diff --git a/ports/libmysql/export-cmake-targets.patch b/ports/libmysql/export-cmake-targets.patch index 62fb9d6701cd36..81d0d23e9fcb08 100644 --- a/ports/libmysql/export-cmake-targets.patch +++ b/ports/libmysql/export-cmake-targets.patch @@ -1,21 +1,24 @@ diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake -index c3a05ec..0d44ef2 100644 +index 870c9f13732..98bc3ea15e4 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake -@@ -100,7 +100,7 @@ ENDFUNCTION() - - FUNCTION(MYSQL_INSTALL_TARGETS) - MYSQL_PARSE_ARGUMENTS(ARG +@@ -97,7 +97,7 @@ ENDFUNCTION() + FUNCTION(MYSQL_INSTALL_TARGET target_arg) + CMAKE_PARSE_ARGUMENTS(ARG + "NAMELINK_SKIP" - "DESTINATION;COMPONENT" + "DESTINATION;COMPONENT;EXPORT" - "" - ${ARGN} - ) -@@ -115,7 +115,21 @@ FUNCTION(MYSQL_INSTALL_TARGETS) - IF(ARG_COMPONENT) - SET(COMP COMPONENT ${ARG_COMPONENT}) + "" + ${ARGN} + ) +@@ -113,10 +113,21 @@ FUNCTION(MYSQL_INSTALL_TARGET target_arg) + IF(ARG_NAMELINK_SKIP) + SET(LIBRARY_INSTALL_ARGS NAMELINK_SKIP) ENDIF() -- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP}) +- INSTALL(TARGETS ${target} +- RUNTIME DESTINATION ${ARG_DESTINATION} ${COMP} +- ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP} +- LIBRARY DESTINATION ${ARG_DESTINATION} ${COMP} ${LIBRARY_INSTALL_ARGS}) + IF (ARG_EXPORT) + FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake" +"include(CMakeFindDependencyMacro) @@ -27,43 +30,46 @@ index c3a05ec..0d44ef2 100644 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake DESTINATION share/${ARG_EXPORT}) + set(EXPORT_ARGS EXPORT ${ARG_EXPORT}-targets) + ENDIF() -+ INSTALL(TARGETS ${TARGETS} ${EXPORT_ARGS} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ${COMP}) ++ INSTALL(TARGETS ${target} ${EXPORT_ARGS} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ${COMP}) + IF (ARG_EXPORT) + INSTALL(${EXPORT_ARGS} DESTINATION share/${ARG_EXPORT}) + ENDIF() SET(INSTALL_LOCATION ${ARG_DESTINATION} ) - INSTALL_DEBUG_SYMBOLS("${TARGETS}") + INSTALL_DEBUG_SYMBOLS(${target}) SET(INSTALL_LOCATION) diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index 5481fae..3fa58da 100644 +index 23e60ad..cc969a8 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake -@@ -237,7 +237,7 @@ MACRO(MERGE_LIBRARIES_SHARED) - IF(ARG_COMPONENT) - SET(COMP COMPONENT ${ARG_COMPONENT}) +@@ -298,8 +298,9 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) + IF(ARG_NAMELINK_SKIP) + SET(INSTALL_ARGS NAMELINK_SKIP) ENDIF() -- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) -+ MYSQL_INSTALL_TARGETS(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) +- MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP} +- ${INSTALL_ARGS}) ++ IF(NOT INSTALL_STATIC_LIBRARIES) ++ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ ENDIF() ENDIF() - ENDMACRO() -@@ -372,7 +372,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) + IF(WIN32) +@@ -464,7 +465,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) SET(COMP COMPONENT ${ARG_COMPONENT}) ENDIF() IF(INSTALL_STATIC_LIBRARIES) -- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) -+ MYSQL_INSTALL_TARGETS(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) +- MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ENDIF() ENDIF() - ENDMACRO() + ENDMACRO(MERGE_CONVENIENCE_LIBRARIES) diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt -index 605288d..c5d0f5d 100644 +index 2ee26bfa284..46583f4f0a3 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt -@@ -245,8 +245,16 @@ ENDIF() - # LDAP authentication SASL client plugin +@@ -277,6 +277,14 @@ ENDIF() + # LDAP authentication SASL client plug-in ADD_SUBDIRECTORY(authentication_ldap) - + +IF (BUILD_SHARED_LIBS) + set(INSTALL_SHARED ) + set(INSTALL_STATIC SKIP_INSTALL) @@ -72,21 +78,19 @@ index 605288d..c5d0f5d 100644 + set(INSTALL_STATIC ) +ENDIF() + + # FIDO authentication client plugin + ADD_SUBDIRECTORY(authentication_fido) + +@@ -287,7 +295,7 @@ ADD_SUBDIRECTORY(authentication_kerberos) + ADD_SUBDIRECTORY(authentication_oci_client) + # Merge several convenience libraries into one big mysqlclient --MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} ${INSTALL_STATIC} COMPONENT Development) - TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK}) - - # Visual Studio users need debug static library for debug projects -@@ -283,6 +291,7 @@ ENDIF() - # Merge several convenience libraries into one big mysqlclient - # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} -+ ${INSTALL_SHARED} - EXPORTS - ${CLIENT_API_FUNCTIONS} - ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} -@@ -370,6 +379,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CURRENT_BINARY_DIR}/api_test.c) +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} ${INSTALL_STATIC} + COMPONENT Development + LINK_LIBRARIES ${LIBS_TO_LINK} + ) +@@ -403,6 +403,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CURRENT_BINARY_DIR}/api_test.c) # from @CLIENT_API_FUNCTIONS@ are declared by . It will fail # to run if not all of these symbols are exported by the library. # @@ -94,7 +98,22 @@ index 605288d..c5d0f5d 100644 MYSQL_ADD_EXECUTABLE(libmysql_api_test ${CMAKE_CURRENT_BINARY_DIR}/api_test.c LINK_LIBRARIES libmysql ${LIBRT} -@@ -398,3 +408,4 @@ ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD +@@ -410,6 +411,7 @@ MYSQL_ADD_EXECUTABLE(libmysql_api_test + ) + # Clang/UBSAN needs this on some platforms. + SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX) ++ENDIF() + + IF(MY_COMPILER_IS_GNU) + ADD_COMPILE_FLAGS( +@@ -426,9 +428,11 @@ IF(HAS_WARN_FLAG) + ) + ENDIF() + ++IF (ENABLE_TESTING) + # Verify that libmysql_api_test runs OK + MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL + DEPENDS libmysql_api_test COMMAND libmysql_api_test > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out ) diff --git a/ports/libmysql/homebrew.patch b/ports/libmysql/homebrew.patch new file mode 100644 index 00000000000000..a7358dc41f2d73 --- /dev/null +++ b/ports/libmysql/homebrew.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52d12a15190..6033494e4f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1929,7 +1929,7 @@ IF(APPLE) + GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY) + IF(EXISTS ${HOMEBREW_BASE}/include/boost) + FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO) +- IF(WITH_${SYSTEM_LIB} STREQUAL "system") ++ IF(FALSE) + MESSAGE(FATAL_ERROR + "WITH_${SYSTEM_LIB}=system is not compatible with Homebrew boost\n" + "MySQL depends on ${BOOST_PACKAGE_NAME} with a set of patches.\n" diff --git a/ports/libmysql/ignore-boost-version.patch b/ports/libmysql/ignore-boost-version.patch index 99cee245012ab5..757defccf68f14 100644 --- a/ports/libmysql/ignore-boost-version.patch +++ b/ports/libmysql/ignore-boost-version.patch @@ -1,13 +1,13 @@ -diff --git a/cmake/boost.cmake b/cmake/boost.cmake -index 592a67f..202a770 100644 ---- a/cmake/boost.cmake -+++ b/cmake/boost.cmake -@@ -297,7 +297,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) - COULD_NOT_FIND_BOOST() - ENDIF() - --IF(NOT BOOST_MINOR_VERSION EQUAL 70) -+IF(NOT BOOST_MINOR_VERSION EQUAL 70 AND NOT IGNORE_BOOST_VERSION) - MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " - "we need 70" - ) +diff --git a/cmake/boost.cmake b/cmake/boost.cmake +index e879484a9d9..437b77ff49a 100644 +--- a/cmake/boost.cmake ++++ b/cmake/boost.cmake +@@ -301,7 +301,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) + COULD_NOT_FIND_BOOST() + ENDIF() + +-IF(NOT BOOST_MINOR_VERSION EQUAL 77) ++IF(NOT BOOST_MINOR_VERSION EQUAL 77 AND NOT IGNORE_BOOST_VERSION) + MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " + "we need 77" + ) diff --git a/ports/libmysql/openssl.patch b/ports/libmysql/openssl.patch deleted file mode 100644 index 3abbcf98f17e8a..00000000000000 --- a/ports/libmysql/openssl.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc -index dea997b252c..81484f0652b 100644 ---- a/mysys/my_md5.cc -+++ b/mysys/my_md5.cc -@@ -35,6 +35,10 @@ - #include - #include - -+#if OPENSSL_VERSION_NUMBER >= 0x30000000L -+#include -+#endif -+ - static void my_md5_hash(unsigned char *digest, unsigned const char *buf, - int len) { - MD5_CTX ctx; -@@ -56,7 +60,11 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, - int compute_md5_hash(char *digest, const char *buf, int len) { - int retval = 0; - int fips_mode = 0; -+ #if OPENSSL_VERSION_NUMBER < 0x30000000L - fips_mode = FIPS_mode(); -+ #else -+ fips_mode = EVP_default_properties_is_fips_enabled(NULL); -+ #endif - /* If fips mode is ON/STRICT restricted method calls will result into abort, - * skipping call. */ - if (fips_mode == 0) { -diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc -index 13bc6794ea5..8752bcea9bf 100644 ---- a/plugin/x/client/xconnection_impl.cc -+++ b/plugin/x/client/xconnection_impl.cc -@@ -51,6 +51,10 @@ - #include "plugin/x/src/config/config.h" - #include "sql-common/net_ns.h" - -+#if OPENSSL_VERSION_NUMBER >= 0x30000000L -+#include -+#endif -+ - #ifndef WIN32 - #include - #include -@@ -524,12 +528,20 @@ int set_fips_mode(const uint32_t fips_mode, - if (fips_mode > 2) { - goto EXIT; - } -+ #if OPENSSL_VERSION_NUMBER < 0x30000000L - fips_mode_old = FIPS_mode(); -+ #else -+ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); -+ #endif - if (fips_mode_old == fips_mode) { - rc = 1; - goto EXIT; - } -+ #if OPENSSL_VERSION_NUMBER < 0x30000000L - if (!(rc = FIPS_mode_set(fips_mode))) { -+ #else -+ if (!(rc = EVP_default_properties_enable_fips(fips_mode))) { -+ #endif - err_library = ERR_get_error(); - ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); - err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; -diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc -index 6c04029ccb0..164b727e3dc 100644 ---- a/vio/viosslfactories.cc -+++ b/vio/viosslfactories.cc -@@ -40,6 +40,10 @@ - - #include - -+#if OPENSSL_VERSION_NUMBER >= 0x30000000L -+#include -+#endif -+ - #if OPENSSL_VERSION_NUMBER < 0x10002000L - #include - #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */ -@@ -498,12 +502,20 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { - if (fips_mode > 2) { - goto EXIT; - } -+ #if OPENSSL_VERSION_NUMBER < 0x30000000L - fips_mode_old = FIPS_mode(); -+ #else -+ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); -+ #endif - if (fips_mode_old == fips_mode) { - rc = 1; - goto EXIT; - } -+ #if OPENSSL_VERSION_NUMBER < 0x30000000L - if (!(rc = FIPS_mode_set(fips_mode))) { -+ #else -+ if (!(rc = EVP_default_properties_enable_fips(NULL, fips_mode))) { -+ #endif - /* - If OS doesn't have FIPS enabled openssl library and user sets FIPS mode - ON, It fails with proper error. But in the same time it doesn't allow to -@@ -511,7 +523,11 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { - error, setting old working FIPS mode value in the OpenSSL library. It will - allow successful cryptographic operation and will not abort the server. - */ -+ #if OPENSSL_VERSION_NUMBER < 0x30000000L - FIPS_mode_set(fips_mode_old); -+ #else -+ EVP_default_properties_enable_fips(NULL, fips_mode_old); -+ #endif - err_library = ERR_get_error(); - ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); - err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; -@@ -525,7 +541,13 @@ EXIT: - - @returns openssl current fips mode - */ -+#if OPENSSL_VERSION_NUMBER < 0x30000000L - uint get_fips_mode() { return FIPS_mode(); } -+#else -+uint get_fips_mode() { -+ return EVP_default_properties_is_fips_enabled(NULL); -+} -+#endif - - long process_tls_version(const char *tls_version) { - const char *separator = ","; diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 11bac55bba9c91..a9c879bbf775fe 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -9,17 +9,15 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mysql/mysql-server - REF 7d10c82196c8e45554f27c00681474a9fb86d137 # 8.0.20 - SHA512 9f5e8cc254ea2a4cf76313287c7bb6fc693400810464dd2901e67d51ecb27f8916009464fd8aed8365c3038314b845b3d517db6e82ae5c7908612f0b3b72335f + REF mysql-${VERSION} + SHA512 8b9f15b301b158e6ffc99dd916b9062968d36f6bdd7b898636fa61badfbe68f7328d4a39fa3b8b3ebef180d3aec1aee353bd2dac9ef1594e5772291390e17ac0 HEAD_REF master PATCHES ignore-boost-version.patch system-libs.patch - rename-version.patch export-cmake-targets.patch - 004-added-limits-include.patch - openssl.patch Add-target-include-directories.patch + homebrew.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") @@ -42,6 +40,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITHOUT_SERVER=ON + -DWITH_BUILD_ID=OFF -DWITH_UNIT_TESTS=OFF -DENABLED_PROFILING=OFF -DENABLE_TESTING=OFF @@ -53,11 +52,6 @@ vcpkg_cmake_configure( -DMYSQL_MAINTAINER_MODE=OFF -DBUNDLE_RUNTIME_LIBRARIES=OFF -DDOWNLOAD_BOOST=OFF - -DENABLE_DOWNLOADS=OFF - -DWITH_NDB_TEST=OFF - -DWITH_NDB_NODEJS_DEFAULT=OFF - -DWITH_NDBAPI_EXAMPLES=OFF - -DMYSQLX_ADDITIONAL_TESTS_ENABLE=OFF -DWITH_SSL=system -DWITH_ICU=system -DWITH_LIBEVENT=system @@ -70,6 +64,7 @@ vcpkg_cmake_configure( BUNDLE_RUNTIME_LIBRARIES # only on windows LINK_STATIC_RUNTIME_LIBRARIES # only on windows WIX_DIR # only on windows + WITH_BUILD_ID # only on windows ) vcpkg_cmake_install(ADD_BIN_TO_PATH) @@ -79,6 +74,7 @@ list(APPEND MYSQL_TOOLS my_print_defaults mysql mysql_config_editor + mysql_migrate_keyring mysql_secure_installation mysql_ssl_rsa_setup mysqladmin @@ -127,13 +123,29 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/man" "${CURRENT_PACKAGES_DIR}/docs" "${CURRENT_PACKAGES_DIR}/debug/docs" "${CURRENT_PACKAGES_DIR}/lib/debug" "${CURRENT_PACKAGES_DIR}/lib/plugin" - "${CURRENT_PACKAGES_DIR}/lib/plugin/debug" + "${CURRENT_PACKAGES_DIR}/debug/lib/plugin" ) +# delete dynamic dll on static build +if (BUILD_STATIC_LIBS) + # libmysql.dll + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/lib/libmysql.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.lib" + "${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb" + "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb" + ) +endif() + ## remove misc files file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE" @@ -144,11 +156,18 @@ file(REMOVE vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h" "#include " "#include \"mysql/udf_registration_types.h\"") if (NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + set(MYSQL_CONFIG_FILE "${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config") + vcpkg_replace_string(${MYSQL_CONFIG_FILE} "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config") # try to get correct $basedir + vcpkg_replace_string(${MYSQL_CONFIG_FILE} "${CURRENT_PACKAGES_DIR}" "$basedir") # use $basedir to format paths + vcpkg_replace_string(${MYSQL_CONFIG_FILE} "-l\$\<\$\:${CURRENT_INSTALLED_DIR}/debug/lib/libz.a> " "") # remove debug version of libz + vcpkg_replace_string(${MYSQL_CONFIG_FILE} + "\$\<\$\\>:${CURRENT_INSTALLED_DIR}" + "`dirname $0`/../../../../installed/${TARGET_TRIPLET}") # correct path for release version of libz + vcpkg_replace_string(${MYSQL_CONFIG_FILE} "\> -l" " -l") # trailing > tag for previous item endif() file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # copy license -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libmysql/rename-version.patch b/ports/libmysql/rename-version.patch deleted file mode 100644 index 15598382570e36..00000000000000 --- a/ports/libmysql/rename-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/VERSION b/VERSION.txt -similarity index 100% -rename from VERSION -rename to VERSION.txt -diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake -index bed6e9f02e2..a924ef09bac 100644 ---- a/cmake/mysql_version.cmake -+++ b/cmake/mysql_version.cmake -@@ -30,7 +30,7 @@ SET(PROTOCOL_VERSION "10") - - # Generate "something" to trigger cmake rerun when VERSION changes - CONFIGURE_FILE( -- ${CMAKE_SOURCE_DIR}/VERSION -+ ${CMAKE_SOURCE_DIR}/VERSION.txt - ${CMAKE_BINARY_DIR}/VERSION.dep - ) - -@@ -38,7 +38,7 @@ CONFIGURE_FILE( - - MACRO(MYSQL_GET_CONFIG_VALUE keyword var) - IF(NOT ${var}) -- FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=") -+ FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION.txt str REGEX "^[ ]*${keyword}=") - IF(str) - STRING(REPLACE "${keyword}=" "" str ${str}) - STRING(REGEX REPLACE "[ ].*" "" str "${str}") diff --git a/ports/libmysql/system-libs.patch b/ports/libmysql/system-libs.patch index 547573fc58e7ad..afcb2c3775e1e8 100644 --- a/ports/libmysql/system-libs.patch +++ b/ports/libmysql/system-libs.patch @@ -1,149 +1,76 @@ -diff --git a/cmake/icu.cmake b/cmake/icu.cmake -index fde3a75..9f694b9 100644 ---- a/cmake/icu.cmake -+++ b/cmake/icu.cmake -@@ -38,49 +38,11 @@ - # install_root is either 'system' or is assumed to be a path. - # - MACRO (FIND_ICU install_root) -- IF("${install_root}" STREQUAL "system") -- SET(EXTRA_FIND_LIB_ARGS) -- SET(EXTRA_FIND_INC_ARGS) -- ELSE() -- SET(EXTRA_FIND_LIB_ARGS HINTS "${install_root}" -- PATH_SUFFIXES "lib" "lib64" NO_DEFAULT_PATH) -- SET(EXTRA_FIND_INC_ARGS HINTS "${install_root}" -- PATH_SUFFIXES "include" NO_DEFAULT_PATH) -- ENDIF() -- -- FIND_PATH(ICU_INCLUDE_DIR NAMES unicode/regex.h ${EXTRA_FIND_INC_ARGS}) -- IF (NOT ICU_INCLUDE_DIR) -- MESSAGE(FATAL_ERROR "Cannot find ICU regular expression headers") -- ENDIF() -- -- IF(WIN32) -- SET(ICU_LIBS icuuc icuio icudt icuin) -- ELSE() -- SET(ICU_LIBS icuuc icuio icudata icui18n) -- ENDIF() -- -- SET(ICU_SYSTEM_LIBRARIES) -- FOREACH(ICU_LIB ${ICU_LIBS}) -- UNSET(ICU_LIB_PATH CACHE) -- FIND_LIBRARY(ICU_LIB_PATH NAMES ${ICU_LIB} ${EXTRA_FIND_LIB_ARGS}) -- IF(NOT ICU_LIB_PATH) -- MESSAGE(FATAL_ERROR "Cannot find the ICU library ${ICU_LIB}") -- ENDIF() -- LIST(APPEND ICU_SYSTEM_LIBRARIES ${ICU_LIB_PATH}) -- ENDFOREACH() -- -- # To do: If we include the path in ICU_INCLUDE_DIR, it leads to GUnit -- # picking up the wrong regex.h header. And it looks like we don't need it; -- # at least on Linux, the header gets installed in an OS path anyway. -- IF(NOT "${install_root}" STREQUAL "system") -- SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) -- ENDIF() -- -- SET(ICU_LIBRARIES ${ICU_SYSTEM_LIBRARIES}) -- -- # Needed for version information. -- SET(ICU_COMMON_DIR ${ICU_INCLUDE_DIR}) - -+ find_package(ICU REQUIRED COMPONENTS uc io dt in) -+ set(ICU_SYSTEM_LIBRARIES ICU::uc ICU::io ICU::dt ICU::in) -+ set(ICU_COMMON_DIR ${ICU_INCLUDE_DIR}) -+ SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) - ENDMACRO() - - MACRO (MYSQL_USE_BUNDLED_ICU) -diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index 3fa58da..88b53e7 100644 ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -350,12 +350,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) - # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib - # must be merged into mysqlclient.lib - IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient") -- SET(LINKER_EXTRA_FLAGS "") -- FOREACH(LIB ${SSL_LIBRARIES}) -- STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}") -- ENDFOREACH() -- SET_TARGET_PROPERTIES(${TARGET} -- PROPERTIES STATIC_LIBRARY_FLAGS "${LINKER_EXTRA_FLAGS}") -+ TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${SSL_LIBRARIES}) - ENDIF() - - IF(OSLIBS) -diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake -index 9aad130..68cbaba 100644 ---- a/cmake/lz4.cmake -+++ b/cmake/lz4.cmake -@@ -25,7 +25,7 @@ - - MACRO (FIND_SYSTEM_LZ4) - FIND_PATH(PATH_TO_LZ4 NAMES lz4frame.h) -- FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4) -+ FIND_LIBRARY(LZ4_SYSTEM_LIBRARY NAMES lz4d lz4) - IF (PATH_TO_LZ4 AND LZ4_SYSTEM_LIBRARY) - SET(SYSTEM_LZ4_FOUND 1) - INCLUDE_DIRECTORIES(SYSTEM ${PATH_TO_LZ4}) -diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake -index 52feade..1e71bd7 100644 ---- a/cmake/ssl.cmake -+++ b/cmake/ssl.cmake -@@ -93,7 +93,20 @@ ENDMACRO() - # Provides the following configure options: - # WITH_SSL=[yes|system|] - MACRO (MYSQL_CHECK_SSL) -+ find_package(OpenSSL REQUIRED) -+ set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "") -+ set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "") -+ FIND_PROGRAM(OPENSSL_EXECUTABLE openssl -+ DOC "path to the openssl executable") -+ SET(SSL_DEFINES "-DHAVE_OPENSSL") -+ set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) -+ if(NOT WIN32) -+ find_package(Threads REQUIRED) -+ list(APPEND SSL_LIBRARIES Threads::Threads) -+ endif() -+ENDMACRO() - -+MACRO (MYSQL_CHECK_SSL_OLD) - IF(NOT WITH_SSL) - SET(WITH_SSL "system" CACHE STRING ${WITH_SSL_DOC_STRING} FORCE) - ENDIF() -diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake -index 26c56fe..65bebb4 100644 ---- a/cmake/zlib.cmake -+++ b/cmake/zlib.cmake -@@ -51,28 +51,7 @@ MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS) - IF(WITH_ZLIB STREQUAL "bundled") - MYSQL_USE_BUNDLED_ZLIB() - ELSE() -- SET(ZLIB_FIND_QUIETLY TRUE) -- INCLUDE(FindZLIB) -- IF(ZLIB_FOUND) -- INCLUDE(CheckFunctionExists) -- SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) -- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} z) -- CHECK_FUNCTION_EXISTS(crc32 HAVE_CRC32) -- CHECK_FUNCTION_EXISTS(compressBound HAVE_COMPRESSBOUND) -- CHECK_FUNCTION_EXISTS(deflateBound HAVE_DEFLATEBOUND) -- SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES}) -- IF(HAVE_CRC32 AND HAVE_COMPRESSBOUND AND HAVE_DEFLATEBOUND) -- SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES} CACHE INTERNAL "System zlib library") -- SET(WITH_ZLIB "system" CACHE STRING -- "Which zlib to use (possible values are 'bundled' or 'system')") -- SET(ZLIB_SOURCES "") -- ELSE() -- SET(ZLIB_FOUND FALSE CACHE INTERNAL "Zlib found but not usable") -- MESSAGE(STATUS "system zlib found but not usable") -- ENDIF() -- ENDIF() -- IF(NOT ZLIB_FOUND) -- MYSQL_USE_BUNDLED_ZLIB() -- ENDIF() -+ find_package(ZLIB REQUIRED) -+ SET(ZLIB_LIBRARY ZLIB::ZLIB CACHE INTERNAL "System zlib library") - ENDIF() - ENDMACRO() +diff --git a/cmake/icu.cmake b/cmake/icu.cmake +index 3ac136dbfb4..c7bdbc8c47e 100644 +--- a/cmake/icu.cmake ++++ b/cmake/icu.cmake +@@ -68,6 +68,12 @@ ENDMACRO() + # install_root is either 'system' or is assumed to be a path. + # + MACRO (FIND_ICU install_root) ++ find_package(ICU REQUIRED COMPONENTS uc io dt in) ++ set(ICU_SYSTEM_LIBRARIES ICU::uc ICU::io ICU::dt ICU::in) ++ set(ICU_COMMON_DIR ${ICU_INCLUDE_DIR}) ++ SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) ++ENDMACRO() ++MACRO (FIND_ICU_OLD install_root) + IF("${install_root}" STREQUAL "system") + SET(EXTRA_FIND_LIB_ARGS) + SET(EXTRA_FIND_INC_ARGS) +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index ae13a63dfdc..9604ad2fc2a 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -441,19 +441,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) + # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib + # must be merged into mysqlclient.lib + IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient") +- SET(LINKER_EXTRA_FLAGS "") +- FOREACH(LIB ${SSL_LIBRARIES}) +- STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}") +- ENDFOREACH() +- +- # __NULL_IMPORT_DESCRIPTOR already defined, second definition ignored +- # Same symbol from both libssl and libcrypto +- # But: Lib.exe has no /IGNORE option, see +- # https://docs.microsoft.com/en-us/cpp/build/reference/running-lib?view=msvc-160 +- # STRING_APPEND(LINKER_EXTRA_FLAGS " /IGNORE:LNK4006") +- +- SET_TARGET_PROPERTIES(${TARGET} +- PROPERTIES STATIC_LIBRARY_FLAGS "${LINKER_EXTRA_FLAGS}") ++ TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${SSL_LIBRARIES}) + ENDIF() + + IF(ARG_LINK_LIBRARIES) +diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake +index e7047412f9b..ffbc95b578d 100644 +--- a/cmake/lz4.cmake ++++ b/cmake/lz4.cmake +@@ -46,7 +46,7 @@ MACRO (FIND_SYSTEM_LZ4) + FIND_PATH(LZ4_INCLUDE_DIR + NAMES lz4frame.h) + FIND_LIBRARY(LZ4_SYSTEM_LIBRARY +- NAMES lz4) ++ NAMES lz4d lz4) + IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY) + SET(SYSTEM_LZ4_FOUND 1) + SET(LZ4_LIBRARY ${LZ4_SYSTEM_LIBRARY}) +diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake +index 52feade..1e71bd7 100644 +--- a/cmake/ssl.cmake ++++ b/cmake/ssl.cmake +@@ -93,7 +93,16 @@ ENDMACRO() + # Provides the following configure options: + # WITH_SSL=[yes|system|] + MACRO (MYSQL_CHECK_SSL) ++ find_package(OpenSSL REQUIRED) ++ set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "") ++ set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "") ++ FIND_PROGRAM(OPENSSL_EXECUTABLE openssl ++ DOC "path to the openssl executable") ++ SET(SSL_DEFINES "-DHAVE_OPENSSL") ++ set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) ++ENDMACRO() + ++MACRO (MYSQL_CHECK_SSL_OLD) + IF(NOT WITH_SSL) + SET(WITH_SSL "system" CACHE STRING ${WITH_SSL_DOC_STRING} FORCE) + ENDIF() diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index cf955cc80e53aa..41e3fa65a7e2ce 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", - "version": "8.0.20", - "port-version": 10, + "version": "8.0.32", + "port-version": 4, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "license": "GPL-2.0-or-later", diff --git a/ports/libnice-gst/portfile.cmake b/ports/libnice-gst/portfile.cmake index f8c1e5a062a13f..3c75ae3bebc968 100644 --- a/ports/libnice-gst/portfile.cmake +++ b/ports/libnice-gst/portfile.cmake @@ -59,28 +59,33 @@ file(WRITE "${USAGE_FILE}" "${PORT} usage:\n\n") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) - file(APPEND "${USAGE_FILE}" "\tIf the plugin isn't found by the default paths add one of the following paths to the 'GST_PLUGIN_PATH' environment variable\n") + file(APPEND "${USAGE_FILE}" "\tMake sure one of the following paths is added to the 'GST_PLUGIN_PATH' environment variable\n") file(APPEND "${USAGE_FILE}" "\tFor more information on GStreamer environment variables see https://gstreamer.freedesktop.org/documentation/gstreamer/running.html?gi-language=c#environment-variables\n") - - if(VCPKG_TARGET_IS_WINDOWS) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/gstnice.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/gstnice.pdb") - - file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/debug/bin/'\n") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}") + if(VCPKG_TARGET_IS_WINDOWS) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb" + "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/gstnice.pdb") + else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.dll" "${CURRENT_PACKAGES_DIR}/bin/gstnice.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/bin/gstnice.pdb") - file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/bin/'\n") + file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_INSTALLED_DIR}/debug/plugins/gstreamer/'\n") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/gstreamer") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}") + if(VCPKG_TARGET_IS_WINDOWS) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb" + "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/gstnice.pdb") + else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") endif() - else() - file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/'\n") - file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/'\n") + + file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_INSTALLED_DIR}/plugins/gstreamer/'\n") endif() else() file(APPEND "${USAGE_FILE}" "\tRegister static plugin with gst_plugin_register_static()\n") diff --git a/ports/libnice-gst/vcpkg.json b/ports/libnice-gst/vcpkg.json index 2b59bffc47b3bc..56e825b323ee92 100644 --- a/ports/libnice-gst/vcpkg.json +++ b/ports/libnice-gst/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libnice-gst", "version": "0.1.21", + "port-version": 1, "description": "Gstreamer Libnice plugins.", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake index 53cf5db23d5359..284fb69e2fb26a 100644 --- a/ports/libodb-pgsql/portfile.cmake +++ b/ports/libodb-pgsql/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 535515356233b815f144c0098940174f7a530e7fa4e930c0a9ebdc255fdb8bac8cdcceac31f25be4864105323e00bfe50808efa648e7c8ffb5a944e52f514b69 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" ) file(REMOVE "${SOURCE_PATH}/version") diff --git a/ports/libodb-pgsql/vcpkg.json b/ports/libodb-pgsql/vcpkg.json index 10a86d94b2aaed..dbc4b807ccf8b0 100644 --- a/ports/libodb-pgsql/vcpkg.json +++ b/ports/libodb-pgsql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb-pgsql", "version": "2.4.0", - "port-version": 6, + "port-version": 7, "description": "Description: PostgreSQL support for the ODB ORM library", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ diff --git a/ports/libopensp/portfile.cmake b/ports/libopensp/portfile.cmake index cf92ff86f4c90e..013d2d63917bec 100644 --- a/ports/libopensp/portfile.cmake +++ b/ports/libopensp/portfile.cmake @@ -14,10 +14,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF ${OPENSP_VERSION} + SOURCE_BASE ${OPENSP_VERSION} PATCHES ${PATCHES} ) diff --git a/ports/libopensp/vcpkg.json b/ports/libopensp/vcpkg.json index adf16ff17d1a55..90cd3583d499f7 100644 --- a/ports/libopensp/vcpkg.json +++ b/ports/libopensp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libopensp", "version": "1.5.2", - "port-version": 1, + "port-version": 2, "description": "SGML parser algorithm", "homepage": "http://openjade.sourceforge.net", "license": "MIT", diff --git a/ports/libopusenc/vcpkg.json b/ports/libopusenc/vcpkg.json index ea02bcad556054..81c87aca6fd7b7 100644 --- a/ports/libopusenc/vcpkg.json +++ b/ports/libopusenc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libopusenc", - "version-string": "0.2.1", - "port-version": 2, + "version": "0.2.1", + "port-version": 3, "description": "Library for encoding .opus audio files and live streams.", "homepage": "https://github.com/xiph/libopusenc", "supports": "!uwp", diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index e289d493bcee05..10793e44c2bf9d 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -11,9 +11,9 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND PATCHES fix-path-in-project.patch) endif() -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH PATCHES ${PATCHES} ) diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index a524d3460a6be6..cf631f8a008b60 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosip2", "version": "5.2.0", - "port-version": 2, + "port-version": 3, "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", "supports": "!(windows & arm)", diff --git a/ports/libosmscout/portfile.cmake b/ports/libosmscout/portfile.cmake index f1c4990fdf8f68..d680c08f57881f 100644 --- a/ports/libosmscout/portfile.cmake +++ b/ports/libosmscout/portfile.cmake @@ -7,14 +7,14 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cairo OSMDCOUT_BUILD_MAP_CAIRO directx OSMDCOUT_BUILD_MAP_DIRECTX gdi OSMDCOUT_BUILD_MAP_GDI svg OSMDCOUT_BUILD_MAP_SVG ) else() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cairo OSMDCOUT_BUILD_MAP_CAIRO svg OSMDCOUT_BUILD_MAP_SVG ) diff --git a/ports/libosmscout/vcpkg.json b/ports/libosmscout/vcpkg.json index 57158448794c2a..fcff03a79ce9ba 100644 --- a/ports/libosmscout/vcpkg.json +++ b/ports/libosmscout/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosmscout", - "version-string": "1.1.1", - "port-version": 1, + "version": "1.1.1", + "port-version": 2, "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.", "homepage": "http://libosmscout.sourceforge.net/", "documentation": "http://libosmscout.sourceforge.net/documentation/", diff --git a/ports/libp7client/vcpkg.json b/ports/libp7client/vcpkg.json index a116182e7eb3a5..c3db1e637e7a61 100644 --- a/ports/libp7client/vcpkg.json +++ b/ports/libp7client/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libp7client", - "version-string": "5.6", - "port-version": 3, + "version": "5.6", + "port-version": 4, "description": "Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.", "homepage": "https://baical.net/", "supports": "!(arm | uwp | osx)", diff --git a/ports/libpff/portfile.cmake b/ports/libpff/portfile.cmake index 04e25f71f530d9..882825a2a6da77 100644 --- a/ports/libpff/portfile.cmake +++ b/ports/libpff/portfile.cmake @@ -10,10 +10,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 ad2cf4b0841c448b60738cd2f340868c0f11eb34167bfe5b093645a2a080d694e199afe4fef5eeea1016487820132be33f8e51910d2142ff032320ad2dbeb59d ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${LIB_VERSION} + SOURCE_BASE ${LIB_VERSION} ) diff --git a/ports/libpff/vcpkg.json b/ports/libpff/vcpkg.json index 079e4fa826e0bc..ddc8b52eca6606 100644 --- a/ports/libpff/vcpkg.json +++ b/ports/libpff/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libpff", "version-date": "2021-11-14", + "port-version": 1, "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", "homepage": "https://github.com/libyal/libpff", - "license": "LGPL-3.0", + "license": "LGPL-3.0-or-later", "supports": "windows & !(static & windows) & !uwp", "dependencies": [ { diff --git a/ports/libphonenumber/portfile.cmake b/ports/libphonenumber/portfile.cmake index 9db9c58c66379b..7dc8027a13c0f7 100644 --- a/ports/libphonenumber/portfile.cmake +++ b/ports/libphonenumber/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libphonenumber REF "v${VERSION}" - SHA512 b864f0ff25ed32813dfa7db5d92ada501566b4d6c366f6ee856dff82680631b88acf24def742015d112e20d4e8aa7c6312c04afb846d492d1f5bef93099775ec + SHA512 03bd6a6c4499a7135dbfe30acfd0ede818008a1c9a40068c04c0d3cff5638ea10502e186b625534d9f06cbc69da81c470f7d7308cdd08b41428b1a2e0236f409 HEAD_REF master PATCHES fix-re2-identifiers.patch diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json index de26ea3f3d2d1f..52b41caba721e8 100644 --- a/ports/libphonenumber/vcpkg.json +++ b/ports/libphonenumber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libphonenumber", - "version": "8.13.9", + "version": "8.13.13", "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.", "license": "Apache-2.0", "supports": "!linux & !osx", diff --git a/ports/libpopt/vcpkg.json b/ports/libpopt/vcpkg.json index 1329ae49a165ee..8eb546202cdf5f 100644 --- a/ports/libpopt/vcpkg.json +++ b/ports/libpopt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpopt", - "version-string": "1.16", - "port-version": 15, + "version": "1.16", + "port-version": 16, "description": "Library for parsing command line parameters", "dependencies": [ { diff --git a/ports/libpq/Makefile b/ports/libpq/Makefile index ee2ffcaf19572b..67994f4bac2853 100644 --- a/ports/libpq/Makefile +++ b/ports/libpq/Makefile @@ -2,14 +2,12 @@ subdir = . top_builddir = . include src/Makefile.global -.NOTPARALLEL: - ifeq ($(LIBPQ_LIBRARY_TYPE), static) LIBPQ_INSTALL_LIBS = install-stlib endif ifeq ($(LIBPQ_LIBRARY_TYPE), shared) -ifeq ($(USING_MINGW), yes) +ifeq ($(LIBPQ_USING_MINGW), yes) # The import library name is the same as the static library name EXTRA_TARGET = install-lib-static endif @@ -17,21 +15,40 @@ endif .PHONY: all all: - $(MAKE) -C src/include MAKELEVEL=0 - $(MAKE) -C src/common MAKELEVEL=0 - $(MAKE) -C src/port MAKELEVEL=0 - $(MAKE) -C src/interfaces/libpq MAKELEVEL=0 all-$(LIBPQ_LIBRARY_TYPE)-lib - $(MAKE) -C src/bin/pg_config MAKELEVEL=0 + $(MAKE) -C src/include + $(MAKE) -C src/common + $(MAKE) -C src/port + $(MAKE) -C src/interfaces/libpq all-$(LIBPQ_LIBRARY_TYPE)-lib + $(MAKE) -C src/interfaces/ecpg/include + $(MAKE) -C src/interfaces/ecpg/pgtypeslib + $(MAKE) -C src/interfaces/ecpg/ecpglib + $(MAKE) -C src/interfaces/ecpg/compatlib +ifeq ($(LIBPQ_ENABLE_TOOLS), yes) + $(MAKE) -C src/interfaces/ecpg/preproc + $(MAKE) -C src/fe_utils + $(MAKE) -C src/bin +else + $(MAKE) -C src/bin/pg_config +endif .PHONY: install-stlib install-stlib: - $(MAKE) -C src/common MAKELEVEL=0 install -o all + $(MAKE) -C src/common install -o all rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a' - $(MAKE) -C src/port MAKELEVEL=0 install -o all + $(MAKE) -C src/port install -o all rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a' .PHONY: install install: $(LIBPQ_INSTALL_LIBS) - $(MAKE) -C src/include MAKELEVEL=0 install - $(MAKE) -C src/interfaces/libpq MAKELEVEL=0 $(EXTRA_TARGET) install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib - $(MAKE) -C src/bin/pg_config MAKELEVEL=0 install + $(MAKE) -C src/include install + $(MAKE) -C src/interfaces/libpq $(EXTRA_TARGET) install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib + $(MAKE) -C src/interfaces/ecpg/include install + $(MAKE) -C src/interfaces/ecpg/pgtypeslib install + $(MAKE) -C src/interfaces/ecpg/ecpglib install + $(MAKE) -C src/interfaces/ecpg/compatlib install +ifeq ($(LIBPQ_ENABLE_TOOLS), yes) + $(MAKE) -C src/interfaces/ecpg/preproc install + $(MAKE) -C src/bin install +else + $(MAKE) -C src/bin/pg_config install +endif diff --git a/ports/libpq/build-msvc.cmake b/ports/libpq/build-msvc.cmake new file mode 100644 index 00000000000000..7857b11e3a9ed9 --- /dev/null +++ b/ports/libpq/build-msvc.cmake @@ -0,0 +1,80 @@ +function(build_msvc build_type source_path) + if(build_type STREQUAL "DEBUG") + set(vcpkg_configuration "Debug") + set(label "${TARGET_TRIPLET}-dbg") + set(packages_dir "${CURRENT_PACKAGES_DIR}/debug") + else() + set(vcpkg_configuration "Release") + set(label "${TARGET_TRIPLET}-rel") + set(packages_dir "${CURRENT_PACKAGES_DIR}") + endif() + + set(build_path "${CURRENT_BUILDTREES_DIR}/${label}") + file(REMOVE_RECURSE "${build_path}") + file(COPY "${source_path}/" DESTINATION "${build_path}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${build_path}/src/include/port/win32.h" "__declspec (dllimport)" "") + endif() + vcpkg_replace_string("${build_path}/src/tools/msvc/MSBuildProject.pm" "perl " "\"${PERL}\" ") + configure_file("${CURRENT_PORT_DIR}/libpq.props.in" "${build_path}/libpq.props" @ONLY) + configure_file("${CURRENT_PORT_DIR}/vcpkg-libs.props.in" "${build_path}/vcpkg-libs.props" @ONLY) + set(config "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n\n") + foreach(var IN ITEMS VCPKG_TARGET_ARCHITECTURE VCPKG_LIBRARY_LINKAGE VCPKG_CRT_LINKAGE) + string(APPEND config "\$config->{${var}} = \"${${var}}\";\n") + endforeach() + foreach(option IN ITEMS icu lz4 nls openssl python tcl xml xslt zlib zstd) + if(option IN_LIST FEATURES) + string(APPEND config "\$config->{${option}} = \"${CURRENT_INSTALLED_DIR}\";\n") + endif() + endforeach() + if("openssl" IN_LIST FEATURES) + file(STRINGS "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openssl.pc" OPENSSL_VERSION REGEX "Version:") + string(APPEND config "\$config->{openssl_version} = '${OPENSSL_VERSION}';\n") + endif() + string(APPEND config "\$config->{python_version} = '3.10';\n") + string(APPEND config "\$config->{tcl_version} = '90';\n") + file(WRITE "${build_path}/src/tools/msvc/config.pl" "${config}") + + set(build_in_parallel "-m") + set(build_targets libpq libecpg_compat) + set(install_target core) + if(HAS_TOOLS AND NOT build_type STREQUAL "DEBUG") + set(build_in_parallel "") # mitigate winflex races + set(build_targets client) + set(install_target client) + endif() + + string(REPLACE "x86" "Win32" platform "${VCPKG_TARGET_ARCHITECTURE}") + vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION) + set(ENV{MSBFLAGS} "\ + /p:Platform=${platform} \ + /p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET} \ + /p:VCPkgLocalAppDataDisabled=true \ + /p:UseIntelMKL=No \ + /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION} \ + /p:VcpkgConfiguration=${vcpkg_configuration} \ + ${build_in_parallel} \ + /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets;${build_path}/vcpkg-libs.props\" \ + /p:VcpkgTriplet=${TARGET_TRIPLET} \ + /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\" \ + /p:ForceImportAfterCppTargets=\"${build_path}/libpq.props\" \ + ") + + message(STATUS "Building ${label}") + foreach(target IN LISTS build_targets) + string(REPLACE "client" "" target "${target}") + vcpkg_execute_required_process( + COMMAND "${PERL}" build.pl ${build_type} ${target} + WORKING_DIRECTORY "${build_path}/src/tools/msvc" + LOGNAME "build-${target}-${label}" + ) + endforeach() + + message(STATUS "Installing ${label}") + vcpkg_execute_required_process( + COMMAND "${PERL}" install.pl "${packages_dir}" ${install_target} + WORKING_DIRECTORY "${build_path}/src/tools/msvc" + LOGNAME "install-${label}" + ) +endfunction() diff --git a/ports/libpq/config.pl b/ports/libpq/config.pl deleted file mode 100644 index 412eb09c4846a2..00000000000000 --- a/ports/libpq/config.pl +++ /dev/null @@ -1,29 +0,0 @@ -our $config = { - asserts => 0, # --enable-cassert - # float4byval=>1, # --disable-float4-byval, on by default - - # float8byval=> $platformbits == 64, # --disable-float8-byval, - # off by default on 32 bit platforms, on by default on 64 bit platforms - - # blocksize => 8, # --with-blocksize, 8kB by default - # wal_blocksize => 8, # --with-wal-blocksize, 8kB by default - ldap => 1, # --with-ldap - extraver => undef, # --with-extra-version= - gss => undef, # --with-gssapi= - icu => undef, # --with-icu= - lz4 => undef, # --with-lz4= - zstd => undef, # --with-zstd= - nls => undef, # --enable-nls= - tap_tests => undef, # --enable-tap-tests - tcl => undef, # --with-tcl= - perl => undef, # --with-perl= - python => undef, # --with-python= - openssl => undef, # --with-ssl=openssl with - uuid => undef, # --with-uuid= - xml => undef, # --with-libxml= - xslt => undef, # --with-libxslt= - iconv => undef, # (not in configure, path to iconv) - zlib => undef # --with-zlib= -}; - -1; diff --git a/ports/libpq/libpq.props.in b/ports/libpq/libpq.props.in index d172a4af4017f4..223e528fe9f96f 100644 --- a/ports/libpq/libpq.props.in +++ b/ports/libpq/libpq.props.in @@ -1,9 +1,9 @@ - + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_DEBUG@ - + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG@ @@ -12,9 +12,9 @@ - + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_RELEASE@ - + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE@ diff --git a/ports/libpq/patches/windows/MSBuildProject-static-crt.patch b/ports/libpq/patches/windows/MSBuildProject-static-crt.patch deleted file mode 100644 index 03bd832f8597b9..00000000000000 --- a/ports/libpq/patches/windows/MSBuildProject-static-crt.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..faa3e336f 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -84,16 +84,16 @@ EOF - defs => "_DEBUG;DEBUG=1", - opt => 'Disabled', - strpool => 'false', -- runtime => 'MultiThreadedDebugDLL' -+ runtime => 'MultiThreadedDebug' - }); - $self->WriteItemDefinitionGroup( - $f, - 'Release', - { - defs => "", - opt => 'Full', - strpool => 'true', -- runtime => 'MultiThreadedDLL' -+ runtime => 'MultiThreaded' - }); - return; - } diff --git a/ports/libpq/patches/windows/MSBuildProject-static-lib.patch b/ports/libpq/patches/windows/MSBuildProject-static-lib.patch deleted file mode 100644 index 70cd22d60baef7..00000000000000 --- a/ports/libpq/patches/windows/MSBuildProject-static-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..e1dc59aa7 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -265,7 +265,7 @@ sub WriteConfigurationPropertyGroup - my $cfgtype = - ($self->{type} eq "exe") - ? 'Application' -- : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); -+ : ($self->{type} eq "dll" ? 'StaticLibrary' : 'StaticLibrary'); - - print $f < diff --git a/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch b/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch deleted file mode 100644 index 10955c3f98d739..00000000000000 --- a/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..b93992f22 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -384,7 +384,7 @@ EOF - print $f < - Generate DEF file -- perl src\\tools\\msvc\\gendef.pl $cfgname\\$self->{name} $self->{platform} -+ perl "src\\tools\\msvc\\gendef.pl" $cfgname\\$self->{name} $self->{platform} - - EOF - } diff --git a/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch b/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch deleted file mode 100644 index 554d8527a4367c..00000000000000 --- a/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..4f51c12f2 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -199,7 +199,7 @@ sub mkvcbuild - 'syncrep_gram.y'); - $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', - 'jsonpath_gram.y'); -- $postgres->AddDefine('BUILDING_DLL'); -+ # $postgres->AddDefine('BUILDING_DLL'); - $postgres->AddLibrary('secur32.lib'); - $postgres->AddLibrary('ws2_32.lib'); - $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap}); diff --git a/ports/libpq/patches/windows/Solution.patch b/ports/libpq/patches/windows/Solution.patch deleted file mode 100644 index 3387349e0b7a6c..00000000000000 --- a/ports/libpq/patches/windows/Solution.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 51711c2bf..d33fdc3b0 100644 ---- a/src/tools/msvc/Solution.pm -+++ b/src/tools/msvc/Solution.pm -@@ -63,17 +63,21 @@ sub DeterminePlatform - my $self = shift; - - if ($^O eq "MSWin32") - { - # Examine CL help output to determine if we are in 32 or 64-bit mode. - my $output = `cl /help 2>&1`; - $? >> 8 == 0 or die "cl command not found"; -- $self->{platform} = -- ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; -+ if ($output =~ m/x64\s/) { $self->{platform} = 'x64'; -+ } elsif ($output =~ m/x86\s/) { $self->{platform} = 'Win32'; -+ } elsif ($output =~ m/ARM64\s/) { $self->{platform} = 'ARM64'; -+ } elsif ($output =~ m/ARM\s/) { $self->{platform} = 'ARM'; -+ } else { $self->{platform} = 'Unknown' -+ } - } - else - { - $self->{platform} = 'FAKE'; - } - print "Detected hardware platform: $self->{platform}\n"; - return; - } -@@ -757,14 +757,14 @@ EOF - || confess "Could not open pg_config_paths.h"; - print $o <{options}->{zlib}) - { - $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); -- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); -+ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); - } - if ($self->{options}->{openssl}) - { -@@ -989,8 +989,11 @@ sub AddProject - # On both Win32 and Win64 the same library - # names are used without a debugging context. - $dbgsuffix = 0; -- $libsslpath = '\lib\libssl.lib'; -- $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\debug\lib\libssl.lib'; # -+ $libcryptopath = '\debug\lib\libcrypto.lib'; # -+ $proj->AddLibrary('crypt32.lib'); -+ $proj->AddLibrary('ws2_32.lib'); -+ $proj->AddLibrary('secur32.lib'); - } - - $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -1024,7 +1024,7 @@ sub AddProject - if ($self->{options}->{nls}) - { - $proj->AddIncludeDir($self->{options}->{nls} . '\include'); -- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # - } - if ($self->{options}->{gss}) - { -@@ -1051,21 +1051,21 @@ sub AddProject - } - if ($self->{options}->{iconv}) - { - $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); -- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # - } - if ($self->{options}->{icu}) - { - $proj->AddIncludeDir($self->{options}->{icu} . '\include'); - if ($self->{platform} eq 'Win32') - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # - } - else - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # - } -@@ -1074,27 +1074,27 @@ sub AddProject - { - $proj->AddIncludeDir($self->{options}->{xml} . '\include'); - $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); -- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # - } - if ($self->{options}->{xslt}) - { - $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); -- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # - } - if ($self->{options}->{lz4}) - { - $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); -- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); -+ $proj->AddLibrary($self->{options}->{lz4} . '\debug\lib\lz4d.lib'); # - } - if ($self->{options}->{zstd}) - { - $proj->AddIncludeDir($self->{options}->{zstd} . '\include'); -- $proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib'); -+ $proj->AddLibrary($self->{options}->{zstd} . '\debug\lib\zstd.lib'); - } - if ($self->{options}->{uuid}) - { - $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); -- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # - } - return $proj; - } diff --git a/ports/libpq/patches/windows/Solution_RELEASE.patch b/ports/libpq/patches/windows/Solution_RELEASE.patch deleted file mode 100644 index d0bb480413c40e..00000000000000 --- a/ports/libpq/patches/windows/Solution_RELEASE.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 2820ace22..7fddbf0fb 100644 ---- a/src/tools/msvc/Solution.pm -+++ b/src/tools/msvc/Solution.pm -@@ -948,7 +948,7 @@ sub AddProject - if ($self->{options}->{zlib}) - { - $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); -- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); -+ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); - } - if ($self->{options}->{openssl}) - { -@@ -989,8 +989,11 @@ sub AddProject - # On both Win32 and Win64 the same library - # names are used without a debugging context. - $dbgsuffix = 0; -- $libsslpath = '\lib\libssl.lib'; -- $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\lib\libssl.lib'; # -+ $libcryptopath = '\lib\libcrypto.lib'; # -+ $proj->AddLibrary('crypt32.lib'); -+ $proj->AddLibrary('ws2_32.lib'); -+ $proj->AddLibrary('secur32.lib'); - } - - $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -1024,7 +1024,7 @@ sub AddProject - if ($self->{options}->{nls}) - { - $proj->AddIncludeDir($self->{options}->{nls} . '\include'); -- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # - } - if ($self->{options}->{gss}) - { -@@ -1051,21 +1051,21 @@ sub AddProject - } - if ($self->{options}->{iconv}) - { - $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); -- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # - } - if ($self->{options}->{icu}) - { - $proj->AddIncludeDir($self->{options}->{icu} . '\include'); - if ($self->{platform} eq 'Win32') - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # - } - else - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # - } -@@ -1074,27 +1074,27 @@ sub AddProject - { - $proj->AddIncludeDir($self->{options}->{xml} . '\include'); - $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); -- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # - } - if ($self->{options}->{xslt}) - { - $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); -- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # - } - if ($self->{options}->{lz4}) - { - $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); -- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); -+ $proj->AddLibrary($self->{options}->{lz4} . '\lib\lz4.lib'); # - } - if ($self->{options}->{zstd}) - { - $proj->AddIncludeDir($self->{options}->{zstd} . '\include'); -- $proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib'); -+ $proj->AddLibrary($self->{options}->{zstd} . '\lib\zstd.lib'); - } - if ($self->{options}->{uuid}) - { - $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); -- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # - } - return $proj; - } diff --git a/ports/libpq/patches/windows/arm.patch b/ports/libpq/patches/windows/arm.patch deleted file mode 100644 index c6329b14e5c2aa..00000000000000 --- a/ports/libpq/patches/windows/arm.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..4f51c12f2 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -110,8 +110,8 @@ sub mkvcbuild - - if ($vsVersion >= '9.00') - { -- push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); -- push(@pgportfiles, 'pg_crc32c_sse42.c'); -+ #push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); -+ #push(@pgportfiles, 'pg_crc32c_sse42.c'); - push(@pgportfiles, 'pg_crc32c_sb8.c'); - } - else -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..625f32bf8 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -307,7 +307,6 @@ sub WriteItemDefinitionGroup - : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); - my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); - -- my $targetmachine = -- $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64'; -- -+ my $targetmachine = $self->{platform} eq 'ARM64' ? 'MachineARM64' : 'MachineARM'; -+ - my $includes = join ';', @{ $self->{includes} }, ""; -@@ -347,7 +349,6 @@ sub WriteItemDefinitionGroup - .\\$cfgname\\$self->{name}\\$self->{name}.pdb - false - .\\$cfgname\\$self->{name}\\$self->{name}.map -- false - - - Console diff --git a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch deleted file mode 100644 index b5e3b6cdb33355..00000000000000 --- a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index b93992f..2397511 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -336,7 +336,7 @@ sub WriteItemDefinitionGroup - false - Level3 - true -- ProgramDatabase -+ OldStyle - Default - - -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index e0c9a88..98f9e67 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -352,9 +352,12 @@ sub CopySolutionOutput - || croak "Could not copy $pf.$ext\n"; - } - } -- lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") -- || croak "Could not copy $pf.pdb\n"; -- print "."; -+ if ($1 eq 'DynamicLibrary') -+ { -+ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") -+ || croak "Could not copy $pf.pdb\n"; -+ print "."; -+ } - } - print "\n"; - return; diff --git a/ports/libpq/patches/windows/install.patch b/ports/libpq/patches/windows/install.patch deleted file mode 100644 index 0d7a6d69a10491..00000000000000 --- a/ports/libpq/patches/windows/install.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index d109b2c90..75c7446e6 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -89,10 +89,10 @@ sub Install - my $majorver = DetermineMajorVersion(); - print "Installing version $majorver for $conf in $target\n"; - -- my @client_dirs = ('bin', 'lib', 'share', 'symbols'); -+ my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq'); - my @all_dirs = ( -- @client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib', -- 'share/extension', 'share/timezonesets', 'share/tsearch_data'); -+ @client_dirs, 'doc', 'doc/libpq', 'doc/libpq/contrib', 'doc/libpq/extension', 'share/libpq/contrib', -+ 'share/libpq/extension', 'share/libpq/timezonesets', 'share/libpq/tsearch_data'); - if ($insttype eq "client") - { - EnsureDirectories($target, @client_dirs); -@@ -117,7 +117,7 @@ sub Install - } - }, - @top_dir); -- CopySetOfFiles('config files', $sample_files, $target . '/share/'); -+ CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/'); - CopyFiles( - 'Import libraries', - $target . '/lib/', -@@ -131,35 +131,35 @@ sub Install - CopySetOfFiles( - 'timezone names', - [ glob('src\timezone\tznames\*.txt') ], -- $target . '/share/timezonesets/'); -+ $target . '/share/libpq/timezonesets/'); - CopyFiles( - 'timezone sets', -- $target . '/share/timezonesets/', -+ $target . '/share/libpq/timezonesets/', - 'src/timezone/tznames/', 'Default', 'Australia', 'India'); - CopySetOfFiles( - 'BKI files', - [ glob("src\\backend\\catalog\\postgres.*") ], -- $target . '/share/'); -+ $target . '/share/libpq/'); - CopySetOfFiles( - 'SQL files', - [ glob("src\\backend\\catalog\\*.sql") ], -- $target . '/share/'); -+ $target . '/share/libpq/'); - CopyFiles( -- 'Information schema data', $target . '/share/', -+ 'Information schema data', $target . '/share/libpq/', - 'src/backend/catalog/', 'sql_features.txt'); - CopyFiles( -- 'Error code data', $target . '/share/', -+ 'Error code data', $target . '/share/libpq/', - 'src/backend/utils/', 'errcodes.txt'); - GenerateTimezoneFiles($target, $conf); - GenerateTsearchFiles($target); - CopySetOfFiles( - 'Stopword files', - [ glob("src\\backend\\snowball\\stopwords\\*.stop") ], -- $target . '/share/tsearch_data/'); -+ $target . '/share/libpq/tsearch_data/'); - CopySetOfFiles( - 'Dictionaries sample files', - [ glob("src\\backend\\tsearch\\dicts\\*_sample*") ], -- $target . '/share/tsearch_data/'); -+ $target . '/share/libpq/tsearch_data/'); - - my $pl_extension_files = []; - my @pldirs = ('src/pl/plpgsql/src'); -@@ -178,7 +178,7 @@ sub Install - }, - @pldirs); - CopySetOfFiles('PL Extension files', -- $pl_extension_files, $target . '/share/extension/'); -+ $pl_extension_files, $target . '/share/libpq/extension/'); - } - - GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls}); -@@ -293,23 +293,26 @@ sub CopySolutionOutput - { - if ($1 == 1) - { -- push(@{ $install_list{'bin'} }, "exe"); -+ push(@{ $install_list{'tools\\libpq'} }, "exe"); - } - elsif ($1 == 2) - { -- push(@{ $install_list{'lib'} }, "dll"); -+ push(@{ $install_list{'bin'} }, "dll"); - if ($is_sharedlib) - { - push(@{ $install_list{'bin'} }, "dll"); - push(@{ $install_list{'lib'} }, "lib"); - } -+ else -+ { -+ push(@{ $install_list{'lib'} }, "lib"); -+ } - } - else - { -- -+ push(@{ $install_list{'lib'} }, "lib"); - # Static libraries, such as libpgport, only used internally - # during build, don't install. -- next; - } - } - elsif ($vcproj eq 'vcxproj' -@@ -320,11 +320,11 @@ sub CopySolutionOutput - { - if ($1 eq 'Application') - { -- push(@{ $install_list{'bin'} }, "exe"); -+ push(@{ $install_list{'tools\\libpq'} }, "exe"); - } - elsif ($1 eq 'DynamicLibrary') - { -- push(@{ $install_list{'lib'} }, "dll"); -+ push(@{ $install_list{'bin'} }, "dll"); - if ($is_sharedlib) - { - push(@{ $install_list{'bin'} }, "dll"); -@@ -333,10 +333,9 @@ sub CopySolutionOutput - } - else # 'StaticLibrary' - { -- -+ push(@{ $install_list{'lib'} }, "lib"); - # Static lib, such as libpgport, only used internally - # during build, don't install. -- next; - } - } - else -@@ -352,7 +352,7 @@ sub CopySolutionOutput - || croak "Could not copy $pf.$ext\n"; - } - } -- lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb") -+ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") - || croak "Could not copy $pf.pdb\n"; - print "."; - } -@@ -374,5 +374,5 @@ sub GenerateTimezoneFiles - print "Generating timezone files..."; - -- my @args = ("$conf/zic/zic", '-d', "$target/share/timezone"); -+ my @args = ("$conf/zic/zic", '-d', "$target/share/libpq/timezone"); - foreach (@tzfiles) - { -@@ -398,7 +398,7 @@ sub GenerateTsearchFiles - $mf =~ /^LANGUAGES\s*=\s*(.*)$/m - || die "Could not find LANGUAGES line in snowball Makefile\n"; - my @pieces = split /\s+/, $1; -- open($F, '>', "$target/share/snowball_create.sql") -+ open($F, '>', "$target/share/libpq/snowball_create.sql") - || die "Could not write snowball_create.sql"; - print $F read_file('src/backend/snowball/snowball_func.sql.in'); - -@@ -483,7 +483,7 @@ sub CopySubdirFiles - foreach my $f (split /\s+/, $flist) - { - lcopy("$subdir/$module/$f.control", -- "$target/share/extension/$f.control") -+ "$target/share/libpq/extension/$f.control") - || croak("Could not copy file $f.control in contrib $module"); - print '.'; - } -@@ -501,7 +501,7 @@ sub CopySubdirFiles - foreach my $f (split /\s+/, $flist) - { - lcopy("$subdir/$module/$f", -- "$target/share/$moduledir/" . basename($f)) -+ "$target/share/libpq/$moduledir/" . basename($f)) - || croak("Could not copy file $f in contrib $module"); - print '.'; - } -@@ -516,7 +516,7 @@ sub CopySubdirFiles - foreach my $f (split /\s+/, $flist) - { - lcopy("$subdir/$module/$f", -- "$target/share/tsearch_data/" . basename($f)) -+ "$target/share/libpq/tsearch_data/" . basename($f)) - || croak("Could not copy file $f in $subdir $module"); - print '.'; - } -@@ -579,7 +579,7 @@ sub CopySubdirFiles - if ($module eq 'spi'); - foreach my $f (split /\s+/, $flist) - { -- lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f") -+ lcopy("$subdir/$module/$f", "$target/doc/libpq/$moduledir/$f") - || croak("Could not copy file $f in contrib $module"); - print '.'; - } -@@ -708,7 +708,7 @@ sub GenerateNLSFiles - my $majorver = shift; - - print "Installing NLS files..."; -- EnsureDirectories($target, "share/locale"); -+ EnsureDirectories($target, "share/libpq/locale"); - my @flist; - File::Find::find( - { -@@ -730,12 +730,12 @@ sub GenerateNLSFiles - next unless /([^\/]+)\.po/; - $lang = $1; - -- EnsureDirectories($target, "share/locale/$lang", -- "share/locale/$lang/LC_MESSAGES"); -+ EnsureDirectories($target, "share/libpq/locale/$lang", -+ "share/libpq/locale/$lang/LC_MESSAGES"); - my @args = ( - "$nlspath\\bin\\msgfmt", - '-o', -- "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", -+ "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", - $_); - system(@args) && croak("Could not run msgfmt on $dir\\$_"); - print "."; diff --git a/ports/libpq/patches/windows/minimize_install.patch b/ports/libpq/patches/windows/minimize_install.patch deleted file mode 100644 index 1a57c275f757b0..00000000000000 --- a/ports/libpq/patches/windows/minimize_install.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index d109b2c90..75c7446e6 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -22,13 +22,13 @@ our (@ISA, @EXPORT_OK); - - my $insttype; - my @client_contribs = ('oid2name', 'pgbench', 'vacuumlo'); --my @client_program_files = ( -- 'clusterdb', 'createdb', 'createuser', 'dropdb', -- 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -- 'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', -- 'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', -- 'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', -- 'reindexdb', 'vacuumdb', @client_contribs); -+my @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' ); -+ #'clusterdb', 'createdb', 'createuser', 'dropdb', -+ #'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -+ #'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', -+ #'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', -+ #'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', -+ #'reindexdb', 'vacuumdb', @client_contribs); - - sub lcopy - { -@@ -121,7 +121,7 @@ sub Install - CopyFiles( - 'Import libraries', - $target . '/lib/', -- "$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib", -+ "$conf\\", "libpgcommon\\libpgcommon.lib", - "libpgport\\libpgport.lib"); - CopyContribFiles($config, $target); - CopyIncludeFiles($target); - diff --git a/ports/libpq/patches/windows/msgfmt.patch b/ports/libpq/patches/windows/msgfmt.patch deleted file mode 100644 index 98be285bcfb1c3..00000000000000 --- a/ports/libpq/patches/windows/msgfmt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index 66c0c3483..2154c6cf6 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -733,7 +733,7 @@ sub GenerateNLSFiles - EnsureDirectories($target, "share/libpq/locale/$lang", - "share/libpq/locale/$lang/LC_MESSAGES"); - my @args = ( -- "$nlspath\\bin\\msgfmt", -+ "msgfmt.exe", - '-o', - "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", - $_); diff --git a/ports/libpq/patches/windows/openssl-version.patch b/ports/libpq/patches/windows/openssl-version.patch deleted file mode 100644 index 77f464041c99ab..00000000000000 --- a/ports/libpq/patches/windows/openssl-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 72c5b98..0d153c0 100644 ---- a/src/tools/msvc/Solution.pm -+++ b/src/tools/msvc/Solution.pm -@@ -128,6 +128,9 @@ sub copyFile - sub GetOpenSSLVersion - { - my $self = shift; -+ if (($ENV{'VCPKG_OPENSSL_VERSION'} // '') =~ /(\d+)\.(\d+)\.(\d+)/m) { -+ return ($1, $2, $3); -+ } - - # Attempt to get OpenSSL version and location. This assumes that - # openssl.exe is in the specified directory. diff --git a/ports/libpq/patches/windows/python3_build_DEBUG.patch b/ports/libpq/patches/windows/python3_build_DEBUG.patch deleted file mode 100644 index 532a066f9b719f..00000000000000 --- a/ports/libpq/patches/windows/python3_build_DEBUG.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..21b5559d6 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -494,14 +494,15 @@ sub mkvcbuild - - # Attempt to get python version and location. - # Assume python.exe in specified dir. -- my $pythonprog = "import sys;print(sys.prefix);" -- . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -- my $prefixcmd = -- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -- my $pyout = `$prefixcmd`; -- die "Could not query for python version!\n" if $?; -- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -- -+ #my $pythonprog = "import sys;print(sys.prefix);" -+ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -+ #my $prefixcmd = -+ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -+ #my $pyout = `$prefixcmd`; -+ #die "Could not query for python version!\n" if $?; -+ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -+ my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 310; - # Sometimes (always?) if python is not present, the execution - # appears to work, but gives no data... - die "Failed to query python for version information\n" -@@ -510,11 +511,12 @@ sub mkvcbuild - die - "Python version $pyver is too old (version 3 or later is required)" - if int($pymajorver) < 3; - - my $plpython = $solution->AddProject('plpython' . $pymajorver, - 'dll', 'PLs', 'src/pl/plpython'); -- $plpython->AddIncludeDir($pyprefix . '/include'); -- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); -+ $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! -+ $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); - $plpython->AddReference($postgres); - - # Add transform modules dependent on plpython - \ No newline at end of file diff --git a/ports/libpq/patches/windows/python3_build_RELEASE.patch b/ports/libpq/patches/windows/python3_build_RELEASE.patch deleted file mode 100644 index 5a11378942f8ec..00000000000000 --- a/ports/libpq/patches/windows/python3_build_RELEASE.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..21b5559d6 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -494,14 +494,15 @@ sub mkvcbuild - - # Attempt to get python version and location. - # Assume python.exe in specified dir. -- my $pythonprog = "import sys;print(sys.prefix);" -- . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -- my $prefixcmd = -- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -- my $pyout = `$prefixcmd`; -- die "Could not query for python version!\n" if $?; -- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -- -+ #my $pythonprog = "import sys;print(sys.prefix);" -+ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -+ #my $prefixcmd = -+ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -+ #my $pyout = `$prefixcmd`; -+ #die "Could not query for python version!\n" if $?; -+ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -+ my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 310; - # Sometimes (always?) if python is not present, the execution - # appears to work, but gives no data... - die "Failed to query python for version information\n" -@@ -510,11 +511,11 @@ sub mkvcbuild - die - "Python version $pyver is too old (version 3 or later is required)" - if int($pymajorver) < 3; - - my $plpython = $solution->AddProject('plpython' . $pymajorver, - 'dll', 'PLs', 'src/pl/plpython'); -- $plpython->AddIncludeDir($pyprefix . '/include'); -- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); -+ $plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib"); - $plpython->AddReference($postgres); - - # Add transform modules dependent on plpython diff --git a/ports/libpq/patches/windows/tcl_version.patch b/ports/libpq/patches/windows/tcl_version.patch deleted file mode 100644 index 5518949a3a092a..00000000000000 --- a/ports/libpq/patches/windows/tcl_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index e2fbe95..8c4f279 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -226,7 +226,7 @@ sub mkvcbuild - $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); - $pltcl->AddReference($postgres); - -- for my $tclver (qw(86t 86 85 84)) -+ for my $tclver (qw(90 90g 90s 90sg)) - { - my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib"; - if (-e $tcllib) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 4b704a915ae989..b03f3a996dab04 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,365 +1,154 @@ -set(PORT_VERSION ${VERSION}) -# NOTE: the python patches must be regenerated on version update - -## Download and extract sources vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2" - FILENAME "postgresql-${PORT_VERSION}.tar.bz2" - SHA512 115a8a4234791bba4e6dcc4617e9dd77abedcf767894ce9472c59cce9d5d4ef2d4e1746f3a0c7a99de4fc4385fb716652b70dce9f48be45a9db5a682517db7e8 + URLS "https://ftp.postgresql.org/pub/source/v${VERSION}/postgresql-${VERSION}.tar.bz2" + FILENAME "postgresql-${VERSION}.tar.bz2" + SHA512 cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6 ) -set(PATCHES - patches/windows/install.patch - patches/windows/win_bison_flex.patch - patches/windows/openssl-version.patch - patches/windows/Solution.patch - patches/windows/MSBuildProject_fix_gendef_perl.patch - patches/windows/msgfmt.patch - patches/windows/python_lib.patch - patches/windows/fix-compile-flag-Zi.patch - patches/windows/tcl_version.patch - patches/windows/macro-def.patch - patches/fix-configure.patch - ) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch) - list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch) -endif() -if(VCPKG_CRT_LINKAGE STREQUAL "static") - list(APPEND PATCHES patches/windows/MSBuildProject-static-crt.patch) -endif() -if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") - list(APPEND PATCHES patches/windows/arm.patch) -endif() -if(NOT "${FEATURES}" MATCHES "client") - list(APPEND PATCHES patches/windows/minimize_install.patch) -else() - set(HAS_TOOLS TRUE) -endif() vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES ${PATCHES} + PATCHES + unix/fix-configure.patch + unix/single-linkage.patch + unix/no-server-tools.patch + unix/mingw-install.patch + unix/python.patch + windows/macro-def.patch + windows/python_lib.patch + windows/win_bison_flex.patch + windows/msbuild.patch + windows/spin_delay.patch ) -unset(buildenv_contents) -# Get paths to required programs -set(REQUIRED_PROGRAMS PERL) + +if("client" IN_LIST FEATURES) + set(HAS_TOOLS TRUE) +else() + set(HAS_TOOLS FALSE) +endif() + +set(required_programs PERL) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND REQUIRED_PROGRAMS BISON FLEX) + list(APPEND required_programs BISON FLEX) endif() -foreach(program_name ${REQUIRED_PROGRAMS}) +foreach(program_name IN LISTS required_programs) # Need to rename win_bison and win_flex to just bison and flex vcpkg_find_acquire_program(${program_name}) - get_filename_component(${program_name}_EXE_PATH ${${program_name}} DIRECTORY) - vcpkg_add_to_path(PREPEND "${${program_name}_EXE_PATH}") - set(buildenv_contents "${buildenv_contents}\n\$ENV{'PATH'}=\$ENV{'PATH'} . ';${${program_name}_EXE_PATH}';") + get_filename_component(program_dir ${${program_name}} DIRECTORY) + vcpkg_add_to_path(PREPEND "${program_dir}") endforeach() -## Setup build types -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Rr][Ee][Ll][Ee][Aa][Ss][Ee]") - set(_buildtype RELEASE) - set(_short rel) - list(APPEND port_config_list ${_buildtype}) - set(INSTALL_PATH_SUFFIX_${_buildtype} "") - set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") - file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds - set(PACKAGE_DIR_${_buildtype} ${CURRENT_PACKAGES_DIR}) - unset(_short) - unset(_buildtype) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]") - set(_buildtype DEBUG) - set(_short dbg) - list(APPEND port_config_list ${_buildtype}) - set(INSTALL_PATH_SUFFIX_${_buildtype} "/debug") - set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") - file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds - set(PACKAGE_DIR_${_buildtype} "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}") - unset(_short) - unset(_buildtype) -endif() - -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -## Do the build -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_cmake_get_vars(vars_file) - include("${vars_file}") +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") - if("openssl" IN_LIST FEATURES) - file(STRINGS "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openssl.pc" OPENSSL_VERSION REGEX "Version:") - if(OPENSSL_VERSION) - set(ENV{VCPKG_OPENSSL_VERSION} "${OPENSSL_VERSION}") - endif() +if(VCPKG_DETECTED_MSVC) + if("nls" IN_LIST FEATURES) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") endif() - - file(GLOB SOURCE_FILES ${SOURCE_PATH}/*) - foreach(_buildtype ${port_config_list}) - # Copy libpq sources. - message(STATUS "Copying libpq source files to ${BUILDPATH_${_buildtype}}...") - foreach(SOURCE_FILE ${SOURCE_FILES}) - file(COPY ${SOURCE_FILE} DESTINATION "${BUILDPATH_${_buildtype}}") - endforeach() - message(STATUS "Copying libpq source files... done") - - vcpkg_apply_patches( - SOURCE_PATH "${BUILDPATH_${_buildtype}}" - PATCHES patches/windows/Solution_${_buildtype}.patch - patches/windows/python3_build_${_buildtype}.patch + if("xml" IN_LIST FEATURES) + x_vcpkg_pkgconfig_get_modules( + PREFIX PC_LIBXML2 + MODULES --msvc-syntax libxml-2.0 + LIBS ) - message(STATUS "Patches applied!") - file(COPY "${CURRENT_PORT_DIR}/config.pl" DESTINATION "${BUILDPATH_${_buildtype}}/src/tools/msvc") - - set(MSPROJ_PERL "${BUILDPATH_${_buildtype}}/src/tools/msvc/MSBuildProject.pm") - file(READ "${MSPROJ_PERL}" _contents) - string(REPLACE "perl" "\"${PERL}\"" _contents "${_contents}") - file(WRITE "${MSPROJ_PERL}" "${_contents}") - - set(CONFIG_FILE "${BUILDPATH_${_buildtype}}/src/tools/msvc/config.pl") - file(READ "${CONFIG_FILE}" _contents) - - ## ldap => undef, # --with-ldap - ## extraver => undef, # --with-extra-version= - ## gss => undef, # --with-gssapi= - ## icu => undef, # --with-icu= ##done - ## nls => undef, # --enable-nls= ##done - ## tap_tests => undef, # --enable-tap-tests - ## tcl => undef, # --with-tcl= #done - ## perl => undef, # --with-perl - ## python => undef, # --with-python= ##done - ## openssl => undef, # --with-openssl= ##done - ## uuid => undef, # --with-ossp-uuid - ## xml => undef, # --with-libxml= ##done - ## xslt => undef, # --with-libxslt= ##done - ## iconv => undef, # (not in configure, path to iconv) ##done (needed by xml) - ## zlib => undef # --with-zlib= ##done - - ## Setup external dependencies - ##"-DFEATURES=core;openssl;zlib" "-DALL_FEATURES=openssl;zlib;readline;libedit;python;tcl;nls;systemd;llvm;icu;bonjour;uuid;xml;xslt;" - if("${FEATURES}" MATCHES "icu") - string(REPLACE "icu => undef" "icu => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "nls") - string(REPLACE "nls => undef" "nls => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext) - vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") - endif() - if("${FEATURES}" MATCHES "openssl") - string(REPLACE "openssl => undef" "openssl => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "python") - #vcpkg_find_acquire_program(PYTHON3) - #get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) - #vcpkg_add_to_path("${PYTHON3_EXE_PATH}") - string(REPLACE "python => undef" "python => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "tcl") - string(REPLACE "tcl => undef" "tcl => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "xml") - string(REPLACE "xml => undef" "xml => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - string(REPLACE "iconv => undef" "iconv => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "xslt") - string(REPLACE "xslt => undef" "xslt => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "zlib") - string(REPLACE "zlib => undef" "zlib => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "lz4") - string(REPLACE "lz4 => undef" "lz4 => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "zstd") - string(REPLACE "zstd => undef" "zstd => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - - file(WRITE "${CONFIG_FILE}" "${_contents}") - file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}") - configure_file("${CURRENT_PORT_DIR}/libpq.props.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props" @ONLY) - vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION) - set(ENV{MSBFLAGS} "/p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET} - /p:VCPkgLocalAppDataDisabled=true - /p:UseIntelMKL=No - /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION} - /m - /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets\" - /p:ForceImportAfterCppTargets=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props\" - /p:VcpkgTriplet=${TARGET_TRIPLET} - /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\"" - ) - if(HAS_TOOLS) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(ENV{MSBFLAGS} "$ENV{MSBFLAGS} /p:Platform=Win32") - endif() - message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}...") - vcpkg_execute_required_process( - COMMAND ${PERL} build.pl ${_buildtype} - WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" - LOGNAME "build-${TARGET_TRIPLET}-${_buildtype}" - ) - message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}... done") - else() - set(build_libs libpq libecpg_compat) - foreach(build_lib ${build_libs}) - message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}...") - vcpkg_execute_required_process( - COMMAND ${PERL} build.pl ${_buildtype} ${build_lib} - WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" - LOGNAME "build-${build_lib}-${TARGET_TRIPLET}-${_buildtype}" - ) - message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}... done") - endforeach() - endif() - - message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}...") - vcpkg_execute_required_process( - COMMAND ${PERL} install.pl "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}" client - WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" - LOGNAME "install-${TARGET_TRIPLET}-${_buildtype}" + separate_arguments(LIBXML2_LIBS_DEBUG NATIVE_COMMAND "${PC_LIBXML2_LIBS_DEBUG}") + separate_arguments(LIBXML2_LIBS_RELEASE NATIVE_COMMAND "${PC_LIBXML2_LIBS_RELEASE}") + endif() + if("xslt" IN_LIST FEATURES) + x_vcpkg_pkgconfig_get_modules( + PREFIX PC_LIBXSLT + MODULES --msvc-syntax libxslt + LIBS ) - message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done") - endforeach() + separate_arguments(LIBXSLT_LIBS_DEBUG NATIVE_COMMAND "${PC_LIBXSLT_LIBS_DEBUG}") + separate_arguments(LIBXSLT_LIBS_RELEASE NATIVE_COMMAND "${PC_LIBXSLT_LIBS_RELEASE}") + endif() - message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...") - #Cleanup - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/symbols") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/symbols") + include("${CMAKE_CURRENT_LIST_DIR}/build-msvc.cmake") + if(NOT VCPKG_BUILD_TYPE) + build_msvc(DEBUG "${SOURCE_PATH}") + endif() + build_msvc(RELEASE "${SOURCE_PATH}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - if(NOT HAS_TOOLS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") - else() + if(HAS_TOOLS) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") endif() - - message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done") - set(USE_DL OFF) else() file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}") - + + vcpkg_list(SET BUILD_OPTS) + foreach(option IN ITEMS icu lz4 nls openssl python readline xml xslt zlib zstd) + if(option IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-${option}) + else() + list(APPEND BUILD_OPTS --without-${option}) + endif() + endforeach() if("nls" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --enable-nls) set(ENV{MSGFMT} "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}") - else() - list(APPEND BUILD_OPTS --disable-nls) - endif() - if("openssl" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-openssl) - else() - list(APPEND BUILD_OPTS --without-openssl) - endif() - if("zlib" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-zlib) - else() - list(APPEND BUILD_OPTS --without-zlib) - endif() - if("zstd" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-zstd) - else() - list(APPEND BUILD_OPTS --without-zstd) - endif() - if("icu" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-icu) - else() - list(APPEND BUILD_OPTS --without-icu) - endif() - if("lz4" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-lz4) - else() - list(APPEND BUILD_OPTS --without-lz4) - endif() - if("readline" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-readline) - else() - list(APPEND BUILD_OPTS --without-readline) - endif() - if("xml" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-libxml) - else() - list(APPEND BUILD_OPTS --without-libxml) - endif() - if("xslt" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-libxslt) - else() - list(APPEND BUILD_OPTS --without-libxslt) + if(VCPKG_TARGET_IS_ANDROID) + list(APPEND BUILD_OPTS [[LIBS=$LIBS -liconv]]) + endif() endif() if("python" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-python) - else() - list(APPEND BUILD_OPTS --without-python) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND BUILD_OPTS "PYTHON=${PYTHON3}") endif() if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) endif() - vcpkg_cmake_get_vars(cmake_vars_file) - include("${cmake_vars_file}") if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT) list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") endif() vcpkg_configure_make( - AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE - DETERMINE_BUILD_TRIPLET + AUTOCONFIG + ADDITIONAL_MSYS_PACKAGES autoconf-archive + DIRECT_PACKAGES + "https://mirror.msys2.org/msys/x86_64/tzcode-2023c-1-x86_64.pkg.tar.zst" + 7550b843964744607f736a7138f10c6cd92489406a1b84ac71d9a9d8aa16bc69048aa1b24e1f49291b010347047008194c334ca9c632e17fa8245e85549e3c7a OPTIONS ${BUILD_OPTS} - OPTIONS_RELEASE - "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/lib:${CURRENT_INSTALLED_DIR}/debug/lib" OPTIONS_DEBUG --enable-debug - "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/debug/lib:${CURRENT_INSTALLED_DIR}/lib" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(ENV{LIBPQ_LIBRARY_TYPE} shared) + set(ENV{LIBPQ_LIBRARY_TYPE} shared) else() - set(ENV{LIBPQ_LIBRARY_TYPE} static) + set(ENV{LIBPQ_LIBRARY_TYPE} static) endif() if(VCPKG_TARGET_IS_MINGW) - set(ENV{USING_MINGW} yes) + set(ENV{LIBPQ_USING_MINGW} yes) endif() - vcpkg_install_make() - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - if(NOT HAS_TOOLS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - else() - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") - endif() - if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/bin/libpq.dll") - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll") - endif() - endif() - if(VCPKG_TARGET_IS_MINGW) - set(USE_DL OFF) - else() - set(USE_DL ON) + if(HAS_TOOLS) + set(ENV{LIBPQ_ENABLE_TOOLS} yes) endif() + vcpkg_install_make() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/postgresql/server/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") endif() +vcpkg_fixup_pkgconfig() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/symbols" + "${CURRENT_PACKAGES_DIR}/debug/tools" + "${CURRENT_PACKAGES_DIR}/symbols" + "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug" +) + file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT") diff --git a/ports/libpq/patches/fix-configure.patch b/ports/libpq/unix/fix-configure.patch similarity index 84% rename from ports/libpq/patches/fix-configure.patch rename to ports/libpq/unix/fix-configure.patch index 6fd28899cde58c..c0a7f78906ca89 100644 --- a/ports/libpq/patches/fix-configure.patch +++ b/ports/libpq/unix/fix-configure.patch @@ -1,17 +1,18 @@ diff --git a/configure.ac b/configure.ac -index fba79ee..4fadb94 100644 +index 9a73f50..a35395e 100644 --- a/configure.ac +++ b/configure.ac -@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros +@@ -19,7 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [15.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [15.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. ++cross_compiling=yes # Avoid conftest loading shared objects +m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_warn([unsupported],[Autoconf version 2.69 is required. Untested combinations of 'autoconf' and PostgreSQL versions are not recommended. You can remove the check from 'configure.ac' but it is then your responsibility whether the result works or not.])]) -@@ -1184,7 +1184,8 @@ if test "$enable_thread_safety" = yes; then +@@ -1274,7 +1275,8 @@ if test "$enable_thread_safety" = yes; then fi if test "$with_readline" = yes; then @@ -21,7 +22,7 @@ index fba79ee..4fadb94 100644 if test x"$pgac_cv_check_readline" = x"no"; then AC_MSG_ERROR([readline library not found If you have readline already installed, see config.log for details on the -@@ -1194,7 +1195,7 @@ Use --without-readline to disable readline support.]) +@@ -1284,7 +1286,7 @@ Use --without-readline to disable readline support.]) fi if test "$with_zlib" = yes; then @@ -30,7 +31,7 @@ index fba79ee..4fadb94 100644 [AC_MSG_ERROR([zlib library not found If you have zlib already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. -@@ -1243,6 +1244,9 @@ if test "$with_ssl" = openssl ; then +@@ -1333,6 +1335,9 @@ if test "$with_ssl" = openssl ; then # Minimum required OpenSSL version is 1.0.1 AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L], [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) @@ -40,7 +41,7 @@ index fba79ee..4fadb94 100644 if test "$PORTNAME" != "win32"; then AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) -@@ -1250,6 +1254,7 @@ if test "$with_ssl" = openssl ; then +@@ -1340,6 +1345,7 @@ if test "$with_ssl" = openssl ; then AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) fi @@ -48,7 +49,7 @@ index fba79ee..4fadb94 100644 # Function introduced in OpenSSL 1.0.2. AC_CHECK_FUNCS([X509_get_signature_nid]) # Functions introduced in OpenSSL 1.1.0. We used to check for -@@ -1365,15 +1365,18 @@ if test "$with_pam" = yes ; then +@@ -1363,19 +1369,23 @@ if test "$with_pam" = yes ; then fi if test "$with_libxml" = yes ; then @@ -71,8 +72,8 @@ index fba79ee..4fadb94 100644 if test "$with_zstd" = yes ; then - AC_CHECK_LIB(zstd, ZSTD_compress, [], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])]) -+ PKG_CHECK_MODULES([zstd], [zstd], [AC_DEFINE(HAVE_LIBZSTD,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])]) -+ LIBS="$LZ4_LIBS $LIBS" ++ PKG_CHECK_MODULES([ZSTD], [libzstd], [AC_DEFINE(HAVE_LIBZSTD,1,[Define to 1 if with zstd])], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])]) ++ LIBS="$ZSTD_LIBS $LIBS" fi # Note: We can test for libldap_r only after we know PTHREAD_LIBS; diff --git a/ports/libpq/unix/mingw-install.patch b/ports/libpq/unix/mingw-install.patch new file mode 100644 index 00000000000000..ffeea023cfc559 --- /dev/null +++ b/ports/libpq/unix/mingw-install.patch @@ -0,0 +1,36 @@ +diff --git a/src/Makefile.shlib b/src/Makefile.shlib +index 16255d7..51e9ed2 100644 +--- a/src/Makefile.shlib ++++ b/src/Makefile.shlib +@@ -85,7 +85,11 @@ else + # Naming convention for dynamically loadable modules + shlib = $(NAME)$(DLSUFFIX) + endif ++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared) ++stlib = lib$(NAME).dll.a ++else + stlib = lib$(NAME).a ++endif + + ifndef soname + # additional flags for backend modules +@@ -468,6 +472,9 @@ endif + else # no soname + $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)' + endif ++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared) ++ mv '$(DESTDIR)$(libdir)/$(shlib)' '$(DESTDIR)$(libdir)/../bin/$(shlib)' ++endif + + + installdirs-lib: +@@ -476,6 +483,9 @@ ifdef soname + else + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' + endif ++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared) ++ $(MKDIR_P) '$(DESTDIR)$(libdir)/../bin' ++endif + + + ## diff --git a/ports/libpq/unix/no-server-tools.patch b/ports/libpq/unix/no-server-tools.patch new file mode 100644 index 00000000000000..f83682afb05cd4 --- /dev/null +++ b/ports/libpq/unix/no-server-tools.patch @@ -0,0 +1,37 @@ +diff --git a/src/bin/Makefile b/src/bin/Makefile +index 7f9dde9..bc6d835 100644 +--- a/src/bin/Makefile ++++ b/src/bin/Makefile +@@ -13,29 +13,20 @@ subdir = src/bin + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + ++.NOTPARALLEL: ++# incl. https://www.postgresql.org/docs/current/reference-client.html ++# excl. https://www.postgresql.org/docs/current/reference-server.html + SUBDIRS = \ +- initdb \ + pg_amcheck \ +- pg_archivecleanup \ + pg_basebackup \ +- pg_checksums \ + pg_config \ +- pg_controldata \ +- pg_ctl \ + pg_dump \ +- pg_resetwal \ +- pg_rewind \ +- pg_test_fsync \ +- pg_test_timing \ +- pg_upgrade \ + pg_verifybackup \ +- pg_waldump \ + pgbench \ + psql \ + scripts + + ifeq ($(PORTNAME), win32) +-SUBDIRS += pgevent + else + ALWAYS_SUBDIRS += pgevent + endif diff --git a/ports/libpq/unix/python.patch b/ports/libpq/unix/python.patch new file mode 100644 index 00000000000000..6466746ed433b6 --- /dev/null +++ b/ports/libpq/unix/python.patch @@ -0,0 +1,25 @@ +diff --git a/configure.ac b/configure.ac +index a35395e..3c1b3e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1176,7 +1176,19 @@ fi + + if test "$with_python" = yes; then + PGAC_PATH_PYTHON +- PGAC_CHECK_PYTHON_EMBED_SETUP ++ python_majorversion=3 ++ python_version=3.10 ++ PKG_CHECK_MODULES(PYTHON_EMBED, python-${python_version}-embed) ++ python_includespec="${PYTHON_EMBED_CFLAGS}" ++ python_libdir=[$(echo " ${PYTHON_EMBED_LIBS}" | sed -e 's/\( -L[^ ]*\).*/\1/' -e 's/^.* -L//')] ++ python_libspec="${PYTHON_EMBED_LIBS}" ++ python_additional_libs="" ++ AC_SUBST(python_majorversion) ++ AC_SUBST(python_version) ++ AC_SUBST(python_includespec) ++ AC_SUBST(python_libdir) ++ AC_SUBST(python_libspec) ++ AC_SUBST(python_additional_libs) + fi + + if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then diff --git a/ports/libpq/unix/single-linkage.patch b/ports/libpq/unix/single-linkage.patch new file mode 100644 index 00000000000000..dd149c7d3a5bf8 --- /dev/null +++ b/ports/libpq/unix/single-linkage.patch @@ -0,0 +1,56 @@ +diff --git a/src/Makefile.shlib b/src/Makefile.shlib +index 551023c..16255d7 100644 +--- a/src/Makefile.shlib ++++ b/src/Makefile.shlib +@@ -260,10 +260,14 @@ endif + + .PHONY: all-lib all-static-lib all-shared-lib + ++ifndef LIBPQ_LIBRARY_TYPE + all-lib: all-shared-lib + ifdef soname + # no static library when building a dynamically loadable module + all-lib: all-static-lib ++endif ++else ++all-lib: all-$(LIBPQ_LIBRARY_TYPE)-lib + all-lib: lib$(NAME).pc + endif + +@@ -417,9 +421,13 @@ endif # PORTNAME == cygwin || PORTNAME == win32 + ## + + .PHONY: install-lib install-lib-static install-lib-shared installdirs-lib ++ifndef LIBPQ_LIBRARY_TYPE + install-lib: install-lib-shared + ifdef soname + install-lib: install-lib-static ++endif ++else ++install-lib: install-lib-$(LIBPQ_LIBRARY_TYPE) + install-lib: install-lib-pc + endif + +diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile +index 8abdb09..185461e 100644 +--- a/src/interfaces/libpq/Makefile ++++ b/src/interfaces/libpq/Makefile +@@ -115,6 +115,7 @@ backend_src = $(top_srcdir)/src/backend + # Also skip the test on platforms where libpq infrastructure may be provided + # by statically-linked libraries, as we can't expect them to honor this + # coding rule. ++ifeq ($(LIBPQ_LIBRARY_TYPE), shared) + libpq-refs-stamp: $(shlib) + ifneq ($(enable_coverage), yes) + ifeq (,$(filter aix solaris,$(PORTNAME))) +@@ -124,6 +125,10 @@ ifeq (,$(filter aix solaris,$(PORTNAME))) + endif + endif + touch $@ ++else ++.PHONY: libpq-refs-stamp ++libpq-refs-stamp: ++endif + + # Make dependencies on pg_config_paths.h visible in all builds. + fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake index 311f3bb9d53c8f..6f1432570cdd23 100644 --- a/ports/libpq/vcpkg-cmake-wrapper.cmake +++ b/ports/libpq/vcpkg-cmake-wrapper.cmake @@ -6,7 +6,7 @@ PATHS NO_DEFAULT_PATH ) _find_package(${ARGS}) -if(PostgreSQL_FOUND AND @USE_DL@) +if(PostgreSQL_FOUND AND NOT "@VCPKG_TARGET_IS_WINDOWS@") find_library(PostgreSQL_DL_LIBRARY NAMES dl) if(PostgreSQL_DL_LIBRARY) list(APPEND PostgreSQL_LIBRARIES "dl") diff --git a/ports/libpq/vcpkg-libs.props.in b/ports/libpq/vcpkg-libs.props.in new file mode 100644 index 00000000000000..4c777561c7ff4a --- /dev/null +++ b/ports/libpq/vcpkg-libs.props.in @@ -0,0 +1,31 @@ + + + + @CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib;@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib;@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib; + @CURRENT_INSTALLED_DIR@/debug/lib/lz4d.lib + @CURRENT_INSTALLED_DIR@/debug/lib/intl.lib;@CURRENT_INSTALLED_DIR@/debug/lib/iconv.lib;@CURRENT_INSTALLED_DIR@/debug/lib/charset.lib + @CURRENT_INSTALLED_DIR@/debug/lib/libssl.lib;@CURRENT_INSTALLED_DIR@/debug/lib/libcrypto.lib;crypt32.lib;ws2_32.lib;secur32.lib + @CURRENT_INSTALLED_DIR@/debug/lib/python310_d.lib + @CURRENT_INSTALLED_DIR@/debug/lib/tcl90g.lib + @CURRENT_INSTALLED_DIR@/debug/lib/tcl90sg.lib + @CURRENT_INSTALLED_DIR@/debug/lib/tcl90sgx.lib + @LIBXML2_LIBS_DEBUG@ + @LIBXSLT_LIBS_DEBUG@ + @CURRENT_INSTALLED_DIR@/debug/lib/zlibd.lib + @CURRENT_INSTALLED_DIR@/debug/lib/zstd.lib + + + @CURRENT_INSTALLED_DIR@/lib/icuin.lib;@CURRENT_INSTALLED_DIR@/lib/icuuc.lib;@CURRENT_INSTALLED_DIR@/lib/icudt.lib; + @CURRENT_INSTALLED_DIR@/lib/lz4.lib + @CURRENT_INSTALLED_DIR@/lib/intl.lib;@CURRENT_INSTALLED_DIR@/lib/iconv.lib;@CURRENT_INSTALLED_DIR@/lib/charset.lib + @CURRENT_INSTALLED_DIR@/lib/libssl.lib;@CURRENT_INSTALLED_DIR@/lib/libcrypto.lib;crypt32.lib;ws2_32.lib;secur32.lib + @CURRENT_INSTALLED_DIR@/lib/python310.lib + @CURRENT_INSTALLED_DIR@/lib/tcl90.lib + @CURRENT_INSTALLED_DIR@/lib/tcl90s.lib + @CURRENT_INSTALLED_DIR@/lib/tcl90sx.lib + @LIBXML2_LIBS_RELEASE@ + @LIBXSLT_LIBS_RELEASE@ + @CURRENT_INSTALLED_DIR@/lib/zlib.lib + @CURRENT_INSTALLED_DIR@/lib/zstd.lib + + diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 2bc8a59207f17d..106e4694a9e65b 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpq", - "version": "15.2", - "port-version": 2, + "version": "15.3", "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", @@ -18,6 +17,11 @@ { "name": "vcpkg-cmake-get-vars", "host": true + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true, + "platform": "windows & !mingw" } ], "default-features": [ @@ -26,28 +30,78 @@ "zlib" ], "features": { + "all": { + "description": "Build all supported features", + "dependencies": [ + { + "name": "libpq", + "features": [ + "client", + "icu", + "xml", + "xslt", + "zstd" + ] + }, + { + "name": "libpq", + "features": [ + "bonjour" + ], + "platform": "osx" + }, + { + "name": "libpq", + "features": [ + "nls" + ], + "platform": "!osx" + }, + { + "name": "libpq", + "features": [ + "readline" + ], + "platform": "!windows" + }, + { + "name": "libpq", + "features": [ + "python" + ], + "platform": "!android & !mingw" + }, + { + "name": "libpq", + "features": [ + "tcl" + ], + "platform": "windows & !mingw & !arm" + } + ] + }, "bonjour": { - "description": "Build with Bonjour support (--with-bonjour)", + "description": "Build with Bonjour support", "supports": "osx" }, "client": { - "description": "Build all client tools and libraries (dynamic only?)", - "supports": "!(windows & !mingw & static)" + "description": "Build all client tools and libraries" }, "icu": { - "description": "Build with support for the ICU library (--with-icu)", + "description": "Build with support for the ICU library", "dependencies": [ "icu" ] }, "lz4": { - "description": "Use lz4 (else --without-lz4)", + "description": "Use lz4", "dependencies": [ "lz4" ] }, "nls": { - "description": "Native Language Support (--enable-nls[=LANGUAGES])", + "description": "Native Language Support", + "supports": "!osx", "dependencies": [ "gettext", { @@ -55,19 +109,20 @@ "host": true, "features": [ "tools" - ] + ], + "platform": "!windows, mingw" } ] }, "openssl": { - "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows) (--with-openssl)", + "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows)", "dependencies": [ "openssl" ] }, "python": { - "description": "build the PL/Python server programming language (dynamic only?) (--with-python)", - "supports": "!(windows & (static | mingw))", + "$supports": "!(windows & (static | mingw))", + "description": "build the PL/Python server programming language", "dependencies": [ { "name": "libpq", @@ -80,15 +135,16 @@ ] }, "readline": { - "description": "Use readline (else --without-readline)", + "description": "Use readline", "supports": "!windows, mingw", "dependencies": [ "readline" ] }, "tcl": { - "description": "build the PL/Tcl procedural language(dynamic only?) (--with-tcl)", - "supports": "!(windows & (static | mingw))", + "$supports": "!(windows & (static | mingw))", + "description": "build the PL/Tcl procedural language", + "supports": "windows & !mingw", "dependencies": [ { "name": "libpq", @@ -101,13 +157,16 @@ ] }, "xml": { - "description": "Build with libxml (--with-libxml)", + "description": "Build with libxml", "dependencies": [ - "libxml2" + { + "name": "libxml2", + "default-features": false + } ] }, "xslt": { - "description": "Build with libxslt (--with-libxslt)", + "description": "Build with libxslt", "dependencies": [ { "name": "libpq", @@ -120,13 +179,13 @@ ] }, "zlib": { - "description": "Use zlib (else --without-zlib)", + "description": "Use zlib", "dependencies": [ "zlib" ] }, "zstd": { - "description": "Use zstd (else --without-zstd)", + "description": "Use zstd", "dependencies": [ "zstd" ] diff --git a/ports/libpq/patches/windows/macro-def.patch b/ports/libpq/windows/macro-def.patch similarity index 100% rename from ports/libpq/patches/windows/macro-def.patch rename to ports/libpq/windows/macro-def.patch diff --git a/ports/libpq/windows/msbuild.patch b/ports/libpq/windows/msbuild.patch new file mode 100644 index 00000000000000..ce243a326e6e1d --- /dev/null +++ b/ports/libpq/windows/msbuild.patch @@ -0,0 +1,428 @@ +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index 8de79c6..3bc677d 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -53,6 +53,11 @@ sub Install + my $target = shift; + $insttype = shift; + $insttype = "all" unless ($insttype); ++ if ($insttype eq 'core') ++ { ++ $insttype = 'client'; ++ @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' ); ++ } + + # if called from vcregress, the config will be passed to us + # so no need to re-include these +@@ -89,7 +94,7 @@ sub Install + my $majorver = DetermineMajorVersion(); + print "Installing version $majorver for $conf in $target\n"; + +- my @client_dirs = ('bin', 'lib', 'share', 'symbols'); ++ my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq'); + my @all_dirs = ( + @client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib', + 'share/extension', 'share/timezonesets', 'share/tsearch_data'); +@@ -117,11 +122,11 @@ sub Install + } + }, + @top_dir); +- CopySetOfFiles('config files', $sample_files, $target . '/share/'); ++ CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/'); + CopyFiles( + 'Import libraries', + $target . '/lib/', +- "$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib", ++ "$conf\\", "libpgcommon\\libpgcommon.lib", + "libpgport\\libpgport.lib"); + CopyContribFiles($config, $target); + CopyIncludeFiles($target); +@@ -293,7 +298,16 @@ sub CopySolutionOutput + { + if ($1 == 1) + { +- push(@{ $install_list{'bin'} }, "exe"); ++ push(@{ $install_list{'tools\\libpq'} }, "exe"); ++ } ++ elsif ($1 == 2) ++ { ++ push(@{ $install_list{'bin'} }, "dll"); ++ push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins ++ } ++ elsif ($is_sharedlib) # forced to static lib by vcpkg triplet ++ { ++ push(@{ $install_list{'lib'} }, "lib"); + } + elsif ($1 == 2) + { +@@ -317,7 +331,16 @@ sub CopySolutionOutput + { + if ($1 eq 'Application') + { +- push(@{ $install_list{'bin'} }, "exe"); ++ push(@{ $install_list{'tools\\libpq'} }, "exe"); ++ } ++ elsif ($1 eq 'DynamicLibrary') ++ { ++ push(@{ $install_list{'bin'} }, "dll"); ++ push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins ++ } ++ elsif ($is_sharedlib) # forced to static lib by vcpkg triplet ++ { ++ push(@{ $install_list{'lib'} }, "lib"); + } + elsif ($1 eq 'DynamicLibrary') + { +@@ -350,7 +373,8 @@ sub CopySolutionOutput + || croak "Could not copy $pf.$ext\n"; + } + } +- lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb") ++ $1 ne 'DynamicLibrary' || ++ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") + || croak "Could not copy $pf.pdb\n"; + print "."; + } +@@ -482,7 +506,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f.control", +- "$target/share/extension/$f.control") ++ "$target/share/libpq/extension/$f.control") + || croak("Could not copy file $f.control in contrib $module"); + print '.'; + } +@@ -500,7 +524,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f", +- "$target/share/$moduledir/" . basename($f)) ++ "$target/share/libpq/$moduledir/" . basename($f)) + || croak("Could not copy file $f in contrib $module"); + print '.'; + } +@@ -515,7 +539,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f", +- "$target/share/tsearch_data/" . basename($f)) ++ "$target/share/libpq/tsearch_data/" . basename($f)) + || croak("Could not copy file $f in $subdir $module"); + print '.'; + } +@@ -578,7 +602,7 @@ sub CopySubdirFiles + if ($module eq 'spi'); + foreach my $f (split /\s+/, $flist) + { +- lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f") ++ lcopy("$subdir/$module/$f", "$target/share/libpq/doc/$moduledir/$f") + || croak("Could not copy file $f in contrib $module"); + print '.'; + } +@@ -708,7 +732,7 @@ sub GenerateNLSFiles + my $majorver = shift; + + print "Installing NLS files..."; +- EnsureDirectories($target, "share/locale"); ++ EnsureDirectories($target, "share/libpq/locale"); + my @flist; + File::Find::find( + { +@@ -730,12 +754,12 @@ sub GenerateNLSFiles + next unless /([^\/]+)\.po/; + $lang = $1; + +- EnsureDirectories($target, "share/locale/$lang", +- "share/locale/$lang/LC_MESSAGES"); ++ EnsureDirectories($target, "share/libpq/locale/$lang", ++ "share/libpq/locale/$lang/LC_MESSAGES"); + my @args = ( +- "$nlspath\\bin\\msgfmt", ++ "msgfmt", + '-o', +- "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", ++ "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", + $_); + system(@args) && croak("Could not run msgfmt on $dir\\$_"); + print "."; +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index f24d9e5..356cc31 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -81,13 +81,14 @@ EOF + + EOF + ++ my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : ''; + $self->WriteItemDefinitionGroup( + $f, 'Debug', + { + defs => "_DEBUG;DEBUG=1", + opt => 'Disabled', + strpool => 'false', +- runtime => 'MultiThreadedDebugDLL' ++ runtime => 'MultiThreadedDebug' . $maybe_dll + }); + $self->WriteItemDefinitionGroup( + $f, +@@ -96,7 +97,7 @@ EOF + defs => "", + opt => 'Full', + strpool => 'true', +- runtime => 'MultiThreadedDLL' ++ runtime => 'MultiThreaded' . $maybe_dll + }); + return; + } +@@ -266,6 +267,8 @@ sub WriteConfigurationPropertyGroup + ($self->{type} eq "exe") + ? 'Application' + : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); ++ if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static') ++ { $cfgtype =~ s/DynamicLibrary/StaticLibrary/; } + + print $f < +@@ -311,7 +314,9 @@ sub WriteItemDefinitionGroup + my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); + + my $targetmachine = +- $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64'; ++ 'Machine' . uc($self->{platform}); ++ $targetmachine =~ s/WIN32/X86/; ++ my $randomizebase = ($self->{platform} =~ /^ARM/) ? 'true' : 'false'; + + my $includes = join ';', @{ $self->{includes} }, ""; + +@@ -347,7 +352,7 @@ sub WriteItemDefinitionGroup + .\\$cfgname\\$self->{name}\\$self->{name}.pdb + false + .\\$cfgname\\$self->{name}\\$self->{name}.map +- false ++ $randomizebase + + + Console +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index ef0a33c..dd68424 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -114,8 +114,10 @@ sub mkvcbuild + + if ($vsVersion >= '9.00') + { ++ if ($solution->{platform} !~ /^ARM/) { + push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); + push(@pgportfiles, 'pg_crc32c_sse42.c'); ++ } + push(@pgportfiles, 'pg_crc32c_sb8.c'); + } + else +@@ -196,6 +198,7 @@ sub mkvcbuild + 'syncrep_gram.y'); + $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', + 'jsonpath_gram.y'); ++ ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') && + $postgres->AddDefine('BUILDING_DLL'); + $postgres->AddLibrary('secur32.lib'); + $postgres->AddLibrary('ws2_32.lib'); +@@ -240,12 +243,13 @@ sub mkvcbuild + $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); + $pltcl->AddReference($postgres); + +- for my $tclver (qw(86t 86 85 84)) ++ my $v = $solution->{options}->{tcl_version}; ++ for my $tclver ( ("${v}","${v}s","${v}sx") ) + { + my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib"; + if (-e $tcllib) + { +- $pltcl->AddLibrary($tcllib); ++ $pltcl->AddLibrary("\$(VcpkgTcl${tclver}Libs)"); + $found = 1; + last; + } +@@ -500,8 +504,7 @@ sub mkvcbuild + . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; + my $prefixcmd = + qq("$solution->{options}->{python}\\python" -c "$pythonprog"); +- my $pyout = `$prefixcmd`; +- die "Could not query for python version!\n" if $?; ++ my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}"; + my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + + # Sometimes (always?) if python is not present, the execution +@@ -517,8 +520,8 @@ sub mkvcbuild + + my $plpython = $solution->AddProject('plpython' . $pymajorver, + 'dll', 'PLs', 'src/pl/plpython'); +- $plpython->AddIncludeDir($pyprefix . '/include'); +- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); ++ $plpython->AddIncludeDir($pyprefix . "/include/python$pyver"); ++ $plpython->AddLibrary('$(VcpkgPythonLibs)'); + $plpython->AddReference($postgres); + + # Add transform modules dependent on plpython +diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm +index 570bab5..2d51abe 100644 +--- a/src/tools/msvc/Project.pm ++++ b/src/tools/msvc/Project.pm +@@ -167,6 +167,11 @@ sub AddReference + } + $self->AddLibrary( + "__CFGNAME__/" . $ref->{name} . "/" . $ref->{name} . ".lib"); ++ ++ if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static') ++ { ++ map { $self->AddLibrary($_) } @{ $ref->{libraries} }; ++ } + } + return; + } +diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm +index d30e8fc..231275b 100644 +--- a/src/tools/msvc/Solution.pm ++++ b/src/tools/msvc/Solution.pm +@@ -63,6 +63,11 @@ sub DeterminePlatform + my $self = shift; + + if ($^O eq "MSWin32") ++ { ++ $self->{platform} = uc($self->{options}->{VCPKG_TARGET_ARCHITECTURE}); ++ $self->{platform} =~ s/^X86$/Win32/; ++ } ++ elsif (0) + { + # Examine CL help output to determine if we are in 32 or 64-bit mode. + my $output = `cl /help 2>&1`; +@@ -124,6 +129,9 @@ sub copyFile + sub GetOpenSSLVersion + { + my $self = shift; ++ if ($self->{options}->{openssl_version} =~ /(\d+)\.(\d+)\.(\d+)/m) { ++ return ($1, $2, $3); ++ } + + # Attempt to get OpenSSL version and location. This assumes that + # openssl.exe is in the specified directory. +@@ -148,7 +156,7 @@ sub GetOpenSSLVersion + sub GenerateFiles + { + my $self = shift; +- my $bits = $self->{platform} eq 'Win32' ? 32 : 64; ++ my $bits = $self->{platform} =~ /64/ ? 64 : 32; + my $ac_init_found = 0; + my $package_name; + my $package_version; +@@ -502,7 +510,7 @@ sub GenerateFiles + USE_PAM => undef, + USE_SLICING_BY_8_CRC32C => undef, + USE_SSE42_CRC32C => undef, +- USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => 1, ++ USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => $self->{platform} =~ /^ARM/ ? undef : 1, + USE_SYSTEMD => undef, + USE_SYSV_SEMAPHORES => undef, + USE_SYSV_SHARED_MEMORY => undef, +@@ -760,14 +768,14 @@ sub GenerateFiles + || confess "Could not open pg_config_paths.h"; + print $o <{options}->{zlib}) + { + $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); +- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); ++ $proj->AddLibrary('$(VcpkgZlibLibs)'); + } + if ($self->{options}->{openssl}) + { + $proj->AddIncludeDir($self->{options}->{openssl} . '\include'); ++ $proj->AddLibrary('$(VcpkgOpensslLibs)'); ++ } ++ elsif (0) ++ { + my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion(); + + # Starting at version 1.1.0 the OpenSSL installers have +@@ -1027,7 +1039,7 @@ sub AddProject + if ($self->{options}->{nls}) + { + $proj->AddIncludeDir($self->{options}->{nls} . '\include'); +- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); ++ $proj->AddLibrary('$(VcpkgNlsLibs)'); + } + if ($self->{options}->{gss}) + { +@@ -1060,6 +1072,10 @@ sub AddProject + if ($self->{options}->{icu}) + { + $proj->AddIncludeDir($self->{options}->{icu} . '\include'); ++ $proj->AddLibrary('$(VcpkgIcuLibs)'); ++ } ++ elsif (0) ++ { + if ($self->{platform} eq 'Win32') + { + $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); +@@ -1077,22 +1093,22 @@ sub AddProject + { + $proj->AddIncludeDir($self->{options}->{xml} . '\include'); + $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); +- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); ++ $proj->AddLibrary('$(VcpkgXmlLibs)'); + } + if ($self->{options}->{xslt}) + { + $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); +- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); ++ $proj->AddLibrary('$(VcpkgXsltLibs)'); + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary('$(VcpkgLz4Libs)'); + } + if ($self->{options}->{zstd}) + { + $proj->AddIncludeDir($self->{options}->{zstd} . '\include'); +- $proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib'); ++ $proj->AddLibrary('$(VcpkgZstdLibs)'); + } + if ($self->{options}->{uuid}) + { +diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl +index b8c514a..1fb7619 100644 +--- a/src/tools/msvc/gendef.pl ++++ b/src/tools/msvc/gendef.pl +@@ -122,7 +122,7 @@ sub writedef + + # Strip the leading underscore for win32, but not x64 + $f =~ s/^_// +- unless ($platform eq "x64"); ++ if ($platform eq "Win32"); + + # Emit just the name if it's a function symbol, or emit the name + # decorated with the DATA option for variables. +@@ -150,7 +150,7 @@ sub usage + usage() + unless scalar(@ARGV) == 2 + && ( ($ARGV[0] =~ /\\([^\\]+$)/) +- && ($ARGV[1] eq 'Win32' || $ARGV[1] eq 'x64')); ++ && ($ARGV[1] ne '')); + my $defname = uc $1; + my $deffile = "$ARGV[0]/$defname.def"; + my $platform = $ARGV[1]; diff --git a/ports/libpq/patches/windows/python_lib.patch b/ports/libpq/windows/python_lib.patch similarity index 100% rename from ports/libpq/patches/windows/python_lib.patch rename to ports/libpq/windows/python_lib.patch diff --git a/ports/libpq/windows/spin_delay.patch b/ports/libpq/windows/spin_delay.patch new file mode 100644 index 00000000000000..163e8e6ef75191 --- /dev/null +++ b/ports/libpq/windows/spin_delay.patch @@ -0,0 +1,24 @@ +diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h +index 4d3ffc7..658b1a1 100644 +--- a/src/include/storage/s_lock.h ++++ b/src/include/storage/s_lock.h +@@ -953,12 +953,18 @@ typedef LONG slock_t; + /* If using Visual C++ on Win64, inline assembly is unavailable. + * Use a _mm_pause intrinsic instead of rep nop. + */ +-#if defined(_WIN64) ++#if defined(_M_X64) && !defined(_M_ARM64EC) + static __forceinline void + spin_delay(void) + { + _mm_pause(); + } ++#elif defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC) ++static __forceinline void ++spin_delay(void) ++{ ++ __yield(); ++} + #else + static __forceinline void + spin_delay(void) diff --git a/ports/libpq/patches/windows/win_bison_flex.patch b/ports/libpq/windows/win_bison_flex.patch similarity index 100% rename from ports/libpq/patches/windows/win_bison_flex.patch rename to ports/libpq/windows/win_bison_flex.patch diff --git a/ports/libprotobuf-mutator/vcpkg.json b/ports/libprotobuf-mutator/vcpkg.json index 27feafd7b1dcaf..96dc0d5123bd36 100644 --- a/ports/libprotobuf-mutator/vcpkg.json +++ b/ports/libprotobuf-mutator/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libprotobuf-mutator", - "version-string": "1.0", - "port-version": 1, + "version": "1.0", + "port-version": 2, "description": "Library for structured fuzzing with protobuffers.", "dependencies": [ "protobuf", diff --git a/ports/libproxy/fix-install-py.patch b/ports/libproxy/fix-install-py.patch index c4a630b97c275d..6c03602fbc936f 100644 --- a/ports/libproxy/fix-install-py.patch +++ b/ports/libproxy/fix-install-py.patch @@ -6,11 +6,11 @@ index 7c36e51..ee2c5bc 100644 add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/Net/Libproxy.pm) -install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net ) diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt -index 2800a85..c5d8e0f 100644 +index 29e656d..dec5799 100644 --- a/bindings/perl/src/CMakeLists.txt +++ b/bindings/perl/src/CMakeLists.txt -@@ -21,5 +21,3 @@ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES}) - target_compile_options(PLlibproxy PRIVATE ${PX_PERL_CCFLAGS}) +@@ -20,5 +20,3 @@ endif() + target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES}) set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy") set_target_properties(PLlibproxy PROPERTIES PREFIX "") - diff --git a/ports/libproxy/fix-tools-path.patch b/ports/libproxy/fix-tools-path.patch deleted file mode 100644 index ba506117077c53..00000000000000 --- a/ports/libproxy/fix-tools-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/libproxy/cmake/pxmodule.cmk b/libproxy/cmake/pxmodule.cmk -index bbbd989..956948a 100644 ---- a/libproxy/cmake/pxmodule.cmk -+++ b/libproxy/cmake/pxmodule.cmk -@@ -20,7 +20,7 @@ function(px_module name build builtin) - add_library(${name} MODULE modules/${name}.cpp) - target_link_libraries(${name} libproxy) - set_target_properties(${name} PROPERTIES PREFIX "") -- install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR}) -+ install(TARGETS ${name} LIBRARY DESTINATION tools) - if(${ARGC} GREATER 3) - target_link_libraries(${name} ${ARGN}) - endif() -diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt -index 52010c6..0a3f4b5 100644 ---- a/utils/CMakeLists.txt -+++ b/utils/CMakeLists.txt -@@ -1,5 +1,7 @@ - include_directories("../libproxy") - -+if (BUILD_TOOLS) - add_executable(proxy proxy.c) - target_link_libraries(proxy libproxy) --install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) -+install(TARGETS proxy RUNTIME DESTINATION tools) -+endif() -\ No newline at end of file diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 6764256007f362..e1540a676a7819 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libproxy/libproxy - REF 8fec01ed4b95afc71bf7710bf5b736a5de03b343 #0.4.18 - SHA512 6367d21b8816d7e5e3c75ee124c230ec89abbffa09538b6700c9ae61be33629f864617f51a2317e18d2fb960b09e26cae0e3503d747112f23921d1910856b109 + REF "${VERSION}" + SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 HEAD_REF master PATCHES - fix-tools-path.patch support-windows.patch fix-install-py.patch fix-module-lib-name.patch @@ -38,6 +37,8 @@ vcpkg_cmake_configure( WITH_PYTHON3 WITH_VALA MSVC_STATIC + BUILD_TOOLS + WITH_GNOME3 ) vcpkg_cmake_install() @@ -45,9 +46,14 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +vcpkg_copy_tools(TOOL_NAMES proxy AUTO_CLEAN) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libproxy/support-windows.patch b/ports/libproxy/support-windows.patch index 1cad01ff412fe2..d49fa2c0af256c 100644 --- a/ports/libproxy/support-windows.patch +++ b/ports/libproxy/support-windows.patch @@ -29,3 +29,13 @@ index de68e5c..9356486 100644 -install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) +diff --git a/libproxy/cmake/pkgconfig.cmk b/libproxy/cmake/pkgconfig.cmk +index 89bfc62..ffa0897 100644 +--- a/libproxy/cmake/pkgconfig.cmk ++++ b/libproxy/cmake/pkgconfig.cmk +@@ -1,4 +1,4 @@ +-if(NOT WIN32 AND NOT APPLE) ++if(NOT WIN32) + find_package(PkgConfig) + + # Define our magical px_check_modules function diff --git a/ports/libproxy/usage b/ports/libproxy/usage index a37b13c5ada3dc..2a8d884866f413 100644 --- a/ports/libproxy/usage +++ b/ports/libproxy/usage @@ -1,5 +1,5 @@ The package libproxy provides CMake targets: - find_package(libproxy CONFIG REQUIRED) + find_package(libproxy REQUIRED) target_include_directories(main PRIVATE ${LIBPROXY_INCLUDE_DIR}) target_link_libraries(main PRIVATE ${LIBPROXY_LIBRARIES}) diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index 75752ab39a6f2b..fcd0b5d494b8f6 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libproxy", "version": "0.4.18", - "port-version": 1, + "port-version": 2, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "license": "LGPL-2.1-only", - "supports": "!uwp", + "supports": "!(uwp | android)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/librdkafka/fix_curl.patch b/ports/librdkafka/fix_curl.patch deleted file mode 100644 index 7d81ccf15b3c97..00000000000000 --- a/ports/librdkafka/fix_curl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 37b43c4..106fe38 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -213,6 +213,11 @@ if(WITH_ZLIB) - target_link_libraries(rdkafka PUBLIC ZLIB::ZLIB) - endif() - -+if(WITH_CURL) -+ find_package(CURL CONFIG REQUIRED) -+ target_link_libraries(rdkafka PUBLIC CURL::libcurl) -+endif() -+ - if(WITH_ZSTD) - target_link_libraries(rdkafka PRIVATE ${ZSTD_LIBRARY}) - target_include_directories(rdkafka PRIVATE ${ZSTD_INCLUDE_DIR}) -@@ -296,7 +301,7 @@ if(NOT RDKAFKA_BUILD_STATIC) - set(PKG_CONFIG_DESCRIPTION "The Apache Kafka C/C++ library") - - if(WITH_CURL) -- string(APPEND PKG_CONFIG_REQUIRES "curl ") -+ string(APPEND PKG_CONFIG_REQUIRES "libcurl ") - endif() - - if(WITH_ZLIB) diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index c28963f3a3e9ff..2a33c35e7ce3a2 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO edenhill/librdkafka - REF v2.0.2 - SHA512 b1f5bc7bb998051275f1bfa43b67dd3d830349a87906828a90149375ac66c2a04e769454d0eb0ec91f712132814bcc328c49c4247872977272932849de83d98e + REF "v${VERSION}" + SHA512 6bf1761e7ed1820b587fda24277f6606ec046da281064df13c4380f49a92f3e2b165614b9c622d46b27078ec024a4dc211610e500e597265e8219f8869c4d203 HEAD_REF master PATCHES lz4.patch - fix_curl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 264bdce65cdc89..53b640077a89e6 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,6 +1,6 @@ { "name": "librdkafka", - "version": "2.0.2", + "version": "2.1.1", "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "license": null, diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index 8e47fada4ce22f..772cb9c6196c96 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json index eea2a5efde40ec..1b0ea0838b235e 100644 --- a/ports/librsvg/vcpkg.json +++ b/ports/librsvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librsvg", "version": "2.40.20", - "port-version": 5, + "port-version": 6, "description": "A small library to render Scalable Vector Graphics (SVG)", "homepage": "https://gitlab.gnome.org/GNOME/librsvg", "dependencies": [ diff --git a/ports/librttopo/portfile.cmake b/ports/librttopo/portfile.cmake index 1186d45f7ae699..a7470eb6d389b2 100644 --- a/ports/librttopo/portfile.cmake +++ b/ports/librttopo/portfile.cmake @@ -8,9 +8,9 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${LIBRTTOPO_PACKAGE_SUM} ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-makefiles.patch geos-config.patch diff --git a/ports/librttopo/vcpkg.json b/ports/librttopo/vcpkg.json index 5c401dc5f1adf8..de9fb5178ded19 100644 --- a/ports/librttopo/vcpkg.json +++ b/ports/librttopo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librttopo", "version": "1.1.0", - "port-version": 7, + "port-version": 8, "description": "The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided data stores.", "homepage": "https://git.osgeo.org/gitea/rttopo/librttopo", "license": "GPL-2.0-or-later", diff --git a/ports/libsbml/fix-deps-libxml.patch b/ports/libsbml/fix-deps-libxml.patch new file mode 100644 index 00000000000000..1b30586d26eb1c --- /dev/null +++ b/ports/libsbml/fix-deps-libxml.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42b3bd6..34e9a4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -442,17 +442,15 @@ endif(WITH_EXPAT) + set(USE_LIBXML OFF) + if(WITH_LIBXML) + +- find_package(LIBXML REQUIRED) ++ find_package(LibXml2 REQUIRED) + + add_definitions( -DUSE_LIBXML ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML) + set(USE_LIBXML ON) + +- set(LIBSBML_XML_LIBRARY "libxml2") +- set(LIBSBML_XML_LIBRARY_INCLUDE ${LIBXML_INCLUDE_DIR}) +- set(LIBSBML_XML_LIBRARY_LIBS ${LIBXML_LIBRARY}) ++ set(LIBSBML_XML_LIBRARY "LibXml2::LibXml2") ++ set(LIBSBML_XML_LIBRARY_LIBS ${LIBSBML_XML_LIBRARY}) + +- list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindLIBXML.cmake") + + endif(WITH_LIBXML) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 79301a6..985f6cb 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -423,7 +423,7 @@ if(WITH_LIBXML) + sbml/xml/LibXMLParser.h + sbml/xml/LibXMLTranscode.h + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2) + + endif(WITH_LIBXML) + diff --git a/ports/libsbml/libsbml-config.cmake b/ports/libsbml/libsbml-config.cmake new file mode 100644 index 00000000000000..76a1cf6372ce8a --- /dev/null +++ b/ports/libsbml/libsbml-config.cmake @@ -0,0 +1,6 @@ +include(CMakeFindDependencyMacro) +find_dependency(libsbml-static CONFIG) +if(NOT TARGET libsbml) + add_library(libsbml INTERFACE IMPORTED) + target_link_libraries(libsbml INTERFACE libsbml-static) +endif() diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake index e4961abb2b2c2a..8bfe6c8e964d49 100644 --- a/ports/libsbml/portfile.cmake +++ b/ports/libsbml/portfile.cmake @@ -1,13 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sbmlteam/libsbml - REF 118ffbf11f1a5245cc544c1eac71019d979ecb20 #libSBML-5.19.0 - SHA512 7fe8b4d594876c6408e01c646187cb1587d0b4e12707a43286150d4e4646841e547bde971de917de1cdfbbb9365172aeac43c8e02f7d354400f9166f0f1c2c3d + REF "v${VERSION}" + SHA512 c40f164ebd05a36f140ce2684dedb4bbccc51a2732383d3935fca1258738a9b9ba5bc1be2061f3b113b213e5cbb7fe22e9dca43ff78d91964c79cad093e55466 HEAD_REF development + PATCHES + fix-deps-libxml.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DYNAMIC_LIBRARY) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -53,11 +56,17 @@ vcpkg_cmake_configure( -DENABLE_L3V2EXTENDEDMATH:BOOL=ON -DWITH_STATIC_RUNTIME=${STATIC_RUNTIME} -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY} + -DLIBSBML_SKIP_STATIC_LIBRARY=${DYNAMIC_LIBRARY} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME libsbml-static CONFIG_PATH lib/cmake) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libsbml-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +endif() vcpkg_copy_pdbs() @@ -84,5 +93,6 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") vcpkg_fixup_pkgconfig() diff --git a/ports/libsbml/usage b/ports/libsbml/usage new file mode 100644 index 00000000000000..a9e155c1a1ae70 --- /dev/null +++ b/ports/libsbml/usage @@ -0,0 +1,4 @@ +libsbml provides CMake targets: + + find_package(libsbml CONFIG REQUIRED) + target_link_libraries(main PRIVATE libsbml) diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index 4d63730231f081..42281404d53910 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libsbml", - "version": "5.19.0", - "port-version": 2, + "version": "5.20.0", "description": "A library for reading / writing SBML files", + "homepage": "https://github.com/sbmlteam/libsbml", + "license": "LGPL-2.1", "supports": "!uwp", "dependencies": [ { @@ -16,7 +17,6 @@ ], "default-features": [ "comp", - "expat", "fbc", "groups", "layout", diff --git a/ports/libsecret/portfile.cmake b/ports/libsecret/portfile.cmake index 900762ce3d9584..ff0783df9921e1 100644 --- a/ports/libsecret/portfile.cmake +++ b/ports/libsecret/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_configure_meson( -Dgtk_doc=false -Dmanpage=false -Dvapi=false - ADDITIONAL_NATIVE_BINARIES + ADDITIONAL_BINARIES gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) diff --git a/ports/libsecret/vcpkg.json b/ports/libsecret/vcpkg.json index 3c57811cced893..d5062de939d276 100644 --- a/ports/libsecret/vcpkg.json +++ b/ports/libsecret/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsecret", "version": "0.20.4", - "port-version": 1, + "port-version": 2, "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", "license": "LGPL-2.1-or-later", diff --git a/ports/libsonic/CMakeLists.txt b/ports/libsonic/CMakeLists.txt new file mode 100644 index 00000000000000..d89ece21509748 --- /dev/null +++ b/ports/libsonic/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.8) +project(sonic + VERSION 0.2.0 + LANGUAGES C +) + +option(BUILD_TOOL "Build sonic tool" ON) + +add_library(libsonic sonic.c) +set_target_properties(libsonic + PROPERTIES + PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/sonic.h" + SOVERSION ${PROJECT_VERSION_MAJOR} + VERSION ${CMAKE_PROJECT_VERSION} + OUTPUT_NAME sonic +) + +install(TARGETS libsonic + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include +) + +if (BUILD_TOOL) + add_executable(sonic wave.c main.c) + target_link_libraries(sonic + PRIVATE + libsonic + ) + + install(TARGETS sonic + RUNTIME DESTINATION bin + ) +endif() diff --git a/ports/libsonic/portfile.cmake b/ports/libsonic/portfile.cmake new file mode 100644 index 00000000000000..adacd0a2a3066a --- /dev/null +++ b/ports/libsonic/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO waywardgeek/sonic + REF "release-${VERSION}" + SHA512 e70510c89c4f29c30f2a3443a1c4fc1aab2c99147e2ebd1dea3cbb2b89b8bdcee14dc504600ac1f04e82d32c19f17b06fbb417311853beb764c24d15687a126f + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool BUILD_TOOL +) + + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TOOL=${BUILD_TOOL} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(BUILD_TOOL) + vcpkg_copy_tools(TOOL_NAMES sonic AUTO_CLEAN) +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libsonic/vcpkg.json b/ports/libsonic/vcpkg.json new file mode 100644 index 00000000000000..9b30096792c017 --- /dev/null +++ b/ports/libsonic/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libsonic", + "version": "0.2.0", + "description": "Simple library to speed up or slow down speech", + "homepage": "https://github.com/waywardgeek/sonic", + "license": "Apache-2.0", + "supports": "linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build tool" + } + } +} diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 38a8c27988348e..a1fbed5faf4f8d 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES fix-makefiles.patch diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 541e50ba807743..447ffe9934e49e 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 11, + "port-version": 12, "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": null, diff --git a/ports/libstemmer/vcpkg.json b/ports/libstemmer/vcpkg.json index 0934c2c02b203f..9061c7b635c44e 100644 --- a/ports/libstemmer/vcpkg.json +++ b/ports/libstemmer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libstemmer", - "version-string": "2017-9", - "port-version": 7, + "version": "2017-9", + "port-version": 8, "description": "Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval", "homepage": "https://snowball.tartarus.org/", "dependencies": [ diff --git a/ports/libstk/vcpkg.json b/ports/libstk/vcpkg.json index 508767d2c9a5ad..39abd67e97ceb9 100644 --- a/ports/libstk/vcpkg.json +++ b/ports/libstk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libstk", - "version-string": "4.6.1", - "port-version": 2, + "version": "4.6.1", + "port-version": 3, "description": "The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language.", "dependencies": [ { diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index 8322bef1f4540f..0c8051c7947d2f 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.23.1 - SHA512 d01e168b02c0540e193f65ad630180b26ac1690b9386aac039149493f436938fed4a0499ac70235f53d2675df595b7223401804b3bd2d8660917020e911f12c9 + REF 1.24.0 + SHA512 21aae343297ea4aefb89f3bc8fd06c7059e4f59dc34c26ef294f4211873f29bf26b5c600746db8af7eda9e9f5ab270bfd862ab34ae3c409051dcad6bb219df8a HEAD_REF main ) diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index b3b15e936f8543..5e5a205e0fa4c0 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version": "1.23.1", + "version": "1.24.0", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", diff --git a/ports/libtomcrypt/vcpkg.json b/ports/libtomcrypt/vcpkg.json index 4607ff07606ab5..ef092d8e3fd42b 100644 --- a/ports/libtomcrypt/vcpkg.json +++ b/ports/libtomcrypt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtomcrypt", - "version-string": "1.18.2", - "port-version": 2, + "version": "1.18.2", + "port-version": 3, "description": "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit that provides developers with a vast array of well known published block ciphers, one-way hash functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines.", "homepage": "https://www.libtom.net/LibTomCrypt/", "dependencies": [ diff --git a/ports/libtommath/vcpkg.json b/ports/libtommath/vcpkg.json index e6472aa8f70304..c8efdf584872e9 100644 --- a/ports/libtommath/vcpkg.json +++ b/ports/libtommath/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtommath", - "version-string": "1.2.0", - "port-version": 2, + "version": "1.2.0", + "port-version": 3, "description": "LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C.", "homepage": "https://www.libtom.net/LibTomMath/" } diff --git a/ports/libtorch/fix_werror.patch b/ports/libtorch/fix_werror.patch new file mode 100644 index 00000000000000..c952eca00f416a --- /dev/null +++ b/ports/libtorch/fix_werror.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e46275..b505ec5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -788,7 +788,6 @@ if(NOT MSVC) + # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 + string(APPEND CMAKE_CXX_FLAGS " -Wall") + string(APPEND CMAKE_CXX_FLAGS " -Wextra") +- string(APPEND CMAKE_CXX_FLAGS " -Werror=return-type") + string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-field-initializers") + string(APPEND CMAKE_CXX_FLAGS " -Wno-type-limits") + string(APPEND CMAKE_CXX_FLAGS " -Wno-array-bounds") diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake index 29fe9815e9ebbb..16804028394b77 100644 --- a/ports/libtorch/portfile.cmake +++ b/ports/libtorch/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( fix-c10-glog.patch use-flatbuffers2.patch # check with codegen-flatc-mobile_bytecode fix-windows.patch # https://github.com/pytorch/pytorch/issues/87957 + fix_werror.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/caffe2/core/macros.h") # We must use generated header files diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index c704804d3509cc..2e0e8b9d1ccc0e 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "1.12.1", - "port-version": 2, + "port-version": 3, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch b/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch deleted file mode 100644 index bc72079ec56558..00000000000000 --- a/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 24b9c178ed316b39236e62dd655c85f3405e147a Mon Sep 17 00:00:00 2001 -From: David Liu -Date: Mon, 13 Feb 2023 18:03:58 +0800 -Subject: [PATCH] fix build error on Windows ARM64 by add new define - -fix build error on Windows ARM64 by add new define ---- - src/assert.cpp | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/assert.cpp b/src/assert.cpp -index d623605b5..482345451 100644 ---- a/src/assert.cpp -+++ b/src/assert.cpp -@@ -190,16 +190,21 @@ TORRENT_EXPORT void print_backtrace(char* out, int len, int max_depth - std::array stack; - - STACKFRAME64 stack_frame = {}; --#if defined(_WIN64) -- int const machine_type = IMAGE_FILE_MACHINE_AMD64; -- stack_frame.AddrPC.Offset = context_record.Rip; -- stack_frame.AddrFrame.Offset = context_record.Rbp; -- stack_frame.AddrStack.Offset = context_record.Rsp; --#else -+#if defined(_M_IX86) - int const machine_type = IMAGE_FILE_MACHINE_I386; - stack_frame.AddrPC.Offset = context_record.Eip; - stack_frame.AddrFrame.Offset = context_record.Ebp; - stack_frame.AddrStack.Offset = context_record.Esp; -+#elif defined(_M_X64) -+ int const machine_type = IMAGE_FILE_MACHINE_AMD64; -+ stack_frame.AddrPC.Offset = context_record.Rip; -+ stack_frame.AddrFrame.Offset = context_record.Rbp; -+ stack_frame.AddrStack.Offset = context_record.Rsp; -+#elif defined(_M_ARM64) -+ int const machine_type = IMAGE_FILE_MACHINE_ARM64; -+ stack_frame.AddrPC.Offset = context_record.Pc; -+ stack_frame.AddrFrame.Offset = context_record.Fp; -+ stack_frame.AddrStack.Offset = context_record.Sp; - #endif - stack_frame.AddrPC.Mode = AddrModeFlat; - stack_frame.AddrFrame.Mode = AddrModeFlat; --- -2.39.1.windows.1 - diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index ce9de31d2311c8..5dc86b3ba18a9c 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -30,11 +30,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF 64817e0e8793d0875fc10245de52ffb2540a223d # v2.0.8 - SHA512 607172e6a806d78bb34443101bd384ac7a42e0edc3e7c4a2cf5c3ab5f2be64f84557726dce16c2fbaaa2ba254529a8871b3123b0e79fe87cd5bf26021ecb59da + REF "v${VERSION}" + SHA512 cc9c0d9ae66bd7c7df7487e33e8d452ba7b5756987be35a3309038a1dec576e91de5fbabe9d05e58bea9c82d83aad33c607804eeefaf3113a51354bef1a25340 HEAD_REF RC_2_0 - PATCHES - 0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch ) vcpkg_from_github( @@ -80,7 +78,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME LibtorrentRasterbar CONFIG_PATH lib/cmake/LibtorrentRasterbar) # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # Do not duplicate include files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/cmake") diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index f4cd3f0d0ac041..36c64f84032f9e 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtorrent", - "version": "2.0.8", + "version": "2.0.9", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/ports/libtracepoint/portfile.cmake b/ports/libtracepoint/portfile.cmake new file mode 100644 index 00000000000000..6431b4668bb6c8 --- /dev/null +++ b/ports/libtracepoint/portfile.cmake @@ -0,0 +1,37 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_BUILD_TYPE release) # Windows port only includes headers. +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 + SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libtracepoint" + OPTIONS + -DBUILD_SAMPLES=OFF + -DBUILD_TESTS=OFF) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup( + PACKAGE_NAME tracepoint + CONFIG_PATH lib/cmake/tracepoint + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endif() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME tracepoint-headers + CONFIG_PATH lib/cmake/tracepoint-headers) + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libtracepoint/vcpkg.json b/ports/libtracepoint/vcpkg.json new file mode 100644 index 00000000000000..9db1f1d3abcf0d --- /dev/null +++ b/ports/libtracepoint/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libtracepoint", + "version": "1.0.0", + "description": "Linux tracepoints interface for C/C++", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux | windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libudns/vcpkg.json b/ports/libudns/vcpkg.json index f1b9679a3b223b..14593afec6bb2f 100644 --- a/ports/libudns/vcpkg.json +++ b/ports/libudns/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libudns", - "version-string": "0.4", - "port-version": 4, + "version": "0.4", + "port-version": 5, "description": "The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop.", "homepage": "https://github.com/ortclib/udns", "supports": "!windows & !osx" diff --git a/ports/libuuid/CMakeLists.txt b/ports/libuuid/CMakeLists.txt index 9f4bb0605ce88a..a2789541bcd2f4 100644 --- a/ports/libuuid/CMakeLists.txt +++ b/ports/libuuid/CMakeLists.txt @@ -19,6 +19,7 @@ add_library(uuid STATIC uuid_time.c ) target_compile_options(uuid PRIVATE -include "${CMAKE_CURRENT_BINARY_DIR}/config.h") +target_include_directories(uuid PUBLIC "$") add_executable(test_uuid test_uuid.c) target_link_libraries(test_uuid uuid) diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json index 4da714b0e94f85..d47017dd082839 100644 --- a/ports/libuuid/vcpkg.json +++ b/ports/libuuid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libuuid", "version": "1.0.3", - "port-version": 12, + "port-version": 13, "description": "Universally unique id library", "homepage": "https://sourceforge.net/projects/libuuid", "supports": "!osx & !windows", diff --git a/ports/libuvc/vcpkg.json b/ports/libuvc/vcpkg.json index ff87631085ec19..1880ed85d197c3 100644 --- a/ports/libuvc/vcpkg.json +++ b/ports/libuvc/vcpkg.json @@ -1,14 +1,13 @@ { "name": "libuvc", "version-date": "2020-11-24", - "port-version": 3, + "port-version": 4, "description": "a cross-platform library for USB video devices", "homepage": "https://github.com/libuvc/libuvc", "supports": "linux", "dependencies": [ "libjpeg-turbo", "libusb", - "libusb", { "name": "vcpkg-cmake", "host": true diff --git a/ports/libvault/0001-fix-dependencies.patch b/ports/libvault/0001-fix-dependencies.patch new file mode 100644 index 00000000000000..1ff1696e6be951 --- /dev/null +++ b/ports/libvault/0001-fix-dependencies.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd4482b..ac50fb5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,9 +17,8 @@ option(LINK_CURL "Link curl library for vault" OFF) + option(BUILD_SHARED_LIBS "Build vault as a shared library" ON) + option(INSTALL "Run install targets" ON) + +-find_package(CURL) ++find_package(CURL CONFIG REQUIRED) + if(CURL_FOUND) +- include_directories(${CURL_INCLUDE_DIR}) + else(CURL_FOUND) + message(FATAL_ERROR "CURL not found") + endif(CURL_FOUND) +@@ -126,7 +125,7 @@ set_target_properties( + target_include_directories(vault PRIVATE src) + + if(LINK_CURL) +- target_link_libraries(vault curl) ++ target_link_libraries(vault CURL::libcurl) + endif(LINK_CURL) + + if(ENABLE_COVERAGE) +diff --git a/VaultConfig.cmake.in b/VaultConfig.cmake.in +index 67a40ab..82db52d 100644 +--- a/VaultConfig.cmake.in ++++ b/VaultConfig.cmake.in +@@ -1,5 +1,8 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(CURL CONFIG) ++ + include("${CMAKE_CURRENT_LIST_DIR}/libvaultTargets.cmake") + + check_required_components(vault) diff --git a/ports/libvault/portfile.cmake b/ports/libvault/portfile.cmake new file mode 100644 index 00000000000000..34b2b0ed11801f --- /dev/null +++ b/ports/libvault/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO abedra/libvault + REF 0.56.0 + SHA512 6a8d14a755ea3d39c2912ee6d33cec9c6f30a498c57efc40603cecbbd90d400dba52be7b42287c87cd425694c89edbae86218021b2beaa5edca748c3d5dd7c77 + PATCHES + 0001-fix-dependencies.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TEST=OFF + -DLINK_CURL=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME libvault CONFIG_PATH lib/cmake/libvault) +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") + +# Install usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/libvault/usage b/ports/libvault/usage new file mode 100644 index 00000000000000..766be39f097e81 --- /dev/null +++ b/ports/libvault/usage @@ -0,0 +1,4 @@ +libvault provides CMake targets: + + find_package(libvault CONFIG REQUIRED) + target_link_libraries(main PRIVATE libvault::vault) diff --git a/ports/libvault/vcpkg.json b/ports/libvault/vcpkg.json new file mode 100644 index 00000000000000..e39477c98f81b5 --- /dev/null +++ b/ports/libvault/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libvault", + "version": "0.56.0", + "description": "A C++ library for Hashicorp Vault", + "homepage": "https://github.com/abedra/libvault", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libvmdk/vcpkg.json b/ports/libvmdk/vcpkg.json index 3f753346a4315d..ea0be7c6f5813d 100644 --- a/ports/libvmdk/vcpkg.json +++ b/ports/libvmdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libvmdk", - "version-string": "20200926", - "port-version": 3, + "version": "20200926", + "port-version": 4, "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", "homepage": "https://github.com/libyal/libvmdk", "supports": "!uwp", diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 478fadbf8ac66d..55bd9c8ce25187 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -193,6 +193,9 @@ else() elseif(VCPKG_TARGET_IS_OSX) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(LIBVPX_TARGET "arm64-darwin20-gcc") + if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) + set(MAC_OSX_MIN_VERSION_CFLAGS --extra-cflags=-mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET} --extra-cxxflags=-mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET}) + endif() else() set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS endif() @@ -212,6 +215,7 @@ else() --target=${LIBVPX_TARGET} ${OPTIONS} ${OPTIONS_RELEASE} + ${MAC_OSX_MIN_VERSION_CFLAGS} --as=nasm WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME configure-${TARGET_TRIPLET}-rel) @@ -245,6 +249,7 @@ else() --target=${LIBVPX_TARGET} ${OPTIONS} ${OPTIONS_DEBUG} + ${MAC_OSX_MIN_VERSION_CFLAGS} --as=nasm WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME configure-${TARGET_TRIPLET}-dbg) diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index 06c3d7d762e328..39347d71c3ee59 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libvpx", "version": "1.12.0", + "port-version": 1, "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", diff --git a/ports/libxlsxwriter/dependencies.diff b/ports/libxlsxwriter/dependencies.diff new file mode 100644 index 00000000000000..eb7a1cf9f80495 --- /dev/null +++ b/ports/libxlsxwriter/dependencies.diff @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e656184..776c88a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -225,8 +225,8 @@ message("zlib version: " ${ZLIB_VERSION}) + + # MINIZIP + if (USE_SYSTEM_MINIZIP) +- find_package(MINIZIP REQUIRED "1.0") +- list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) ++ find_package(MINIZIP NAMES unofficial-minizip REQUIRED) ++ set(MINIZIP_LIBRARIES unofficial::minizip::minizip) + endif() + + # LIBRARY +diff --git a/dev/release/pkg-config.txt b/dev/release/pkg-config.txt +index a87d080..fa58047 100644 +--- a/dev/release/pkg-config.txt ++++ b/dev/release/pkg-config.txt +@@ -7,4 +7,5 @@ Name: libxlsxwriter + Description: A C library for creating Excel XLSX files + Version: @VERSION@ + Cflags: -I${includedir} +-Libs: -L${libdir} -lxlsxwriter -lz ++Libs: -L${libdir} -lxlsxwriter ++Requires.private: minizip zlib diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index 02053c7ec3434c..2ccfb6f76a42b8 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -1,20 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jmcnamara/libxlsxwriter - REF RELEASE_1.1.5 + REF "RELEASE_${VERSION}" SHA512 bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6 HEAD_REF master + PATCHES + dependencies.diff ) +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/minizip") +set(USE_WINDOWSSTORE OFF) if (VCPKG_TARGET_IS_UWP) - set(USE_WINDOWSSTORE ON) -else() - set(USE_WINDOWSSTORE OFF) + set(USE_WINDOWSSTORE ON) endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DUSE_SYSTEM_MINIZIP=1 -DWINDOWSSTORE=${USE_WINDOWSSTORE} ) @@ -24,5 +27,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json index 5fd73fa2ce84cb..da65e5f14d9b9a 100644 --- a/ports/libxlsxwriter/vcpkg.json +++ b/ports/libxlsxwriter/vcpkg.json @@ -1,10 +1,12 @@ { "name": "libxlsxwriter", "version": "1.1.5", + "port-version": 1, "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.", "homepage": "https://github.com/jmcnamara/libxlsxwriter", "license": null, "dependencies": [ + "minizip", { "name": "vcpkg-cmake", "host": true diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index 1620e79b38995d..011bc5f48abd29 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 ae8d7a178e7a3b48a9f0e1ea303e8a4e4d879d0d9367124ede3783d0c31e31c862b98e5d28d72edc4c0b19c6b457ead2d25664efd33d65e44fd52c5783ec3091 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" ) diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index ff1b69a481c275..517ba3f2d9d756 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxmlpp", "version": "5.0.0", - "port-version": 2, + "port-version": 3, "description": "a C++ wrapper for the libxml XML parser library.", "supports": "!(windows & static)", "dependencies": [ diff --git a/ports/libxmp-lite/0001-msvc-buildfix.patch b/ports/libxmp-lite/0001-msvc-buildfix.patch deleted file mode 100644 index dfd548186c6d1d..00000000000000 --- a/ports/libxmp-lite/0001-msvc-buildfix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur .\libxmp-lite-4.4.1/src/common.h .\libxmp-lite-4.4.1-orig/src/common.h ---- a/src/common.h 2016-07-16 13:37:36 +0200 -+++ b/src/common.h 2017-05-23 00:52:17 +0200 -@@ -77,19 +77,12 @@ - #ifndef CLIB_DECL - #define CLIB_DECL - #endif --#ifdef DEBUG --#ifndef ATTR_PRINTF --#define ATTR_PRINTF(x,y) --#endif --void CLIB_DECL D_(const char *text, ...) ATTR_PRINTF(1,2); --#else - // VS prior to VC7.1 does not support variadic macros. VC8.0 does not optimize unused parameters passing - #if _MSC_VER < 1400 - void __inline CLIB_DECL D_(const char *text, ...) { do {} while (0); } - #else - #define D_(args, ...) do {} while (0) - #endif --#endif - - #elif defined __ANDROID__ - diff --git a/ports/libxmp-lite/0002-fix-symbols.patch b/ports/libxmp-lite/0002-fix-symbols.patch deleted file mode 100644 index f765a7bf0ca453..00000000000000 --- a/ports/libxmp-lite/0002-fix-symbols.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/lite/src/format.c b/lite/src/format.c ---- a/src/format.c -+++ b/src/format.c -@@ -27,20 +27,20 @@ - #endif - #include "format.h" - --extern const struct format_loader xm_loader; --extern const struct format_loader mod_loader; --extern const struct format_loader it_loader; --extern const struct format_loader s3m_loader; -+extern const struct format_loader libxmp_loader_xm; -+extern const struct format_loader libxmp_loader_mod; -+extern const struct format_loader libxmp_loader_it; -+extern const struct format_loader libxmp_loader_s3m; - - extern const struct pw_format *const pw_format[]; - - const struct format_loader *const format_loader[5] = { -- &xm_loader, -- &mod_loader, -+ &libxmp_loader_xm, -+ &libxmp_loader_mod, - #ifndef LIBXMP_CORE_DISABLE_IT -- &it_loader, -+ &libxmp_loader_it, - #endif -- &s3m_loader, -+ &libxmp_loader_s3m, - NULL - }; - -diff --git a/lite/src/loaders/mod_load.c b/lite/src/loaders/mod_load.c ---- a/src/loaders/mod_load.c -+++ b/src/loaders/mod_load.c -@@ -36,7 +36,7 @@ - static int mod_test (HIO_HANDLE *, char *, const int); - static int mod_load (struct module_data *, HIO_HANDLE *, const int); - --const struct format_loader mod_loader = { -+const struct format_loader libxmp_loader_mod = { - "Protracker", - mod_test, - mod_load diff --git a/ports/libxmp-lite/CMakeLists.txt b/ports/libxmp-lite/CMakeLists.txt deleted file mode 100644 index e1f14f377971ef..00000000000000 --- a/ports/libxmp-lite/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -cmake_minimum_required(VERSION 3.4) -project(libxmp-lite) - -set(HEADERS "include/libxmp-lite/xmp.h") - -set(SOURCES src/virtual.c - src/format.c - src/period.c - src/player.c - src/read_event.c - src/dataio.c - src/lfo.c - src/scan.c - src/control.c - src/filter.c - src/effects.c - src/mixer.c - src/mix_all.c - src/load_helpers.c - src/load.c - src/hio.c - src/smix.c - src/memio.c - src/loaders/common.c - src/loaders/itsex.c - src/loaders/sample.c - src/loaders/xm_load.c - src/loaders/mod_load.c - src/loaders/s3m_load.c - src/loaders/it_load.c -) - -include_directories(include/libxmp-lite src) - -option(BUILD_SHARED_LIBS "Build shared libs" OFF) -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - option(INSTALL_HEADERS "Install header files" OFF) -else() - option(INSTALL_HEADERS "Install header files" ON) -endif() - -add_library(libxmp-lite ${SOURCES}) -target_compile_definitions(libxmp-lite PRIVATE - LIBXMP_CORE_PLAYER=1 - inline=__inline - _USE_MATH_DEFINES=1 -) - -# Fix UWP /sdl compile errors -# Disable C4703: Not initialized -# Disable C4996: Deprecated -set_target_properties(libxmp-lite PROPERTIES COMPILE_FLAGS "/wd4703 /wd4996") - -install( - TARGETS libxmp-lite - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin -) - -if(INSTALL_HEADERS) - install(FILES ${HEADERS} DESTINATION include) -endif() diff --git a/ports/libxmp-lite/portfile.cmake b/ports/libxmp-lite/portfile.cmake deleted file mode 100644 index abcad6008d1478..00000000000000 --- a/ports/libxmp-lite/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO xmp/libxmp - REF 4.4.1 - FILENAME "libxmp-lite-4.4.1.tar.gz" - SHA512 f27e3f9fb79ff15ce90b51fb29641c01cadf7455150da57cde6860c2ba075ed497650eb44ec9143bdd3538288228c609f7db6d862c9d73f007f686eccb05543e - PATCHES - 0001-msvc-buildfix.patch - 0002-fix-symbols.patch -) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxmp-lite/vcpkg.json b/ports/libxmp-lite/vcpkg.json deleted file mode 100644 index 3e0d850444b87e..00000000000000 --- a/ports/libxmp-lite/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "libxmp-lite", - "version": "4.4.1", - "port-version": 8, - "description": "Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.", - "homepage": "https://sourceforge.net/projects/xmp/", - "supports": "windows", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/libxmp/fix-cmake-config-dir.patch b/ports/libxmp/fix-cmake-config-dir.patch new file mode 100644 index 00000000000000..95c35d95e6559f --- /dev/null +++ b/ports/libxmp/fix-cmake-config-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1794cb2c1534d53d502785e0446d302e5439216a..c960405632c0d1b4797470424fce4ff8a7ec1aef 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -170,7 +170,7 @@ add_subdirectory(docs) + + include(CMakePackageConfigHelpers) + +-if(WIN32) ++if(0) + set(cmake_install_cmakdir "cmake") + else() + set(cmake_install_cmakdir "${CMAKE_INSTALL_LIBDIR}/cmake/libxmp") diff --git a/ports/libxmp/fix-uwp-build.patch b/ports/libxmp/fix-uwp-build.patch new file mode 100644 index 00000000000000..02b4e2b9ea17dd --- /dev/null +++ b/ports/libxmp/fix-uwp-build.patch @@ -0,0 +1,26 @@ +diff --git a/src/depackers/ptpopen.c b/src/depackers/ptpopen.c +index 421faf08c6bf83e38fbb795595f1a8cf79691b16..a11ade9d81267346a0a3970723de2dc12f62c189 100644 +--- a/src/depackers/ptpopen.c ++++ b/src/depackers/ptpopen.c +@@ -12,7 +12,7 @@ + * useful. -- Kurt Keller, Aug 2013 + */ + +-#ifdef _WIN32 ++#if defined(_WIN32 ) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + + #include "ptpopen.h" + +diff --git a/src/depackers/depacker.c b/src/depackers/depacker.c +index 7ff76513781d7daf79135ddf578db94f826f6e19..429a421e29fe1c17ed1d79a5e0d376dbfe04e7b9 100644 +--- a/src/depackers/depacker.c ++++ b/src/depackers/depacker.c +@@ -28,7 +28,7 @@ + #include "../tempfile.h" + #include "xfnmatch.h" + +-#ifdef _WIN32 ++#if defined(_WIN32 ) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + /* Note: The _popen function returns an invalid file opaque, if + * used in a Windows program, that will cause the program to hang + * indefinitely. _popen works properly in a Console application. diff --git a/ports/libxmp/portfile.cmake b/ports/libxmp/portfile.cmake new file mode 100644 index 00000000000000..4a409029acd0a7 --- /dev/null +++ b/ports/libxmp/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libxmp/libxmp + REF 2c339d0f7517e464d3f2f743212ca76c8c6fe1f1 + SHA512 6c8eca7e37ad9b51b4d9aea08f253c6c4c34f01bfc44b2be4066450b8e34c4bc96a1d1129edc761de4d2e281f718f8d969ce86273af23e37ee172072af8b0a2c + PATCHES + fix-cmake-config-dir.patch + fix-uwp-build.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + depackers LIBXMP_DISABLE_DEPACKERS + prowizard LIBXMP_DISABLE_PROWIZARD +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_SHARED=${BUILD_SHARED} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME "libxmp" + CONFIG_PATH "lib/cmake/libxmp" +) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${SOURCE_PATH}/docs/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxmp/usage b/ports/libxmp/usage new file mode 100644 index 00000000000000..6dcd832f18ed74 --- /dev/null +++ b/ports/libxmp/usage @@ -0,0 +1,4 @@ +libxmp provides CMake targets: + + find_package(libxmp CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,libxmp::xmp_shared,libxmp::xmp_static>) diff --git a/ports/libxmp/vcpkg.json b/ports/libxmp/vcpkg.json new file mode 100644 index 00000000000000..9c4dc8139c109d --- /dev/null +++ b/ports/libxmp/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libxmp", + "version-date": "2023-04-13", + "description": "Libxmp is a library that renders module files to PCM data.", + "homepage": "https://sourceforge.net/projects/xmp/", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "depackers", + "prowizard" + ], + "features": { + "depackers": { + "description": "Enable archive depackers." + }, + "prowizard": { + "description": "Enable ProWizard format loaders." + } + } +} diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index d2ac80d90a6b25..6624f6a781822f 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -66,6 +66,15 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "ifdef LIBEXSLT_STATIC" "if 1") endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt") + endif() +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index e5b9489b61bc1b..8b9e8b83bc22c4 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxslt", "version": "1.1.37", - "port-version": 1, + "port-version": 2, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, diff --git a/ports/libyaml/vcpkg.json b/ports/libyaml/vcpkg.json index 06a3e7600f0a86..4dd2ec9bfdd971 100644 --- a/ports/libyaml/vcpkg.json +++ b/ports/libyaml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libyaml", - "version-string": "0.2.5", - "port-version": 3, + "version": "0.2.5", + "port-version": 4, "description": "A C library for parsing and emitting YAML.", "homepage": "https://github.com/yaml/libyaml", "dependencies": [ diff --git a/ports/libzen/portfile.cmake b/ports/libzen/portfile.cmake index adb5123cf6685c..75a7dca390ab92 100644 --- a/ports/libzen/portfile.cmake +++ b/ports/libzen/portfile.cmake @@ -1,23 +1,30 @@ -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/ZenLib - REF ecb548043a6dbee15a07a43d4d3388509d849570 # v0.4.40 - SHA512 9be9dfa20f4bf7e1f450b2ab19391ea091a091d242e98797652aa74ae595365e25f44ccca915b8889bc46245abf523949d22a012805a2f4f55742ae3c0e8932d + REF "v${VERSION}" + SHA512 4232eb6e73e9b380f6fe2ce3cfeb9fe343936362a35ca8d088c783dc6277332df762d689efe023e3f1418c2e6d2629e0b82ac93df9cce3ae0ab346c2ed1911f1 HEAD_REF master ) +vcpkg_find_acquire_program(PKGCONFIG) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/Project/CMake" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DCMAKE_REQUIRE_FIND_PACKAGE_PkgConfig=1 ) - vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib CONFIG_PATH share/zenlib) +vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib) vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzen.pc" " -lzen" " -lzend") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/libzen/vcpkg.json b/ports/libzen/vcpkg.json index 70691bec0824ff..69bb33dadfe8ff 100644 --- a/ports/libzen/vcpkg.json +++ b/ports/libzen/vcpkg.json @@ -1,7 +1,8 @@ { "name": "libzen", - "version": "0.4.40", + "version": "0.4.41", "description": "ZenLib is a C++ utility library for easiest cross-platform development", + "homepage": "https://github.com/MediaArea/ZenLib", "license": "Zlib", "dependencies": [ { diff --git a/ports/libzim/cross-builds.diff b/ports/libzim/cross-builds.diff new file mode 100644 index 00000000000000..0916513f91de73 --- /dev/null +++ b/ports/libzim/cross-builds.diff @@ -0,0 +1,42 @@ +diff --git a/meson.build b/meson.build +index 85d8da7..7f97dbc 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,7 +3,7 @@ project('libzim', ['c', 'cpp'], + license : 'GPL2', + default_options : ['c_std=c11', 'cpp_std=c++11']) + +-if build_machine.system() != 'windows' ++if host_machine.system() != 'windows' or meson.get_compiler('cpp').get_id() == 'gcc' + add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp') + endif + +@@ -56,8 +56,8 @@ private_conf.set('ENABLE_XAPIAN', xapian_dep.found()) + public_conf.set('LIBZIM_WITH_XAPIAN', xapian_dep.found()) + + pkg_requires = ['liblzma', 'libzstd'] +-if build_machine.system() == 'windows' +- extra_link_args = ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-licuuc', '-licuin'] ++if host_machine.system() == 'windows' ++ extra_link_args = ['-lrpcrt4', '-lws2_32', '-lwinmm'] + extra_cpp_args = ['-DSORTPP_PASS'] + else + extra_link_args = [] +@@ -65,7 +65,7 @@ else + endif + + compiler = meson.get_compiler('cpp') +-if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd' ++if (compiler.get_id() == 'gcc' and host_machine.system() == 'linux') or host_machine.system() == 'freebsd' + # C++ std::thread is implemented using pthread on linux by gcc + thread_dep = dependency('threads') + else +@@ -74,6 +74,8 @@ endif + + if xapian_dep.found() + pkg_requires += ['xapian-core'] ++endif ++if true + icu_dep = dependency('icu-i18n', static:static_linkage) + pkg_requires += ['icu-i18n'] + else diff --git a/ports/libzim/disable-gtest.diff b/ports/libzim/disable-gtest.diff new file mode 100644 index 00000000000000..7609c09c832ed1 --- /dev/null +++ b/ports/libzim/disable-gtest.diff @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index d887f9a..270413d 100644 +--- a/meson.build ++++ b/meson.build +@@ -81,7 +81,7 @@ else + icu_dep = dependency('icu-i18n', required:false, static:static_linkage) + endif + +-gtest_dep = dependency('gtest', main:true, fallback:['gtest', 'gtest_main_dep'], required:false) ++gtest_dep = dependency('', required:false) + + inc = include_directories('include') + diff --git a/ports/libzim/dllexport.diff b/ports/libzim/dllexport.diff new file mode 100644 index 00000000000000..d643f4110237b5 --- /dev/null +++ b/ports/libzim/dllexport.diff @@ -0,0 +1,52 @@ +diff --git a/include/zim/zim.h b/include/zim/zim.h +index 5d1af80..6171f56 100644 +--- a/include/zim/zim.h ++++ b/include/zim/zim.h +@@ -33,14 +33,16 @@ + #define DEPRECATED + #endif + +-#if (defined _WIN32 || defined __CYGWIN__) && defined LIBZIM_EXPORT_DLL ++#include ++ ++#if defined(LIBZIM_DLL) && defined(LIBZIM_BUILDING_LIBRARY) + #define LIBZIM_API __declspec(dllexport) ++#elif defined(LIBZIM_DLL) ++ #define LIBZIM_API __declspec(dllimport) + #else + #define LIBZIM_API + #endif + +-#include +- + namespace zim + { + // An index of an entry (in a zim file) +diff --git a/meson.build b/meson.build +index 7f97dbc..8fd13d7 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,6 +14,10 @@ sizeof_size_t = cpp.sizeof('size_t') + private_conf = configuration_data() + public_conf = configuration_data() + ++if host_machine.system() == 'windows' and get_option('default_library') == 'shared' ++ public_conf.set('LIBZIM_DLL', true) ++endif ++ + private_conf.set('VERSION', '"@0@"'.format(meson.project_version())) + public_conf.set('LIBZIM_VERSION', '"@0@"'.format(meson.project_version())) + private_conf.set('DIRENT_CACHE_SIZE', get_option('DIRENT_CACHE_SIZE')) +diff --git a/src/meson.build b/src/meson.build +index 4529b7c..956b145 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -75,7 +75,7 @@ libzim = library('zim', + include_directories : inc, + dependencies : deps, + link_args : extra_link_args, +- cpp_args : extra_cpp_args, ++ cpp_args : extra_cpp_args + '-DLIBZIM_BUILDING_LIBRARY', + version: meson.project_version(), + install : true) + libzim_dep = declare_dependency(link_with: libzim, diff --git a/ports/libzim/portfile.cmake b/ports/libzim/portfile.cmake new file mode 100644 index 00000000000000..85b0bf595a10d0 --- /dev/null +++ b/ports/libzim/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openzim/libzim + REF "${VERSION}" + SHA512 4554a9237f5167f6f94aad76ef0e847e949c47c6ee2a89bbd6e587da3b3a3e2d0a8b2d03f7a0fbde0e0dc96fb61bf8c115b3ef3cbd7eff5e880f152bee9b29f0 + HEAD_REF main + PATCHES + cross-builds.diff + dllexport.diff + disable-gtest.diff +) + +set(EXTRA_OPTIONS "") + +if(NOT "xapian" IN_LIST FEATURES) + list(APPEND EXTRA_OPTIONS "-Dwith_xapian=false") +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dexamples=false + ${EXTRA_OPTIONS} +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libzim/vcpkg.json b/ports/libzim/vcpkg.json new file mode 100644 index 00000000000000..9df7dd355e7c24 --- /dev/null +++ b/ports/libzim/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libzim", + "version": "8.2.0", + "port-version": 1, + "description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.", + "homepage": "https://github.com/openzim/libzim", + "license": "GPL-2.0-or-later", + "supports": "!android", + "dependencies": [ + "icu", + "liblzma", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zstd" + ], + "features": { + "xapian": { + "description": "Enable xapian support", + "dependencies": [ + "xapian" + ] + } + } +} diff --git a/ports/libzippp/fix-find-lzma.patch b/ports/libzippp/fix-find-lzma.patch deleted file mode 100644 index bc52cbd8fb583f..00000000000000 --- a/ports/libzippp/fix-find-lzma.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindLIBZIP.cmake b/cmake/FindLIBZIP.cmake -index c51c09a..a32bb13 100644 ---- a/cmake/FindLIBZIP.cmake -+++ b/cmake/FindLIBZIP.cmake -@@ -50,7 +50,7 @@ if (LIBZIP_FOUND) - set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES Nettle::Nettle) - endif() - if(_have_extra_libs MATCHES "-llzma") -- find_package(LibLZMA::LibLZMA REQUIRED) -+ find_package(LibLZMA REQUIRED) - set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA) - endif() - if(_have_extra_libs MATCHES "-lz") diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index b8968e1f940018..4f60d687734a4b 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp - REF 681bac0362b82bba8f28117d8a48dca54f028ee5 #v6.0-1.9.2 with CXX std version c++11 - SHA512 2f9ab671de2af0e97d5b3fe4f367504ad47f2e1f6df8009aec8e96680f34bf0e3ae5b45ebaea846676b2527d0a5fd31d91c6f62a2bba2867c6010a387ff24150 + REF 1934adf591ffe2a53e48d46a522b222b9c1df870 #v6.1-1.9.2 with CXX std version c++11 + SHA512 1fcc30b5e94c7b7d4bfcd520e91f8cff3d00feeda9acd280ccefa13986aeb98884f45af44334c965a0b6c33a9300f0757d727ff15b86a98e66dd7bf3179c042a HEAD_REF master - PATCHES fix-find-lzma.patch ) vcpkg_check_features( diff --git a/ports/libzippp/vcpkg.json b/ports/libzippp/vcpkg.json index 97fe8a50242f9e..b338b05baeabd7 100644 --- a/ports/libzippp/vcpkg.json +++ b/ports/libzippp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libzippp", - "version": "6.0-1.9.2", + "version": "6.1-1.9.2", "description": "Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling", "homepage": "https://github.com/ctabin/libzippp", "license": "BSD-3-Clause", diff --git a/ports/licensepp/0002-fix-cmake.patch b/ports/licensepp/0002-fix-cmake.patch deleted file mode 100644 index 5f13d03e1855f8..00000000000000 --- a/ports/licensepp/0002-fix-cmake.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5a7cbbe8423ee3daf533bcc1fefa7d1f1315634c Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Wed, 23 Sep 2020 09:43:37 -0700 -Subject: [PATCH 2/2] fix cmake - -Remove this patch if https://github.com/amrayn/licensepp/pull/33 is merged ---- - CMakeLists.txt | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2c39d1..0d49632 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,10 +35,8 @@ if (APPLE) - endif() - endif() - --if(MSVC) -- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ") --else() -- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ") -+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall") - endif() - - # Check for cryptopp (static) -@@ -73,6 +71,7 @@ endif() - set_target_properties (licensepp-lib PROPERTIES - VERSION ${LICENSEPP_SOVERSION} - ) -+target_include_directories(licensepp-lib PUBLIC $) - target_link_libraries (licensepp-lib - ${CRYPTOPP_LIBRARIES} - ) --- -2.24.3 (Apple Git-128) - diff --git a/ports/licensepp/0002-fix-compilation-macos.patch b/ports/licensepp/0002-fix-compilation-macos.patch new file mode 100644 index 00000000000000..3bad0b9f38e46a --- /dev/null +++ b/ports/licensepp/0002-fix-compilation-macos.patch @@ -0,0 +1,26 @@ +From b0e09221f5f782e6dc2dedf197eba8064095edcd Mon Sep 17 00:00:00 2001 +From: Michael Migliore +Date: Thu, 6 Apr 2023 09:36:17 +0200 +Subject: [PATCH] Fix compilation on macOS + +--- + src/json-object.h | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/json-object.h b/src/json-object.h +index 712e9a0..9764514 100644 +--- a/src/json-object.h ++++ b/src/json-object.h +@@ -80,12 +80,6 @@ class JsonObject + return get(key, defaultValue); + } + +- inline const char* getCString(const std::string& key, +- const char* defaultValue = "") const +- { +- return getString(key, defaultValue).c_str(); +- } +- + inline bool hasKey(const std::string& key) const + { + return m_root.count(key) > 0; diff --git a/ports/licensepp/portfile.cmake b/ports/licensepp/portfile.cmake index c43eee7cfa9398..807841f9f569b1 100644 --- a/ports/licensepp/portfile.cmake +++ b/ports/licensepp/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO amrayn/licensepp - REF 0b6d669c0b323be004f73d8c811d38158ce8c0c7 - SHA512 2161575815d8ff49110d7c2823662ba30d9f1ca2eb6be6dad1ee0807fb3fa9f28483839a133c9d380035254df7c452f8d6fa7f17fd4f29acd8b9bfbbda059291 + REF e9501da1470a3bd29254975577d806612a3d3e3c + SHA512 6f70904d1214036af3891dc54f71ea2052acd8f60c277dbd2a5f3190ce4610771f36108d4d5a123c0e7312aded410d652460018d74586fc4f41b05fabb6100bd HEAD_REF master PATCHES 0001-use-old-pem-pack.patch - 0002-fix-cmake.patch + 0002-fix-compilation-macos.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake") diff --git a/ports/licensepp/vcpkg.json b/ports/licensepp/vcpkg.json index d24f81b5710192..ecb29ffda833db 100644 --- a/ports/licensepp/vcpkg.json +++ b/ports/licensepp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "licensepp", - "version-date": "2020-05-19", - "port-version": 4, + "version-date": "2020-11-24", "description": "Cross platform software licensing library", "homepage": "https://github.com/zuhd-org/licensepp", "supports": "!uwp", diff --git a/ports/lightningscanner/portfile.cmake b/ports/lightningscanner/portfile.cmake new file mode 100644 index 00000000000000..dd385f02e13c53 --- /dev/null +++ b/ports/lightningscanner/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO localcc/LightningScanner + REF v${VERSION} + SHA512 7bd41e049ccdf1dbe39b2ab3c58344822300165482d7c5392fe1cd2b15a40baec9ff080963f7db60f2826ece983a06b921d8a28ba57edf751c2cc7644f0a1150 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIGHTNING_SCANNER_INSTALL=ON + -DLIGHTNING_SCANNER_BUILD_BENCH=OFF + -DLIGHTNING_SCANNER_BUILD_DOCS=OFF + -DLIGHTNING_SCANNER_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/LightningScanner) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + diff --git a/ports/lightningscanner/usage b/ports/lightningscanner/usage new file mode 100644 index 00000000000000..2be4d647578a1e --- /dev/null +++ b/ports/lightningscanner/usage @@ -0,0 +1,4 @@ +The package lightningscanner is compatible with built-in CMake targets: + + find_package(LightningScanner REQUIRED) + target_link_libraries(main PRIVATE LightningScanner::LightningScanner) diff --git a/ports/lightningscanner/vcpkg.json b/ports/lightningscanner/vcpkg.json new file mode 100644 index 00000000000000..d86eba942e8bd3 --- /dev/null +++ b/ports/lightningscanner/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "lightningscanner", + "version": "1.0.0", + "description": "A lightning-fast memory signature/pattern scanner, capable of scanning gigabytes of data per second.", + "homepage": "https://localcc.github.io/LightningScanner/", + "license": "MIT", + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/linalg/vcpkg.json b/ports/linalg/vcpkg.json index 07871bcfdb0d22..2d8170835bf41d 100644 --- a/ports/linalg/vcpkg.json +++ b/ports/linalg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "linalg", - "version-string": "2.1", - "port-version": 1, + "version": "2.1", + "port-version": 2, "description": "linalg.h is a single header public domain linear algebra library for C++11" } diff --git a/ports/lionkor-commandline/add-install.patch b/ports/lionkor-commandline/add-install.patch index 5b794737336107..8d6ce1df1e3007 100644 --- a/ports/lionkor-commandline/add-install.patch +++ b/ports/lionkor-commandline/add-install.patch @@ -1,10 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b4db57c..7ace55c 100644 +index b04634b..ba08ef4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,3 +22,5 @@ if(BUILD_EXAMPLES) - target_link_libraries(test commandline) +@@ -44,3 +44,5 @@ if(BUILD_EXAMPLES) + set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT commandline_test) 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) + \ No newline at end of file diff --git a/ports/lionkor-commandline/portfile.cmake b/ports/lionkor-commandline/portfile.cmake index 51232f1b42c430..0aab65873e290b 100644 --- a/ports/lionkor-commandline/portfile.cmake +++ b/ports/lionkor-commandline/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lionkor/commandline - REF 01434c11aaf82d37a126dc70f5aa02cc523dbbb4 - SHA512 fb9554c07d13aa4c5d84f8288ad39e67ab302da4b286172e0f8fbc22b351234a83fb60f1c085a238d10477a379fded32302338cbddbe7ee0fdda54c6c4a75593 + REF v${VERSION} + SHA512 55473defd4e3837497c552511fdf0552a7a51a8510363d58f436b657e149241e23439c23622a42cf377bc94c8da502cf75e3ce70331e295520b427328bc0a140 HEAD_REF master PATCHES add-install.patch diff --git a/ports/lionkor-commandline/vcpkg.json b/ports/lionkor-commandline/vcpkg.json index f9256896ca62f6..a87389507c4569 100644 --- a/ports/lionkor-commandline/vcpkg.json +++ b/ports/lionkor-commandline/vcpkg.json @@ -1,10 +1,10 @@ { "name": "lionkor-commandline", - "version-semver": "2.0.0", + "version-semver": "2.2.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 & !uwp", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index a9ba8c76b94ed5..2f3ed3834f7515 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://live555.com/liveMedia/public/live.2023.03.30.tar.gz" - FILENAME "live.2023.03.30.tar.gz" - SHA512 84dcc9af7fcfd565342b913e8420e2cca9b45e9a8ff74c04ef8e32449f6bbf35eb594ba48ae06d93efe6ec4c3d7c6812ce5989d02676398cdbd63f2ec0042b68 + URLS "http://live555.com/liveMedia/public/live.2023.05.10.tar.gz" + FILENAME "live.2023.05.10.tar.gz" + SHA512 2997305d5b338466ba765c2969f7fab59907e6e4cabf5fa6d12b1c2b450f9dd543dc59936717352e9a3fc98d6a9bdf316d3a67fc690eebbf62482c21f21634ea ) vcpkg_extract_source_archive( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index fb83a9680f1f2e..2ab6c7e2978939 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,6 +1,6 @@ { "name": "live555", - "version-date": "2023-03-30", + "version-date": "2023-05-10", "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/ports/llvm/0001-Fix-install-paths.patch b/ports/llvm/0001-Fix-install-paths.patch new file mode 100644 index 00000000000000..9f303e642e3889 --- /dev/null +++ b/ports/llvm/0001-Fix-install-paths.patch @@ -0,0 +1,208 @@ + clang/cmake/modules/CMakeLists.txt | 4 ++-- + clang/utils/hmaptool/CMakeLists.txt | 2 +- + compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +- + flang/cmake/modules/CMakeLists.txt | 4 ++-- + lld/cmake/modules/CMakeLists.txt | 4 ++-- + llvm/CMakeLists.txt | 2 +- + llvm/cmake/modules/AddLLVM.cmake | 2 +- + llvm/cmake/modules/CMakeLists.txt | 2 +- + mlir/cmake/modules/CMakeLists.txt | 8 ++++---- + mlir/test/CMakeLists.txt | 2 +- + openmp/tools/Modules/CMakeLists.txt | 2 +- + polly/cmake/CMakeLists.txt | 8 ++++---- + 12 files changed, 21 insertions(+), 21 deletions(-) + +diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt +index 6a7fa2fa27eb..a17f807ab155 100644 +--- a/clang/cmake/modules/CMakeLists.txt ++++ b/clang/cmake/modules/CMakeLists.txt +@@ -6,13 +6,13 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(CLANG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/clang" CACHE STRING ++set(CLANG_INSTALL_PACKAGE_DIR "share/clang" CACHE STRING + "Path for CMake subdirectory for Clang (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/clang')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. + set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING + "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") +diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt +index 511268069bd1..72915ec66504 100644 +--- a/clang/utils/hmaptool/CMakeLists.txt ++++ b/clang/utils/hmaptool/CMakeLists.txt +@@ -1,4 +1,4 @@ +-install(PROGRAMS hmaptool DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) ++install(PROGRAMS hmaptool DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) + add_custom_target(hmaptool ALL DEPENDS "hmaptool") + set_target_properties(hmaptool PROPERTIES FOLDER "Utils") + +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index e322af89a042..0df6a7a775cd 100644 +--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake ++++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +@@ -377,7 +377,7 @@ macro(load_llvm_config) + file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR) + else() + file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE) +- set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") ++ set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm") + endif() + + set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake") +diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt +index 105cc09bf850..460db6c1d9e7 100644 +--- a/flang/cmake/modules/CMakeLists.txt ++++ b/flang/cmake/modules/CMakeLists.txt +@@ -5,13 +5,13 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(FLANG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/flang" CACHE STRING ++set(FLANG_INSTALL_PACKAGE_DIR "share/flang" CACHE STRING + "Path for CMake subdirectory for Flang (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/flang')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. + set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/flang") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING + "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") +diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt +index 57195bce45c9..e24c080725d7 100644 +--- a/lld/cmake/modules/CMakeLists.txt ++++ b/lld/cmake/modules/CMakeLists.txt +@@ -5,13 +5,13 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(LLD_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/lld" CACHE STRING ++set(LLD_INSTALL_PACKAGE_DIR "share/lld" CACHE STRING + "Path for CMake subdirectory for LLD (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/lld')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. + set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/lld") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING + "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index 4be91312271d..d6002808a205 100644 +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -325,7 +325,7 @@ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name + # LLVM_INSTALL_PACKAGE_DIR needs to be declared prior to adding the tools + # subdirectory in order to have the value available for llvm-config. + include(GNUInstallPackageDir) +-set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING + "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") + + set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING +diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake +index 057431208322..89cbba8a5676 100644 +--- a/llvm/cmake/modules/AddLLVM.cmake ++++ b/llvm/cmake/modules/AddLLVM.cmake +@@ -1093,7 +1093,7 @@ function(process_llvm_pass_plugins) + message(FATAL_ERROR "LLVM_INSTALL_PACKAGE_DIR must be defined and writable. GEN_CONFIG should only be passe when building LLVM proper.") + endif() + # LLVM_INSTALL_PACKAGE_DIR might be absolute, so don't reuse below. +- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") ++ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") + file(WRITE + "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") +diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt +index 470881516915..36d2e9aa2120 100644 +--- a/llvm/cmake/modules/CMakeLists.txt ++++ b/llvm/cmake/modules/CMakeLists.txt +@@ -3,7 +3,7 @@ include(LLVMDistributionSupport) + include(FindPrefixFromConfig) + + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. +-set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") ++set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. + set(LLVM_EXPORTS_FILE ${llvm_cmake_builddir}/LLVMExports.cmake) +diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt +index 5fd9454cad93..af1d73a852c7 100644 +--- a/mlir/cmake/modules/CMakeLists.txt ++++ b/mlir/cmake/modules/CMakeLists.txt +@@ -6,16 +6,16 @@ include(FindPrefixFromConfig) + # Generate a list of CMake library targets so that other CMake projects can + # link against them. LLVM calls its version of this file LLVMExports.cmake, but + # the usual CMake convention seems to be ${Project}Targets.cmake. +-set(MLIR_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/mlir" CACHE STRING ++set(MLIR_INSTALL_PACKAGE_DIR "share/mlir" CACHE STRING + "Path for CMake subdirectory for Polly (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/polly')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. +-set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") ++set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/share/mlir") + + # Keep this in sync with llvm/cmake/CMakeLists.txt! +-set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING + "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. +-set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") ++set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") + + get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) + export(TARGETS ${MLIR_EXPORTS} FILE ${mlir_cmake_builddir}/MLIRTargets.cmake) +diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt +index 74f805865d2d..998ddb3b48e8 100644 +--- a/mlir/test/CMakeLists.txt ++++ b/mlir/test/CMakeLists.txt +@@ -8,7 +8,7 @@ endif() + # Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test + # can find MLIR's CMake configuration + set(MLIR_CMAKE_DIR +- "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") ++ "${CMAKE_BINARY_DIR}/share/mlir") + + # Passed to lit.site.cfg.py.in to set up the path where to find the libraries + # for linalg integration tests. +diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt +index 22d818eea72d..75aacc4468d4 100644 +--- a/openmp/tools/Modules/CMakeLists.txt ++++ b/openmp/tools/Modules/CMakeLists.txt +@@ -12,4 +12,4 @@ + + + install(FILES "FindOpenMPTarget.cmake" +- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") ++ DESTINATION "share/openmp") +diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt +index 4c528d562e23..800080fb3f79 100644 +--- a/polly/cmake/CMakeLists.txt ++++ b/polly/cmake/CMakeLists.txt +@@ -4,15 +4,15 @@ include(GNUInstallPackageDir) + include(ExtendPath) + include(FindPrefixFromConfig) + +-set(POLLY_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/polly" CACHE STRING ++set(POLLY_INSTALL_PACKAGE_DIR "share/polly" CACHE STRING + "Path for CMake subdirectory for Polly (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/polly')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. +-set(polly_cmake_builddir "${POLLY_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/polly") ++set(polly_cmake_builddir "${POLLY_BINARY_DIR}/share/polly") + +-set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING ++set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING + "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") + # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. +-set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") ++set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") + + if (CMAKE_CONFIGURATION_TYPES) + set(POLLY_EXPORTS_FILE_NAME "PollyExports-$>.cmake") diff --git a/ports/llvm/0004-fix-dr-1734.patch b/ports/llvm/0002-Fix-DR-1734.patch similarity index 100% rename from ports/llvm/0004-fix-dr-1734.patch rename to ports/llvm/0002-Fix-DR-1734.patch diff --git a/ports/llvm/0002-fix-install-paths.patch b/ports/llvm/0002-fix-install-paths.patch deleted file mode 100644 index c5a2885f429629..00000000000000 --- a/ports/llvm/0002-fix-install-paths.patch +++ /dev/null @@ -1,161 +0,0 @@ - clang/cmake/modules/CMakeLists.txt | 4 ++-- - compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +- - flang/cmake/modules/CMakeLists.txt | 4 ++-- - lld/cmake/modules/CMakeLists.txt | 4 ++-- - llvm/cmake/modules/AddLLVM.cmake | 2 +- - llvm/cmake/modules/CMakeLists.txt | 2 +- - mlir/cmake/modules/CMakeLists.txt | 4 ++-- - mlir/test/CMakeLists.txt | 2 +- - openmp/tools/Modules/CMakeLists.txt | 2 +- - polly/cmake/CMakeLists.txt | 4 ++-- - 10 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt -index c6f6ce9fe5d6..fc886b23a1a8 100644 ---- a/clang/cmake/modules/CMakeLists.txt -+++ b/clang/cmake/modules/CMakeLists.txt -@@ -5,11 +5,11 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang) -+set(CLANG_INSTALL_PACKAGE_DIR share/clang) - set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR share/llvm) - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS) -diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -index 052095801aae..f3402793b60c 100644 ---- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -@@ -376,7 +376,7 @@ macro(load_llvm_config) - file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR) - else() - file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE) -- set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+ set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm") - endif() - - set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake") -diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt -index 170568c80dde..1bf6d6a829e2 100644 ---- a/flang/cmake/modules/CMakeLists.txt -+++ b/flang/cmake/modules/CMakeLists.txt -@@ -4,11 +4,11 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(FLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/flang) -+set(FLANG_INSTALL_PACKAGE_DIR share/flang) - set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/${FLANG_INSTALL_PACKAGE_DIR}") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR share/llvm) - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS) -diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt -index 760c9d5f8d87..acd8a65808f5 100644 ---- a/lld/cmake/modules/CMakeLists.txt -+++ b/lld/cmake/modules/CMakeLists.txt -@@ -4,11 +4,11 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(LLD_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/lld) -+set(LLD_INSTALL_PACKAGE_DIR share/lld) - set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/${LLD_INSTALL_PACKAGE_DIR}") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR share/llvm) - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 37bc98f9e021..7cbfa2a9a577 100644 ---- a/llvm/cmake/modules/AddLLVM.cmake -+++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -1049,7 +1049,7 @@ function(process_llvm_pass_plugins) - - ## Part 1: Extension header to be included whenever we need extension - # processing. -- set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+ set(LLVM_INSTALL_PACKAGE_DIR share/llvm) - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - file(WRITE - "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" -diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index cea0c1df0a14..639c5422b04a 100644 ---- a/llvm/cmake/modules/CMakeLists.txt -+++ b/llvm/cmake/modules/CMakeLists.txt -@@ -2,7 +2,7 @@ include(ExtendPath) - include(LLVMDistributionSupport) - include(FindPrefixFromConfig) - --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR share/llvm) - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. -diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt -index d6703993bd74..e2f6cd3ea8cb 100644 ---- a/mlir/cmake/modules/CMakeLists.txt -+++ b/mlir/cmake/modules/CMakeLists.txt -@@ -5,11 +5,11 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(MLIR_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir) -+set(MLIR_INSTALL_PACKAGE_DIR share/mlir) - set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/${MLIR_INSTALL_PACKAGE_DIR}") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR share/llvm) - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) -diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt -index 8e44a9c37cf1..f6edc7d77ffd 100644 ---- a/mlir/test/CMakeLists.txt -+++ b/mlir/test/CMakeLists.txt -@@ -8,7 +8,7 @@ endif() - # Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test - # can find MLIR's CMake configuration - set(MLIR_CMAKE_DIR -- "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") -+ "${CMAKE_BINARY_DIR}/share/mlir") - - # Passed to lit.site.cfg.py.in to set up the path where to find the libraries - # for linalg integration tests. -diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt -index 22d818eea72d..75aacc4468d4 100644 ---- a/openmp/tools/Modules/CMakeLists.txt -+++ b/openmp/tools/Modules/CMakeLists.txt -@@ -12,4 +12,4 @@ - - - install(FILES "FindOpenMPTarget.cmake" -- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") -+ DESTINATION "share/openmp") -diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt -index 7a0190b69df6..cdd3b4f126bb 100644 ---- a/polly/cmake/CMakeLists.txt -+++ b/polly/cmake/CMakeLists.txt -@@ -3,8 +3,8 @@ - include(ExtendPath) - include(FindPrefixFromConfig) - --set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") --set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly") -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm") -+set(POLLY_INSTALL_PACKAGE_DIR "share/polly") - if (CMAKE_CONFIGURATION_TYPES) - set(POLLY_EXPORTS_FILE_NAME "PollyExports-$>.cmake") - else() diff --git a/ports/llvm/0005-fix-tools-path.patch b/ports/llvm/0003-Fix-tools-path.patch similarity index 87% rename from ports/llvm/0005-fix-tools-path.patch rename to ports/llvm/0003-Fix-tools-path.patch index 1b1142ec9ef537..66fec67d86631b 100644 --- a/ports/llvm/0005-fix-tools-path.patch +++ b/ports/llvm/0003-Fix-tools-path.patch @@ -2,10 +2,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp -index 8ed88f33ead4..3f2d1b98adcc 100644 +index 2c6c55f89d38..f2b581559991 100644 --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp -@@ -305,7 +305,7 @@ int main(int argc, char **argv) { +@@ -307,7 +307,7 @@ int main(int argc, char **argv) { // bin dir). sys::fs::make_absolute(CurrentPath); CurrentExecPrefix = diff --git a/ports/llvm/0007-fix-compiler-rt-install-path.patch b/ports/llvm/0004-Fix-compiler-rt-install-path.patch similarity index 80% rename from ports/llvm/0007-fix-compiler-rt-install-path.patch rename to ports/llvm/0004-Fix-compiler-rt-install-path.patch index c33dd996344cf8..b08c12154585e1 100644 --- a/ports/llvm/0007-fix-compiler-rt-install-path.patch +++ b/ports/llvm/0004-Fix-compiler-rt-install-path.patch @@ -4,20 +4,20 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt -index 078988980c52..795f495b32d6 100644 +index 6e2060991b92..94ced7feda9b 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt -@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES - FOLDER "Misc" - RUNTIME_OUTPUT_DIRECTORY "${output_dir}") +@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files}) + add_header_target("windows-resource-headers" ${windows_only_files}) + add_header_target("utility-resource-headers" ${utility_files}) -set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) +set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include) - install( - FILES ${files} ${generated_files} + ############################################################# + # Install rules for the catch-all clang-resource-headers target diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt -index ca7e17927ee1..87d4282b36ad 100644 +index 9f4633bc85b1..6d7b70ee0dea 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) @@ -30,10 +30,10 @@ index ca7e17927ee1..87d4282b36ad 100644 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake -index d7b0124f3546..55e515cb1c7a 100644 +index 8a6219568b3f..f9c9f6478280 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake -@@ -44,7 +44,7 @@ if (LLVM_TREE_AVAILABLE) +@@ -45,7 +45,7 @@ if (LLVM_TREE_AVAILABLE) # Setup the paths where compiler-rt runtimes and headers should be stored. set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) diff --git a/ports/llvm/0009-fix-tools-install-path.patch b/ports/llvm/0005-Fix-tools-install-path.patch similarity index 80% rename from ports/llvm/0009-fix-tools-install-path.patch rename to ports/llvm/0005-Fix-tools-install-path.patch index 294de6fdabbd70..a6d44d3ce33f19 100644 --- a/ports/llvm/0009-fix-tools-install-path.patch +++ b/ports/llvm/0005-Fix-tools-install-path.patch @@ -8,14 +8,12 @@ clang/tools/scan-build-py/CMakeLists.txt | 4 ++-- clang/tools/scan-build/CMakeLists.txt | 2 +- clang/tools/scan-view/CMakeLists.txt | 2 +- - clang/utils/hmaptool/CMakeLists.txt | 2 +- flang/cmake/modules/AddFlang.cmake | 2 +- flang/tools/f18/CMakeLists.txt | 2 +- flang/tools/flang-driver/CMakeLists.txt | 2 +- lld/cmake/modules/AddLLD.cmake | 2 +- - lld/tools/lld/CMakeLists.txt | 2 +- lldb/cmake/modules/AddLLDB.cmake | 2 +- - 17 files changed, 18 insertions(+), 18 deletions(-) + 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt index 3ce552872015..e09b917ae5f8 100644 @@ -41,18 +39,18 @@ index fb17e353c39f..4b409e47446a 100644 + RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT clang-extras) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake -index 9bbbfc032b7d..bd238ff249cd 100644 +index 21ac332e4f5f..1aaf785bdc99 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake -@@ -160,7 +160,7 @@ macro(add_clang_tool name) - get_target_export_arg(${name} Clang export_to_clangtargets) - install(TARGETS ${name} - ${export_to_clangtargets} -- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" - COMPONENT ${name}) +@@ -166,7 +166,7 @@ macro(add_clang_tool name) + get_target_export_arg(${name} Clang export_to_clangtargets) + install(TARGETS ${name} + ${export_to_clangtargets} +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT ${name}) - if(NOT LLVM_ENABLE_IDE) + if(NOT LLVM_ENABLE_IDE) diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt index 0ae1b4e55244..e8a34e136194 100644 --- a/clang/tools/c-index-test/CMakeLists.txt @@ -78,14 +76,14 @@ index bbdef93b576b..8744e414da0a 100644 + DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT clang-format) diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt -index 1614f40fb60e..0e78982310c7 100644 +index 88c19cad7b53..b50c9ff90586 100644 --- a/clang/tools/clang-linker-wrapper/CMakeLists.txt +++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt -@@ -37,4 +37,4 @@ target_link_libraries(clang-linker-wrapper +@@ -44,4 +44,4 @@ target_link_libraries(clang-linker-wrapper ${CLANG_LINKER_WRAPPER_LIB_DEPS} ) --install(TARGETS clang-linker-wrapper RUNTIME DESTINATION bin) +-install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") +install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") diff --git a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt index 2c979e509795..f22b801fe19a 100644 @@ -120,7 +118,7 @@ index 061dc7ef4dd9..91499600693b 100644 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) endif() diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt -index 4a578b4c6f3e..05574a4919f6 100644 +index ef687b0e90a1..a52af70443c3 100644 --- a/clang/tools/scan-build/CMakeLists.txt +++ b/clang/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) @@ -145,24 +143,11 @@ index 07aec76ee66f..ca6a3380ad0c 100644 COMPONENT scan-view) endforeach() -diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt -index f0d9866782b8..5fcdfc04425f 100644 ---- a/clang/utils/hmaptool/CMakeLists.txt -+++ b/clang/utils/hmaptool/CMakeLists.txt -@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM - - list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) - install(PROGRAMS ${CLANG_HMAPTOOL} -- DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" - COMPONENT hmaptool) - - add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake -index 369e303e148a..3c3697c07406 100644 +index d516ca31b51f..4a0d4ce80168 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake -@@ -109,7 +109,7 @@ macro(add_flang_tool name) +@@ -110,7 +110,7 @@ macro(add_flang_tool name) get_target_export_arg(${name} Flang export_to_flangtargets) install(TARGETS ${name} ${export_to_flangtargets} @@ -172,28 +157,30 @@ index 369e303e148a..3c3697c07406 100644 if(NOT LLVM_ENABLE_IDE) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt -index aa77676c6229..dd15b0b7727b 100644 +index dd0898730e2e..d01c2f8076e3 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt -@@ -50,5 +50,5 @@ if (NOT WIN32) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/flang - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/flang ${CMAKE_BINARY_DIR}/bin) - add_custom_target(flang ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang) -- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") +@@ -56,7 +56,7 @@ if (NOT WIN32) + @ONLY + ) + add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc) +- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") endif() + + # TODO Move this to a more suitable location diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt -index b3e90746e786..b327e69aaeaa 100644 +index 94c8ce6d58f1..466d41c58b1d 100644 --- a/flang/tools/flang-driver/CMakeLists.txt +++ b/flang/tools/flang-driver/CMakeLists.txt -@@ -34,4 +34,4 @@ if(FLANG_PLUGIN_SUPPORT) +@@ -42,4 +42,4 @@ if(FLANG_PLUGIN_SUPPORT) export_executable_symbols_for_plugins(flang-new) endif() -install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}") +install(TARGETS flang-new DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake -index dd2898ce6236..86560bddd5e4 100644 +index d3924f7243d4..f328b62ad8c8 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake @@ -47,7 +47,7 @@ macro(add_lld_tool name) @@ -205,19 +192,6 @@ index dd2898ce6236..86560bddd5e4 100644 COMPONENT ${name}) if(NOT CMAKE_CONFIGURATION_TYPES) -diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt -index df48cc0d6c51..1363144fd8e1 100644 ---- a/lld/tools/lld/CMakeLists.txt -+++ b/lld/tools/lld/CMakeLists.txt -@@ -20,7 +20,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index 3291a7c808e1..9fe9b9a7940d 100644 --- a/lldb/cmake/modules/AddLLDB.cmake @@ -231,3 +205,16 @@ index 3291a7c808e1..9fe9b9a7940d 100644 if(ARG_INSTALL_PREFIX) set(install_dest ${ARG_INSTALL_PREFIX}) endif() +diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt +index df48cc0d6..1363144fd 100644 +--- a/lld/tools/lld/CMakeLists.txt ++++ b/lld/tools/lld/CMakeLists.txt +@@ -20,7 +20,7 @@ target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE diff --git a/ports/llvm/0010-fix-libffi.patch b/ports/llvm/0006-Fix-libffi.patch similarity index 100% rename from ports/llvm/0010-fix-libffi.patch rename to ports/llvm/0006-Fix-libffi.patch diff --git a/ports/llvm/0011-fix-install-bolt.patch b/ports/llvm/0007-Fix-install-bolt.patch similarity index 74% rename from ports/llvm/0011-fix-install-bolt.patch rename to ports/llvm/0007-Fix-install-bolt.patch index 1e2660fa93c178..361f58e7e8e6d5 100644 --- a/ports/llvm/0011-fix-install-bolt.patch +++ b/ports/llvm/0007-Fix-install-bolt.patch @@ -1,11 +1,11 @@ - bolt/tools/driver/CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) + bolt/tools/driver/CMakeLists.txt | 7 ------- + 1 file changed, 7 deletions(-) diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt -index d50781615663..df06604c724c 100644 +index e56be15dbcff..85b078e2e761 100644 --- a/bolt/tools/driver/CMakeLists.txt +++ b/bolt/tools/driver/CMakeLists.txt -@@ -33,14 +33,6 @@ set(BOLT_DEPENDS +@@ -35,13 +35,6 @@ set(BOLT_DEPENDS ) add_custom_target(bolt DEPENDS ${BOLT_DEPENDS}) @@ -13,7 +13,6 @@ index d50781615663..df06604c724c 100644 - ${CMAKE_BINARY_DIR}/bin/llvm-bolt - ${CMAKE_BINARY_DIR}/bin/perf2bolt - ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff -- ${CMAKE_BINARY_DIR}/bin/llvm-bolt-heatmap - DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT bolt - ) diff --git a/ports/llvm/0008-llvm_assert.patch b/ports/llvm/0008-llvm_assert.patch new file mode 100644 index 00000000000000..2e1f653e50c70c --- /dev/null +++ b/ports/llvm/0008-llvm_assert.patch @@ -0,0 +1,18 @@ +diff --git a/mlir/include/mlir/IR/PatternMatch.h b/mlir/include/mlir/IR/PatternMatch.h +index 12bf196bb58e5..200eae8c3b71c 100644 +--- a/mlir/include/mlir/IR/PatternMatch.h ++++ b/mlir/include/mlir/IR/PatternMatch.h +@@ -1102,10 +1097,9 @@ void assertArgs(PatternRewriter &rewriter, ArrayRef values, + auto errorFn = [&](const Twine &msg) -> LogicalResult { + llvm::report_fatal_error(msg); + }; +- (void)std::initializer_list{ +- (assert(succeeded(ProcessPDLValue>::verifyAsArg(errorFn, values[I], I))), +- 0)...}; ++ assert((succeeded(ProcessPDLValue>:: ++ verifyAsArg(errorFn, values[I], I)) && ++ ...)); + #endif + } + diff --git a/ports/llvm/0012-disable-libomp-aliases.patch b/ports/llvm/0009-disable-libomp-aliases.patch similarity index 95% rename from ports/llvm/0012-disable-libomp-aliases.patch rename to ports/llvm/0009-disable-libomp-aliases.patch index a0c4aa1978cf97..3598464189c809 100644 --- a/ports/llvm/0012-disable-libomp-aliases.patch +++ b/ports/llvm/0009-disable-libomp-aliases.patch @@ -29,7 +29,7 @@ index e795032..5e8cba5 100644 foreach(alias IN LISTS LIBOMP_ALIASES) @@ -362,6 +366,7 @@ if(WIN32) install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\" - \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")") + \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"${outdir}\")") endforeach() + endif() else() diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index cb467491c01df4..1ddcc720d901fe 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -3,18 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project - REF llvmorg-${VERSION} - SHA512 d64f97754c24f32deb5f284ebbd486b3a467978b7463d622f50d5237fff91108616137b4394f1d1ce836efa59bf7bec675b6dee257a79b241c15be52d4697460 + REF "llvmorg-${VERSION}" + SHA512 99beff9ee6f8c26f16ea53f03ba6209a119099cbe361701b0d5f4df9d5cc5f2f0da7c994c899a4cec876da8428564dc7a8e798226a9ba8b5c18a3ef8b181d39e HEAD_REF main PATCHES - 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. - 0004-fix-dr-1734.patch - 0005-fix-tools-path.patch - 0007-fix-compiler-rt-install-path.patch - 0009-fix-tools-install-path.patch - 0010-fix-libffi.patch - 0011-fix-install-bolt.patch - 0012-disable-libomp-aliases.patch + 0001-Fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. + 0002-Fix-DR-1734.patch + 0003-Fix-tools-path.patch + 0004-Fix-compiler-rt-install-path.patch + 0005-Fix-tools-install-path.patch + 0006-Fix-libffi.patch + 0007-Fix-install-bolt.patch + 0008-llvm_assert.patch + 0009-disable-libomp-aliases.patch ) vcpkg_check_features( @@ -29,6 +30,7 @@ vcpkg_check_features( enable-ffi LLVM_ENABLE_FFI enable-terminfo LLVM_ENABLE_TERMINFO enable-threads LLVM_ENABLE_THREADS + enable-ios COMPILER_RT_ENABLE_IOS enable-eh LLVM_ENABLE_EH enable-bindings LLVM_ENABLE_BINDINGS ) @@ -40,14 +42,17 @@ include("${cmake_vars_file}") # LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON disables this error. # See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html # and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly" on llvm-dev Jan 21-23 2020. -list(APPEND FEATURE_OPTIONS - -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -) +if(VCPKG_DETECTED_MSVC_VERSION LESS "1925" AND VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") + list(APPEND FEATURE_OPTIONS + -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON + ) +endif() # Force enable or disable external libraries set(llvm_external_libraries zlib libxml2 + zstd ) foreach(external_library IN LISTS llvm_external_libraries) string(TOLOWER "enable-${external_library}" feature_name) @@ -224,12 +229,14 @@ endforeach() vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(${PYTHON3_DIR}) +vcpkg_add_to_path("${PYTHON3_DIR}") set(LLVM_LINK_JOBS 1) +file(REMOVE "${SOURCE_PATH}/llvm/cmake/modules/Findzstd.cmake") + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/llvm + SOURCE_PATH "${SOURCE_PATH}/llvm" OPTIONS ${FEATURE_OPTIONS} -DLLVM_INCLUDE_EXAMPLES=OFF @@ -245,10 +252,20 @@ vcpkg_cmake_configure( "-DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}" "-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}" + -DPACKAGE_VERSION=${VERSION} # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_LINK_JOBS}" - -DLLVM_TOOLS_INSTALL_DIR=tools/llvm + -DLLVM_TOOLS_INSTALL_DIR:PATH=tools/llvm + -DCLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm + -DLLD_TOOLS_INSTALL_DIR:PATH=tools/llvm + -DMLIR_TOOLS_INSTALL_DIR:PATH=tools/llvm + -DBOLT_TOOLS_INSTALL_DIR:PATH=tools/llvm # all others are strings + -DOPENMP_TOOLS_INSTALL_DIR:PATH=tools/llvm + MAYBE_UNUSED_VARIABLES + COMPILER_RT_ENABLE_IOS + OPENMP_TOOLS_INSTALL_DIR + MLIR_TOOLS_INSTALL_DIR ) vcpkg_cmake_install(ADD_BIN_TO_PATH) @@ -287,6 +304,7 @@ set(empty_dirs) if("clang-tools-extra" IN_LIST FEATURES) list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/clang-tidy/plugin") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/clang-tidy/misc/ConfusableTable") endif() if("pstl" IN_LIST FEATURES) diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 1f0bd34bda64f3..99f7b717a8b632 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,12 +1,16 @@ { "name": "llvm", - "version": "14.0.6", - "port-version": 1, + "version": "15.0.7", + "port-version": 3, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", "supports": "!uwp & !(arm & windows)", "dependencies": [ + { + "name": "atlmfc", + "platform": "windows & !mingw" + }, { "name": "vcpkg-cmake", "host": true @@ -47,7 +51,6 @@ "name": "llvm", "default-features": false, "features": [ - "compiler-rt", "tools" ] } @@ -66,7 +69,16 @@ ] }, "compiler-rt": { - "description": "Include compiler's runtime libraries." + "description": "Include compiler's runtime libraries.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "clang" + ] + } + ] }, "default-options": { "description": "Build with default options.", @@ -80,7 +92,8 @@ "enable-bindings", "enable-terminfo", "enable-threads", - "enable-zlib" + "enable-zlib", + "enable-zstd" ] } ] @@ -162,6 +175,18 @@ "libffi" ] }, + "enable-ios": { + "description": "Build compiler-rt for iOS SDK.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-arm" + ] + } + ] + }, "enable-libxml2": { "description": "Build with LibXml2.", "dependencies": [ @@ -183,6 +208,12 @@ "zlib" ] }, + "enable-zstd": { + "description": "Build with zstd.", + "dependencies": [ + "zstd" + ] + }, "flang": { "description": "Include Fortran front end.", "dependencies": [ @@ -213,10 +244,28 @@ ] }, "libcxxabi": { - "description": "Include libcxxabi library." + "description": "Include libcxxabi library.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] }, "libunwind": { - "description": "Include libunwind library." + "description": "Include libunwind library.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] }, "lld": { "description": "Include LLVM linker.", @@ -237,6 +286,8 @@ "name": "llvm", "default-features": false, "features": [ + "clang", + "enable-terminfo", "tools" ] } @@ -261,6 +312,7 @@ "name": "llvm", "default-features": false, "features": [ + "clang", "utils" ] } diff --git a/ports/log4cxx/expat.patch b/ports/log4cxx/expat.patch deleted file mode 100644 index 8248ddb47b6838..00000000000000 --- a/ports/log4cxx/expat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4b96376..8b966872 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,7 @@ find_package(APR-Util REQUIRED) - find_package( Threads REQUIRED ) - - # Find expat for XML parsing --find_package(EXPAT REQUIRED) -+find_package(expat CONFIG REQUIRED) - if(TARGET EXPAT::EXPAT) - set(EXPAT_LIBRARIES EXPAT::EXPAT) - elseif(TARGET expat::expat) diff --git a/ports/log4cxx/linux.patch b/ports/log4cxx/linux.patch deleted file mode 100644 index 01c51c21880f3a..00000000000000 --- a/ports/log4cxx/linux.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/cmake/FindAPR.cmake b/src/cmake/FindAPR.cmake -index a204ece..4d2b48d 100644 ---- a/src/cmake/FindAPR.cmake -+++ b/src/cmake/FindAPR.cmake -@@ -45,7 +45,11 @@ if(EXISTS ${APR_CONFIG_EXECUTABLE}) - else() - find_path(APR_INCLUDE_DIR apr.h PATH_SUFFIXES apr-1) - if (APR_STATIC OR NOT BUILD_SHARED_LIBS) -- set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4) -+ if(WIN32) -+ set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4) -+ else() -+ set(APR_SYSTEM_LIBS pthread) -+ endif() - set(APR_COMPILE_DEFINITIONS APR_DECLARE_STATIC) - find_library(APR_LIBRARIES NAMES apr-1) - else() diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 98f22ce70b836b..849a5c94a9e216 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -1,16 +1,11 @@ -set(VERSION 0.13.0) vcpkg_download_distfile(ARCHIVE URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz" FILENAME "apache-log4cxx-${VERSION}.tar.gz" - SHA512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5 + SHA512 a6b928d7b5b4fb60a67504be082f436a6d1a750b752a89df51d0660670b6c008e7376cf56c1749fd5fc17777ae8a2d957f72879c9a89487ecb0f179999dc1283 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES - expat.patch - threadutility.patch - linux.patch ) vcpkg_cmake_configure( diff --git a/ports/log4cxx/threadutility.patch b/ports/log4cxx/threadutility.patch deleted file mode 100644 index 526f19ed8efee9..00000000000000 --- a/ports/log4cxx/threadutility.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/main/cpp/threadutility.cpp b/src/main/cpp/threadutility.cpp -index b57ab66b..c14c12fd 100644 ---- a/src/main/cpp/threadutility.cpp -+++ b/src/main/cpp/threadutility.cpp -@@ -16,8 +16,11 @@ - */ - - #include "log4cxx/helpers/threadutility.h" --#include "log4cxx/private/log4cxx_private.h" - #include "log4cxx/helpers/loglog.h" -+#if !defined(LOG4CXX) -+ #define LOG4CXX 1 -+#endif -+#include "log4cxx/private/log4cxx_private.h" - - #include - #include diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index b1b6199237daac..48aeae262ee1ed 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "log4cxx", - "version": "0.13.0.1", + "version": "1.0.0", "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", "homepage": "https://logging.apache.org/log4cxx", "license": "Apache-2.0", diff --git a/ports/lpeg/vcpkg.json b/ports/lpeg/vcpkg.json index 55ba23e74e129b..82fb1d2a9e75dd 100644 --- a/ports/lpeg/vcpkg.json +++ b/ports/lpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lpeg", - "version-string": "1.0.2", - "port-version": 3, + "version": "1.0.2", + "port-version": 4, "description": "LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).", "homepage": "https://www.inf.puc-rio.br/~roberto/lpeg", "dependencies": [ diff --git a/ports/ltla-aarand/portfile.cmake b/ports/ltla-aarand/portfile.cmake new file mode 100644 index 00000000000000..cf569bd65e836e --- /dev/null +++ b/ports/ltla-aarand/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/aarand + REF 84d48b65d49ce8b844398f11aff3015b86e17197 + SHA512 78b175055768dd8b0abab421b66d0d16ad9bc23f1d1406d774874d4ea12b11e199554ccf6a6ef02d10ef96ad5f652863e403aa3ec9522211958c78d243821ee5 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DAARAND_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_aarand + CONFIG_PATH lib/cmake/ltla_aarand +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-aarand/vcpkg.json b/ports/ltla-aarand/vcpkg.json new file mode 100644 index 00000000000000..60c5c7cf8fb618 --- /dev/null +++ b/ports/ltla-aarand/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ltla-aarand", + "version-date": "2023-03-19", + "description": "Aaron's random distributions for C++", + "homepage": "https://github.com/LTLA/aarand", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-cppirlba/portfile.cmake b/ports/ltla-cppirlba/portfile.cmake new file mode 100644 index 00000000000000..7a71588401d1ba --- /dev/null +++ b/ports/ltla-cppirlba/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/CppIrlba + REF d23a4c12b95563907cf8ca7584b7bb6625ff886b + SHA512 1fdc9552ab00c7c541b4cd34326075f257a30ebcf73dd633dd088b20a20cb0dd704be0c3295ab96d5a573cb1a783c19f34a3e5d860c719e413c098fd9df4cb3a + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DIRLBA_FETCH_EXTERN=OFF + -DIRLBA_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_irlba + CONFIG_PATH lib/cmake/ltla_irlba +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-cppirlba/vcpkg.json b/ports/ltla-cppirlba/vcpkg.json new file mode 100644 index 00000000000000..eaafa717bbef97 --- /dev/null +++ b/ports/ltla-cppirlba/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ltla-cppirlba", + "version-date": "2023-04-07", + "description": "A C++ port of the IRLBA algorithm, based on the C code in the R package.", + "homepage": "https://github.com/LTLA/CppIrlba", + "license": "MIT", + "dependencies": [ + "eigen3", + "ltla-aarand", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-cppkmeans/portfile.cmake b/ports/ltla-cppkmeans/portfile.cmake new file mode 100644 index 00000000000000..f98a4b2f7438bf --- /dev/null +++ b/ports/ltla-cppkmeans/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/CppKmeans + REF 4c5aca44bffd8ed7d7243b2451105b572028e9d4 + SHA512 c56147bc89ab50aa4d738c1392dffcf32771ad4995cbb206a83af05294dbfe640a1da265d46e108816486374fe0e6fa45c1b1da770cdc4367a69195c3510ecd4 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKMEANS_FETCH_EXTERN=OFF + -DKMEANS_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_kmeans + CONFIG_PATH lib/cmake/ltla_kmeans +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-cppkmeans/vcpkg.json b/ports/ltla-cppkmeans/vcpkg.json new file mode 100644 index 00000000000000..d3a3902ba0a82a --- /dev/null +++ b/ports/ltla-cppkmeans/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ltla-cppkmeans", + "version-date": "2023-03-20", + "description": "C++ port of R's Hartigan-Wong implementation", + "homepage": "https://github.com/LTLA/CppKmeans", + "license": "MIT", + "dependencies": [ + "ltla-aarand", + "ltla-powerit", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-knncolle/portfile.cmake b/ports/ltla-knncolle/portfile.cmake new file mode 100644 index 00000000000000..98855cdb83925e --- /dev/null +++ b/ports/ltla-knncolle/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/knncolle + REF 3ad6b8cdbd281d78c77390d5a6ded4513bdf3860 + SHA512 c6e66d8ea5501cb511fd88155d18b57b31661ad0e20f3289d9a7ec8fc558f91dd409487b53d41171111fdaa2baa11fe9548f01daf307a90121d17dc398203676 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKNNCOLLE_FETCH_EXTERN=OFF + -DKNNCOLLE_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_knncolle + CONFIG_PATH lib/cmake/ltla_knncolle +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-knncolle/vcpkg.json b/ports/ltla-knncolle/vcpkg.json new file mode 100644 index 00000000000000..f6655c6642c76d --- /dev/null +++ b/ports/ltla-knncolle/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "ltla-knncolle", + "version-date": "2023-05-09", + "description": "Collection of KNN algorithms in C++", + "homepage": "https://github.com/LTLA/knncolle", + "license": "MIT", + "dependencies": [ + "annoy", + "hnswlib", + "ltla-cppkmeans", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-powerit/portfile.cmake b/ports/ltla-powerit/portfile.cmake new file mode 100644 index 00000000000000..6843077ee34a6f --- /dev/null +++ b/ports/ltla-powerit/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/powerit + REF 705c4a6209baeaf4a246c8a61c46ecd0d3473511 + SHA512 e45172baf90fe2e76152a53feb2a3b613a355482b657e5bc71f0eca4199dff947da70b44edd87efbdc4929eb39ec4455300edaf8f95eb394f61213657c97c321 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPOWERIT_FETCH_EXTERN=OFF + -DPOWERIT_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_powerit + CONFIG_PATH lib/cmake/ltla_powerit +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-powerit/vcpkg.json b/ports/ltla-powerit/vcpkg.json new file mode 100644 index 00000000000000..363288278eb957 --- /dev/null +++ b/ports/ltla-powerit/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ltla-powerit", + "version-date": "2023-03-19", + "description": "Lightweight C++ library for power iterations", + "homepage": "https://github.com/LTLA/powerit", + "license": "MIT", + "dependencies": [ + "ltla-aarand", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-umappp/portfile.cmake b/ports/ltla-umappp/portfile.cmake new file mode 100644 index 00000000000000..3d08dd6e17cfb1 --- /dev/null +++ b/ports/ltla-umappp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/umappp + REF d18095ea8b6d62aa740a566411e439eaab16b71f + SHA512 5f05c9cd7eeac2c16e8dbb0e747c84bc5209e91e37cf8a120273b01f681e19afa69d52e03a6862386c75d9f4d62d925135087c69b835257764aa1f490d92ef3d + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUMAPPP_FETCH_EXTERN=OFF + -DUMAPPP_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_umappp + CONFIG_PATH lib/cmake/ltla_umappp +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-umappp/vcpkg.json b/ports/ltla-umappp/vcpkg.json new file mode 100644 index 00000000000000..5184116d9f399a --- /dev/null +++ b/ports/ltla-umappp/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "ltla-umappp", + "version-date": "2023-05-11", + "description": "UMAP C++ implementation", + "homepage": "https://github.com/LTLA/umappp", + "license": "BSD-2-Clause", + "dependencies": [ + "ltla-aarand", + "ltla-cppirlba", + "ltla-knncolle", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/lua/CMakeLists-cpp.txt b/ports/lua/CMakeLists-cpp.txt index 88e128ffff9222..ec988b5fffd90e 100644 --- a/ports/lua/CMakeLists-cpp.txt +++ b/ports/lua/CMakeLists-cpp.txt @@ -13,7 +13,7 @@ IF (UNIX) FIND_LIBRARY (LIB_DLOPEN NAMES dl) IF (LIB_DLOPEN) TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) - TARGET_LINK_LIBRARIES (lua-cpp ${LIB_DLOPEN}) + TARGET_LINK_LIBRARIES (lua-cpp ${CMAKE_DL_LIBS}) ENDIF () ENDIF () ENDIF () diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index c88b600eb52442..0a180032fdbfda 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -7,11 +7,10 @@ # - This is a source-incompatible change because extern "C" is chosen by the including application. # - The lua.hpp header will not be available. -PROJECT ( lua ) - - CMAKE_MINIMUM_REQUIRED(VERSION 3.18) +PROJECT(lua) + # Build Libraries FILE(GLOB HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.h") # For luac.c diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index e607a6f61f5dc0..6eeeeb1ffecfa8 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_download_distfile(ARCHIVE FILENAME "lua-5.4.4.tar.gz" SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES vs2015-impl-c99.patch diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index 282bb43779c49e..a98f37bd1d436c 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lua", "version": "5.4.4", - "port-version": 5, + "port-version": 7, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", "license": null, diff --git a/ports/luafilesystem/vcpkg.json b/ports/luafilesystem/vcpkg.json index 57dd1b446d9b69..e0ed0a18372391 100644 --- a/ports/luafilesystem/vcpkg.json +++ b/ports/luafilesystem/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luafilesystem", - "version-string": "1.8.0", - "port-version": 3, + "version": "1.8.0", + "port-version": 4, "description": "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.", "homepage": "https://github.com/keplerproject/luafilesystem", "dependencies": [ diff --git a/ports/luajit/004-fix-build-path-and-crt-linkage.patch b/ports/luajit/004-fix-build-path-and-crt-linkage.patch deleted file mode 100644 index 5d3aaeaaeb4e3b..00000000000000 --- a/ports/luajit/004-fix-build-path-and-crt-linkage.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index d323d8d..6e61150 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -15,19 +15,20 @@ - @setlocal - @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK - @set DEBUGCFLAGS= --@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline -+@set SOURCEDIR=%1 -+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR% - @set LJLINK=link /nologo - @set LJMT=mt /nologo - @set LJLIB=lib /nologo /nodefaultlib --@set DASMDIR=..\dynasm -+@set DASMDIR=%SOURCEDIR%\..\dynasm - @set DASM=%DASMDIR%\dynasm.lua --@set DASC=vm_x64.dasc -+@set DASC=%SOURCEDIR%\vm_x64.dasc - @set LJDLLNAME=lua51.dll - @set LJLIBNAME=lua51.lib - @set BUILDTYPE=release --@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c -+@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c %SOURCEDIR%\lib_buffer.c - --%LJCOMPILE% host\minilua.c -+%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:minilua.exe minilua.obj - @if errorlevel 1 goto :BAD -@@ -38,20 +39,20 @@ if exist minilua.exe.manifest^ - @set LJARCH=x64 - @minilua - @if errorlevel 8 goto :X64 --@set DASC=vm_x86.dasc -+@set DASC=%SOURCEDIR%\vm_x86.dasc - @set DASMFLAGS=-D WIN -D JIT -D FFI - @set LJARCH=x86 - @set LJCOMPILE=%LJCOMPILE% /arch:SSE2 - :X64 - @if "%1" neq "nogc64" goto :GC64 - @shift --@set DASC=vm_x86.dasc -+@set DASC=%SOURCEDIR%\vm_x86.dasc - @set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64 - :GC64 --minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% -+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %DASC% - @if errorlevel 1 goto :BAD - --%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c -+%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:buildvm.exe buildvm*.obj - @if errorlevel 1 goto :BAD -@@ -60,41 +61,44 @@ if exist buildvm.exe.manifest^ - - buildvm -m peobj -o lj_vm.obj - @if errorlevel 1 goto :BAD --buildvm -m bcdef -o lj_bcdef.h %ALL_LIB% -+buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m ffdef -o lj_ffdef.h %ALL_LIB% -+buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m libdef -o lj_libdef.h %ALL_LIB% -+buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m recdef -o lj_recdef.h %ALL_LIB% -+buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB% -+buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m folddef -o lj_folddef.h lj_opt_fold.c -+buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c - @if errorlevel 1 goto :BAD - --@if "%1" neq "debug" goto :NODEBUG -+@if "%2"=="static" set CRT_LINKAGE=/MT -+@if "%2"=="dynamic" set CRT_LINKAGE=/MD -+@set LJLINK=%LJLINK% /debug -+@if "%3" neq "debug" goto :NODEBUG - @shift - @set BUILDTYPE=debug - @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% --@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no -+@set CRT_LINKAGE=%CRT_LINKAGE%d - :NODEBUG - @set LJLINK=%LJLINK% /%BUILDTYPE% --@if "%1"=="amalg" goto :AMALGDLL --@if "%1"=="static" goto :STATIC --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c -+@if "%3"=="amalg" goto :AMALGDLL -+@if "%3"=="static" goto :STATIC -+%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD - @goto :MTDLL - :STATIC --%LJCOMPILE% lj_*.c lib_*.c -+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD - @goto :MTDLL - :AMALGDLL --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c -+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj - @if errorlevel 1 goto :BAD -@@ -102,7 +106,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c - if exist %LJDLLNAME%.manifest^ - %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 - --%LJCOMPILE% luajit.c -+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c /Fdluajit.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% - @if errorlevel 1 goto :BAD -@@ -110,8 +114,8 @@ if exist luajit.exe.manifest^ - %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe - - @del *.obj *.manifest minilua.exe buildvm.exe --@del host\buildvm_arch.h --@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h -+@del %SOURCEDIR%\host\buildvm_arch.h -+@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h - @echo. - @echo === Successfully built LuaJIT for Windows/%LJARCH% === - -@@ -124,4 +128,5 @@ if exist luajit.exe.manifest^ - @goto :END - :FAIL - @echo You must open a "Visual Studio Command Prompt" to run this script -+exit 1 - :END diff --git a/ports/luajit/Makefile.nmake b/ports/luajit/Makefile.nmake new file mode 100644 index 00000000000000..5dadd97351ca76 --- /dev/null +++ b/ports/luajit/Makefile.nmake @@ -0,0 +1,20 @@ +all: + @echo _CL_ = $(_CL_) + @echo _LINK_ = $(_LINK_) + cd src && .\msvcbuild.bat $(MSVCBUILD_OPTIONS) + +install: src/luajit.exe + -mkdir "$(INSTALLDIR)" + -mkdir "$(INSTALLDIR)\bin" + copy src\luajit.exe "$(INSTALLDIR)\bin\" + if exist src\lua51.dll copy src\lua51.dll "$(INSTALLDIR)\bin\" + -mkdir "$(INSTALLDIR)\lib" + copy src\lua51.lib "$(INSTALLDIR)\lib\" + -mkdir "$(INSTALLDIR)\include" + -mkdir "$(INSTALLDIR)\include\luajit" + copy src/lua.h "$(INSTALLDIR)\include\luajit\" + copy src/luajit.h "$(INSTALLDIR)\include\luajit\" + copy src/luaconf.h "$(INSTALLDIR)\include\luajit\" + copy src/lualib.h "$(INSTALLDIR)\include\luajit\" + copy src/lauxlib.h "$(INSTALLDIR)\include\luajit\" + copy src/lua.hpp "$(INSTALLDIR)\include\luajit\" diff --git a/ports/luajit/configure b/ports/luajit/configure new file mode 100755 index 00000000000000..49171aa39f652d --- /dev/null +++ b/ports/luajit/configure @@ -0,0 +1,86 @@ +#!/bin/sh + +set -e + +LJARCH= +LUAJIT_BUILDMODE= +LUAJIT_BUILDVM_X= +LUAJIT_DASM_ARCHS= +LUAJIT_PREFIX= +for OPTION; do + case "${OPTION}" in + --prefix=*) + LUAJIT_PREFIX="${OPTION#--prefix=}" + ;; + BUILDMODE=*) + LUAJIT_BUILDMODE="${OPTION#BUILDMODE=}" + ;; + BUILDVM_X=*) + LUAJIT_BUILDVM_X="${OPTION#BUILDVM_X=}" + ;; + DASM_ARCHS=*) + LUAJIT_DASM_ARCHS="${OPTION#DASM_ARCHS=}" + ;; + LJARCH=*) + LJARCH="${OPTION#LJARCH=}" + ;; + esac +done + +cat > Makefile.vcpkg < [-m32] -E src/lj_arch.h -dM' +TARGET_TESTARCH_COMMON += 'LJ_LE 1' 'LJ_HASJIT 1' 'LJ_HASFFI 1' 'LJ_ARCH_HASFPU 1' 'LJ_ABI_SOFTFP 0' +TARGET_TESTARCH_COMMON_32 += \$(TARGET_TESTARCH_COMMON) 'LJ_ARCH_BITS 32' +TARGET_TESTARCH_COMMON_64 += \$(TARGET_TESTARCH_COMMON) 'LJ_ARCH_BITS 64' 'LJ_TARGET_GC64 1' +TARGET_TESTARCH_arm = \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_ARM +TARGET_TESTARCH_arm64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_ARM64 'LJ_ARCH_VERSION 80' +TARGET_TESTARCH_x86 = \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_X86 +TARGET_TESTARCH_x64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_X64 'LJ_DUALNUM 1' 'LJ_FR2 1' + +all: + \$(MAKE) clean \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) + \$(MAKE) all \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) + for DA in \$(DASM_ARCHS); do \\ + rm -f src/host/buildvm_arch.h src/host/*.o; \\ + case "\$\$DA" in \\ + arm) TARGET_TESTARCH="\$(TARGET_TESTARCH_arm)" ;; \\ + arm64) TARGET_TESTARCH="\$(TARGET_TESTARCH_arm64)" ;; \\ + x86) TARGET_TESTARCH="\$(TARGET_TESTARCH_x86)" ;; \\ + x64) TARGET_TESTARCH="\$(TARGET_TESTARCH_x64)" ;; \\ + esac ; \\ + \$(MAKE) -C src host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX) \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) \\ + BUILDVM_T=host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX) "TARGET_TESTARCH=\$\${TARGET_TESTARCH}" \\ + || exit 1; \\ + done + +install: + \$(MAKE) install \$(COMMON_OPTIONS) + for DA in \$(DASM_ARCHS); do \\ + mkdir -p "\$\${DESTDIR}\$(BUILDVM_PREFIX)"; \\ + install -m 0755 "src/host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX)" "\$\${DESTDIR}\$(BUILDVM_PREFIX)/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX)" || exit 1 ; \\ + done + +END_MAKEFILE diff --git a/ports/luajit/luajit.pc.win.in b/ports/luajit/luajit.pc.win.in index 56c0c5783af24b..b90d065426b03a 100644 --- a/ports/luajit/luajit.pc.win.in +++ b/ports/luajit/luajit.pc.win.in @@ -6,7 +6,7 @@ version=${majver}.${minver}.${relver}-beta3 abiver=51 prefix=@PREFIX@ -multilib=@LJIT_LIBDIR@ +multilib=lib exec_prefix=${prefix} libdir=${exec_prefix}/${multilib} libname=lua${abiver} diff --git a/ports/luajit/msvcbuild.patch b/ports/luajit/msvcbuild.patch new file mode 100644 index 00000000000000..8e2e756d8bcd6b --- /dev/null +++ b/ports/luajit/msvcbuild.patch @@ -0,0 +1,31 @@ +diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat +index aab4ef1..e92c486 100644 +--- a/src/msvcbuild.bat ++++ b/src/msvcbuild.bat +@@ -79,10 +79,9 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c + @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% + @set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no + :NODEBUG +-@set LJLINK=%LJLINK% /%BUILDTYPE% + @if "%1"=="amalg" goto :AMALGDLL + @if "%1"=="static" goto :STATIC +-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c ++%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c /Fdlua51.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj + @if errorlevel 1 goto :BAD +@@ -102,7 +101,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c + if exist %LJDLLNAME%.manifest^ + %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 + +-%LJCOMPILE% luajit.c ++%LJCOMPILE% luajit.c /Fdluajit.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% + @if errorlevel 1 goto :BAD +@@ -124,4 +123,5 @@ if exist luajit.exe.manifest^ + @goto :END + :FAIL + @echo You must open a "Visual Studio Command Prompt" to run this script ++@exit 1 + :END diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index c272e9b1e93bfe..4688fcb2983e50 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -1,7 +1,6 @@ +set(extra_patches "") if (VCPKG_TARGET_IS_OSX) - set (LJIT_PATCHES 005-do-not-pass-ld-e-macosx.patch) -else() - set (LJIT_PATCHES "") + list(APPEND extra_patches 005-do-not-pass-ld-e-macosx.patch) endif() vcpkg_from_github( @@ -11,124 +10,95 @@ vcpkg_from_github( SHA512 e4111b2d7eeb05676c62d69da13a380a51d98f082c0be575a414c09ee27ff17d101b5b4a95e1b8a1bad14d55a4d2b305718a11878fbf36e0d3d48e62ba03407f HEAD_REF master PATCHES + msvcbuild.patch 003-do-not-set-macosx-deployment-target.patch - 004-fix-build-path-and-crt-linkage.patch - ${LJIT_PATCHES} + ${extra_patches} ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set (LJIT_STATIC "") - set (LJIT_MSVC_PC_CFLAGS "/DLUA_BUILD_AS_DLL=1") -else() - set (LJIT_STATIC "static") - set (LJIT_MSVC_PC_CFLAGS "") -endif() +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") -if(VCPKG_TARGET_IS_OSX) - set(MACOSX_DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}") - set(TARGET_ARCHITECTURE "${VCPKG_TARGET_ARCHITECTURE}") - if(TARGET_ARCHITECTURE STREQUAL x64) - set(TARGET_ARCHITECTURE x86_64) +if(VCPKG_DETECTED_MSVC) + # Due to lack of better MSVC cross-build support, just always build the host + # minilua tool with the target toolchain. This will work for native builds and + # for targeting x86 from x64 hosts. (UWP and ARM64 is unsupported.) + vcpkg_list(SET options) + set(PKGCONFIG_CFLAGS "") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND options "MSVCBUILD_OPTIONS=static") + else() + set(PKGCONFIG_CFLAGS "/DLUA_BUILD_AS_DLL=1") endif() - list(APPEND MACOSX_ARCHITECTURES "TARGET_CFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin") - list(APPEND MACOSX_ARCHITECTURES "TARGET_LDFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin") -endif() - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_execute_required_process_repeat( - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - LOGNAME build-${TARGET_TRIPLET}-dbg - ) + vcpkg_install_nmake(SOURCE_PATH "${SOURCE_PATH}" + PROJECT_NAME "${CMAKE_CURRENT_LIST_DIR}/Makefile.nmake" + OPTIONS + ${options} + ) - # Note that luajit's build system responds to failure by producing no output; in particular a likely outcome is - # only 'minilua.exe' being produced. This resulted in: - # https://github.com/microsoft/vcpkg/pull/25856#issuecomment-1214285736 - # Please ensure luajit.exe is actually produced when making future changes. - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - set(LJIT_LIBDIR "debug/lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/luajit.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" @ONLY) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") - endif() - vcpkg_copy_pdbs() - else() - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clean-${TARGET_TRIPLET}-debug - ) - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-debug - ) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" "multilib=lib" "multilib=debug/lib") endif() -endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) - message(STATUS "Building ${TARGET_TRIPLET}-rel") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - - if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_execute_required_process_repeat( - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - LOGNAME build-${TARGET_TRIPLET}-rel + vcpkg_copy_pdbs() +else() + vcpkg_list(SET options) + if(VCPKG_CROSSCOMPILING) + list(APPEND options + "LJARCH=${VCPKG_TARGET_ARCHITECTURE}" + "BUILDVM_X=${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/buildvm-${VCPKG_TARGET_ARCHITECTURE}${VCPKG_HOST_EXECUTABLE_SUFFIX}" ) + endif() - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - set(LJIT_LIBDIR "lib") - configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/luajit.pc" @ONLY) + vcpkg_list(SET make_options "EXECUTABLE_SUFFIX=${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_IS_OSX) + vcpkg_list(APPEND make_options "TARGET_SYS=Darwin") + elseif(VCPKG_TARGET_IS_IOS) + vcpkg_list(APPEND make_options "TARGET_SYS=iOS") + elseif(VCPKG_TARGET_IS_LINUX) + vcpkg_list(APPEND make_options "TARGET_SYS=Linux") + elseif(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND make_options "TARGET_SYS=Windows") + endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - vcpkg_copy_tools(TOOL_NAMES luajit SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools AUTO_CLEAN) - endif() - vcpkg_copy_pdbs() - else() - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clean-${TARGET_TRIPLET}-rel - ) - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-rel - ) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua") + set(dasm_archs "") + if("buildvm-32" IN_LIST FEATURES) + string(APPEND dasm_archs " arm x86") + endif() + if("buildvm-64" IN_LIST FEATURES) + string(APPEND dasm_archs " arm64 x64") endif() -endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" + COPY_SOURCE + OPTIONS + "BUILDMODE=${VCPKG_LIBRARY_LINKAGE}" + ${options} + OPTIONS_RELEASE + "DASM_ARCHS=${dasm_archs}" + ) + vcpkg_install_make( + MAKEFILE "Makefile.vcpkg" + OPTIONS + ${make_options} + "TARGET_AR=${VCPKG_DETECTED_CMAKE_AR} rcus" + "TARGET_STRIP=${VCPKG_DETECTED_CMAKE_STRIP}" + ) endif() -file(INSTALL "${SOURCE_PATH}/src/lua.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/luajit.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/luaconf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/lualib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/lauxlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/lua.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/lua" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/lua" + "${CURRENT_PACKAGES_DIR}/share/lua" + "${CURRENT_PACKAGES_DIR}/share/man" +) + +vcpkg_copy_tools(TOOL_NAMES luajit AUTO_CLEAN) vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT") diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 91f54602f04930..6eb2ddc091b305 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,11 +1,28 @@ { "name": "luajit", "version-date": "2023-01-04", + "port-version": 1, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", - "supports": "!uwp", + "supports": "!uwp & !(arm64 & windows)", "dependencies": [ + { + "name": "luajit", + "host": true, + "features": [ + "buildvm-64" + ], + "platform": "!native & (arm64 | x64) & (!windows | mingw)" + }, + { + "name": "luajit", + "host": true, + "features": [ + "buildvm-32" + ], + "platform": "!native & ((arm & !arm64) | x86) & (!windows | mingw)" + }, { "name": "vcpkg-cmake", "host": true @@ -13,6 +30,20 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ], + "features": { + "buildvm-32": { + "description": "Install host tools for 32 bit targets", + "supports": "native & ((arm & !arm64) | x86) & (!windows | mingw)" + }, + "buildvm-64": { + "description": "Install host tools for 64 bit targets", + "supports": "native & (arm64 | x64) & (!windows | mingw)" } - ] + } } diff --git a/ports/luasec/portfile.cmake b/ports/luasec/portfile.cmake index ee2fff5a6046c7..ced0899615310e 100644 --- a/ports/luasec/portfile.cmake +++ b/ports/luasec/portfile.cmake @@ -1,5 +1,5 @@ -set(LUASEC_REVISION v1.1.0) -set(LUASEC_HASH ce08be2c62e97ebfab30e867790874030d404d195ce336b149d9501d652e9b8efe201cc2d0bcbb3be16214d7e4763b5871e45cbc22db758724baab9f7cd78568) +set(LUASEC_REVISION "v${VERSION}") +set(LUASEC_HASH cfa4187518445abc6591bd0c24924122b62252be25ffd5564cf291f9a2ae3702a5fa299ffd265d2e0e8315b90d6783eccace4ff560f54f299161d3c5e3749508) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -26,7 +26,7 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE) # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/luasec/vcpkg.json b/ports/luasec/vcpkg.json index 98f86d809f6665..25b94e81563286 100644 --- a/ports/luasec/vcpkg.json +++ b/ports/luasec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "luasec", - "version": "1.1.0", + "version": "1.3.1", "maintainers": "Stephen Baker ", "description": "LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts.", "homepage": "https://github.com/brunoos/luasec", diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index 2b08c476903f09..a2a126e8ad2ee2 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lunarmodules/luasocket - REF v3.0.0 - SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6 + REF "v${VERSION}" + SHA512 1e9e98484740ec6538fe3d2b0dab74d31f052956ecf9ee3b60e229f2d0b13fcc6d4aaf74cd2a3e2ee330333dabb316fe6a43c60baaea26f0cc01069b6aa4519b HEAD_REF master) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -18,28 +18,19 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/luasocket") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGES_DIR}/share/luasocket/copyright") +vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # Handle socket dll name - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll") - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb") - endif() - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll") - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb") - endif() + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll" RESULT temp) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb" RESULT temp) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll" RESULT temp) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb" RESULT temp) # Handle mime dll name - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll") - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb") - endif() - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll") - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb") - endif() + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll" RESULT temp) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb" RESULT temp) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll" RESULT temp) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb" RESULT temp) endif() # Allow empty include directory diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json index c8a6525690f4da..719065696084d5 100644 --- a/ports/luasocket/vcpkg.json +++ b/ports/luasocket/vcpkg.json @@ -1,7 +1,6 @@ { "name": "luasocket", - "version": "3.0.0", - "port-version": 1, + "version": "3.1.0", "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.", "homepage": "https://lunarmodules.github.io/luasocket/", "license": "MIT", diff --git a/ports/lzfse/vcpkg.json b/ports/lzfse/vcpkg.json index 0ce096d3c91473..c156f05043dbd5 100644 --- a/ports/lzfse/vcpkg.json +++ b/ports/lzfse/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lzfse", - "version-string": "1.0", - "port-version": 4, + "version": "1.0", + "port-version": 5, "description": "Lempel-Ziv style data compressor using Finite State Entropy coding.", "homepage": "https://github.com/lzfse/lzfse", "supports": "!arm", diff --git a/ports/lzo/vcpkg.json b/ports/lzo/vcpkg.json index 0fa7596c0a61da..adcf8037902a03 100644 --- a/ports/lzo/vcpkg.json +++ b/ports/lzo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lzo", - "version-string": "2.10", - "port-version": 8, + "version": "2.10", + "port-version": 9, "description": "Lossless data compression library", "homepage": "https://www.oberhumer.com/opensource/lzo/", "dependencies": [ diff --git a/ports/lzokay/vcpkg.json b/ports/lzokay/vcpkg.json index 9de82907a6b0ac..e50fda6a0ab4d6 100644 --- a/ports/lzokay/vcpkg.json +++ b/ports/lzokay/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lzokay", - "version-string": "2020-07-30", - "port-version": 1, + "version-date": "2020-07-30", + "port-version": 2, "description": "lzokay – MIT licensed C++ implementation of LZO compression/decompression algorithm", "homepage": "https://github.com/jackoalan/lzokay", "dependencies": [ diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 47167025a0fe61..e365fe10cffcae 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,15 +3,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.8.2 - SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a + REF v0.9.1 + SHA512 d76acfec5c8bdd1c22d1e278bc28965c8a15ec119b9671bf1bc49c143171f3ec9924e7f7b2e5ca689674f862f81600f7e92ace04f95f9cd96eeeed519fdf55d5 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF -DMAGIC_ENUM_OPT_INSTALL=ON diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 45c695ae9b35f4..6e7b955570ceef 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version": "0.8.2", + "version": "0.9.1", "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum", "license": "MIT", diff --git a/ports/magic-get/vcpkg.json b/ports/magic-get/vcpkg.json index bb803ad76345cb..3e51827069ac02 100644 --- a/ports/magic-get/vcpkg.json +++ b/ports/magic-get/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magic-get", - "version-string": "2019-09-02", - "port-version": 2, + "version-date": "2019-09-02", + "port-version": 3, "description": "Deprecated boost-pfr port.", "homepage": "https://github.com/apolukhin/magic_get", "dependencies": [ diff --git a/ports/magnum-integration/portfile.cmake b/ports/magnum-integration/portfile.cmake index 21ee8cb6741fce..a16467e96cca40 100644 --- a/ports/magnum-integration/portfile.cmake +++ b/ports/magnum-integration/portfile.cmake @@ -44,6 +44,12 @@ if("${FEATURES}" STREQUAL "core") "${CURRENT_PACKAGES_DIR}/debug" ) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +else() + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/*") + list(LENGTH FILES COUNT) + if(COUNT EQUAL 0) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/magnum-integration/vcpkg.json b/ports/magnum-integration/vcpkg.json index e3d7399895adab..f54866e439d853 100644 --- a/ports/magnum-integration/vcpkg.json +++ b/ports/magnum-integration/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum-integration", "version-string": "2020.06", - "port-version": 2, + "port-version": 3, "description": "Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, diff --git a/ports/makeid/portfile.cmake b/ports/makeid/portfile.cmake new file mode 100644 index 00000000000000..b4328b40ccc3d8 --- /dev/null +++ b/ports/makeid/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.humus.name/3D/MakeID.h" + FILENAME "MakeID.h-${VERSION}" + SHA512 9b7cb5c1b71904f37f65fcac3d18194154029fbe04d89099d879ce8eb03e796662c78653322317ed72988d3695414aaa6e6c24cfff999bea5009ec47119c57a7 +) + +file(COPY "${ARCHIVE}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +set(license_text +"Public Domain + +This file is released in the hopes that it will be useful. Use in whatever way you like, but no guarantees that it +actually works or fits any particular purpose. It has been unit-tested and benchmarked though, and seems to do +what it was designed to do, and seems pretty quick at it too." +) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/makeid/copyright" "${license_text}") diff --git a/ports/makeid/vcpkg.json b/ports/makeid/vcpkg.json new file mode 100644 index 00000000000000..fbd793888b2cef --- /dev/null +++ b/ports/makeid/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "makeid", + "version": "1.0.2", + "description": "MakeID is a cross platform C++ library for IDs allocation/deallocation", + "homepage": "http://www.humus.name/index.php?page=3D", + "license": null +} diff --git a/ports/mapbox-variant/vcpkg.json b/ports/mapbox-variant/vcpkg.json index 91f0b61eca10a1..b31533e46a576f 100644 --- a/ports/mapbox-variant/vcpkg.json +++ b/ports/mapbox-variant/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapbox-variant", - "version-string": "1.2.0", - "port-version": 1, + "version": "1.2.0", + "port-version": 2, "description": "C++11/C++14 Variant" } diff --git a/ports/mathc/vcpkg.json b/ports/mathc/vcpkg.json index f326158215eb04..531276a2b49efb 100644 --- a/ports/mathc/vcpkg.json +++ b/ports/mathc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mathc", - "version-string": "2019-09-29", - "port-version": 2, + "version-date": "2019-09-29", + "port-version": 3, "description": "Pure C math library for 2D and 3D programming", "homepage": "https://github.com/felselva/mathc", "dependencies": [ diff --git a/ports/mathgl/fix-include-property.patch b/ports/mathgl/fix-include-property.patch new file mode 100644 index 00000000000000..1c15d38a1cac91 --- /dev/null +++ b/ports/mathgl/fix-include-property.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d44125c..1ad17a1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -53,6 +53,9 @@ generate_export_header(mgl EXPORT_FILE_NAME ../include/mgl2/dllexport.h) + target_link_libraries(mgl ${MGL_DEP_LIBS}) + target_link_libraries(mgl-static ${MGL_DEP_LIBS}) + ++target_include_directories(mgl PUBLIC $) ++target_include_directories(mgl-static PUBLIC $) ++ + mgl_po_src(${mgl_src} ${mgl_hdr}) + + if(MGL_HAVE_MPI) diff --git a/ports/mathgl/include_functional.patch b/ports/mathgl/include_functional.patch new file mode 100644 index 00000000000000..1b7a2b7458caeb --- /dev/null +++ b/ports/mathgl/include_functional.patch @@ -0,0 +1,12 @@ +diff --git a/src/prc/writePRC.h b/src/prc/writePRC.h +index d0b4e0e..3bc68ea 100644 +--- a/src/prc/writePRC.h ++++ b/src/prc/writePRC.h +@@ -31,6 +31,7 @@ + #include "PRC.h" + #include + #include ++#include + + static const uint32_t m1=(uint32_t)-1; + static const double pi=acos(-1.0); diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index 24ada6108252d9..dff022719e63fd 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO mathgl/mathgl @@ -15,6 +14,8 @@ vcpkg_from_sourceforge( fix-format-specifiers.patch fix-glut.patch fix-mgllab.patch + include_functional.patch + fix-include-property.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/addons/getopt") @@ -104,4 +105,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MG vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH\t\"${CURRENT_PACKAGES_DIR}/share/mathgl/fonts\"" "") 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index e56b8c62f1d6c2..dd59023718bb7d 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mathgl", "version": "8.0.1", + "port-version": 2, "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", "license": "GPL-3.0-only", "supports": "!uwp", @@ -98,7 +99,14 @@ "png": { "description": "png module", "dependencies": [ - "libpng" + "libpng", + { + "name": "mathgl", + "default-features": false, + "features": [ + "zlib" + ] + } ] }, "qt5": { diff --git a/ports/matplotlib-cpp/vcpkg.json b/ports/matplotlib-cpp/vcpkg.json index 83944db18a7d0d..8e379d72af4f96 100644 --- a/ports/matplotlib-cpp/vcpkg.json +++ b/ports/matplotlib-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matplotlib-cpp", - "version-string": "2020-08-27", - "port-version": 1, + "version-date": "2020-08-27", + "port-version": 2, "description": "Extremely simple yet powerful header-only C++ plotting library built on the popular matplotlib", "homepage": "https://github.com/lava/matplotlib-cpp" } diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake index eac14d7b7d7d4f..1d07a901205967 100644 --- a/ports/matroska/portfile.cmake +++ b/ports/matroska/portfile.cmake @@ -1,12 +1,8 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "matroska does not currently support UWP") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libmatroska - REF release-1.6.3 - SHA512 f4b4cd5b5e76c452fb559ead28c4bcb5ec4e28d74898f13c1709a6ab75d95cf82b319118445d7a7f895708bb0d5d1f3c09040d3e3263c6a2f2a27ffc92d35c2f + REF release-1.7.1 + SHA512 abb4fb4b527266944b1a59516866462498675c5e71bb679758894dff6156169d7132dddaa2e2ef6187a6dbce4a4aa377eeb75dd869268fd44933c769b34be5b9 HEAD_REF master ) @@ -24,3 +20,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/matroska/vcpkg.json b/ports/matroska/vcpkg.json index 2987f36de745b2..6b2f72d7c7ff8e 100644 --- a/ports/matroska/vcpkg.json +++ b/ports/matroska/vcpkg.json @@ -1,11 +1,14 @@ { "name": "matroska", - "version": "1.6.3", + "version": "1.7.1", + "port-version": 1, "description": "a C++ library to parse Matroska files (.mkv and .mka)", "homepage": "https://github.com/Matroska-Org/libmatroska", - "supports": "!uwp", "dependencies": [ - "ebml", + { + "name": "ebml", + "version>=": "1.4.3" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/mchehab-zbar/portfile.cmake b/ports/mchehab-zbar/portfile.cmake index c2da7714e363a6..9992aaaaf3e420 100644 --- a/ports/mchehab-zbar/portfile.cmake +++ b/ports/mchehab-zbar/portfile.cmake @@ -17,29 +17,9 @@ if("nls" IN_LIST FEATURES) else() vcpkg_list(APPEND options "--disable-nls") set(ENV{AUTOPOINT} true) # true, the program + # Simulate the relevant effects of (interactive) `gettextize`. file(TOUCH "${SOURCE_PATH}/po/Makefile.in.in") - # Get missing build-time m4 files from gettext source - set(gettext_version 0.21.1) - vcpkg_download_distfile(gettext_archive - URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${gettext_version}.tar.gz" - "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${gettext_version}.tar.gz" - FILENAME "gettext-${gettext_version}.tar.gz" - SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05 - ) - file(ARCHIVE_EXTRACT INPUT "${gettext_archive}" - DESTINATION "${SOURCE_PATH}/gettext-autoconf" - PATTERNS "*/gettext-runtime/m4/gettext.m4" - "*/gettext-runtime/m4/iconv.m4" - "*/gettext-runtime/m4/intlmacosx.m4" - "*/gettext-runtime/m4/nls.m4" - "*/gettext-runtime/m4/po.m4" - "*/gettext-runtime/m4/progtest.m4" - "*/gettext-runtime/gnulib-m4/host-cpu-c-abi.m4" - "*/gettext-runtime/gnulib-m4/lib-ld.m4" - "*/gettext-runtime/gnulib-m4/lib-link.m4" - "*/gettext-runtime/gnulib-m4/lib-prefix.m4" - ) - file(GLOB_RECURSE m4_files "${SOURCE_PATH}/gettext-autoconf/*/*.m4") + file(GLOB_RECURSE m4_files "${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/*.m4") file(INSTALL ${m4_files} DESTINATION "${SOURCE_PATH}/config") endif() diff --git a/ports/mchehab-zbar/vcpkg.json b/ports/mchehab-zbar/vcpkg.json index cf61794cc387c8..ff07384aee7536 100644 --- a/ports/mchehab-zbar/vcpkg.json +++ b/ports/mchehab-zbar/vcpkg.json @@ -1,26 +1,30 @@ { "name": "mchehab-zbar", "version": "0.23.90", - "port-version": 3, + "port-version": 4, "description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.", "homepage": "https://github.com/mchehab/zbar", "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ + { + "name": "gettext", + "host": true + }, "libiconv" ], "features": { "nls": { "description": "Native Language Support", "dependencies": [ - "gettext", { "name": "gettext", "host": true, "features": [ "tools" ] - } + }, + "gettext-libintl" ] } } diff --git a/ports/mcpp/vcpkg.json b/ports/mcpp/vcpkg.json index e7636ef29fcf01..dbb305d3591a5a 100644 --- a/ports/mcpp/vcpkg.json +++ b/ports/mcpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mcpp", - "version-string": "2.7.2.14", - "port-version": 4, + "version": "2.7.2.14", + "port-version": 5, "description": "Fork of mcpp, a C/C++ preprocessor", "homepage": "https://github.com/zeroc-ice/mcpp", "dependencies": [ diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json index 772720cdaabf60..7a3c57dc3a2e5e 100644 --- a/ports/mecab/vcpkg.json +++ b/ports/mecab/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mecab", - "version-string": "2019-09-25", - "port-version": 3, + "version-date": "2019-09-25", + "port-version": 4, "description": "A morphological analysis engine based on CRF", "supports": "!(uwp | arm | arm64)", "dependencies": [ diff --git a/ports/memorymodule/vcpkg.json b/ports/memorymodule/vcpkg.json index 49b5726ad7adaa..3d7c422ce96343 100644 --- a/ports/memorymodule/vcpkg.json +++ b/ports/memorymodule/vcpkg.json @@ -1,7 +1,7 @@ { "name": "memorymodule", - "version-string": "2019-12-31", - "port-version": 2, + "version-date": "2019-12-31", + "port-version": 3, "description": "Library to load a DLL from memory", "homepage": "https://github.com/fancycode/MemoryModule", "supports": "!linux & !osx & !uwp", diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 6dbe24e074cfd2..feec2312c1ce91 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -134,4 +134,8 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() +if(FEATURES STREQUAL "core") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/license.rst") diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 14652411688d8b..b652de2bf5d458 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mesa", "version": "23.0.1", + "port-version": 1, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", @@ -111,7 +112,16 @@ ] }, "offscreen": { - "description": "Build with support for offscreen rendering (OSMesa)" + "description": "Build with support for offscreen rendering (OSMesa)", + "dependencies": [ + { + "name": "mesa", + "default-features": false, + "features": [ + "opengl" + ] + } + ] }, "opengl": { "description": "Build support for OpenGL (all versions)", diff --git a/ports/microsoft-signalr/find-msgpack.patch b/ports/microsoft-signalr/find-msgpack.patch new file mode 100644 index 00000000000000..04a812758610a3 --- /dev/null +++ b/ports/microsoft-signalr/find-msgpack.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 676cde2..4562873 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,8 +45,8 @@ set(JSONCPP_LIB "jsoncpp_static" CACHE STRING "jsoncpp target name") + endif() + + if(USE_MSGPACK) +- find_package(msgpack CONFIG REQUIRED) +- set(MSGPACK_LIB "msgpackc-cxx") ++ find_package(msgpack-cxx CONFIG REQUIRED) ++ set(MSGPACK_LIB "msgpack-cxx") + endif() + + include_directories (include) +diff --git a/src/signalrclient/microsoft-signalr-config.in.cmake b/src/signalrclient/microsoft-signalr-config.in.cmake +index b28235b..09a7d56 100644 +--- a/src/signalrclient/microsoft-signalr-config.in.cmake ++++ b/src/signalrclient/microsoft-signalr-config.in.cmake +@@ -7,7 +7,7 @@ endif() + find_dependency(jsoncpp) + + if(@USE_MSGPACK@) +- find_dependency(msgpack) ++ find_dependency(msgpack-cxx CONFIG) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/microsoft-signalr-targets.cmake") +\ No newline at end of file diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index 3b71eafec9f7e4..5830591618837c 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aspnet/SignalR-Client-Cpp - REF v0.1.0-alpha4 + REF "v${VERSION}" SHA512 b87c94e8bc81781c1cfb4292f1fe3ce046a5f192a25c02104f454b533349c1c0ed965570bd749b496bb316ccb89ae51c5e7461ffa06055e71dac659fbde79456 HEAD_REF main + PATCHES + find-msgpack.patch ) vcpkg_check_features( @@ -23,6 +25,7 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF ${FEATURE_OPTIONS} -DWALL=OFF + "-DJSONCPP_LIB=JsonCpp::JsonCpp" ) vcpkg_cmake_install() @@ -31,7 +34,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/share/microsoft-signalr) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(COPY "${SOURCE_PATH}/third-party-notices.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json index 78df0f3dda5448..112a3e72fa9227 100644 --- a/ports/microsoft-signalr/vcpkg.json +++ b/ports/microsoft-signalr/vcpkg.json @@ -1,10 +1,11 @@ { "name": "microsoft-signalr", "version": "0.1.0-alpha4", - "port-version": 2, + "port-version": 6, "description": "C++ Client for ASP.NET Core SignalR.", "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", "dependencies": [ + "jsoncpp", { "name": "vcpkg-cmake", "host": true @@ -33,7 +34,6 @@ "default-features": { "description": "Features installed by default", "dependencies": [ - "jsoncpp", { "name": "microsoft-signalr", "features": [ diff --git a/ports/mikktspace/vcpkg.json b/ports/mikktspace/vcpkg.json index e9afd510076506..317420cc9735d8 100644 --- a/ports/mikktspace/vcpkg.json +++ b/ports/mikktspace/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mikktspace", - "version-string": "2020-10-06", - "port-version": 2, + "version-date": "2020-10-06", + "port-version": 3, "description": "A common standard for tangent space used in baking tools to produce normal maps", "homepage": "https://github.com/mmikk/MikkTSpace", "dependencies": [ diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 4e6dc1aaa6e8ed..6d2cb0901e3e1a 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.9 - SHA512 bf6945bfb600ade35dab34c7f570ee4f69a77612547ad874bbbd989a4e594a6a219c222a22c90c5e36f205aae4d5cd1a5e4651caed5433db275d414c6769bf49 + REF "v${VERSION}" + SHA512 01c7bdfd001ebc34bb0918fe4ecff42a4ec316fbbd73d4dda52c93c31e5712595758a595ae7ea436f445ecc0ebbf7f9c63d9c572f1c1c5a9e96f51fc524a4875 HEAD_REF master PATCHES fix-cmake.patch @@ -55,4 +55,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 70e0c134870390..2a2836e7346112 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimalloc", - "version": "2.0.9", + "version": "2.1.1", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/ports/miniply/fix-cmake.patch b/ports/miniply/fix-cmake.patch new file mode 100644 index 00000000000000..808a940db4ee7b --- /dev/null +++ b/ports/miniply/fix-cmake.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bde25da..e1129db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,19 +2,29 @@ cmake_minimum_required(VERSION 3.5) + + project(miniply LANGUAGES CXX) + ++include(GNUInstallDirs) ++ + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + +-include_directories(.) ++add_library(miniply miniply.cpp) ++ ++target_include_directories(miniply ++ PUBLIC ++ $ ++ $) ++ ++install(FILES ${CMAKE_SOURCE_DIR}/miniply.h ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ ++install(TARGETS miniply EXPORT miniply-config ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ INCLUDES DESTINATION include) + +-add_executable(miniply-perf +- miniply.cpp +- miniply.h +- extra/miniply-perf.cpp +-) ++install(EXPORT miniply-config ++ FILE unofficial-miniply-config.cmake ++ NAMESPACE unofficial::miniply:: ++ DESTINATION share/unofficial-miniply) + +-add_executable(miniply-info +- miniply.cpp +- miniply.h +- extra/miniply-info.cpp +-) diff --git a/ports/miniply/portfile.cmake b/ports/miniply/portfile.cmake new file mode 100644 index 00000000000000..3422934909f4a4 --- /dev/null +++ b/ports/miniply/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vilya/miniply + REF 1a235c70390fadf789695c9ccbf285ae712416b3 + SHA512 856bb39bd36dab588026b9ee886a996bd697df5c1a24de2abff822e037a0fb7af0be19dca5e2f6ccc524453b0b9ee6e225510565ca78f6b965dd7406ba67dac1 + HEAD_REF master + PATCHES + fix-cmake.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-miniply) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/miniply/vcpkg.json b/ports/miniply/vcpkg.json new file mode 100644 index 00000000000000..61e20ae06c7748 --- /dev/null +++ b/ports/miniply/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "miniply", + "version-date": "2022-09-15", + "port-version": 1, + "description": "A fast and easy-to-use PLY parsing library in a single c++11 header and cpp file", + "homepage": "https://github.com/vilya/miniply", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/minitrace/CMakeLists.txt b/ports/minitrace/CMakeLists.txt deleted file mode 100644 index fcae7841ef5717..00000000000000 --- a/ports/minitrace/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(minitrace C) - -set(minitrace_HEADERS minitrace.h) -set(minitrace_SOURCES minitrace.c) - -add_library(minitrace ${minitrace_SOURCES}) - -# Install headers -install(FILES ${minitrace_HEADERS} DESTINATION include/minitrace) - -# Install minitrace -install( - TARGETS minitrace EXPORT minitraceConfig - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) - -# Export config file for minitrace -export( - TARGETS minitrace - NAMESPACE minitrace:: - FILE "${CMAKE_CURRENT_BINARY_DIR}/minitrace-config.cmake" -) - -# Install config file -install( - EXPORT minitraceConfig - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/minitrace" - NAMESPACE minitrace:: -) diff --git a/ports/minitrace/portfile.cmake b/ports/minitrace/portfile.cmake index 06b43396e63a04..b5a4b5a6edb01b 100644 --- a/ports/minitrace/portfile.cmake +++ b/ports/minitrace/portfile.cmake @@ -1,15 +1,11 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hrydgard/minitrace - REF a48215c409dd848fa0a76c5eb4dfaba4ca3bca39 - SHA512 591fa52132b6bbe8e7e121526a43d07056deff8fe026227c1a4c26bebf95536e5d68750fa8551d23afebf048fe8b8503017b9a93650e18a992cf2e5678d46135 + REF a45ca4f58c8af2fc4d4d6042e68aa68bfea422c9 + SHA512 5ea6fb58a1f2397444e58e449fd32b4b45f5a15afe8f8694115a0025f5444cf493ba8228a58f0772ca1dc149fd1633fc897b0a264b8927cfd6cc15eefa40c336 HEAD_REF master ) -file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) diff --git a/ports/minitrace/vcpkg.json b/ports/minitrace/vcpkg.json index cb27c98a27b8e4..8c09d532070baa 100644 --- a/ports/minitrace/vcpkg.json +++ b/ports/minitrace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "minitrace", - "version-string": "2019.02.06", - "port-version": 2, + "version-date": "2023-04-23", "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer.", "dependencies": [ { diff --git a/ports/miniupnpc/vcpkg.json b/ports/miniupnpc/vcpkg.json index c1798a9d4d33a3..ddd85b1b8c2ce0 100644 --- a/ports/miniupnpc/vcpkg.json +++ b/ports/miniupnpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "miniupnpc", - "version-string": "2.1", - "port-version": 3, + "version": "2.1", + "port-version": 4, "description": "UPnP client library/tool to access Internet Gateway Devices", "dependencies": [ { diff --git a/ports/minizip-ng/Modify-header-file-path.patch b/ports/minizip-ng/Modify-header-file-path.patch deleted file mode 100644 index ac1c6fee8b1cad..00000000000000 --- a/ports/minizip-ng/Modify-header-file-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ef8023..ec1ee55 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -81,7 +81,7 @@ include(FeatureSummary) - - set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables") - set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") --set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers") -+set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers") - set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages") - - set(STDLIB_DEF) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 1e290c3be878b8..5b0cd5868e3fd8 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -5,11 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng - REF 241428886216f0f0efd6926efcaaaa13794e51bd #v3.0.7 - SHA512 779a53fafe63b64f5f703448262871c323f5753cbb58001dd0d0ef10de8d3bd7bb6055db4e763e664ccb5b781ce8dd06bf7c3e6b38eca019de835322a833fa06 + REF "${VERSION}" + SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 HEAD_REF master - PATCHES - Modify-header-file-path.patch ) vcpkg_check_features( @@ -31,16 +29,16 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DMZ_FETCH_LIBS=OFF - -DMZ_PROJECT_SUFFIX:STRING=-ng + -DMZ_LIB_SUFFIX=-ng ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index e7c89c8f940210..5d83b7facfed15 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,6 +1,7 @@ { "name": "minizip-ng", - "version": "3.0.7", + "version": "4.0.0", + "port-version": 1, "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "license": "Zlib", diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index 313450b96294bf..6826b5847da58f 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -1,104 +1,115 @@ -cmake_minimum_required(VERSION 3.8) -project(minizip VERSION 1.2.13 LANGUAGES C) +cmake_minimum_required(VERSION 3.25) +project(minizip LANGUAGES C) if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) endif() -find_package(ZLIB REQUIRED) -set(MIN_SRC contrib/minizip) - -include_directories(${MIN_SRC} ${ZLIB_INCLUDE_DIRS}) - -set(MINIZIP_LIBRARIES ZLIB::ZLIB) -if(ENABLE_BZIP2) - message(STATUS "Building with bzip2 support") - find_package(BZip2) - - include_directories(${BZIP2_INCLUDE_DIR}) - set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARIES} ${BZIP2_LIBRARIES}) -else() - message(STATUS "Building without bzip2 support") -endif() - set(SRC - ${MIN_SRC}/ioapi.c - ${MIN_SRC}/unzip.c - ${MIN_SRC}/zip.c - ${MIN_SRC}/mztools.c + ioapi.c + unzip.c + zip.c + mztools.c ) -if(WIN32) - list(APPEND SRC ${MIN_SRC}/iowin32.c) -endif() - set(HEADERS - ${MIN_SRC}/crypt.h - ${MIN_SRC}/ioapi.h - ${MIN_SRC}/unzip.h - ${MIN_SRC}/zip.h - ${MIN_SRC}/mztools.h + crypt.h + ioapi.h + unzip.h + zip.h + mztools.h ) if(WIN32) - list(APPEND HEADERS ${MIN_SRC}/iowin32.h) + list(APPEND SRC iowin32.c) + list(APPEND HEADERS iowin32.h) endif() add_library(minizip ${SRC}) +target_include_directories(minizip PUBLIC $) -target_link_libraries(minizip PRIVATE ZLIB::ZLIB) +find_package(ZLIB REQUIRED) target_compile_definitions(minizip PRIVATE -D_ZLIB_H) +target_link_libraries(minizip PUBLIC ZLIB::ZLIB) +set(MINIZIP_REQUIRES zlib) if(ENABLE_BZIP2) - target_link_libraries(minizip PUBLIC ${BZIP2_LIBRARIES}) + message(STATUS "Building with bzip2 support") + find_package(BZip2 REQUIRED) target_compile_definitions(minizip PRIVATE -DHAVE_BZIP2=1) + target_link_libraries(minizip PUBLIC BZip2::BZip2) + list(APPEND MINIZIP_REQUIRES bzip2) +else() + message(STATUS "Building without bzip2 support") endif() + if(ANDROID) target_compile_definitions(minizip PRIVATE IOAPI_NO_64) endif() + +if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + target_compile_definitions(minizip PRIVATE -DIOWIN32_USING_WINRT_API) +endif() + if(NOT DISABLE_INSTALL_TOOLS) - add_executable(minizip_bin ${MIN_SRC}/minizip.c) - add_executable(miniunz_bin ${MIN_SRC}/miniunz.c) + add_executable(minizip_bin minizip.c) + add_executable(miniunz_bin miniunz.c) - target_link_libraries(minizip_bin minizip ${MINIZIP_LIBRARIES}) - target_link_libraries(miniunz_bin minizip ${MINIZIP_LIBRARIES}) + target_link_libraries(minizip_bin minizip) + target_link_libraries(miniunz_bin minizip) set_target_properties(minizip_bin PROPERTIES OUTPUT_NAME minizip) set_target_properties(miniunz_bin PROPERTIES OUTPUT_NAME miniunz) + + install ( + TARGETS minizip_bin miniunz_bin + RUNTIME DESTINATION bin + ) endif() install( TARGETS minizip - EXPORT minizipTargets + EXPORT unofficial-minizipTargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) include(CMakePackageConfigHelpers) -write_basic_package_version_file("${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake" - COMPATIBILITY SameMajorVersion) +write_basic_package_version_file("${PROJECT_BINARY_DIR}/unofficial-minizipConfigVersion.cmake" + VERSION "${PACKAGE_VERSION}" + COMPATIBILITY SameMajorVersion +) -configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/minizipConfig.cmake.in - minizipConfig.cmake - INSTALL_DESTINATION share/minizip) +configure_package_config_file(unofficial-minizipConfig.cmake.in + unofficial-minizipConfig.cmake + INSTALL_DESTINATION share/unofficial-minizip +) install(FILES - "${PROJECT_BINARY_DIR}/minizipConfig.cmake" - "${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake" - DESTINATION share/minizip + "${PROJECT_BINARY_DIR}/unofficial-minizipConfig.cmake" + "${PROJECT_BINARY_DIR}/unofficial-minizipConfigVersion.cmake" + DESTINATION share/unofficial-minizip ) -install(EXPORT minizipTargets - NAMESPACE minizip:: - DESTINATION share/minizip +install(EXPORT unofficial-minizipTargets + NAMESPACE unofficial::minizip:: + DESTINATION share/unofficial-minizip ) -if(NOT DISABLE_INSTALL_TOOLS) - install ( - TARGETS minizip_bin miniunz_bin - RUNTIME DESTINATION tools/minizip - ) -endif() - if(NOT DISABLE_INSTALL_HEADERS) install(FILES ${HEADERS} DESTINATION include/minizip) endif() + +list(JOIN MINIZIP_REQUIRES " " MINIZIP_REQUIRES) +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/minizip.pc" + @ONLY +) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/minizip.pc" + DESTINATION lib/pkgconfig +) + diff --git a/ports/minizip/minizipConfig.cmake.in b/ports/minizip/minizipConfig.cmake.in index 17fc694e774080..4527b18d6f5ffa 100644 --- a/ports/minizip/minizipConfig.cmake.in +++ b/ports/minizip/minizipConfig.cmake.in @@ -1,12 +1,10 @@ -#@PACKAGE_INIT@ +message(WARNING "'find_package(minizip CONFIG)' is deprecated. Please use 'find_package(unofficial-minizip CONFIG)' instead.") include(CMakeFindDependencyMacro) - -find_dependency(ZLIB) - -if (@ENABLE_BZIP2@) - find_dependency(BZip2) +find_dependency(unofficial-minizip ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG) +if(NOT TARGET unofficial::minizip::minizip) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) +elseif(NOT TARGET minizip::minizip) + add_library(minizip::minizip INTERFACE IMPORTED) + set_target_properties(minizip::minizip PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::minizip::minizip) endif() - -include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/ports/minizip/pkgconfig.patch b/ports/minizip/pkgconfig.patch new file mode 100644 index 00000000000000..107f9fc323831d --- /dev/null +++ b/ports/minizip/pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/contrib/minizip/minizip.pc.in b/contrib/minizip/minizip.pc.in +index 69b5b7f..9e43084 100644 +--- a/contrib/minizip/minizip.pc.in ++++ b/contrib/minizip/minizip.pc.in +@@ -8,5 +8,5 @@ Description: Minizip zip file manipulation library + Requires: + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lminizip +-Libs.private: -lz ++Requires.private: @MINIZIP_REQUIRES@ + Cflags: -I${includedir} diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index b929116f53a9e7..1e79583b13cd1e 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -12,38 +12,47 @@ vcpkg_from_github( 0001-remove-ifndef-NOUNCRYPT.patch 0002-add-declaration-for-mkdir.patch 0003-no-io64.patch + pkgconfig.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES bzip2 ENABLE_BZIP2 + INVERTED_FEATURES + tools DISABLE_INSTALL_TOOLS ) -configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${SOURCE_PATH}/cmake/minizipConfig.cmake.in" COPYONLY) -configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipConfig.cmake.in" + DESTINATION "${SOURCE_PATH}/contrib/minizip" +) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/contrib/minizip" OPTIONS ${FEATURE_OPTIONS} - -DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS} + -DPACKAGE_VERSION=${VERSION} OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/minizip") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-minizip) +vcpkg_fixup_pkgconfig() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES minizip miniunz AUTO_CLEAN) +endif() if ("bzip2" IN_LIST FEATURES) file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h") foreach(HEADER ${HEADERS}) - file(READ "${HEADER}" _contents) - string(REPLACE "#ifdef HAVE_BZIP2" "#if 1" _contents "${_contents}") - file(WRITE "${HEADER}" "${_contents}") + vcpkg_replace_string("${HEADER}" "#ifdef HAVE_BZIP2" "#if 1") endforeach() endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/minizipConfig.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt") diff --git a/ports/minizip/unofficial-minizipConfig.cmake.in b/ports/minizip/unofficial-minizipConfig.cmake.in new file mode 100644 index 00000000000000..f2afcbb32ea402 --- /dev/null +++ b/ports/minizip/unofficial-minizipConfig.cmake.in @@ -0,0 +1,10 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +if ("@ENABLE_BZIP2@") + find_dependency(BZip2) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipTargets.cmake") +check_required_components(unofficial-minizip) diff --git a/ports/minizip/usage b/ports/minizip/usage index 38a6340661d627..6113742b8d0051 100644 --- a/ports/minizip/usage +++ b/ports/minizip/usage @@ -1,4 +1,4 @@ minizip provides CMake targets: - find_package(minizip CONFIG REQUIRED) - target_link_libraries(main PRIVATE minizip::minizip) + find_package(unofficial-minizip CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::minizip::minizip) diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index 89f610ccccff40..6bbf27021d17da 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,10 +1,10 @@ { "name": "minizip", "version-semver": "1.2.13", - "description": "Zip compression library", + "port-version": 2, + "description": "Minizip zip file manipulation library", "homepage": "https://github.com/madler/zlib", "license": "Zlib", - "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", @@ -22,6 +22,10 @@ "dependencies": [ "bzip2" ] + }, + "tools": { + "description": "Install tools", + "supports": "!ios" } } } diff --git a/ports/moos-core/include_functional.patch b/ports/moos-core/include_functional.patch new file mode 100644 index 00000000000000..1245ca8731dbdc --- /dev/null +++ b/ports/moos-core/include_functional.patch @@ -0,0 +1,12 @@ +diff --git a/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp b/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp +index 9d4473f..3f91018 100644 +--- a/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp ++++ b/Core/libMOOS/Utils/MOOSUtilityFunctions.cpp +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + #ifndef _WIN32 + #include diff --git a/ports/moos-core/portfile.cmake b/ports/moos-core/portfile.cmake index b799cc2ed7635d..3bd8a627b93ebe 100644 --- a/ports/moos-core/portfile.cmake +++ b/ports/moos-core/portfile.cmake @@ -3,18 +3,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO themoos/core-moos - REF v10.4.0 + REF "v${VERSION}" SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e HEAD_REF master PATCHES cmake_fix.patch + include_functional.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DCMAKE_ENABLE_EXPORT=OFF ) vcpkg_cmake_install() @@ -26,4 +25,4 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/Core/GPLCore.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Core/GPLCore.txt") diff --git a/ports/moos-core/vcpkg.json b/ports/moos-core/vcpkg.json index 068e390a1a86b0..43b72a27ef5a4f 100644 --- a/ports/moos-core/vcpkg.json +++ b/ports/moos-core/vcpkg.json @@ -1,10 +1,10 @@ { "name": "moos-core", "version": "10.4.0", - "port-version": 7, + "port-version": 8, "description": "A very light weight, easy to use middleware.", "homepage": "https://sites.google.com/site/moossoftware/", - "license": null, + "license": "GPL-2.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/moos-essential/vcpkg.json b/ports/moos-essential/vcpkg.json index d6128e8ed4aed3..7cfbe5f65ae315 100644 --- a/ports/moos-essential/vcpkg.json +++ b/ports/moos-essential/vcpkg.json @@ -1,7 +1,7 @@ { "name": "moos-essential", - "version-string": "10.0.1", - "port-version": 4, + "version": "10.0.1", + "port-version": 5, "description": "a set of useful applications that leverage the core-moos communications layer.", "homepage": "https://sites.google.com/site/moossoftware/", "dependencies": [ diff --git a/ports/moos-ui/vcpkg.json b/ports/moos-ui/vcpkg.json index 71e509a5ee7a58..a625ef30b5058a 100644 --- a/ports/moos-ui/vcpkg.json +++ b/ports/moos-ui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "moos-ui", - "version-string": "10.0.1", - "port-version": 4, + "version": "10.0.1", + "port-version": 5, "description": "set of user interface tools to use and leverage the MOOS project.", "homepage": "https://sites.google.com/site/moossoftware/", "dependencies": [ diff --git a/ports/morton-nd/vcpkg.json b/ports/morton-nd/vcpkg.json index 161e7064fda488..422dc9cf01ad96 100644 --- a/ports/morton-nd/vcpkg.json +++ b/ports/morton-nd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "morton-nd", - "version-string": "4.0.0", - "port-version": 2, + "version": "4.0.0", + "port-version": 3, "description": "header-only constexpr library for fast Morton encoding/decoding in N dimensions.", "homepage": "https://github.com/kevinhartman/morton-nd", "dependencies": [ diff --git a/ports/mpark-variant/vcpkg.json b/ports/mpark-variant/vcpkg.json index 9694c0748d92b1..06c30e54ecf47b 100644 --- a/ports/mpark-variant/vcpkg.json +++ b/ports/mpark-variant/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpark-variant", - "version-string": "1.4.0", - "port-version": 2, + "version": "1.4.0", + "port-version": 3, "description": "an implementation of C++17 std::variant for C++11/14/17.", "dependencies": [ { diff --git a/ports/mpc/portfile.cmake b/ports/mpc/portfile.cmake index 7ecd9b325bca0d..4b83260ccf10a9 100644 --- a/ports/mpc/portfile.cmake +++ b/ports/mpc/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/mpc/vcpkg.json b/ports/mpc/vcpkg.json index 9f79c44a801646..d4a8b109c33a4b 100644 --- a/ports/mpc/vcpkg.json +++ b/ports/mpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpc", "version": "1.2.0", - "port-version": 2, + "port-version": 3, "description": "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.", "homepage": "http://www.multiprecision.org/mpc/", "dependencies": [ diff --git a/ports/mpi/vcpkg.json b/ports/mpi/vcpkg.json index 2d5bbaddfd8db6..57d6419ab94b0d 100644 --- a/ports/mpi/vcpkg.json +++ b/ports/mpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpi", - "version-string": "1", - "port-version": 3, + "version": "1", + "port-version": 4, "description": "Message Passing Interface (MPI) is a standardized and portable message-passing standard designed by a group of researchers from academia and industry to function on a wide variety of parallel computing architectures. The standard defines the syntax and semantics of a core of library routines useful to a wide range of users writing portable message-passing programs in C, C++, and Fortran. There are several well-tested and efficient implementations of MPI, many of which are open-source or in the public domain.", "license": null, "supports": "!uwp", diff --git a/ports/ms-gltf/fix-apple-filesystem.patch b/ports/ms-gltf/fix-apple-filesystem.patch deleted file mode 100644 index d2d1a504b05bf5..00000000000000 --- a/ports/ms-gltf/fix-apple-filesystem.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/GLTFSDK.Samples/CMakeLists.txt b/GLTFSDK.Samples/CMakeLists.txt -index a66ed93..d948ee2 100644 ---- a/GLTFSDK.Samples/CMakeLists.txt -+++ b/GLTFSDK.Samples/CMakeLists.txt -@@ -1,4 +1,6 @@ - cmake_minimum_required(VERSION 3.5) -- -+if(APPLE) -+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") -+endif() - add_subdirectory(Deserialize) - add_subdirectory(Serialize) -diff --git a/GLTFSDK.Samples/Deserialize/CMakeLists.txt b/GLTFSDK.Samples/Deserialize/CMakeLists.txt -index 791898c..6474aee 100644 ---- a/GLTFSDK.Samples/Deserialize/CMakeLists.txt -+++ b/GLTFSDK.Samples/Deserialize/CMakeLists.txt -@@ -17,6 +17,8 @@ if (MSVC) - - # Make sure that all PDB files on Windows are installed to the output folder. By default, only the debug build does this. - set_target_properties(Deserialize PROPERTIES COMPILE_PDB_NAME "Deserialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}") -+elseif(APPLE) -+ set_target_properties(Deserialize PROPERTIES CXX_STANDARD 17) - endif() - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -diff --git a/GLTFSDK.Samples/Deserialize/Source/main.cpp b/GLTFSDK.Samples/Deserialize/Source/main.cpp -index 80198fa..fb560e0 100644 ---- a/GLTFSDK.Samples/Deserialize/Source/main.cpp -+++ b/GLTFSDK.Samples/Deserialize/Source/main.cpp -@@ -8,6 +8,9 @@ - - // Replace this with (and use std::filesystem rather than - // std::experimental::filesystem) if your toolchain fully supports C++17 -+#if defined(__APPLE__) -+#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM -+#endif - #include - - #include -diff --git a/GLTFSDK.Samples/Serialize/CMakeLists.txt b/GLTFSDK.Samples/Serialize/CMakeLists.txt -index 5269da8..1129ea0 100644 ---- a/GLTFSDK.Samples/Serialize/CMakeLists.txt -+++ b/GLTFSDK.Samples/Serialize/CMakeLists.txt -@@ -17,6 +17,8 @@ if (MSVC) - - # Make sure that all PDB files on Windows are installed to the output folder. By default, only the debug build does this. - set_target_properties(Serialize PROPERTIES COMPILE_PDB_NAME "Serialize" COMPILE_PDB_OUTPUT_DIRECTORY "${RUNTIME_OUTPUT_DIRECTORY}") -+elseif(APPLE) -+ set_target_properties(Serialize PROPERTIES CXX_STANDARD 17) - endif() - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -diff --git a/GLTFSDK.Samples/Serialize/Source/main.cpp b/GLTFSDK.Samples/Serialize/Source/main.cpp -index ac87c10..f5c6e0b 100644 ---- a/GLTFSDK.Samples/Serialize/Source/main.cpp -+++ b/GLTFSDK.Samples/Serialize/Source/main.cpp -@@ -10,6 +10,9 @@ - - // Replace this with (and use std::filesystem rather than - // std::experimental::filesystem) if your toolchain fully supports C++17 -+#if defined(__APPLE__) -+#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM -+#endif - #include - - #include diff --git a/ports/ms-gltf/portfile.cmake b/ports/ms-gltf/portfile.cmake index 2066ac67284144..2caaff22e373a3 100644 --- a/ports/ms-gltf/portfile.cmake +++ b/ports/ms-gltf/portfile.cmake @@ -10,7 +10,6 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-install.patch - fix-apple-filesystem.patch ) # note: Test/Sample executables won't be installed @@ -37,4 +36,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ms-gltf/vcpkg.json b/ports/ms-gltf/vcpkg.json index d5e7ac83e00bfa..a720155b23082b 100644 --- a/ports/ms-gltf/vcpkg.json +++ b/ports/ms-gltf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ms-gltf", "version-date": "2022-06-28", - "port-version": 1, + "port-version": 2, "description": "glTF-SDK is a C++ Software Development Kit for glTF", "homepage": "https://github.com/microsoft/glTF-SDK", "license": "MIT", @@ -18,7 +18,8 @@ ], "features": { "samples": { - "description": "Build with GLTF samples" + "description": "Build with GLTF samples", + "supports": "!osx & !ios & !android" }, "test": { "description": "Build test programs", diff --git a/ports/msgpack/vcpkg.json b/ports/msgpack/vcpkg.json index 2d9903b70b22b2..fcc2ebaae08439 100644 --- a/ports/msgpack/vcpkg.json +++ b/ports/msgpack/vcpkg.json @@ -1,13 +1,18 @@ { "name": "msgpack", "version": "6.0.0", + "port-version": 1, "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", "homepage": "https://github.com/msgpack/msgpack-c", "license": "BSL-1.0", "dependencies": [ + "boost-assert", "boost-fusion", "boost-numeric-conversion", "boost-optional", + "boost-predef", + "boost-preprocessor", + "boost-utility", "boost-variant", { "name": "vcpkg-cmake", diff --git a/ports/msinttypes/vcpkg.json b/ports/msinttypes/vcpkg.json index 46bc22f188a622..b0cf6b300e7dc2 100644 --- a/ports/msinttypes/vcpkg.json +++ b/ports/msinttypes/vcpkg.json @@ -1,7 +1,7 @@ { "name": "msinttypes", - "version-string": "2018-02-25", - "port-version": 1, + "version-date": "2018-02-25", + "port-version": 2, "description": "msinttypes is a package to provide missing ISO C9x compliant headers for Microsoft Visual Studio", "homepage": "https://github.com/chemeris/msinttypes" } diff --git a/ports/mstch/vcpkg.json b/ports/mstch/vcpkg.json index 5cda51228904df..405d70ec396b94 100644 --- a/ports/mstch/vcpkg.json +++ b/ports/mstch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mstch", - "version-string": "1.0.2", - "port-version": 4, + "version": "1.0.2", + "port-version": 5, "description": "Mstch is a complete implementation of {{mustache}} templates using modern C++", "homepage": "https://github.com/no1msd/mstch", "dependencies": [ diff --git a/ports/mvfst/fix_format.patch b/ports/mvfst/fix_format.patch new file mode 100644 index 00000000000000..4bf12f2cd31495 --- /dev/null +++ b/ports/mvfst/fix_format.patch @@ -0,0 +1,13 @@ +diff --git a/quic/server/QuicServerWorker.cpp b/quic/server/QuicServerWorker.cpp +index 744cb81..ff3e559 100644 +--- a/quic/server/QuicServerWorker.cpp ++++ b/quic/server/QuicServerWorker.cpp +@@ -692,7 +692,7 @@ PacketDropReason QuicServerWorker::isDstConnIdMisrouted( + "Dropping packet due to DCID parsing error={}, errorCode={}," + "routingInfo = {} ", + ex.what(), +- ex.errorCode(), ++ toString(ex.errorCode()), + logRoutingInfo(dstConnId)); + // TODO do we need to reset? + return PacketDropReason::PARSE_ERROR_DCID; diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index 8766d87c6fc42c..96a8f316c9fef7 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/mvfst - REF 28857570ac808c5493312144dc5af92d6f0a7381 #2022-11-03 - SHA512 3e413e8906ac83f48936871f24d06980bdeff8b7a659326498549afaa53321c047bcd843a7ed971bfed7ddb51e086a28c1ac5fb0f91aabd0a078dda6a75fe488 + REF aeee9b372827cea28697755ea1f68bfc5288548a #2023-05-18 + SHA512 feece3f05537b58270507d9423cc95fe577532997b857586aa49c2000516f3297c487696b659a35f194f0e970b8e84ff0c1a7446d4af7b400a2183704df995a2 HEAD_REF main + PATCHES + fix_format.patch ) vcpkg_cmake_configure( diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index 4082b77518bbe3..e28cc76b28e7a3 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,12 +1,19 @@ { "name": "mvfst", - "version-date": "2022-11-03", + "version-date": "2023-05-18", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebookincubator/mvfst", "license": "MIT", "supports": "!windows", "dependencies": [ - "boost", + "boost-context", + "boost-date-time", + "boost-filesystem", + "boost-iostreams", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", "fizz", "fmt", "folly", diff --git a/ports/mygui/Install-tools.patch b/ports/mygui/Install-tools.patch index bdfc2c90f7ab70..010344f7ba7e43 100644 --- a/ports/mygui/Install-tools.patch +++ b/ports/mygui/Install-tools.patch @@ -1,14 +1,16 @@ diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake -index 6483339..71710de 100644 +index 6483339..0b35148 100644 --- a/CMake/Utils/MyGUIConfigTargets.cmake +++ b/CMake/Utils/MyGUIConfigTargets.cmake -@@ -170,6 +170,9 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER) +@@ -170,6 +170,11 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER) set(MYGUI_EXEC_TYPE WIN32) endif () add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) -+ install(TARGETS ${PROJECTNAME} -+ RUNTIME DESTINATION bin -+ ) ++ if (APPLE) ++ install(TARGETS ${PROJECTNAME} BUNDLE DESTINATION bin) ++ else () ++ install(TARGETS ${PROJECTNAME} RUNTIME DESTINATION bin) ++ endif () endif () set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json index 62f79ea6357825..7858fddb83060e 100644 --- a/ports/mygui/vcpkg.json +++ b/ports/mygui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mygui", "version": "3.4.1", - "port-version": 4, + "port-version": 5, "description": "Fast, flexible and simple GUI", "homepage": "http://mygui.info", "license": "MIT", diff --git a/ports/nana/vcpkg.json b/ports/nana/vcpkg.json index d5707d57c75fb5..4fc982aa00ed6c 100644 --- a/ports/nana/vcpkg.json +++ b/ports/nana/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nana", - "version-string": "1.7.4", - "port-version": 3, + "version": "1.7.4", + "port-version": 4, "description": "Cross-platform library for GUI programming in modern C++ style.", "homepage": "https://github.com/cnjinhao/nana", "dependencies": [ diff --git a/ports/nano-signal-slot/vcpkg.json b/ports/nano-signal-slot/vcpkg.json index 55e08710650cd5..983026f1369e8e 100644 --- a/ports/nano-signal-slot/vcpkg.json +++ b/ports/nano-signal-slot/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nano-signal-slot", - "version-string": "2.0.1", - "port-version": 1, + "version": "2.0.1", + "port-version": 2, "description": "Pure C++17 Signals and Slots", "homepage": "https://github.com/NoAvailableAlias/nano-signal-slot", "supports": "!uwp" diff --git a/ports/nanoprintf/vcpkg.json b/ports/nanoprintf/vcpkg.json index 9828d6baa28eea..822acc5a739778 100644 --- a/ports/nanoprintf/vcpkg.json +++ b/ports/nanoprintf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanoprintf", - "version-string": "2020-05-27", - "port-version": 1, + "version-date": "2020-05-27", + "port-version": 2, "description": "A tiny embeddable printf replacement written in C99", "homepage": "https://github.com/charlesnicholson/nanoprintf" } diff --git a/ports/nanort/vcpkg.json b/ports/nanort/vcpkg.json index c91db27aeabf11..bb1265efa974e1 100644 --- a/ports/nanort/vcpkg.json +++ b/ports/nanort/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanort", - "version-string": "2019-08-20", - "port-version": 2, + "version-date": "2019-08-20", + "port-version": 3, "description": "Single header only modern ray tracing kernel", "homepage": "https://github.com/lighttransport/nanort" } diff --git a/ports/netcdf-c/fix-dependency-libzip.patch b/ports/netcdf-c/fix-dependency-libzip.patch index 9422198a2210bd..6305b9902f277c 100644 --- a/ports/netcdf-c/fix-dependency-libzip.patch +++ b/ports/netcdf-c/fix-dependency-libzip.patch @@ -9,7 +9,7 @@ index b93a141..c3763a7 100644 -FIND_PACKAGE(Zip) +if(ENABLE_NCZARR_ZIP) + find_package(libzip CONFIG REQUIRED) -+ set(Zip_LIBRARIES libzip::zip) ++ set(Zip_LIBRARIES zip) + set(Zip_FOUND TRUE) +else() + set(Zip_LIBRARIES "") @@ -32,3 +32,62 @@ index b3be259..72b4b25 100644 include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") # Compiling Options +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 1363d35..31dbbda 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -134,6 +134,10 @@ ENDIF() + + TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) + ++if(ENABLE_NCZARR_ZIP) ++ target_link_libraries(netcdf libzip::zip) ++endif() ++ + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TLL_LIBS}) + IF(MSVC) + SET_TARGET_PROPERTIES(netcdf PROPERTIES +diff --git a/libnczarr/CMakeLists.txt b/libnczarr/CMakeLists.txt +index 86e093b..d7edaf6 100644 +--- a/libnczarr/CMakeLists.txt ++++ b/libnczarr/CMakeLists.txt +@@ -58,6 +58,10 @@ ENDIF() + + add_library(nczarr OBJECT ${libnczarr_SOURCES}) + ++IF(ENABLE_NCZARR_ZIP) ++ target_link_libraries(nczarr PRIVATE libzip::zip) ++ENDIF() ++ + IF(MPI_C_INCLUDE_PATH) + target_include_directories(nczarr PUBLIC ${MPI_C_INCLUDE_PATH}) + ENDIF(MPI_C_INCLUDE_PATH) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6357965..3de76cd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2123,6 +2123,10 @@ replace_pkgconfig_module("-lzip" "libzip") + replace_pkgconfig_module("-lCURL[^ ]*" "libcurl") + replace_pkgconfig_module("-lZLIB[^ ]*" "zlib") + ++IF(ENABLE_NCZARR_ZIP) ++ string(APPEND NC_REQUIRES_PRIVATE " libzip") ++ENDIF() ++ + configure_file( + ${netCDF_SOURCE_DIR}/netcdf.pc.in + ${netCDF_BINARY_DIR}/netcdf.pc @ONLY) +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 31dbbda..eb497cc 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -120,9 +120,6 @@ IF(ENABLE_PNETCDF AND PNETCDF) + SET(TLL_LIBS ${TLL_LIBS} ${PNETCDF}) + ENDIF() + +-IF(ENABLE_NCZARR_ZIP) +- SET(TLL_LIBS ${TLL_LIBS} ${Zip_LIBRARIES}) +-ENDIF() + + IF(ENABLE_S3_SDK) + TARGET_LINK_DIRECTORIES(netcdf PUBLIC ${AWSSDK_LIB_DIR}) diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index 77df76e4d85f14..000b850c44a8e6 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "netcdf-c", "version": "4.8.1", - "port-version": 2, + "port-version": 3, "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ diff --git a/ports/netcdf-cxx4/vcpkg.json b/ports/netcdf-cxx4/vcpkg.json index 5cb3d77205efde..ff189f7db0c06b 100644 --- a/ports/netcdf-cxx4/vcpkg.json +++ b/ports/netcdf-cxx4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "netcdf-cxx4", - "version-string": "4.3.1", - "port-version": 4, + "version": "4.3.1", + "port-version": 5, "description": "a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-cxx4", "dependencies": [ diff --git a/ports/nettle/ccas.patch b/ports/nettle/ccas.patch index 087081a33bb43b..703e622f5ab00a 100644 --- a/ports/nettle/ccas.patch +++ b/ports/nettle/ccas.patch @@ -7,19 +7,33 @@ index d00b565..c465d0b 100644 %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s - $(COMPILE) -c $*.s -+ $(COMPILE_AS) -c $*.s ++ $(COMPILE_AS) -c $*.s -o $@ %.$(OBJEXT): %.c $(COMPILE) -c $< \ +diff --git a/aclocal.m4 b/aclocal.m4 +index 1d218a0..1ff02c8 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -301,7 +301,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE], + [cat >conftest.s <&AC_FD_CC + ifelse([$2],,:,[$2]) diff --git a/config.make.in b/config.make.in index f8e1f74..4668884 100644 --- a/config.make.in +++ b/config.make.in -@@ -73,6 +73,8 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib +@@ -73,6 +73,9 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib # flags before CPPFLAGS and LDFLAGS. While EXTRA_CFLAGS are added at the end. COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEP_FLAGS) +CCAS = @CCAS@ ++ASMFLAGS = @ASMFLAGS@ +COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(ASMFLAGS) $(DEP_FLAGS) COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS) LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) @@ -28,13 +42,32 @@ diff --git a/configure.ac b/configure.ac index 1012718..8db139d 100644 --- a/configure.ac +++ b/configure.ac -@@ -118,6 +118,9 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ +@@ -134,6 +134,10 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ # Checks for programs. AC_PROG_CC +# Copied from gmp +test -n "$CCAS" || CCAS='$(CC)' +AC_SUBST(CCAS) ++AC_SUBST(ASMFLAGS) NETTLE_CHECK_IFUNC +@@ -321,7 +325,7 @@ W64_ABI=no # For x86_64 windows + case "$host_cpu" in + [x86_64 | amd64]) + AC_TRY_COMPILE([ +-#if defined(__x86_64__) || defined(__arch64__) ++#if defined(__x86_64__) || defined(__arch64__) || defined(_M_AMD64) + #error 64-bit x86 + #endif + ], [], [ +@@ -374,7 +378,7 @@ case "$host_cpu" in + ;; + aarch64*) + AC_TRY_COMPILE([ +-#if defined(__aarch64__) ++#if defined(__aarch64__) || defined(_M_ARM64) + #error 64-bit arm + #endif + ], [], [ diff --git a/ports/nettle/hogweed-arm.def b/ports/nettle/hogweed-arm.def new file mode 100644 index 00000000000000..dd9dccdde81649 --- /dev/null +++ b/ports/nettle/hogweed-arm.def @@ -0,0 +1,282 @@ +EXPORTS + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify_itch + _nettle_eddsa_verify + _nettle_eddsa_sign_itch + _nettle_eddsa_sign + _nettle_eddsa_public_key_itch + _nettle_eddsa_public_key + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress_itch + _nettle_eddsa_decompress + _nettle_eddsa_compress_itch + _nettle_eddsa_compress + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_ecc_gostdsa_verify + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecc_gostdsa_sign + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecc_ecdsa_verify + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_ecdsa_sign + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_init + nettle_ecc_scalar_clear + nettle_ecc_scalar_set + nettle_ecc_scalar_get + nettle_ecc_point_init + nettle_ecc_point_clear + nettle_ecc_point_set + nettle_ecc_point_get + nettle_ecc_scalar_random + _nettle_ecc_mod_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_zero_p + _nettle_ecc_mod_equal_p + _nettle_ecc_mod_add + _nettle_ecc_mod_sub + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_sec_zero_p + _nettle_mpz_limbs_copy + _nettle_mpz_set_n + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_gmp_alloc_limbs + _nettle_gmp_free_limbs + _nettle_gmp_alloc + _nettle_gmp_free + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_dsa_openssl_private_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_public_key_from_der_iterator + nettle_rsa_private_key_from_der_iterator + nettle_rsa_keypair_from_der + nettle_asn1_der_get_bignum + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_get_uint32 + nettle_rsa_keypair_to_openpgp + nettle_pgp_put_uint32 + nettle_pgp_put_uint16 + nettle_pgp_put_mpi + nettle_pgp_put_string + nettle_pgp_put_length + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_sub_packet_start + nettle_pgp_put_sub_packet + nettle_pgp_sub_packet_end + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_userid + nettle_pgp_crc24 + nettle_pgp_armor + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_public_key_init + nettle_dsa_public_key_clear + nettle_dsa_private_key_init + nettle_dsa_private_key_clear + nettle_dsa_params_init + nettle_dsa_params_clear + nettle_dsa_signature_init + nettle_dsa_signature_clear + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_sec_compute_root + _nettle_rsa_verify + _nettle_rsa_verify_recover + nettle_rsa_compute_root_tr + _nettle_rsa_sec_compute_root_tr + nettle_rsa_private_key_init + nettle_rsa_private_key_clear + nettle_rsa_private_key_prepare + nettle_rsa_compute_root + nettle_rsa_public_key_init + nettle_rsa_public_key_clear + nettle_rsa_public_key_prepare + _nettle_rsa_check_size + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + nettle_random_prime + _nettle_generate_pocklington_prime + nettle_mpz_random_size + nettle_mpz_random + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_mpz_get_str_256 + nettle_mpz_set_str_256_s + nettle_mpz_init_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_init_set_str_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_first + nettle_sexp_iterator_next + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_subexpr + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_assoc diff --git a/ports/nettle/hogweed-arm64.def b/ports/nettle/hogweed-arm64.def new file mode 100644 index 00000000000000..dd9dccdde81649 --- /dev/null +++ b/ports/nettle/hogweed-arm64.def @@ -0,0 +1,282 @@ +EXPORTS + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify_itch + _nettle_eddsa_verify + _nettle_eddsa_sign_itch + _nettle_eddsa_sign + _nettle_eddsa_public_key_itch + _nettle_eddsa_public_key + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress_itch + _nettle_eddsa_decompress + _nettle_eddsa_compress_itch + _nettle_eddsa_compress + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_ecc_gostdsa_verify + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecc_gostdsa_sign + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecc_ecdsa_verify + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_ecdsa_sign + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_init + nettle_ecc_scalar_clear + nettle_ecc_scalar_set + nettle_ecc_scalar_get + nettle_ecc_point_init + nettle_ecc_point_clear + nettle_ecc_point_set + nettle_ecc_point_get + nettle_ecc_scalar_random + _nettle_ecc_mod_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_zero_p + _nettle_ecc_mod_equal_p + _nettle_ecc_mod_add + _nettle_ecc_mod_sub + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_sec_zero_p + _nettle_mpz_limbs_copy + _nettle_mpz_set_n + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_gmp_alloc_limbs + _nettle_gmp_free_limbs + _nettle_gmp_alloc + _nettle_gmp_free + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_dsa_openssl_private_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_public_key_from_der_iterator + nettle_rsa_private_key_from_der_iterator + nettle_rsa_keypair_from_der + nettle_asn1_der_get_bignum + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_get_uint32 + nettle_rsa_keypair_to_openpgp + nettle_pgp_put_uint32 + nettle_pgp_put_uint16 + nettle_pgp_put_mpi + nettle_pgp_put_string + nettle_pgp_put_length + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_sub_packet_start + nettle_pgp_put_sub_packet + nettle_pgp_sub_packet_end + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_userid + nettle_pgp_crc24 + nettle_pgp_armor + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_public_key_init + nettle_dsa_public_key_clear + nettle_dsa_private_key_init + nettle_dsa_private_key_clear + nettle_dsa_params_init + nettle_dsa_params_clear + nettle_dsa_signature_init + nettle_dsa_signature_clear + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_sec_compute_root + _nettle_rsa_verify + _nettle_rsa_verify_recover + nettle_rsa_compute_root_tr + _nettle_rsa_sec_compute_root_tr + nettle_rsa_private_key_init + nettle_rsa_private_key_clear + nettle_rsa_private_key_prepare + nettle_rsa_compute_root + nettle_rsa_public_key_init + nettle_rsa_public_key_clear + nettle_rsa_public_key_prepare + _nettle_rsa_check_size + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + nettle_random_prime + _nettle_generate_pocklington_prime + nettle_mpz_random_size + nettle_mpz_random + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_mpz_get_str_256 + nettle_mpz_set_str_256_s + nettle_mpz_init_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_init_set_str_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_first + nettle_sexp_iterator_next + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_subexpr + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_assoc diff --git a/ports/nettle/install-dll.patch b/ports/nettle/install-dll.patch deleted file mode 100644 index 1d75a8f9c815a7..00000000000000 --- a/ports/nettle/install-dll.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 6e1585b..88c8b05 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -491,8 +491,8 @@ install-static: $(LIBTARGETS) - done - - install-dll-nettle: -- $(MKDIR_P) $(DESTDIR)$(bindir) -- $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(bindir)/$(LIBNETTLE_FORLINK) -+ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin -+ $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBNETTLE_FORLINK) - - install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle - $(MKDIR_P) $(DESTDIR)$(libdir) -@@ -504,8 +504,8 @@ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle - && $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK)) - - install-dll-hogweed: -- $(MKDIR_P) $(DESTDIR)$(bindir) -- $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(bindir)/$(LIBHOGWEED_FORLINK) -+ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin -+ $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBHOGWEED_FORLINK) - - install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed - $(MKDIR_P) $(DESTDIR)$(libdir) diff --git a/ports/nettle/msvc-support.patch b/ports/nettle/msvc-support.patch new file mode 100644 index 00000000000000..0e335897a07074 --- /dev/null +++ b/ports/nettle/msvc-support.patch @@ -0,0 +1,85 @@ +diff --git a/Makefile.in b/Makefile.in +index 6e1585b..88c8b05 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -29,8 +29,9 @@ include config.make + PRE_CPPFLAGS = -I. + EXTRA_CFLAGS = $(CCPIC) + +-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a ++LIBTARGETS = @IF_STATIC@ @LIBNETTLE_ARCHIVE@ @IF_HOGWEED@ @LIBHOGWEED_ARCHIVE@ + SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) ++MSVC_TARGET = @MSVC_TARGET@ + + getopt_SOURCES = getopt.c getopt1.c + getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT)) +@@ -279,13 +280,13 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) \ + hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \ + $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT) + +-libnettle.a: $(nettle_OBJS) ++@LIBNETTLE_ARCHIVE@: $(nettle_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(nettle_OBJS) + $(RANLIB) $@ + echo nettle > libnettle.stamp + +-libhogweed.a: $(hogweed_OBJS) ++@LIBHOGWEED_ARCHIVE@: $(hogweed_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(hogweed_OBJS) + $(RANLIB) $@ +@@ -491,8 +492,8 @@ install-static: $(LIBTARGETS) + done + + install-dll-nettle: +- $(MKDIR_P) $(DESTDIR)$(bindir) +- $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(bindir)/$(LIBNETTLE_FORLINK) ++ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin ++ $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBNETTLE_FORLINK) + + install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle + $(MKDIR_P) $(DESTDIR)$(libdir) +@@ -504,8 +505,8 @@ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle + && $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK)) + + install-dll-hogweed: +- $(MKDIR_P) $(DESTDIR)$(bindir) +- $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(bindir)/$(LIBHOGWEED_FORLINK) ++ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin ++ $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBHOGWEED_FORLINK) + + install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed + $(MKDIR_P) $(DESTDIR)$(libdir) +diff --git a/configure.ac b/configure.ac +index d50d1f5..2464514 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -877,6 +877,27 @@ case "$host_os" in + LIBHOGWEED_LIBS='libnettle.so $(LIBS)' + ;; + esac ++AC_ARG_VAR(MSVC_TARGET,[Enable msvc and set target architecture]) ++case "$MSVC_TARGET" in ++x86|x64|arm|arm64) ++ LIBNETTLE_ARCHIVE='nettle.lib' ++ LIBNETTLE_FORLINK='nettle-$(LIBNETTLE_MAJOR).dll' ++ LIBNETTLE_FILE='nettle.lib' ++ LIBNETTLE_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBNETTLE_FILE) -Wl,-DEF:$(srcdir)/nettle-$(MSVC_TARGET).def' ++ LIBNETTLE_LIBS='$(LIBS)' ++ LIBHOGWEED_FILE='hogweed.lib' ++ LIBHOGWEED_ARCHIVE='hogweed.lib' ++ LIBHOGWEED_FORLINK='hogweed-$(LIBHOGWEED_MAJOR).dll' ++ LIBHOGWEED_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBHOGWEED_FILE) -Wl,-DEF:$(srcdir)/hogweed-$(MSVC_TARGET).def' ++ LIBHOGWEED_LIBS='$(LIBNETTLE_FILE) $(LIBS)' ++ ;; ++*) ++ LIBNETTLE_ARCHIVE='libnettle.a' ++ LIBHOGWEED_ARCHIVE='libhogweed.a' ++ ;; ++esac ++AC_SUBST(LIBNETTLE_ARCHIVE) ++AC_SUBST(LIBHOGWEED_ARCHIVE) + + ASM_SYMBOL_PREFIX='' + ASM_ELF_STYLE='no' diff --git a/ports/nettle/nettle-arm.def b/ports/nettle/nettle-arm.def new file mode 100644 index 00000000000000..d174e5f694eea1 --- /dev/null +++ b/ports/nettle/nettle-arm.def @@ -0,0 +1,518 @@ +EXPORTS + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_decrypt_message + nettle_xts_aes128_set_encrypt_key + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_decrypt_message + nettle_xts_encrypt_message + nettle_xts_decrypt_message + nettle_yarrow_key_event_init + nettle_yarrow_key_event_estimate + nettle_yarrow256_init + nettle_yarrow256_seed + nettle_yarrow256_update + nettle_yarrow256_random + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_fast_reseed + nettle_yarrow256_slow_reseed + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac128_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac96_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac64_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + nettle_umac32_digest + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3_init + _nettle_umac_l3 + _nettle_umac_l2_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish_set_key + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_encrypt + nettle_twofish_decrypt + nettle_streebog256 + nettle_streebog512 + nettle_streebog512_init + nettle_streebog512_update + nettle_streebog512_digest + nettle_streebog256_init + nettle_streebog256_digest + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent_set_key + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_sm3 + nettle_sm3_init + nettle_sm3_update + nettle_sm3_digest + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_512_digest + nettle_sha3_384 + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_384_digest + nettle_sha3_256 + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_256_digest + nettle_sha3_224 + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_224_digest + nettle_sha3_permute + _nettle_sha3_update + _nettle_sha3_pad + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha512_init + nettle_sha512_update + nettle_sha512_digest + nettle_sha384_init + nettle_sha384_digest + nettle_sha512_224_init + nettle_sha512_224_digest + nettle_sha512_256_init + nettle_sha512_256_digest + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress + nettle_sha256_init + nettle_sha256_update + nettle_sha256_digest + nettle_sha224_init + nettle_sha224_digest + nettle_sha1 + nettle_sha1_compress + nettle_sha1_init + nettle_sha1_update + nettle_sha1_digest + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_init + nettle_ripemd160_update + nettle_ripemd160_digest + nettle_realloc + nettle_xrealloc + _nettle_poly1305_set_key + _nettle_poly1305_digest + _nettle_poly1305_block + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_poly1305_aes_digest + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + nettle_memxor + nettle_memeql_sec + nettle_md5 + nettle_MD5Init + nettle_MD5Update + nettle_MD5Final + nettle_md5_compress + nettle_md5_init + nettle_md5_update + nettle_md5_digest + nettle_md4 + nettle_md4_init + nettle_md4_update + nettle_md4_digest + nettle_md2 + nettle_md2_init + nettle_md2_update + nettle_md2_digest + nettle_hkdf_extract + nettle_hkdf_expand + nettle_knuth_lfib_init + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_random + nettle_hmac_sm3 + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_sm3_set_key + nettle_hmac_sm3_update + nettle_hmac_sm3_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_streebog512_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog256_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha512_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha384_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha256_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha224_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_sha1_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_ripemd160_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_md5_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_hmac_digest + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94_digest + nettle_gosthash94cp_update + nettle_gosthash94cp_digest + _nettle_gost28147_param_test_3411 + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_encrypt_block + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_des3_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes256_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac_aes128_digest + nettle_cmac64_set_key + nettle_cmac64_init + nettle_cmac64_update + nettle_cmac64_digest + nettle_cmac128_set_key + nettle_cmac128_init + nettle_cmac128_update + nettle_cmac128_digest + nettle_gcm_camellia256 + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_update + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia128 + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_update + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_aes256 + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes192 + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes128 + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes_set_key + nettle_gcm_aes_set_iv + nettle_gcm_aes_update + nettle_gcm_aes_encrypt + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_set_key + nettle_gcm_set_iv + nettle_gcm_update + nettle_gcm_encrypt + nettle_gcm_decrypt + nettle_gcm_digest + _nettle_ghash_update + _nettle_ghash_set_key + nettle_eax_aes128 + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_aes128_encrypt + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_eax_encrypt + nettle_eax_decrypt + nettle_eax_digest + nettle_des3_set_key + nettle_des3_encrypt + nettle_des3_decrypt + nettle_des_set_key + nettle_des_encrypt + nettle_des_decrypt + nettle_des_check_parity + nettle_des_fix_parity + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_set_key + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_decrypt_message + nettle_cfb_encrypt + nettle_cfb_decrypt + nettle_cfb8_encrypt + nettle_cfb8_decrypt + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_decrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_ccm_encrypt + nettle_ccm_decrypt + nettle_ccm_digest + nettle_ccm_encrypt_message + nettle_ccm_decrypt_message + nettle_cbc_aes256_encrypt + nettle_cbc_aes192_encrypt + nettle_cbc_aes128_encrypt + nettle_cbc_encrypt + nettle_cbc_decrypt + nettle_cast128 + nettle_cast5_set_key + nettle_cast128_set_key + nettle_cast128_encrypt + nettle_cast128_decrypt + nettle_camellia256 + nettle_camellia256_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia192_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia256_set_encrypt_key + nettle_camellia192_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia_set_decrypt_key + nettle_camellia128_invert_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_clear + nettle_buffer_reset + nettle_buffer_grow + nettle_buffer_write + nettle_buffer_space + nettle_buffer_copy + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_decode_final + nettle_base64_encode_init + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base64_encode_final + nettle_base64_encode_raw + nettle_base64_encode_group + nettle_base16 + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_decode_final + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_initial_ctx + nettle_blowfish_set_key + nettle_blowfish128_set_key + nettle_blowfish_encrypt + nettle_blowfish_decrypt + _nettle_blowfish_encround + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo128 + nettle_arctwo_gutmann128 + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo128_set_key + nettle_arctwo_set_key_gutmann + nettle_arctwo128_set_key_gutmann + nettle_arctwo_encrypt + nettle_arctwo_decrypt + nettle_arcfour_crypt + nettle_arcfour_set_key + nettle_arcfour128_set_key + nettle_nist_keywrap16 + nettle_nist_keyunwrap16 + nettle_aes128_keywrap + nettle_aes192_keywrap + nettle_aes256_keywrap + nettle_aes128_keyunwrap + nettle_aes192_keyunwrap + nettle_aes256_keyunwrap + nettle_aes256 + nettle_aes256_set_decrypt_key + nettle_aes256_invert_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_set_decrypt_key + nettle_aes192_invert_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_set_decrypt_key + nettle_aes128_invert_key + nettle_aes128_set_encrypt_key + nettle_aes_set_decrypt_key + nettle_aes_invert_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + nettle_aes256_encrypt + nettle_aes192_encrypt + nettle_aes128_encrypt + _nettle_aes_encrypt_table + nettle_aes_encrypt + _nettle_aes_encrypt + nettle_aes256_decrypt + nettle_aes192_decrypt + nettle_aes128_decrypt + _nettle_aes_decrypt_table + nettle_aes_decrypt + _nettle_aes_decrypt diff --git a/ports/nettle/nettle-arm64.def b/ports/nettle/nettle-arm64.def new file mode 100644 index 00000000000000..591c1505e67e9d --- /dev/null +++ b/ports/nettle/nettle-arm64.def @@ -0,0 +1,542 @@ +EXPORTS + _nettle_sha256_compress_arm64 + _nettle_sha1_compress_arm64 + _nettle_ghash_update_arm64 + _nettle_ghash_set_key_arm64 + _nettle_chacha_4core + _nettle_chacha_4core32 + _nettle_chacha_2core + _nettle_chacha_2core32 + _nettle_aes256_decrypt_arm64 + _nettle_aes256_encrypt_arm64 + _nettle_aes192_decrypt_arm64 + _nettle_aes192_encrypt_arm64 + _nettle_aes128_decrypt_arm64 + _nettle_aes128_encrypt_arm64 + nettle_aes128_encrypt + nettle_aes128_decrypt + nettle_aes192_encrypt + nettle_aes192_decrypt + nettle_aes256_encrypt + nettle_aes256_decrypt + _nettle_ghash_set_key + _nettle_ghash_update + nettle_sha1_compress + _nettle_sha256_compress + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_decrypt_message + nettle_xts_aes128_set_encrypt_key + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_decrypt_message + nettle_xts_encrypt_message + nettle_xts_decrypt_message + nettle_yarrow_key_event_init + nettle_yarrow_key_event_estimate + nettle_yarrow256_init + nettle_yarrow256_seed + nettle_yarrow256_update + nettle_yarrow256_random + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_fast_reseed + nettle_yarrow256_slow_reseed + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac128_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac96_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac64_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + nettle_umac32_digest + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3_init + _nettle_umac_l3 + _nettle_umac_l2_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish_set_key + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_encrypt + nettle_twofish_decrypt + nettle_streebog256 + nettle_streebog512 + nettle_streebog512_init + nettle_streebog512_update + nettle_streebog512_digest + nettle_streebog256_init + nettle_streebog256_digest + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent_set_key + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_sm3 + nettle_sm3_init + nettle_sm3_update + nettle_sm3_digest + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_512_digest + nettle_sha3_384 + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_384_digest + nettle_sha3_256 + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_256_digest + nettle_sha3_224 + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_224_digest + nettle_sha3_permute + _nettle_sha3_update + _nettle_sha3_pad + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha512_init + nettle_sha512_update + nettle_sha512_digest + nettle_sha384_init + nettle_sha384_digest + nettle_sha512_224_init + nettle_sha512_224_digest + nettle_sha512_256_init + nettle_sha512_256_digest + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress_c + nettle_sha256_init + nettle_sha256_update + nettle_sha256_digest + nettle_sha224_init + nettle_sha224_digest + nettle_sha1 + _nettle_sha1_compress_c + nettle_sha1_init + nettle_sha1_update + nettle_sha1_digest + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_init + nettle_ripemd160_update + nettle_ripemd160_digest + nettle_realloc + nettle_xrealloc + _nettle_poly1305_set_key + _nettle_poly1305_digest + _nettle_poly1305_block + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_poly1305_aes_digest + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + nettle_memxor + nettle_memeql_sec + nettle_md5 + nettle_MD5Init + nettle_MD5Update + nettle_MD5Final + nettle_md5_compress + nettle_md5_init + nettle_md5_update + nettle_md5_digest + nettle_md4 + nettle_md4_init + nettle_md4_update + nettle_md4_digest + nettle_md2 + nettle_md2_init + nettle_md2_update + nettle_md2_digest + nettle_hkdf_extract + nettle_hkdf_expand + nettle_knuth_lfib_init + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_random + nettle_hmac_sm3 + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_sm3_set_key + nettle_hmac_sm3_update + nettle_hmac_sm3_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_streebog512_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog256_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha512_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha384_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha256_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha224_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_sha1_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_ripemd160_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_md5_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_hmac_digest + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94_digest + nettle_gosthash94cp_update + nettle_gosthash94cp_digest + _nettle_gost28147_param_test_3411 + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_encrypt_block + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_des3_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes256_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac_aes128_digest + nettle_cmac64_set_key + nettle_cmac64_init + nettle_cmac64_update + nettle_cmac64_digest + nettle_cmac128_set_key + nettle_cmac128_init + nettle_cmac128_update + nettle_cmac128_digest + nettle_gcm_camellia256 + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_update + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia128 + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_update + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_aes256 + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes192 + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes128 + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes_set_key + nettle_gcm_aes_set_iv + nettle_gcm_aes_update + nettle_gcm_aes_encrypt + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_set_key + nettle_gcm_set_iv + nettle_gcm_update + nettle_gcm_encrypt + nettle_gcm_decrypt + nettle_gcm_digest + _nettle_ghash_update_c + _nettle_ghash_set_key_c + nettle_eax_aes128 + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_aes128_encrypt + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_eax_encrypt + nettle_eax_decrypt + nettle_eax_digest + nettle_des3_set_key + nettle_des3_encrypt + nettle_des3_decrypt + nettle_des_set_key + nettle_des_encrypt + nettle_des_decrypt + nettle_des_check_parity + nettle_des_fix_parity + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_set_key + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_decrypt_message + nettle_cfb_encrypt + nettle_cfb_decrypt + nettle_cfb8_encrypt + nettle_cfb8_decrypt + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_decrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_ccm_encrypt + nettle_ccm_decrypt + nettle_ccm_digest + nettle_ccm_encrypt_message + nettle_ccm_decrypt_message + nettle_cbc_aes256_encrypt + nettle_cbc_aes192_encrypt + nettle_cbc_aes128_encrypt + nettle_cbc_encrypt + nettle_cbc_decrypt + nettle_cast128 + nettle_cast5_set_key + nettle_cast128_set_key + nettle_cast128_encrypt + nettle_cast128_decrypt + nettle_camellia256 + nettle_camellia256_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia192_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia256_set_encrypt_key + nettle_camellia192_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia_set_decrypt_key + nettle_camellia128_invert_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_clear + nettle_buffer_reset + nettle_buffer_grow + nettle_buffer_write + nettle_buffer_space + nettle_buffer_copy + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_decode_final + nettle_base64_encode_init + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base64_encode_final + nettle_base64_encode_raw + nettle_base64_encode_group + nettle_base16 + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_decode_final + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_initial_ctx + nettle_blowfish_set_key + nettle_blowfish128_set_key + nettle_blowfish_encrypt + nettle_blowfish_decrypt + _nettle_blowfish_encround + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo128 + nettle_arctwo_gutmann128 + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo128_set_key + nettle_arctwo_set_key_gutmann + nettle_arctwo128_set_key_gutmann + nettle_arctwo_encrypt + nettle_arctwo_decrypt + nettle_arcfour_crypt + nettle_arcfour_set_key + nettle_arcfour128_set_key + nettle_nist_keywrap16 + nettle_nist_keyunwrap16 + nettle_aes128_keywrap + nettle_aes192_keywrap + nettle_aes256_keywrap + nettle_aes128_keyunwrap + nettle_aes192_keyunwrap + nettle_aes256_keyunwrap + nettle_aes256 + nettle_aes256_set_decrypt_key + nettle_aes256_invert_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_set_decrypt_key + nettle_aes192_invert_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_set_decrypt_key + nettle_aes128_invert_key + nettle_aes128_set_encrypt_key + nettle_aes_set_decrypt_key + nettle_aes_invert_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes256_encrypt_c + _nettle_aes192_encrypt_c + _nettle_aes128_encrypt_c + _nettle_aes_encrypt_table + nettle_aes_encrypt + _nettle_aes_encrypt + _nettle_aes256_decrypt_c + _nettle_aes192_decrypt_c + _nettle_aes128_decrypt_c + _nettle_aes_decrypt_table + nettle_aes_decrypt + _nettle_aes_decrypt diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index ba848f86daa932..a0b36b05a78e4b 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -1,11 +1,3 @@ -vcpkg_list(SET extra_patches) -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_list(APPEND extra_patches - yasm.patch # the asm changes are a downgrade to an older version - libname-windows.patch # libtool rules for lib naming, exports - ) -endif() - vcpkg_from_gitlab( GITLAB_URL https://git.lysator.liu.se/ OUT_SOURCE_PATH SOURCE_PATH @@ -19,53 +11,72 @@ vcpkg_from_gitlab( compile.patch host-tools.patch ccas.patch - install-dll.patch - ${extra_patches} + msvc-support.patch ) -# Temporarily set to 1 to re-generate the lists of exported symbols. -# This is needed when the version is bumped. +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +# Maintainer switch: Temporarily set this to 1 to re-generate the lists +# of exported symbols. This is needed when the version is bumped. set(GENERATE_SYMBOLS 0) if(GENERATE_SYMBOLS) - if(VCPKG_TARGET_IS_MINGW OR NOT VCPKG_TARGET_IS_WINDOWS) - set(GENERATE_SYMBOLS 0) - else() + if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + else() + set(GENERATE_SYMBOLS 0) endif() endif() vcpkg_list(SET OPTIONS) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_list(APPEND OPTIONS --disable-static) -else() - vcpkg_list(APPEND OPTIONS --disable-shared) -endif() - if("tools" IN_LIST FEATURES) vcpkg_list(APPEND OPTIONS --enable-tools) endif() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(asmflag win64) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(asmflag win32) +# As in gmp +set(disable_assembly OFF) +set(ccas "") +set(asmflags "") +if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") + vcpkg_list(APPEND OPTIONS ac_cv_func_memset=yes) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(APPEND asmflags " --target=i686-pc-windows-msvc -m32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND asmflags " --target=x86_64-pc-windows-msvc") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + string(APPEND asmflags " --target=arm64-pc-windows-msvc") + else() + set(disable_assembly ON) + endif() + if(NOT disable_assembly) + vcpkg_find_acquire_program(CLANG) + set(ccas "${CLANG}") endif() - set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") - vcpkg_list(APPEND OPTIONS - ac_cv_func_memset=yes - nettle_cv_asm_type_percent_function=no - nettle_cv_asm_align_log=no - ) else() - vcpkg_list(APPEND OPTIONS "CCAS=") # configure will use CC + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") +endif() + +if(disable_assembly) + vcpkg_list(APPEND OPTIONS "--enable-assembler=no") +elseif(ccas) + cmake_path(GET ccas PARENT_PATH ccas_dir) + vcpkg_add_to_path("${ccas_dir}") + cmake_path(GET ccas FILENAME ccas_command) + vcpkg_list(APPEND OPTIONS "CCAS=${ccas_command}" "ASMFLAGS=${asmflags}") endif() if(VCPKG_CROSSCOMPILING) set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}") endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(GLOB def_files "${CMAKE_CURRENT_LIST_DIR}/*.def") + file(COPY ${def_files} DESTINATION "${SOURCE_PATH}") + vcpkg_list(APPEND OPTIONS "MSVC_TARGET=${VCPKG_TARGET_ARCHITECTURE}") +else() + vcpkg_list(APPEND OPTIONS "MSVC_TARGET=no") +endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG @@ -77,40 +88,8 @@ vcpkg_configure_make( OPTIONS_DEBUG --disable-tools ) - -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - # def files are created by running 'llvm-nm | findstr /R /C:"[RT] _*nettle_"' on the static build and replacing '00[0-9abcdef]+ [RT]' with spaces - # please update the defs if the version is bumped - set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") - configure_file( - "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/nettle.def" - COPYONLY - ) - configure_file( - "${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/hogweed.def" - COPYONLY - ) - if(NOT VCPKG_BUILD_TYPE) - set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") - configure_file( - "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/nettle.def" - COPYONLY - ) - configure_file("${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/hogweed.def" - COPYONLY - ) - endif() - endif() -endif() vcpkg_install_make() - -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") +vcpkg_fixup_pkgconfig() if(NOT VCPKG_CROSSCOMPILING) set(tool_names desdata eccdata) # aes gcm sha twofish? @@ -120,9 +99,14 @@ if(NOT VCPKG_CROSSCOMPILING) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") endif() -vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if("tools" IN_LIST FEATURES) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYINGv3") diff --git a/ports/nettle/vcpkg.json b/ports/nettle/vcpkg.json index ade31eac42897e..d7c2e93089d59c 100644 --- a/ports/nettle/vcpkg.json +++ b/ports/nettle/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nettle", "version": "3.8.1", + "port-version": 1, "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", "homepage": "https://git.lysator.liu.se/nettle/nettle", "license": null, @@ -11,12 +12,8 @@ "host": true }, { - "name": "yasm", - "host": true, - "features": [ - "tools" - ], - "platform": "windows" + "name": "vcpkg-cmake-get-vars", + "host": true } ], "features": { diff --git a/ports/networkdirect-sdk/portfile.cmake b/ports/networkdirect-sdk/portfile.cmake index bd378607f61318..1d6c73c928c3f7 100644 --- a/ports/networkdirect-sdk/portfile.cmake +++ b/ports/networkdirect-sdk/portfile.cmake @@ -12,8 +12,8 @@ vcpkg_download_distfile(LICENSE SHA512 7d79aae4c9beb85811a3e122a2b12aad231f519dd12a461ac49d52864a735a6b05a263d433c11ede1406d2e49b6dc62dd38487eb7bd8c079d7198a20cf85fc4d ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL ) diff --git a/ports/networkdirect-sdk/vcpkg.json b/ports/networkdirect-sdk/vcpkg.json index 8313f8f606db8e..850635164dabe3 100644 --- a/ports/networkdirect-sdk/vcpkg.json +++ b/ports/networkdirect-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "networkdirect-sdk", "version": "2.0.1", - "port-version": 3, + "port-version": 4, "description": "The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.", "homepage": "https://www.nuget.org/packages/NetworkDirect", "supports": "windows & (x64 | x86) & !uwp" diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index fedb9a6e070fb1..bfe68aa02f5c8f 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF v1.51.0 - SHA512 801a6625edefadf348f3c50132f00ce7ad2b15a77d8addca2dd68f0006e69649d35ea3b649000103c85d959680e4159bdda9c437679cbcd6417d8516a5f2fac1 + REF v${VERSION} + SHA512 7cd9bd2c1e3b0b97fd9c1a57559a91faa10ad046a38e65bc040cb7b31f2c65a92941125364c52c84f79cbb0be460795e8f067761598be0ae0e7ad7f17c3cd243 HEAD_REF master ) @@ -14,11 +14,9 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_LIB_ONLY=ON - -DENABLE_ASIO_LIB=OFF "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" - -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libcares=ON @@ -26,17 +24,13 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Libbpf=ON -DCMAKE_DISABLE_FIND_PACKAGE_Systemd=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jansson=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libevent=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Cython=ON - -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jemalloc=ON -DCMAKE_DISABLE_FIND_PACKAGE_Threads=ON -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index a5785fa80cd61a..b630bd0bc25832 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nghttp2", - "version": "1.51.0", - "port-version": 1, + "version": "1.53.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index cd3e9b872d29b4..15d76e51acf56d 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 44dd4f4bb807a4d9f2c85399e83e3146ca8e18b4d4e9bca0b1a9a626daf1f9ca2892bfa55552267a3f43af7e6c6090ec662782936a45bada6faca822d1a31638 + SHA512 2f90bfe983370a10b513991d42304dc4200f28d309e7877e7f112dd6363c6ad4b3a9b348f9dc4263a5f8e216c75b662a8cbc7c4f31e75b5bbb2c99fd6e238c86 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index a9109b544165a8..bd3e81a2c03259 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "0.10.0", + "version": "0.11.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/ports/ngtcp2/export-unofficical-target.patch b/ports/ngtcp2/export-unofficical-target.patch index 6a067b5efdf18a..30960f9c3b2e85 100644 --- a/ports/ngtcp2/export-unofficical-target.patch +++ b/ports/ngtcp2/export-unofficical-target.patch @@ -1,49 +1,43 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index d98747f..2bc20d0 100644 +index f822c8e..591a588 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -80,12 +80,15 @@ if(ENABLE_SHARED_LIB) - C_VISIBILITY_PRESET hidden - POSITION_INDEPENDENT_CODE ON - ) -- target_include_directories(ngtcp2 PUBLIC ${ngtcp2_INCLUDE_DIRS}) -- -- install(TARGETS ngtcp2 -+ target_include_directories(ngtcp2 PRIVATE ${ngtcp2_INCLUDE_DIRS}) -+ install(TARGETS ngtcp2 EXPORT unofficial-ngtcp2-config +@@ -69,8 +69,9 @@ set(ngtcp2_SOURCES + ) + + set(ngtcp2_INCLUDE_DIRS +- "${CMAKE_CURRENT_SOURCE_DIR}/includes" +- "${CMAKE_CURRENT_BINARY_DIR}/includes" ++ "$" ++ "$" ++ "$" + ) + + # Public shared library +@@ -85,6 +86,7 @@ if(ENABLE_SHARED_LIB) + target_include_directories(ngtcp2 PUBLIC ${ngtcp2_INCLUDE_DIRS}) + + install(TARGETS ngtcp2 ++ EXPORT unofficial-ngtcp2-config ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ install( -+ EXPORT unofficial-ngtcp2-config -+ NAMESPACE unofficial::ngtcp2:: -+ DESTINATION share/unofficial-ngtcp2) - endif() - - if(HAVE_CUNIT OR ENABLE_STATIC_LIB) -@@ -97,10 +100,14 @@ if(HAVE_CUNIT OR ENABLE_STATIC_LIB) - C_VISIBILITY_PRESET hidden - ) +@@ -102,10 +104,18 @@ if(HAVE_CUNIT OR ENABLE_STATIC_LIB) target_compile_definitions(ngtcp2_static PUBLIC "-DNGTCP2_STATICLIB") -- target_include_directories(ngtcp2_static PUBLIC ${ngtcp2_INCLUDE_DIRS}) -+ target_include_directories(ngtcp2_static PRIVATE ${ngtcp2_INCLUDE_DIRS}) + target_include_directories(ngtcp2_static PUBLIC ${ngtcp2_INCLUDE_DIRS}) if(ENABLE_STATIC_LIB) -- install(TARGETS ngtcp2_static -+ install(TARGETS ngtcp2_static EXPORT unofficial-ngtcp2_static-config ++ add_library(ngtcp2 INTERFACE) ++ target_link_libraries(ngtcp2 INTERFACE ngtcp2_static) + install(TARGETS ngtcp2_static ++ ngtcp2 ++ EXPORT unofficial-ngtcp2-config DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ install( -+ EXPORT unofficial-ngtcp2_static-config -+ NAMESPACE unofficial::ngtcp2_static:: -+ DESTINATION share/unofficial-ngtcp2) endif() endif() ++install( ++ EXPORT unofficial-ngtcp2-config ++ NAMESPACE unofficial::ngtcp2:: ++ DESTINATION share/unofficial-ngtcp2) -diff --git a/lib/includes/CMakeLists.txt b/lib/includes/CMakeLists.txt -index 5eabf73..78bb715 100644 ---- a/lib/includes/CMakeLists.txt -+++ b/lib/includes/CMakeLists.txt -@@ -1,3 +1,4 @@ -+configure_file("${CMAKE_CURRENT_LIST_DIR}/ngtcp2/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/ngtcp2/version.h") - install(FILES - ngtcp2/ngtcp2.h - "${CMAKE_CURRENT_BINARY_DIR}/ngtcp2/version.h" + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libngtcp2.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index f6f6c77533fb5a..b09868e9a25444 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 6bfcae1d7c782931093541156ebd6e736843b5df13362aa5468daa72f74bad33d0f1aa2aafc6f4d138cdd34d6a367e2ff12efedfd6dfa5b8811e4cdebaca0016 + SHA512 a942ea7789cc306e5a07aaf66bc1af4cb722c0facca7cb2de80e6fb8a30a88cd1beba50dd06164d9547a64d2273fe98d8bb22ab64323b1922002c45d5e714fc7 HEAD_REF master PATCHES export-unofficical-target.patch @@ -16,32 +16,21 @@ vcpkg_cmake_configure( OPTIONS "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" - -DCMAKE_DISABLE_FIND_PACKAGE_GnuTLS=ON - -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_wolfssl=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jemalloc=ON + -DENABLE_OPENSSL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_GnuTLS - CMAKE_DISABLE_FIND_PACKAGE_Jemalloc - CMAKE_DISABLE_FIND_PACKAGE_wolfssl + -DCMAKE_INSTALL_DOCDIR=share/ngtcp2 ) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH "share/unofficial-ngtcp2") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-ngtcp2) -# Clean -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) -#License +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/ngtcp2/usage b/ports/ngtcp2/usage new file mode 100644 index 00000000000000..97e0d2616c656e --- /dev/null +++ b/ports/ngtcp2/usage @@ -0,0 +1,4 @@ +ngtcp2 provides CMake targets: + + find_package(unofficial-ngtcp2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::ngtcp2::ngtcp2) diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index f10f995492f85d..05506b0d7048a4 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "0.14.0", + "version": "0.14.1", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake index b48af3f0cbf5ed..dbfb99a1e655ed 100644 --- a/ports/nmap/portfile.cmake +++ b/ports/nmap/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_download_distfile(ARCHIVE ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH + vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES fix-snprintf.patch diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json index 76093aa5555793..2c9b4066ae8502 100644 --- a/ports/nmap/vcpkg.json +++ b/ports/nmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nmap", "version": "7.70", - "port-version": 8, + "port-version": 9, "description": "A library for scanning network ports.", "dependencies": [ { diff --git a/ports/nngpp/vcpkg.json b/ports/nngpp/vcpkg.json index a1529030b18f88..2720e9b0d6d901 100644 --- a/ports/nngpp/vcpkg.json +++ b/ports/nngpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nngpp", - "version-string": "1.3.0", - "port-version": 2, + "version": "1.3.0", + "port-version": 3, "description": "C++ wrapper around the nanomsg NNG API.", "homepage": "https://github.com/cwzx/nngpp", "dependencies": [ diff --git a/ports/node-addon-api/portfile.cmake b/ports/node-addon-api/portfile.cmake index 2d6b96ab1254ec..b56a1894bbb18c 100644 --- a/ports/node-addon-api/portfile.cmake +++ b/ports/node-addon-api/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nodejs/node-addon-api REF "v${VERSION}" - SHA512 f7889d676665f053577c4964b56a51d628f2da1bd9ee77b478b088cc11750952037687242e0a24036daae759d27c9b619b9f9db9c2c2839204d91af1603a1d90 + SHA512 1b39c0faef74f29e0e709d54e4c8f3bf04adbfb601b4c5aa1199626abf1e0fa7681c2fe7dc7423da6852dcbd128efbadb7012ddccf3fa2868a09f934f656ac8d HEAD_REF main ) diff --git a/ports/node-addon-api/unofficial-node-addon-api-config.cmake b/ports/node-addon-api/unofficial-node-addon-api-config.cmake index ace4d47b751de7..57e2a2625fd60f 100644 --- a/ports/node-addon-api/unofficial-node-addon-api-config.cmake +++ b/ports/node-addon-api/unofficial-node-addon-api-config.cmake @@ -1,9 +1,9 @@ if(NOT TARGET unofficial::node-addon-api::node-addon-api) include(CMakeFindDependencyMacro) - find_dependency(unofficial-node-api CONFIG) + find_dependency(unofficial-node-api-headers CONFIG) add_library(unofficial::node-addon-api::node-addon-api IMPORTED INTERFACE) - target_link_libraries(unofficial::node-addon-api::node-addon-api INTERFACE unofficial::node-api::node-api) + target_link_libraries(unofficial::node-addon-api::node-addon-api INTERFACE unofficial::node-api-headers::node-api-headers) set_target_properties(unofficial::node-addon-api::node-addon-api PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/../../include/" diff --git a/ports/node-addon-api/vcpkg.json b/ports/node-addon-api/vcpkg.json index b1a236d1d3ca5e..a8091a169062b3 100644 --- a/ports/node-addon-api/vcpkg.json +++ b/ports/node-addon-api/vcpkg.json @@ -1,12 +1,12 @@ { "name": "node-addon-api", - "version": "6.0.0", + "version": "6.1.0", "description": "Module for using Node-API from C++", "homepage": "https://github.com/nodejs/node-addon-api", "license": "MIT", "supports": "((windows & !arm) | linux | osx) & !uwp", "dependencies": [ - "node-api", + "node-api-headers", { "name": "vcpkg-cmake", "host": true diff --git a/ports/node-api-headers/CMakeLists.txt b/ports/node-api-headers/CMakeLists.txt new file mode 100644 index 00000000000000..8360555407219e --- /dev/null +++ b/ports/node-api-headers/CMakeLists.txt @@ -0,0 +1,15 @@ +project(nodelib C) + +add_custom_target(nodelib ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node.lib) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/node.lib + COMMAND ${CMAKE_AR} + /def:${CMAKE_CURRENT_SOURCE_DIR}/def/node_api.def + /out:${CMAKE_CURRENT_BINARY_DIR}/node.lib + ${CMAKE_STATIC_LINKER_FLAGS} + $<$:${CMAKE_STATIC_LINKER_FLAGS_DEBUG}> + $<$:${CMAKE_STATIC_LINKER_FLAGS_RELEASE}> + COMMENT "Building import library for NodeJS" +) + +install(FILES ${CMAKE_BINARY_DIR}/node.lib DESTINATION lib) diff --git a/ports/node-api-headers/portfile.cmake b/ports/node-api-headers/portfile.cmake new file mode 100644 index 00000000000000..062e2eef2ef165 --- /dev/null +++ b/ports/node-api-headers/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nodejs/node-api-headers + REF "v${VERSION}" + SHA512 e80d9b8cc2d96929a6d73fc1e5bcfbf6d585bef114946f939b93195aefb91bf8e6ef8720625394d344636626fd74548db71ff178f9f529ab5b20db980f09b197 + HEAD_REF main +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + vcpkg_cmake_install() +endif() + +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME "node") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) diff --git a/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in b/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in new file mode 100644 index 00000000000000..7eb5751fcada62 --- /dev/null +++ b/ports/node-api-headers/unofficial-node-api-headers-config.cmake.in @@ -0,0 +1,41 @@ +if(NOT TARGET unofficial::node-api-headers::node-api-headers) + if(WIN32) + add_library(unofficial::node-api-headers::node-api-headers UNKNOWN IMPORTED) + else() + add_library(unofficial::node-api-headers::node-api-headers INTERFACE IMPORTED) + endif() + + set(node-api-headers_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../include/node) + + set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${node-api-headers_INCLUDE_DIR}" + ) + + if(APPLE) + # setting those properties like cmake-js does + # https://github.com/cmake-js/cmake-js/blob/272ec1883bc1207205abae948022eecdea02e225/lib/toolset.js#L126 + set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES + INTERFACE_LINK_OPTIONS "LINKER:SHELL:-undefined dynamic_lookup" + ) + set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "_DARWIN_USE_64_BIT_INODE=1;_LARGEFILE_SOURCE;_FILE_OFFSET_BITS=64" + ) + endif() + + set_property(TARGET unofficial::node-api-headers::node-api-headers APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "BUILDING_NODE_EXTENSION") + + if(WIN32) + find_library(node-api-headers_LIBRARY_RELEASE NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH REQUIRED) + set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES + IMPORTED_LOCATION_RELEASE "${node-api-headers_LIBRARY_RELEASE}" + IMPORTED_CONFIGURATIONS RELEASE + ) + if("@VCPKG_BUILD_TYPE@" STREQUAL "") + find_library(node-api-headers_LIBRARY_DEBUG NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH REQUIRED) + set_target_properties(unofficial::node-api-headers::node-api-headers PROPERTIES + IMPORTED_LOCATION_DEBUG "${node-api-headers_LIBRARY_DEBUG}" + ) + set_property(TARGET unofficial::node-api-headers::node-api-headers APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + endif() +endif() diff --git a/ports/node-api-headers/usage b/ports/node-api-headers/usage new file mode 100644 index 00000000000000..09bf0b37c37955 --- /dev/null +++ b/ports/node-api-headers/usage @@ -0,0 +1,23 @@ +node-api-headers provides CMake targets: + + find_package(unofficial-node-api-headers CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::node-api-headers::node-api-headers) + +Add this to your CMakeLists.txt to build a Node.js addon: + add_library(addon SHARED main.cpp ...) + set_target_properties(addon PROPERTIES OUTPUT_NAME "my-addon" PREFIX "" SUFFIX ".node") + + find_package(unofficial-node-api-headers CONFIG REQUIRED) + target_link_libraries(addon PRIVATE unofficial::node-api-headers::node-api-headers) + +You will be able to load your addon in JavaScript code: + const addon = require("/path/to/addon/my-addon.node"); + +Make sure that your Node.js OS/architecture matches vcpkg triplet you use. + +Also, make sure to register a module in your C/C++ code like official example does: +https://github.com/nodejs/node-addon-examples/blob/main/1_hello_world/napi/hello.c + +This port doesn't have specific functionality for publishing npm packages. + +See https://nodejs.org/api/n-api.html diff --git a/ports/node-api-headers/vcpkg.json b/ports/node-api-headers/vcpkg.json new file mode 100644 index 00000000000000..24c6c3a21781b7 --- /dev/null +++ b/ports/node-api-headers/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "node-api-headers", + "version": "1.0.0", + "port-version": 1, + "description": "NodeJS API for writing modules in C++", + "homepage": "https://nodejs.org/api/addons.html", + "license": "MIT", + "supports": "(windows & !arm & !uwp) | linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" + } + ] +} diff --git a/ports/node-api/portfile.cmake b/ports/node-api/portfile.cmake deleted file mode 100644 index 53a4f17e82c9c4..00000000000000 --- a/ports/node-api/portfile.cmake +++ /dev/null @@ -1,76 +0,0 @@ -set(SHA512 0) - -if(VCPKG_TARGET_IS_WINDOWS) - set(SHA512 ee66d0c03d2e48046a42616abf7639a3983e7db24c04d8643b9141cb9209a50643e31873c5a4918853a4344e822d653480558510a4db9a2ab481396891d79917) - set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-headers.tar.gz") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - vcpkg_download_distfile( - out_win_lib - URLS "https://nodejs.org/dist/v${VERSION}/win-x64/node.lib" - FILENAME "node.lib" - SHA512 95c4b053bf88f758b6124b4a576719901545485613767f1ab996bb019ea7bb0d303c511b357f830e5a14d463dd74c6b412f126103f21d12e31ca00c7de86d853 - ) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - vcpkg_download_distfile( - out_win_lib - URLS "https://nodejs.org/dist/v${VERSION}/win-x86/node.lib" - FILENAME "node.lib" - SHA512 0baa54a7870088a3290f817f6362446d304e8710ee36f99075925d110bce5c1eac377aa5c4ed6cf30161f98f39032d848eeb8d459add57b1c6458b8c91c72073 - ) - endif() -elseif(VCPKG_TARGET_IS_OSX) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(SHA512 8eb1713afdce23b0e8408d81aa47b3ea0955de328105d666a57efef8955b286c707c107377cff36164d8455558829ab65567b9cbe5997085afc841d95128fcd5) - set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-darwin-arm64.tar.gz") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(SHA512 ffe7e878fd5e424b0ff0d2e7db5e9c02f283792df2f1a748bd6381226701bcd9f93ae48f88d295412afb10d1c924ca068f70aba9857236c8893a2b812eacf248) - set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-darwin-x64.tar.gz") - endif() -elseif(VCPKG_TARGET_IS_LINUX) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(SHA512 f137a0dba52ded9f2f6b304c5f41fd2c75ba069ee31cfb89811b14254552c0d5ba10890f7001e64e8a6fee277302cb0ba915e0a417c047577384ac495c4ff447) - set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-linux-x64.tar.gz") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(SHA512 a0b2f522b0ecdc4b642f3104fd2eb08b8dfa6dc2b116b5a331722b8c6d96b2b6d5df0e691ef2b56e0463e1f30d37c98c686c5d306e1aa8cd927b306c4eef0770) - set(DIST_URL "https://nodejs.org/dist/v${VERSION}/node-v${VERSION}-linux-arm64.tar.gz") - endif() -endif() - -get_filename_component(DIST_FILENAME "${DIST_URL}" NAME) - -if(out_win_lib) - # nodejs requires the same node.lib to be used for both debug and release builds - file(COPY "${out_win_lib}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY "${out_win_lib}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -endif() - -# download dist -vcpkg_download_distfile( - out_dist - URLS "${DIST_URL}" - FILENAME "${DIST_FILENAME}" - SHA512 "${SHA512}" -) - -# extract dist -vcpkg_extract_source_archive( - OUT_SOURCE_PATH - ARCHIVE "${out_dist}" -) - -# copy headers -set(suffix "include/node") -set(source_path "${OUT_SOURCE_PATH}/${suffix}") -file(COPY "${source_path}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") - -# we do not take the license from the dist file because for windows it is not included as we download the headers only -set(license_url "https://raw.githubusercontent.com/nodejs/node/v${VERSION}/LICENSE") -vcpkg_download_distfile( - out_license - URLS "${license_url}" - FILENAME "LICENSE" - SHA512 2d79b49a12178a078cf1246ef7589d127189914403cd6f4dfe277ced2b3ef441a6e6ee131f1c75f996d1c1528b7e1ae332e83c1dc44580b2b51a933ed0c50c48 -) -file(INSTALL "${out_license}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-node-api-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-node-api-config.cmake" @ONLY) diff --git a/ports/node-api/unofficial-node-api-config.cmake.in b/ports/node-api/unofficial-node-api-config.cmake.in deleted file mode 100644 index 452d7657612425..00000000000000 --- a/ports/node-api/unofficial-node-api-config.cmake.in +++ /dev/null @@ -1,38 +0,0 @@ -if(NOT TARGET unofficial::node-api::node-api) - if(WIN32) - add_library(unofficial::node-api::node-api UNKNOWN IMPORTED) - else() - add_library(unofficial::node-api::node-api INTERFACE IMPORTED) - endif() - - find_path(node-api_INCLUDE_DIR - NAMES node.h - PATHS "${CMAKE_CURRENT_LIST_DIR}/../../include/node" - NO_DEFAULT_PATH - REQUIRED - ) - set_target_properties(unofficial::node-api::node-api PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${node-api_INCLUDE_DIR}" - ) - - if(APPLE) - set_target_properties(unofficial::node-api::node-api PROPERTIES - INTERFACE_LINK_OPTIONS "LINKER:SHELL:-undefined dynamic_lookup" - ) - endif() - - if(WIN32) - find_library(node-api_LIBRARY_RELEASE NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH REQUIRED) - set_target_properties(unofficial::node-api::node-api PROPERTIES - IMPORTED_LOCATION_RELEASE "${node-api_LIBRARY_RELEASE}" - IMPORTED_CONFIGURATIONS RELEASE - ) - if("@VCPKG_BUILD_TYPE@" STREQUAL "") - find_library(node-api_LIBRARY_DEBUG NAMES node PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH REQUIRED) - set_target_properties(unofficial::node-api::node-api PROPERTIES - IMPORTED_LOCATION_DEBUG "${node-api_LIBRARY_DEBUG}" - ) - set_property(TARGET unofficial::node-api::node-api APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - endif() - endif() -endif() diff --git a/ports/node-api/vcpkg.json b/ports/node-api/vcpkg.json deleted file mode 100644 index 1aa1c247fb10f6..00000000000000 --- a/ports/node-api/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "node-api", - "version-semver": "18.12.1", - "port-version": 2, - "description": "NodeJS API for writing modules in C++", - "homepage": "https://nodejs.org/api/addons.html", - "license": null, - "supports": "((windows & !arm) | linux | osx) & !uwp", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/nonius/vcpkg.json b/ports/nonius/vcpkg.json index 31b84d02c77cad..ae3b517b081854 100644 --- a/ports/nonius/vcpkg.json +++ b/ports/nonius/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nonius", - "version-string": "2019-04-20", - "port-version": 3, + "version-date": "2019-04-20", + "port-version": 4, "description": "A C++ micro-benchmarking framework", "dependencies": [ "boost-algorithm", diff --git a/ports/nowide/portfile.cmake b/ports/nowide/portfile.cmake index e77c5085546a77..959124d3365303 100644 --- a/ports/nowide/portfile.cmake +++ b/ports/nowide/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 c3748921b85648aa0e89970f2ab24588cbc72d05edd7ddf4f61a607d9ecbddd45e9e6799d2ed83386c43045b9487693e027494a81b11a6a7bdfaa939d1251938 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/nowide/vcpkg.json b/ports/nowide/vcpkg.json index ec60ea01c74d23..7fac7ad53d164f 100644 --- a/ports/nowide/vcpkg.json +++ b/ports/nowide/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nowide", "version": "11.2.0", + "port-version": 1, "description": "Boost nowide module (standalone)", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ diff --git a/ports/nspr/portfile.cmake b/ports/nspr/portfile.cmake index a7ecaafe975e50..5735dede5d78c5 100644 --- a/ports/nspr/portfile.cmake +++ b/ports/nspr/portfile.cmake @@ -5,10 +5,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF "${VERSION}" + SOURCE_BASE "${VERSION}" ) set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild") diff --git a/ports/nspr/vcpkg.json b/ports/nspr/vcpkg.json index c051100fc2366f..ee000485aec789 100644 --- a/ports/nspr/vcpkg.json +++ b/ports/nspr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nspr", "version": "4.35", - "port-version": 2, + "port-version": 3, "description": "Netscape portable runtime", "homepage": "https://releases.mozilla.org/pub/nspr/", "license": "MPL-2.0", diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake index 80a71c67c3408c..3e39dd0fecba3c 100644 --- a/ports/nss/portfile.cmake +++ b/ports/nss/portfile.cmake @@ -7,10 +7,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 4ec7b94e537df109638b821f3a7e3b7bf31d89c3739a6e4c85cad4fab876390ae482971d6f66198818400f467661e86f39dc1d2a4a88077fd81e3a0b7ed64110 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF "${VERSION}" + SOURCE_BASE "${VERSION}" PATCHES "01-nspr-no-lib-prefix.patch" "02-gen-debug-info-for-release.patch" diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index 0d5452dd6c2ac9..e84343a61d3b69 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nss", "version": "3.87", + "port-version": 1, "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/ports/nt-wrapper/vcpkg.json b/ports/nt-wrapper/vcpkg.json index 8f3403076925ea..eef5e82c372ccb 100644 --- a/ports/nt-wrapper/vcpkg.json +++ b/ports/nt-wrapper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nt-wrapper", - "version-string": "2019-08-10", - "port-version": 2, + "version-date": "2019-08-10", + "port-version": 3, "description": "A header only wrapper library around native windows system APIs", "homepage": "https://github.com/JustasMasiulis/nt_wrapper", "dependencies": [ diff --git a/ports/nu-book-zxing-cpp/portfile.cmake b/ports/nu-book-zxing-cpp/portfile.cmake index 5082d532dd48e4..72bae08f583916 100644 --- a/ports/nu-book-zxing-cpp/portfile.cmake +++ b/ports/nu-book-zxing-cpp/portfile.cmake @@ -1,25 +1,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile( + STACK_PROTECTOR_FIX_PATCH + URLS https://github.com/zxing-cpp/zxing-cpp/commit/accced21bae23320aad47b295de1085ab4e561b5.patch + FILENAME accced21bae23320aad47b295de1085ab4e561b5.patch + SHA512 c787f7cd313d80fcaa39c171a59021453a98936a66b842b3d83389104c8398417eed42151b8f5649e339e83b7261e9caa3423d9fa7b47e1fd00c933d8b11447c +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zxing-cpp/zxing-cpp REF v2.0.0 SHA512 fa22164f834a42194eafd0d3e9c09d953233c69843ac6e79c8d6513314be28d8082382b436c379368e687e0eed05cb5e566d2893ec6eb29233a36643904ae083 HEAD_REF master + PATCHES + "${STACK_PROTECTOR_FIX_PATCH}" ) -if (VCPKG_TARGET_IS_UWP) - set(ENV{CL} "$ENV{CL} -wd4996") -endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_BLACKBOX_TESTS=OFF -DBUILD_EXAMPLES=OFF - -DBUILD_SYSTEM_DEPS=ALWAYS - MAYBE_UNUSED_VARIABLES - # Currently no dependencies, but this defends against future additions - BUILD_SYSTEM_DEPS ) vcpkg_cmake_install() diff --git a/ports/nu-book-zxing-cpp/vcpkg.json b/ports/nu-book-zxing-cpp/vcpkg.json index 7bc783a75f090e..c1782ff4372b26 100644 --- a/ports/nu-book-zxing-cpp/vcpkg.json +++ b/ports/nu-book-zxing-cpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "nu-book-zxing-cpp", "version": "2.0.0", + "port-version": 1, "description": "Barcode detection and decoding library.", "homepage": "https://github.com/zxing-cpp/zxing-cpp", "license": "Apache-2.0", - "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/numcpp/portfile.cmake b/ports/numcpp/portfile.cmake index e2dce207f88e81..da4b7c30fd6a9f 100644 --- a/ports/numcpp/portfile.cmake +++ b/ports/numcpp/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dpilger26/NumCpp - REF Version_2.6.0 - SHA512 4D057941F4CB541CFAA56E4188C865DFC1804CA1B2203422B9EB7D7E8EE43CCB15DC5109DA5C932234E6055B6A5554D877347FA7CAEC5EA619A2975A56D2B16C + REF "Version_${VERSION}" + SHA512 8474e38b2522b52235b38abb556c60284b7c44861b450f310bfa1a66938053006e47dde9106c73dad843bf049a2dd8988cbe2d2ba747a86f548c1f356f39e081 HEAD_REF master ) @@ -17,4 +17,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME NumCpp CONFIG_PATH share/NumCpp/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/numcpp/vcpkg.json b/ports/numcpp/vcpkg.json index d93591882171e7..900d372ae78889 100644 --- a/ports/numcpp/vcpkg.json +++ b/ports/numcpp/vcpkg.json @@ -1,11 +1,12 @@ { "name": "numcpp", - "version": "2.6.0", + "version": "2.10.1", "description": "C++ implementation of the Python Numpy library", "homepage": "https://dpilger26.github.io/NumCpp", "license": "MIT", "dependencies": [ "boost-algorithm", + "boost-date-time", "boost-endian", "boost-integer", "boost-math", diff --git a/ports/observer-ptr-lite/vcpkg.json b/ports/observer-ptr-lite/vcpkg.json index cb8c340635f668..027ea5703a4f3e 100644 --- a/ports/observer-ptr-lite/vcpkg.json +++ b/ports/observer-ptr-lite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "observer-ptr-lite", - "version-string": "0.4.0", - "port-version": 2, + "version": "0.4.0", + "port-version": 3, "description": "A C++17-like observer_ptr for C++98 and later in a single-file header-only library", "dependencies": [ { diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index 9636902af9a362..dced1beb25b9ed 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -9,12 +9,6 @@ vcpkg_from_github( if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM x86) - else() - set(PLATFORM x64) - endif() - # There is no debug configuration # As it is a C library, build the release configuration and copy its output to the debug folder set(VCPKG_BUILD_TYPE release) @@ -24,7 +18,7 @@ if(VCPKG_TARGET_IS_WINDOWS) INCLUDES_SUBPATH include LICENSE_SUBPATH LICENSE RELEASE_CONFIGURATION "Release - ANSI" - PLATFORM ${PLATFORM} + PLATFORM "${VCPKG_TARGET_ARCHITECTURE}" USE_VCPKG_INTEGRATION ALLOW_ROOT_INCLUDES) diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 2ed663e6c83684..7185fea52b4427 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ocilib", "version": "4.7.5", + "port-version": 2, "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", "license": "Apache-2.0", - "supports": "!(arm | uwp)" + "supports": "!uwp & !(arm & windows)" } diff --git a/ports/ogre/fix_override.patch b/ports/ogre/fix_override.patch new file mode 100644 index 00000000000000..99e07547ef4453 --- /dev/null +++ b/ports/ogre/fix_override.patch @@ -0,0 +1,33 @@ +diff --git a/PlugIns/EXRCodec/src/O_IStream.cpp b/PlugIns/EXRCodec/src/O_IStream.cpp +index 6f668d5..eba9ac7 100644 +--- a/PlugIns/EXRCodec/src/O_IStream.cpp ++++ b/PlugIns/EXRCodec/src/O_IStream.cpp +@@ -39,11 +39,11 @@ bool O_IStream::read(char c[], int n) { + return _stream.eof(); + } + +-Int64 O_IStream::tellg() { ++uint64_t O_IStream::tellg() { + return _stream.getCurrentPtr() - _stream.getPtr(); + } + +-void O_IStream::seekg(Int64 pos) { ++void O_IStream::seekg(uint64_t pos) { + _stream.seek(pos); + } + +diff --git a/PlugIns/EXRCodec/src/O_IStream.h b/PlugIns/EXRCodec/src/O_IStream.h +index 8eb09d8..dc301ae 100644 +--- a/PlugIns/EXRCodec/src/O_IStream.h ++++ b/PlugIns/EXRCodec/src/O_IStream.h +@@ -46,8 +46,8 @@ public: + IStream (file_name), _stream(stream) {} + + bool read (char c[], int n) override; +- Imf::Int64 tellg () override; +- void seekg (Imf::Int64 pos) override; ++ virtual uint64_t tellg () override; ++ virtual void seekg (uint64_t pos) override; + void clear () override; + + private: diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index ffd6c9057cb9a8..5e1809d0c76c23 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -10,6 +10,10 @@ if(VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_EMSCRIPTEN) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() +set(PATCHLIB fix-dependencies.patch cfg-rel-paths.patch swig-python-polyfill.patch pkgconfig.patch same-install-rules-all-platforms.patch) +if(VCPKG_TARGET_IS_OSX) + list(APPEND PATCHLIB fix_override.patch) # upstream PR:https://github.com/OGRECave/ogre/pull/2831 +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre @@ -17,10 +21,7 @@ vcpkg_from_github( SHA512 d4022a454e0649a01182545f24094ba1f72127099a9b096e1b438238659629e93b1d79277d02acc0aceebdc3969aab0031de7f86390077bafc66ccfd86755430 HEAD_REF master PATCHES - fix-dependencies.patch - cfg-rel-paths.patch - swig-python-polyfill.patch - pkgconfig.patch + ${PATCHLIB} ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre/same-install-rules-all-platforms.patch b/ports/ogre/same-install-rules-all-platforms.patch new file mode 100644 index 00000000000000..06f72bad73fc94 --- /dev/null +++ b/ports/ogre/same-install-rules-all-platforms.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake +index c4e6de8..e92da59 100644 +--- a/CMake/Utils/OgreConfigTargets.cmake ++++ b/CMake/Utils/OgreConfigTargets.cmake +@@ -56,9 +56,6 @@ elseif (UNIX) + set(OGRE_LIB_RELEASE_PATH "") + set(OGRE_LIB_RELWDBG_PATH "") + set(OGRE_LIB_DEBUG_PATH "") +- if(APPLE AND NOT APPLE_IOS) +- set(OGRE_RELEASE_PATH "/${PLATFORM_NAME}") +- endif() + if(APPLE AND APPLE_IOS) + set(OGRE_LIB_RELEASE_PATH "/Release") + endif(APPLE AND APPLE_IOS) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 13e5a393ba3814..248f194e7bf783 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ogre", "version": "13.6.2", + "port-version": 2, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", diff --git a/ports/omniorb/add_win_into_autotools.patch b/ports/omniorb/add_win_into_autotools.patch new file mode 100644 index 00000000000000..df25c3183010b8 --- /dev/null +++ b/ports/omniorb/add_win_into_autotools.patch @@ -0,0 +1,315 @@ +diff --git a/configure.ac b/configure.ac +index d485463..2ba9c82 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -231,6 +231,7 @@ case "$host" in + *-*-openbsd*) plat_name="OpenBSD"; plat_def="__openbsd__"; os_v="3";; + *-*-sco*) plat_name="OSR5"; plat_def="__osr5__"; os_v="5";; + *-*-gnu*) plat_name="GNU"; plat_def="__hurd__" ; os_v="0";; ++ *-*-mingw*) plat_name="Win32Platform"; plat_def="__WIN32__" ; os_v="4";; + esac + + AC_SUBST(PLATFORM_NAME, $plat_name) +diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in +index f078912..9aef646 100644 +--- a/mk/beforeauto.mk.in ++++ b/mk/beforeauto.mk.in +@@ -1311,3 +1314,7 @@ endif + + lib_depend := $(patsubst %,$(LibPattern),omnithread) + OMNITHREAD_LIB_DEPEND := $(GENERATE_LIB_DEPEND) ++ ++ifdef Win32Platform ++include $(THIS_IMPORT_TREE)/mk/platforms/vcpkg.mk ++endif +\ No newline at end of file +diff --git a/mk/win32.mk b/mk/win32.mk +index 94c9aad..f788d41 100644 +--- a/mk/win32.mk ++++ b/mk/win32.mk +@@ -81,7 +81,6 @@ endif + + + ifndef WINVER +-WINVER = 0x0400 + endif + + IMPORT_CPPFLAGS += -D__WIN32__ -D_WIN32_WINNT=$(WINVER) +@@ -179,7 +179,7 @@ define CXXExecutable + $(RM) $@; \ + $(CXXLINK) -out:$@ $(CXXLINKOPTIONS) -PDB:$@.pdb $(IMPORT_LIBRARY_FLAGS) \ + $(filter-out $(LibPattern),$^) $$libs; \ +- $(MANIFESTTOOL) /outputresource:"$@;#1" /manifest $@.manifest; \ ++ $(MANIFESTTOOL) -outputresource:"$@;#1" -manifest $@.manifest; \ + ) + endef + +@@ -187,7 +187,7 @@ define CExecutable + (set -x; \ + $(RM) $@; \ + $(CLINK) -out:$@ $(CLINKOPTIONS) -PDB:$@.pdb $(IMPORT_LIBRARY_FLAGS) $(filter-out $(LibPattern),$^) $$libs; \ +- $(MANIFESTTOOL) /outputresource:"$@;#1" /manifest $@.manifest; \ ++ $(MANIFESTTOOL) -outputresource:"$@;#1" -manifest $@.manifest; \ + ) + endef + +@@ -356,18 +356,18 @@ extralinkoption="$(MSVC_DLL_CXXLINKDEBUGOPTIONS)"; \ + else \ + extralinkoption="$(MSVC_DLL_CXXLINKNODEBUGOPTIONS)"; \ + fi; \ + if [ -z "$$nodeffile" ]; then \ + $(MakeCXXExportSymbolDefinitionFile) \ + defflag="-def:$$defname"; \ + fi; \ + $(MakeResourceDefinitionFile) \ + set -x; \ + $(RM) $@; \ + $(CXXLINK) -out:$$dllname -DLL $$extralinkoption \ + $$defflag -IMPLIB:$@ $(IMPORT_LIBRARY_FLAGS) \ + $^ $$extralibs $$resname; \ +-$(MANIFESTTOOL) /outputresource:"$$dllname;#2" /manifest $$dllname.manifest; \ ++$(MANIFESTTOOL) -outputresource:"$$dllname;#2" -manifest $$dllname.manifest; \ + $(CP) $@ $$slibname; + endef + + # Export SharedLibrary +diff --git a/acinclude.m4 b/acinclude.m4 +index cef87f8bd..cf61556bd 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -433,8 +433,8 @@ AC_SUBST(ENABLE_LONGDOUBLE, $omni_cv_enable_longdouble) + + dnl Enable ZIOP + AC_DEFUN([OMNI_ENABLE_ZIOP], +-[AC_CHECK_LIB(z,compressBound,omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no) +-AC_CHECK_LIB(zstd,ZSTD_compress,omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no) ++[AC_SEARCH_LIBS(compressBound,[z zlib zlibd],omni_cv_enable_ziop_zlib=yes,omni_cv_enable_ziop_zlib=no) ++AC_SEARCH_LIBS(ZSTD_compress,[zstd zstdd],omni_cv_enable_ziop_zstd=yes,omni_cv_enable_ziop_zstd=no) + omni_cv_enable_ziop="no" + if test "$omni_cv_enable_ziop_zlib" = "yes"; then + omni_cv_enable_ziop="yes" +diff --git a/mk/win32.mk b/mk/win32.mk +index 741835b4b..7a5bff934 100644 +--- a/mk/win32.mk ++++ b/mk/win32.mk +@@ -580,8 +580,7 @@ OMNIORB_IDL = $(OMNIORB_IDL_ONLY) $(OMNIORB_IDL_ANY_FLAGS) + OMNIORB_CPPFLAGS = -D__OMNIORB4__ -I$(CORBA_STUB_DIR) $(OMNITHREAD_CPPFLAGS) + OMNIORB_IDL_OUTPUTDIR_PATTERN = -C% + +-msvc_work_around_stub = $(patsubst %,$(LibPattern),msvcstub) \ +- -NODEFAULTLIB:libcmt.lib -NODEFAULTLIB:libcmtd.lib ++msvc_work_around_stub = $(patsubst %,$(LibPattern),msvcstub) + + OMNIORB_LIB = $(omniorb_dll_name) \ + $(omnidynamic_dll_name) \ +diff --git a/src/tool/dir.mk b/src/tool/dir.mk +index c6cb127d9..d75ba288a 100644 +--- a/src/tool/dir.mk ++++ b/src/tool/dir.mk +@@ -11,7 +11,7 @@ SUBDIRS = omkdepend omniidl + endif + + ifdef Win32Platform +-SUBDIRS = omniidl ++SUBDIRS = omkdepend omniidl + endif + + +diff --git a/mk/win32.mk b/mk/win32.mk +index 6d320a2bd..3983eba5c 100644 +--- a/mk/win32.mk ++++ b/mk/win32.mk +@@ -40,12 +40,7 @@ SORT = sort + endif + + +-AR = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/libwrapper $(XLN) +-CXX = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/clwrapper $(XLN) +-CXXLINK = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/linkwrapper $(XLN) + CXXMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D__cplusplus -D_MSC_VER +-CC = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/clwrapper $(XLN) +-CLINK = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/linkwrapper $(XLN) + CMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D_MSC_VER + + RCTOOL = rc.exe +@@ -83,7 +83,7 @@ endif + ifndef WINVER + endif + +-IMPORT_CPPFLAGS += -D__WIN32__ -D_WIN32_WINNT=$(WINVER) ++IMPORT_CPPFLAGS += -D__WIN32__ + + SOCKET_LIB = ws2_32.lib mswsock.lib + +diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in +index b7087ea36..d7a826fa9 100644 +--- a/mk/beforeauto.mk.in ++++ b/mk/beforeauto.mk.in +@@ -36,6 +36,8 @@ BINDIR = bin + + prefix := @prefix@ + exec_prefix := @exec_prefix@ ++includedir := @includedir@ ++libdir := @libdir@ + INSTALLTARGET := 1 + INSTALLINCDIR := $(DESTDIR)@includedir@ + INSTALLBINDIR := $(DESTDIR)@bindir@ +@@ -362,6 +364,9 @@ endef + # + # Patterns for various file types + # ++ ++ifndef Win32Platform ++ + LibPathPattern = -L% + LibNoDebugPattern = lib%.a + LibDebugPattern = lib%.a +@@ -371,6 +376,37 @@ LibSearchPattern = -l% + BinPattern = % + TclScriptPattern = % + ++else ++ ++LibPathPattern = -libpath:% ++LibNoDebugPattern = %.lib ++LibDebugPattern = %d.lib ++DLLNoDebugPattern = %_rt.lib ++DLLDebugPattern = %_rtd.lib ++LibNoDebugSearchPattern = %.lib ++LibDebugSearchPattern = %d.lib ++DLLNoDebugSearchPattern = %_rt.lib ++DLLDebugSearchPattern = %_rtd.lib ++ ++ ++ifndef BuildDebugBinary ++ ++LibPattern = $(LibNoDebugPattern) ++DLLPattern = $(DLLNoDebugPattern) ++LibSearchPattern = $(LibNoDebugSearchPattern) ++DLLSearchPattern = $(DLLNoDebugSearchPattern) ++ ++else ++ ++LibPattern = $(LibDebugPattern) ++DLLPattern = $(DLLDebugPattern) ++LibSearchPattern = $(LibDebugSearchPattern) ++DLLSearchPattern = $(DLLDebugSearchPattern) ++endif ++ ++endif ++ ++ + + # + # Stuff to generate statically-linked libraries. +diff --git a/src/services/mklib/dynstublib/dir.mk b/src/services/mklib/dynstublib/dir.mk +index e128aa87a..f2e1448b3 100644 +--- a/src/services/mklib/dynstublib/dir.mk ++++ b/src/services/mklib/dynstublib/dir.mk +@@ -17,6 +17,14 @@ ifdef Win32Platform + MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC + endif + ++ifdef Win32Platform ++# in case of Win32 lossage: ++dynimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt.lib \ ++ $(patsubst $(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB)) ++else ++dynimps := $(OMNIORB_COS_LIB) $(OMNIORB_LIB) ++endif ++ + ifndef NoReleaseBuild + all:: mkstatic mkshared + +@@ -75,14 +83,6 @@ dynskshared = shared/$(shell $(SharedLibraryFullName) $(dynsknamespec)) + + MDFLAGS += -p shared/ + +-ifdef Win32Platform +-# in case of Win32 lossage: +-dynimps := COS$(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)$(OMNIORB_MICRO_VERSION)_rt.lib \ +- $(patsubst $(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), $(OMNIORB_LIB)) +-else +-dynimps := $(OMNIORB_COS_LIB) $(OMNIORB_LIB) +-endif +- + mkshared:: + @(dir=shared; $(CreateDir)) + +diff --git a/mk/win32.mk b/mk/win32.mk +index 83f1b1687..741835b4b 100644 +--- a/mk/win32.mk ++++ b/mk/win32.mk +@@ -43,5 +43,5 @@ endif +-CXXMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D__cplusplus -D_MSC_VER ++CXXMAKEDEPEND = $(OMKDEPEND) -D__cplusplus -D_MSC_VER +-CMAKEDEPEND = $(BASE_OMNI_TREE)/$(WRAPPER_FPATH)/omkdepend $(MKDEPOPT) -D_MSC_VER ++CMAKEDEPEND = $(OMKDEPEND) $(MKDEPOPT) -D_MSC_VER + + RCTOOL = rc.exe + MANIFESTTOOL = true +@@ -145,7 +145,7 @@ BinPattern = %.exe + define StaticLinkLibrary + (set -x; \ + $(RM) $@; \ +- $(AR) $@ $^; \ ++ $(AR) -OUT:$@ $^; \ + ) + endef + +@@ -439,12 +444,11 @@ endef + # The pattern rules below ensured that the right compiler flags are used + # to compile the source for the library. + ++ifndef NoReleaseBuild ++ + static/%.o: %.cc + $(CXX) -c $(CXXDEBUGFLAGS) $(MSVC_STATICLIB_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major).pdb $< + +-debug/%.o: %.cc +- $(CXX) -c $(MSVC_STATICLIB_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fddebug\\$(LIB_NAME)$(major)d.pdb $< +- + shared/%DynSK.o: %DynSK.cc + $(CXX) -c $(CXXDEBUGFLAGS) -DUSE_core_stub_in_nt_dll $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshared\\ $< + +@@ -454,6 +458,18 @@ shared/%SK.o: %SK.cc + shared/%.o: %.cc + $(CXX) -c $(CXXDEBUGFLAGS) $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshared\\ $< + ++static/%.o: %.c ++ $(CC) -c $(CDEBUGFLAGS) $(MSVC_STATICLIB_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major).pdb $< ++ ++shared/%.o: %.c ++ $(CC) -c $(CDEBUGFLAGS) $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ $< ++ ++endif ++ ++ifndef NoDebugBuild ++ ++debug/%.o: %.cc ++ $(CXX) -c $(MSVC_STATICLIB_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fddebug\\$(LIB_NAME)$(major)d.pdb $< + + shareddebug/%DynSK.o: %DynSK.cc + $(CXX) -c -DUSE_core_stub_in_nt_dll $(MSVC_DLL_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshareddebug\\ $< +@@ -464,19 +480,14 @@ shareddebug/%SK.o: %SK.cc + shareddebug/%.o: %.cc + $(CXX) -c $(MSVC_DLL_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdshareddebug\\ $< + +-static/%.o: %.c +- $(CC) -c $(CDEBUGFLAGS) $(MSVC_STATICLIB_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major).pdb $< +- + debug/%.o: %.c + $(CC) -c $(MSVC_STATICLIB_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ -Fdstatic\\$(LIB_NAME)$(major)d.pdb $< + +-shared/%.o: %.c +- $(CC) -c $(CDEBUGFLAGS) $(MSVC_DLL_CXXNODEBUGFLAGS) $(CPPFLAGS) -Fo$@ $< +- +- + shareddebug/%.o: %.c + $(CC) -c $(MSVC_DLL_CXXDEBUGFLAGS) $(CPPFLAGS) -Fo$@ $< + ++endif ++ + + # + # Replacements for implicit rules diff --git a/ports/omniorb/def_gen_fix.patch b/ports/omniorb/def_gen_fix.patch new file mode 100644 index 00000000000000..5034c2e13ad0a8 --- /dev/null +++ b/ports/omniorb/def_gen_fix.patch @@ -0,0 +1,18 @@ +diff --git a/mk/win32.mk b/mk/win32.mk +index fc179563e..15903919a 100644 +--- a/mk/win32.mk ++++ b/mk/win32.mk +@@ -264,12 +264,12 @@ endef + define MakeCXXExportSymbolDefinitionFile + symrefdir=$${debug:+debug}; \ + symreflib=$(SharedLibrarySymbolRefLibraryTemplate); \ + if [ ! -f $$symreflib ]; then echo "Cannot find reference static library $$symreflib"; return 1; fi; \ + set -x; \ + echo "LIBRARY $$dllbase" > $$defname; \ + echo "VERSION $$version" >> $$defname; \ + echo "EXPORTS" >> $$defname; \ +-DUMPBIN.EXE /SYMBOLS $$symreflib | \ ++DUMPBIN.EXE $$symreflib -SYMBOLS | \ + egrep '^[^ ]+ +[^ ]+ +SECT[^ ]+ +[^ ]+ +\(\) +External +\| +\?[^ ]*|^[^ ]+ +[^ ]+ +SECT[^ ]+ +[^ ]+ +External +\| +\?[^?][^ ]*'|\ + egrep -v 'deleting destructor[^(]+\(unsigned int\)' | \ + egrep -v 'anonymous namespace' | \ diff --git a/ports/omniorb/fix_dependency.patch b/ports/omniorb/fix_dependency.patch new file mode 100644 index 00000000000000..39398c3bcea791 --- /dev/null +++ b/ports/omniorb/fix_dependency.patch @@ -0,0 +1,78 @@ +diff --git a/mk/mklib.mk b/mk/mklib.mk +index fb83cf391..9b28a314b 100644 +--- a/mk/mklib.mk ++++ b/mk/mklib.mk +@@ -100,6 +100,10 @@ $(shlib): $(patsubst %, shared/%, $(LIB_OBJS) $(LIB_SHARED_ONLY_OBJS)) + @(namespec="$(namespec)" extralibs="$(imps) $(extralibs)"; \ + $(MakeCXXSharedLibrary)) + ++ifdef Win32Platform ++$(shlib): | $(staticlib) ++endif ++ + export:: $(shlib) + @(namespec="$(namespec)"; \ + $(ExportSharedLibrary)) +@@ -209,6 +211,10 @@ $(dbugshlib): $(patsubst %, shareddebug/%, $(LIB_OBJS) $(LIB_SHARED_ONLY_OBJS)) + (namespec="$(namespec)" debug=1 extralibs="$(dbugimps) $(extralibs)"; \ + $(MakeCXXSharedLibrary)) + ++ifdef Win32Platform ++$(dbugshlib): | $(dbuglib) ++endif ++ + export:: $(dbugshlib) + @(namespec="$(namespec)" debug=1; \ + $(ExportSharedLibrary)) +diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk +index ce46f6c5f..eb619e5c5 100644 +--- a/src/services/mklib/stublib/dir.mk ++++ b/src/services/mklib/stublib/dir.mk +@@ -92,6 +92,10 @@ $(skshared): $(patsubst %, shared/%, $(COS_SK_OBJS)) + @(namespec="$(sknamespec)"; extralibs="$(imps) $(extralibs)"; \ + $(MakeCXXSharedLibrary)) + ++ifdef Win32Platform ++$(skshared): | $(sk) ++endif ++ + export:: $(skshared) + @(namespec="$(sknamespec)"; \ + $(ExportSharedLibrary)) +@@ -168,6 +170,10 @@ $(skshareddbug): $(patsubst %, shareddebug/%, $(COS_SK_OBJS)) + (namespec="$(sknamespec)"; debug=1; extralibs="$(dbugimps) $(extralibs)"; \ + $(MakeCXXSharedLibrary)) + ++ifdef Win32Platform ++$(skshareddbug): | $(skdbug) ++endif ++ + export:: $(skshareddbug) + @(namespec="$(sknamespec)" debug=1; \ + $(ExportSharedLibrary)) +diff --git a/src/services/mklib/dynstublib/dir.mk b/src/services/mklib/dynstublib/dir.mk +index f2e1448b3..9134e8aba 100644 +--- a/src/services/mklib/dynstublib/dir.mk ++++ b/src/services/mklib/dynstublib/dir.mk +@@ -92,6 +92,10 @@ $(dynskshared): $(skshared) $(patsubst %, shared/%, $(COS_DYNSK_OBJS)) + @(namespec="$(dynsknamespec)"; extralibs="$(dynimps)"; \ + $(MakeCXXSharedLibrary)) + ++ifdef Win32Platform ++$(dynskshared): | $(dynsk) ++endif ++ + export:: $(dynskshared) + @(namespec="$(dynsknamespec)"; \ + $(ExportSharedLibrary)) +@@ -169,6 +171,10 @@ $(dynskshareddbug): $(patsubst %, shareddebug/%, $(COS_DYNSK_OBJS)) + @(namespec="$(dynsknamespec)"; debug=1; extralibs="$(skshareddbug) $(dbugimps) $(extralibs)"; \ + $(MakeCXXSharedLibrary)) + ++ifdef Win32Platform ++$(dynskshareddbug): | $(dynskdbug) ++endif ++ + export:: $(dynskshareddbug) + @(namespec="$(dynsknamespec)" debug=1; \ + $(ExportSharedLibrary)) diff --git a/ports/omniorb/hardcode_vaargs_for_msvc.patch b/ports/omniorb/hardcode_vaargs_for_msvc.patch new file mode 100644 index 00000000000000..add8ec08019dfe --- /dev/null +++ b/ports/omniorb/hardcode_vaargs_for_msvc.patch @@ -0,0 +1,76 @@ +diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c +index 507c330..5651b3e 100644 +--- a/src/tool/omniidl/cxx/cccp/cccp.c ++++ b/src/tool/omniidl/cxx/cccp/cccp.c +@@ -182,15 +182,20 @@ my_bzero (b, length) + # endif + #endif + ++#if defined(_MSC_VER) ++#define OMNI_HAVE_VPRINTF ++#define __STDC__ ++#endif ++ + #if defined (__STDC__) && defined (OMNI_HAVE_VPRINTF) + # include + # define VA_START(va_list, var) va_start (va_list, var) + # define PRINTF_ALIST(msg) char *msg, ... + # define PRINTF_DCL(msg) + # define PRINTF_PROTO(ARGS, m, n) PROTO (ARGS) __attribute__ ((format (__printf__, m, n))) + #else + # include + # define VA_START(va_list, var) va_start (va_list) + # define PRINTF_ALIST(msg) msg, va_alist + # define PRINTF_DCL(msg) char *msg; va_dcl + # define PRINTF_PROTO(ARGS, m, n) () __attribute__ ((format (__printf__, m, n))) +diff --git a/src/tool/omniidl/cxx/cccp/cexp.c b/src/tool/omniidl/cxx/cccp/cexp.c +index 4b4679c..b534fb3 100644 +--- a/src/tool/omniidl/cxx/cccp/cexp.c ++++ b/src/tool/omniidl/cxx/cccp/cexp.c +@@ -152,15 +152,20 @@ struct arglist { + # endif + #endif + ++#if defined(_MSC_VER) ++#define OMNI_HAVE_VPRINTF ++#define __STDC__ ++#endif ++ + #if defined (__STDC__) && defined (OMNI_HAVE_VPRINTF) + # include + # define VA_START(va_list, var) va_start (va_list, var) + # define PRINTF_ALIST(msg) char *msg, ... + # define PRINTF_DCL(msg) + # define PRINTF_PROTO(ARGS, m, n) PROTO (ARGS) __attribute__ ((format (__printf__, m, n))) + #else + # include + # define VA_START(va_list, var) va_start (va_list) + # define PRINTF_ALIST(msg) msg, va_alist + # define PRINTF_DCL(msg) char *msg; va_dcl + # define PRINTF_PROTO(ARGS, m, n) () __attribute__ ((format (__printf__, m, n))) +diff --git a/src/tool/omniidl/cxx/cccp/cexp.y.source b/src/tool/omniidl/cxx/cccp/cexp.y.source +index 6fc69f5..6f59873 100644 +--- a/src/tool/omniidl/cxx/cccp/cexp.y.source ++++ b/src/tool/omniidl/cxx/cccp/cexp.y.source +@@ -111,15 +111,20 @@ struct arglist { + # endif + #endif + ++#if defined(_MSC_VER) ++#define OMNI_HAVE_VPRINTF ++#define __STDC__ ++#endif ++ +-#if defined (__STDC__) && defined (HAVE_VPRINTF) ++#if defined (__STDC__) && defined (OMNI_HAVE_VPRINTF) + # include + # define VA_START(va_list, var) va_start (va_list, var) + # define PRINTF_ALIST(msg) char *msg, ... + # define PRINTF_DCL(msg) + # define PRINTF_PROTO(ARGS, m, n) PROTO (ARGS) __attribute__ ((format (__printf__, m, n))) + #else + # include + # define VA_START(va_list, var) va_start (va_list) + # define PRINTF_ALIST(msg) msg, va_alist + # define PRINTF_DCL(msg) char *msg; va_dcl + # define PRINTF_PROTO(ARGS, m, n) () __attribute__ ((format (__printf__, m, n))) diff --git a/ports/omniorb/msvc-src-build-fixes.patch b/ports/omniorb/msvc-src-build-fixes.patch new file mode 100644 index 00000000000000..fb7ae67169054b --- /dev/null +++ b/ports/omniorb/msvc-src-build-fixes.patch @@ -0,0 +1,13 @@ +diff --git a/include/omnithread/atomic.h b/include/omnithread/atomic.h +index 3fed8df..e1b6a71 100644 +--- a/include/omnithread/atomic.h ++++ b/include/omnithread/atomic.h +@@ -27,7 +27,7 @@ + #define __omnithread_atomic_h_ + + +-#ifdef OMNI_HAVE_SYNC_ADD_AND_FETCH ++#if defined(OMNI_HAVE_SYNC_ADD_AND_FETCH) && !defined(_MSC_VER) + + # define OMNI_REFCOUNT_DEFINED + diff --git a/ports/omniorb/portfile.cmake b/ports/omniorb/portfile.cmake new file mode 100644 index 00000000000000..768716f5652bfa --- /dev/null +++ b/ports/omniorb/portfile.cmake @@ -0,0 +1,212 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://netcologne.dl.sourceforge.net/project/omniorb/omniORB/omniORB-4.3.0/omniORB-4.3.0.tar.bz2" + FILENAME "omniORB-${VERSION}.tar.bz2" + SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) +set (PATCHES + hardcode_vaargs_for_msvc.patch + ) +set (OPTIONS + ac_cv_prog_cc_g=yes + ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_g=yes + omni_cv_sync_add_and_fetch=no + ) +endif() + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + fix_dependency.patch + def_gen_fix.patch + msvc-src-build-fixes.patch + release-debug-static.patch + add_win_into_autotools.patch + python-fixes.patch + ${PATCHES} +) + +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/python3") # port ask python distutils for info. +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{PYTHONPATH} "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/Lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/python${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/python") +endif() + +vcpkg_find_acquire_program(FLEX) +cmake_path(GET FLEX PARENT_PATH FLEX_DIR) +vcpkg_add_to_path("${FLEX_DIR}") + +vcpkg_find_acquire_program(BISON) +cmake_path(GET BISON PARENT_PATH BISON_DIR) +vcpkg_add_to_path("${BISON_DIR}") + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(z_vcpkg_org_linkage "${VCPKG_LIBRARY_LINKAGE}") + # convoluted build system; shared builds requires + # static library to create def file for symbol export + # tools seem to only dynamically link on windows due to make rules! + # zlib/zstd deps for ZIOP seem to not work on windows. At least configure + # won't run the required checks for some reasons. + set(VCPKG_LIBRARY_LINKAGE dynamic) + z_vcpkg_get_cmake_vars(cmake_vars_file) + include("${cmake_vars_file}") + if(VCPKG_BUILD_TYPE) + string(APPEND build_info "NoDebugBuild=1\n") + endif() + string(APPEND build_info "replace-with-per-config-text\n") + set(progs C_COMPILER CXX_COMPILER AR + LINKER RANLIB OBJDUMP MT + STRIP NM DLLTOOL RC_COMPILER) + list(TRANSFORM progs PREPEND "VCPKG_DETECTED_CMAKE_") + foreach(prog IN LISTS progs) + if(${prog}) + set(path "${${prog}}") + unset(prog_found CACHE) + get_filename_component(${prog} "${${prog}}" NAME) + find_program(prog_found ${${prog}} PATHS ENV PATH NO_DEFAULT_PATH) + if(NOT path STREQUAL prog_found) + get_filename_component(path "${path}" DIRECTORY) + vcpkg_add_to_path(PREPEND ${path}) + endif() + endif() + endforeach() + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg.mk" "${SOURCE_PATH}/mk/platforms/vcpkg.mk" @ONLY NEWLINE_STYLE UNIX) + file(GLOB_RECURSE wrappers "${SOURCE_PATH}/bin/x86_win32/*") + file(COPY ${wrappers} DESTINATION "${SOURCE_PATH}/bin") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + NO_WRAPPERS + COPY_SOURCE + OPTIONS + ${OPTIONS} +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel//mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoDebugBuild=1") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoReleaseBuild=1\nBuildDebugBinary=1") + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "python$(subst .,,$(PYVERSION)).lib" "python$(subst .,,$(PYVERSION))_d.lib") + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "zlib.lib" "zlibd.lib") + endif() +endif() + +vcpkg_install_make( + MAKEFILE "GNUmakefile" + ADD_BIN_TO_PATH +) + +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/msvcstub.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB all_libs "${CURRENT_PACKAGES_DIR}/lib/*.lib") + set(import_libs "${all_libs}") + list(FILTER import_libs INCLUDE REGEX "(_rt.lib$|msvcstub)") + if(z_vcpkg_org_linkage STREQUAL "static") + file(REMOVE ${import_libs}) + else() + list(REMOVE_ITEM all_libs ${import_libs}) + file(REMOVE ${all_libs}) # remove installed static libs + set(to_copy_and_rename "${import_libs}") + list(FILTER to_copy_and_rename INCLUDE REGEX "3(0)?_rt.lib") + foreach(cp IN LISTS to_copy_and_rename) + string(REGEX REPLACE "3(0)?_rt" "" new_name "${cp}") + string(REGEX REPLACE "thread4" "thread" new_name "${new_name}") + file(COPY_FILE "${cp}" "${new_name}") + endforeach() + file(GLOB dll_files "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/*.dll") + file(COPY ${dll_files} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") + foreach(pc_file IN LISTS pc_files) + get_filename_component(filename "${pc_file}" NAME_WE) + if(filename STREQUAL "omnithread3") + vcpkg_replace_string("${pc_file}" "-lomnithread" "-lomnithread_rt") + else() + vcpkg_replace_string("${pc_file}" "-l${filename}" "-l${filename}_rt") + endif() + endforeach() + endif() + + if(NOT VCPKG_BUILD_TYPE) # dbg libs have no install rules so manually copy them. + file(GLOB all_libs "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib") + set(install_libs "${all_libs}") + if(z_vcpkg_org_linkage STREQUAL "static") + list(FILTER install_libs EXCLUDE REGEX "(_rtd.lib$|msvcstub)") + else() # dynamic lib + list(FILTER install_libs INCLUDE REGEX "(_rtd.lib$|msvcstub)") + set(to_copy_and_rename "${install_libs}") + list(FILTER to_copy_and_rename INCLUDE REGEX "3(0)?_rtd.lib") + foreach(cp IN LISTS to_copy_and_rename) + string(REGEX REPLACE "3(0)?_rt" "" new_name "${cp}") + string(REGEX REPLACE "thread4" "thread" new_name "${new_name}") + file(COPY_FILE "${cp}" "${new_name}") + list(APPEND install_libs "${new_name}") + endforeach() + file(GLOB dll_files "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/*.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY ${dll_files} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") + foreach(pc_file IN LISTS pc_files) + get_filename_component(filename "${pc_file}" NAME_WE) + if(filename STREQUAL "omnithread3") + vcpkg_replace_string("${pc_file}" "-lomnithread" "-lomnithread_rtd") + else() + vcpkg_replace_string("${pc_file}" "-l${filename}" "-l${filename}_rtd") + endif() + endforeach() + endif() + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY ${install_libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LIB") # Lib is LGPL +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" RENAME copyright) # Tools etc are GPL + +vcpkg_copy_pdbs() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) +file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/omnicpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + DESTINATION + "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + ) +endif() + +file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/omniidl${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + DESTINATION + "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + ) + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + +# Restore old linkage info. +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_LIBRARY_LINKAGE "${z_vcpkg_org_linkage}") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/omniidl" "${CURRENT_INSTALLED_DIR}" "\"os.path.dirname(__file__)+\"/../../../") +endif() + +set(del_files "") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB del_files "${CURRENT_PACKAGES_DIR}/lib/*.a" "${CURRENT_PACKAGES_DIR}/debug/lib/*.a") + if(del_files) + file(REMOVE ${del_files}) + endif() +else() + file(GLOB del_files "${CURRENT_PACKAGES_DIR}/lib/*.so*" "${CURRENT_PACKAGES_DIR}/debug/lib/*.so*") + if(del_files) + file(REMOVE ${del_files}) + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/omniorb/python-fixes.patch b/ports/omniorb/python-fixes.patch new file mode 100644 index 00000000000000..e35613602c23a1 --- /dev/null +++ b/ports/omniorb/python-fixes.patch @@ -0,0 +1,46 @@ +diff --git a/mk/python.mk b/mk/python.mk +index 1380018..fb321a5 100644 +--- a/mk/python.mk ++++ b/mk/python.mk +@@ -4,7 +4,7 @@ + + PYVERSION := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(".".join(sys.version.split(".")[:2]))') + PYPREFIX := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.exec_prefix.replace("\\","/"))') +-PYINCDIR := $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_inc().replace("\\","/"))') ++PYINCDIR := $(includedir)/python3.10 + + PythonSHAREDLIB_SUFFIX = $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write((distutils.sysconfig.get_config_var("SO") or ".so").lstrip("."))') + +diff --git a/src/tool/omniidl/cxx/idlpython.cc b/src/tool/omniidl/cxx/idlpython.cc +index 639515105..27ad3ee0e 100644 +--- a/src/tool/omniidl/cxx/idlpython.cc ++++ b/src/tool/omniidl/cxx/idlpython.cc +@@ -27,8 +27,6 @@ + + // On Windows, if _DEBUG is defined, some Python versions try to force + // use of _d.lib libraries that are not actually present. +-#undef _DEBUG +- + #include + + #include +diff --git a/src/tool/omniidl/cxx/dir.mk b/src/tool/omniidl/cxx/dir.mk +index 84f10ac03..3b5a60b87 100644 +--- a/src/tool/omniidl/cxx/dir.mk ++++ b/src/tool/omniidl/cxx/dir.mk +@@ -190,13 +190,13 @@ ifdef Win32Platform + + DIR_CPPFLAGS += -DMSDOS -DOMNIIDL_EXECUTABLE + +-PYLIBDIR := $(PYPREFIX)/libs $(PYPREFIX)/lib/x86_win32 ++PYLIBDIR := $(libdir) + + ifdef MinGW32Build + PYLIB := -lpython$(subst .,,$(PYVERSION)) + CXXLINKOPTIONS += $(patsubst %,-L%,$(PYLIBDIR)) + else +-PYLIB := python$(subst .,,$(PYVERSION)).lib ++PYLIB = python$(subst .,,$(PYVERSION)).lib zlib.lib Advapi32.lib + CXXLINKOPTIONS += $(patsubst %,-libpath:%,$(PYLIBDIR)) + endif + diff --git a/ports/omniorb/release-debug-static.patch b/ports/omniorb/release-debug-static.patch new file mode 100644 index 00000000000000..f9cc82409c8322 --- /dev/null +++ b/ports/omniorb/release-debug-static.patch @@ -0,0 +1,319 @@ +diff --git a/mk/mklib.mk b/mk/mklib.mk +index 8f64b14dd..1d73cfdbe 100644 +--- a/mk/mklib.mk ++++ b/mk/mklib.mk +@@ -16,6 +16,8 @@ + # are called libfoo.a and libfoo.so.1.3 etc. + # + ++ifndef NoReleaseBuild ++ + all:: mkstatic mkshared + + export:: mkstatic mkshared +@@ -147,9 +149,13 @@ mkshared:: + + endif + ++endif ++ + ############################################################################## + # Build debug libraries for Win32 + ############################################################################## ++ifndef NoDebugBuild ++ + ifdef Win32Platform + + ifdef BuildSharedLibrary +@@ -231,3 +237,4 @@ veryclean:: + + endif + endif ++endif +\ No newline at end of file +diff --git a/src/lib/dir.mk b/src/lib/dir.mk +index 732f8457c..bff3144f8 100644 +--- a/src/lib/dir.mk ++++ b/src/lib/dir.mk +@@ -17,9 +17,14 @@ ciao:: + ifndef EmbeddedSystem + ifdef Win32Platform + ifndef MinGW32Build ++ifndef NoReleaseBuild + export:: + (cd $(EXPORT_TREE)/$(BINDIR); editbin /REBASE:BASE=0x68000000,DOWN *_rt.dll; ) ++endif ++ifndef NoDebugBuild ++export:: + (cd $(EXPORT_TREE)/$(BINDIR); editbin /REBASE:BASE=0x68000000,DOWN *_rtd.dll; ) + endif + endif + endif ++endif +diff --git a/src/lib/omnithread/dir.mk b/src/lib/omnithread/dir.mk +index ed2194c98..adb87adba 100644 +--- a/src/lib/omnithread/dir.mk ++++ b/src/lib/omnithread/dir.mk +@@ -32,14 +32,6 @@ LIB_VERSION := $(OMNITHREAD_VERSION) + LIB_OBJS := $(CXXSRCS:.cc=.o) + LIB_IMPORTS := $(OMNITHREAD_PLATFORM_LIB) + +-all:: mkstatic mkshared +- +-export:: mkstatic mkshared +- +-ifdef INSTALLTARGET +-install:: mkstatic mkshared +-endif +- + vers := $(subst ., ,$(LIB_VERSION)) + ifeq ($(words $(vers)), 2) + vers := _ $(vers) +@@ -50,6 +42,16 @@ endif + + namespec := $(LIB_NAME) $(vers) + ++ifndef NoReleaseBuild ++ ++all:: mkstatic mkshared ++ ++export:: mkstatic mkshared ++ ++ifdef INSTALLTARGET ++install:: mkstatic mkshared ++endif ++ + ############################################################################## + # Build Static library + ############################################################################## +@@ -158,9 +160,12 @@ mkshared:: + + endif + ++endif + ############################################################################## + # Build debug libraries for Win32 + ############################################################################## ++ifndef NoDebugBuild ++ + ifdef Win32Platform + + ifdef BuildSharedLibrary +@@ -239,4 +244,4 @@ veryclean:: + + endif + endif +- ++endif +diff --git a/src/services/mklib/dynstublib/dir.mk b/src/services/mklib/dynstublib/dir.mk +index 23573345d..e128aa87a 100644 +--- a/src/services/mklib/dynstublib/dir.mk ++++ b/src/services/mklib/dynstublib/dir.mk +@@ -12,15 +12,18 @@ COS_DYNSK_SRCS = $(COS_INTERFACES:%=%DynSK.cc) + + CXXSRCS = $(COS_DYNSK_SRCS) + +-all:: mkstatic mkshared +- +-export:: mkstatic mkshared +- + ifdef Win32Platform + MSVC_STATICLIB_CXXNODEBUGFLAGS += -D_WINSTATIC + MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC + endif + ++ifndef NoReleaseBuild ++all:: mkstatic mkshared ++ ++export:: mkstatic mkshared ++ ++ ++ + + ############################################################################## + # Build Static library +@@ -108,10 +111,11 @@ else + mkshared:: + + endif +- ++endif + ############################################################################## + # Build debug libraries for Win32 + ############################################################################## ++ifndef NoDebugBuild + ifdef Win32Platform + + all:: mkstaticdbug mkshareddbug +@@ -145,6 +149,7 @@ clean:: + ##################################################### + # DLL debug libraries + ##################################################### ++ + shareddbugversion = $(OMNIORB_VERSION) + + dynsknamespec = $(subst ., ,$(COS_DYNSKLIB_NAME).$(shareddbugversion)) +@@ -173,3 +178,4 @@ clean:: + @(dir=shareddebug; $(CleanSharedLibrary)) + + endif ++endif +\ No newline at end of file +diff --git a/src/services/mklib/mkBOAlib/dir.mk b/src/services/mklib/mkBOAlib/dir.mk +index 1869d083d..18cc38764 100644 +--- a/src/services/mklib/mkBOAlib/dir.mk ++++ b/src/services/mklib/mkBOAlib/dir.mk +@@ -16,6 +16,8 @@ COS_SK_OBJS = $(COS_INTERFACES:%=%SK.o) + COS_SK_SRCS = $(COS_INTERFACES:%=%SK.cc) + CXXSRCS = $(COS_SK_SRCS) + ++ifndef NoReleaseBuild ++ + all:: mkstatic mkshared + + export:: mkstatic mkshared +@@ -124,10 +126,11 @@ else + mkshared:: + + endif +- ++endif + ############################################################################## + # Build debug libraries for Win32 + ############################################################################## ++ifndef NoDebugBuild + ifdef Win32Platform + + all:: mkstaticdbug mkshareddbug +@@ -190,4 +193,4 @@ clean:: + + endif + +- ++endif +diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk +index d58027d84..87f7ec22b 100644 +--- a/src/services/mklib/stublib/dir.mk ++++ b/src/services/mklib/stublib/dir.mk +@@ -12,15 +12,18 @@ COS_SK_SRCS = $(COS_INTERFACES:%=%SK.cc) + + CXXSRCS = $(COS_SK_SRCS) + +-all:: mkstatic mkshared +- +-export:: mkstatic mkshared +- + ifdef Win32Platform + MSVC_STATICLIB_CXXNODEBUGFLAGS += -D_WINSTATIC + MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC + endif + ++ifndef NoReleaseBuild ++ ++all:: mkstatic mkshared ++ ++export:: mkstatic mkshared ++ ++ + + ############################################################################## + # Build Static library +@@ -108,10 +111,11 @@ else + mkshared:: + + endif +- ++endif + ############################################################################## + # Build debug libraries for Win32 + ############################################################################## ++ifdef NoDebugBuild + ifdef Win32Platform + + all:: mkstaticdbug mkshareddbug +@@ -173,3 +177,4 @@ clean:: + @(dir=shareddebug; $(CleanSharedLibrary)) + + endif ++endif +diff --git a/src/lib/omniORB/orbcore/dir.mk b/src/lib/omniORB/orbcore/dir.mk +index 634e6b1e2..4370fed07 100644 +--- a/src/lib/omniORB/orbcore/dir.mk ++++ b/src/lib/omniORB/orbcore/dir.mk +@@ -220,6 +220,7 @@ include $(BASE_OMNI_TREE)/mk/mklib.mk + + ######################################################################### + ifdef Win32Platform ++ifndef NoReleaseBuild + + stublib = static/$(patsubst %,$(LibNoDebugPattern),msvcstub) + +@@ -236,6 +237,8 @@ clean:: + + veryclean:: + $(RM) $(stublib) ++endif ++ifndef NoDebugBuild + + stubdblib = debug/$(patsubst %,$(LibDebugPattern),msvcstub) + +@@ -254,6 +257,7 @@ veryclean:: + $(RM) $(stubdblib) + + endif ++endif + + ######################################################################### + ifdef OPEN_SSL_ROOT +diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk +index 87f7ec22b..ce46f6c5f 100644 +--- a/src/services/mklib/stublib/dir.mk ++++ b/src/services/mklib/stublib/dir.mk +@@ -115,7 +115,7 @@ endif + ############################################################################## + # Build debug libraries for Win32 + ############################################################################## +-ifdef NoDebugBuild ++ifndef NoDebugBuild + ifdef Win32Platform + + all:: mkstaticdbug mkshareddbug +diff --git a/mk/mklib.mk b/mk/mklib.mk +index 1d73cfdbe..e6e8d65fe 100644 +--- a/mk/mklib.mk ++++ b/mk/mklib.mk +@@ -16,16 +16,6 @@ + # are called libfoo.a and libfoo.so.1.3 etc. + # + +-ifndef NoReleaseBuild +- +-all:: mkstatic mkshared +- +-export:: mkstatic mkshared +- +-ifdef INSTALLTARGET +-install:: mkstatic mkshared +-endif +- + vers := $(subst ., ,$(LIB_VERSION)) + ifeq ($(words $(vers)), 2) + vers := _ $(vers) +@@ -36,6 +26,16 @@ endif + + namespec := $(LIB_NAME) $(vers) + ++ifndef NoReleaseBuild ++ ++all:: mkstatic mkshared ++ ++export:: mkstatic mkshared ++ ++ifdef INSTALLTARGET ++install:: mkstatic mkshared ++endif ++ + ############################################################################## + # Build Static library + ############################################################################## + diff --git a/ports/omniorb/vcpkg.json b/ports/omniorb/vcpkg.json new file mode 100644 index 00000000000000..11dce3fbd92cab --- /dev/null +++ b/ports/omniorb/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "omniorb", + "version": "4.3.0", + "description": "omniORB is a robust high performance CORBA ORB for C++", + "homepage": "https://omniorb.sourceforge.io/", + "license": "LGPL-2.1-or-later", + "supports": "!uwp & !((arm | x86) & windows) & !osx", + "dependencies": [ + "openssl", + "python3", + { + "name": "python3", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/ports/omniorb/vcpkg.mk b/ports/omniorb/vcpkg.mk new file mode 100644 index 00000000000000..1dd805aeb92f67 --- /dev/null +++ b/ports/omniorb/vcpkg.mk @@ -0,0 +1,89 @@ +# +# vcpkg.mk - make variables and rules specific to Visual Studio +# + +WindowsNT=1 +x86Processor=1 + +BINDIR = bin +LIBDIR = lib + +ABSTOP = $(shell cd $(TOP); pwd) + +# Windows builds require a shared library build +BuildSharedLibrary=1 +# This will be replaced + +ThreadSystem=NT +undefine UnixPlatform +# Windows build requires static lib to generate symbol def file +undefine NoStaticLibrary +platform = Win32Platform + +@build_info@ + +# Use the following set of flags to build and use multithreaded DLLs +# +MSVC_DLL_CXXNODEBUGFLAGS = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@ +MSVC_DLL_CXXLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE@ -manifest +MSVC_DLL_CNODEBUGFLAGS = @VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE@ +MSVC_DLL_CLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE@ -manifest +# +MSVC_DLL_CXXDEBUGFLAGS = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG@ -D_DEBUG +MSVC_DLL_CXXLINKDEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG@ -manifest +MSVC_DLL_CDEBUGFLAGS = @VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG@ -D_DEBUG +MSVC_DLL_CLINKDEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG@ -manifest +# +# Or +# +# Use the following set of flags to build and use multithread static libraries +# +MSVC_STATICLIB_CXXNODEBUGFLAGS = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@ +MSVC_STATICLIB_CXXLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE@ -manifest +MSVC_STATICLIB_CNODEBUGFLAGS = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@ +MSVC_STATICLIB_CLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE@ -manifest + +MSVC_STATICLIB_CXXDEBUGFLAGS = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG@ -D_DEBUG +MSVC_STATICLIB_CXXLINKDEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG@ -manifest +MSVC_STATICLIB_CDEBUGFLAGS = @VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG@ -D_DEBUG +MSVC_STATICLIB_CLINKDEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG@ -manifest + +# +# Include general win32 things +# + +include $(THIS_IMPORT_TREE)/mk/win32.mk + +MANIFESTTOOL = @VCPKG_DETECTED_CMAKE_MT@ +RCTOOL = @VCPKG_DETECTED_CMAKE_RC_COMPILER@ +CLINK = @VCPKG_DETECTED_CMAKE_LINKER@ +CXXLINK = @VCPKG_DETECTED_CMAKE_LINKER@ +AR = @VCPKG_DETECTED_CMAKE_AR@ +RANLIB = true + +# To build ZIOP support, EnableZIOP must be defined and one or both of +# the zlib and zstd sections must be defined. + +#EnableZIOP = 1 + +#EnableZIOPZLib = 1 +#ZLIB_ROOT = /cygdrive/c/zlib-1.2.11 +#ZLIB_CPPFLAGS = -DOMNI_ENABLE_ZIOP_ZLIB -I$(ZLIB_ROOT) +#ZLIB_LIB = $(patsubst %,$(LibPathPattern),$(ZLIB_ROOT)) zdll.lib + +#EnableZIOPZStd = 1 +#ZSTD_ROOT = /cygdrive/c/zstd +#ZSTD_CPPFLAGS = -DOMNI_ENABLE_ZIOP_ZSTD -I$(ZSTD_ROOT)/include +#ZSTD_LIB = $(patsubst %,$(LibPathPattern),$(ZSTD_ROOT)/lib) zstd.lib +LN_S=cp -pR + +define ExportSharedLibraryToDir + $(ExportLibraryToDir); \ + $(ParseNameSpec); \ + soname=$(SharedLibraryShortLibName); \ + libname=$(SharedLibraryLibNameTemplate); \ + set -x; \ + cd $$dir; \ + $(RM) $$soname; \ + $(LN_S) $(= 9.0 @@ -40,7 +41,6 @@ vcpkg_cmake_configure( -DBUILD_SAMPLES_QT=OFF -DBUILD_DOC_Overview=OFF -DINSTALL_TEST_CASES=OFF - -DINSTALL_SAMPLES=OFF ) vcpkg_cmake_install() @@ -77,11 +77,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - # debug creates libd and bind directories that need moving - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") - +if (NOT VCPKG_BUILD_TYPE) # fix paths in target files list(APPEND TARGET_FILES "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake" @@ -92,14 +88,21 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake" "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake" ) - + foreach(TARGET_FILE IN LISTS TARGET_FILES) file(READ "${TARGET_FILE}" filedata) - string(REGEX REPLACE "libd" "lib" filedata "${filedata}") - string(REGEX REPLACE "bind" "bin" filedata "${filedata}") + string(REGEX REPLACE "/libd" "/lib" filedata "${filedata}") + string(REGEX REPLACE "/bind" "/bin" filedata "${filedata}") file(WRITE "${TARGET_FILE}" "${filedata}") endforeach() +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # debug creates libd and bind directories that need moving + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") + # the bin directory ends up with bat files that are noise, let's clean that up file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat") file(REMOVE_RECURSE ${BATS}) @@ -108,4 +111,4 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index 1b16eece7b9217..b44e8d573d54e3 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencascade", "version": "7.6.2", - "port-version": 1, + "port-version": 3, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1", @@ -31,6 +31,9 @@ "rapidjson" ] }, + "samples": { + "description": "Enable optional samples" + }, "tbb": { "description": "Enable optional usage of tbb", "dependencies": [ diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake index 393d4f67fcac2a..318cd8631ea172 100644 --- a/ports/opencl/portfile.cmake +++ b/ports/opencl/portfile.cmake @@ -68,10 +68,10 @@ else() endif() elseif(VCPKG_TARGET_IS_OSX) if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) endif() if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() endif() endif() @@ -80,4 +80,4 @@ vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) diff --git a/ports/opencl/vcpkg-cmake-wrapper.cmake b/ports/opencl/vcpkg-cmake-wrapper.cmake index 0893710ff58a4a..4010eb40dc3b4e 100644 --- a/ports/opencl/vcpkg-cmake-wrapper.cmake +++ b/ports/opencl/vcpkg-cmake-wrapper.cmake @@ -1,12 +1,12 @@ _find_package(${ARGS}) -if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")) +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")) find_package(Threads REQUIRED) set(OpenCL_Extra_Libs ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) if(CMAKE_SYSTEM_NAME MATCHES "Windows") list(APPEND OpenCL_Extra_Libs cfgmgr32) - if($ENV{WindowsSDKVersion} MATCHES "^10") - list(APPEND OpenCL_Extra_Libs OneCoreUAP) - endif() + if($ENV{WindowsSDKVersion} MATCHES "^10") + list(APPEND OpenCL_Extra_Libs OneCoreUAP) + endif() endif(CMAKE_SYSTEM_NAME MATCHES "Windows") if(TARGET OpenCL::OpenCL) @@ -15,4 +15,5 @@ if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")) if(OpenCL_LIBRARIES) list(APPEND OpenCL_LIBRARIES ${OpenCL_Extra_Libs}) endif() -endif() \ No newline at end of file + unset(OpenCL_Extra_Libs) +endif() diff --git a/ports/opencl/vcpkg.json b/ports/opencl/vcpkg.json index fd108491c41c3a..454210a30caa67 100644 --- a/ports/opencl/vcpkg.json +++ b/ports/opencl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencl", "version-string": "v2023.02.06", + "port-version": 2, "description": "C/C++ headers and ICD loader (Installable Client Driver) for OpenCL", "homepage": "https://github.com/KhronosGroup/OpenCL-Headers", "license": "Apache-2.0", diff --git a/ports/opencsg/vcpkg.json b/ports/opencsg/vcpkg.json index 568f9044091c02..d6f1d6f997bd96 100644 --- a/ports/opencsg/vcpkg.json +++ b/ports/opencsg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencsg", - "version-string": "1.4.2", - "port-version": 3, + "version": "1.4.2", + "port-version": 4, "description": "OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system.", "dependencies": [ "glew", diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 5667ee761cbdac..041c844db59988 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -111,6 +111,7 @@ vcpkg_cmake_configure( -DWITH_ZLIB=ON -WITH_GTK=${WITH_GTK} -DWITH_CUBLAS=OFF # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix + -DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON ) vcpkg_cmake_install() diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index 559113b5e3777b..15eff84eeed391 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 16, + "port-version": 18, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index d7990dfcf7345a..5f7e360c99bb11 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -72,3 +72,16 @@ if(NOT GDCM_FOUND) set(HAVE_GDCM NO) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) +diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt +index 213667a..4052387 100644 +--- a/modules/imgcodecs/CMakeLists.txt ++++ b/modules/imgcodecs/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + + if(HAVE_WEBP) + add_definitions(-DHAVE_WEBP) +- ocv_include_directories(${WEBP_INCLUDE_DIR}) ++ ocv_include_directories(${WEBP_INCLUDE_DIRS}) + list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES}) + endif() + diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 1892908f1ec3b3..8904d19935aed0 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -2,6 +2,7 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) string(JSON OPENCV_VERSION GET "${_contents}" version) set(USE_QT_VERSION "5") +set(ENABLE_CXX11 ON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -282,6 +283,7 @@ if("ffmpeg" IN_LIST FEATURES) endif() if("halide" IN_LIST FEATURES) + set(ENABLE_CXX11 OFF) list(APPEND ADDITIONAL_BUILD_FLAGS # Halide 13 requires C++17 "-DCMAKE_CXX_STANDARD=17" @@ -369,7 +371,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON # ENABLE - -DENABLE_CXX11=ON + -DENABLE_CXX11=${ENABLE_CXX11} ###### OPENCV vars "-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache" ${BUILD_WITH_CONTRIB_FLAG} @@ -398,6 +400,7 @@ vcpkg_cmake_configure( ###### Additional build flags ${ADDITIONAL_BUILD_FLAGS} -DBUILD_IPP_IW=${WITH_IPP} + -DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON ) vcpkg_cmake_install() diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index c78d92b832fd41..3ad32ac8b353b6 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.18", - "port-version": 6, + "port-version": 10, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", @@ -229,6 +229,13 @@ "python": { "description": "Python wrapper support for opencv", "dependencies": [ + { + "name": "opencv3", + "default-features": false, + "features": [ + "flann" + ] + }, "python3" ] }, diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index 64bba84629caed..3c2bfe79301c3b 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -81,3 +81,16 @@ if(NOT GDCM_FOUND) set(HAVE_GDCM NO) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) +diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt +index 213667a..4052387 100644 +--- a/modules/imgcodecs/CMakeLists.txt ++++ b/modules/imgcodecs/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + + if(HAVE_WEBP) + add_definitions(-DHAVE_WEBP) +- ocv_include_directories(${WEBP_INCLUDE_DIR}) ++ ocv_include_directories(${WEBP_INCLUDE_DIRS}) + list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES}) + endif() + diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 8d99f0f8246d59..ffd843d35d2268 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -445,6 +445,7 @@ vcpkg_cmake_configure( ###### Additional build flags ${ADDITIONAL_BUILD_FLAGS} -DBUILD_IPP_IW=${WITH_IPP} + -DOPENCV_LAPACK_FIND_PACKAGE_ONLY=ON ) vcpkg_cmake_install() diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index ac42c56160cb15..e68b2f471a7572 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.7.0", - "port-version": 3, + "port-version": 6, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/openexr/avx.patch b/ports/openexr/avx.patch deleted file mode 100644 index 4f57a63c5c9168..00000000000000 --- a/ports/openexr/avx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/OpenEXRCore/unpack.c b/src/lib/OpenEXRCore/unpack.c -index 7587eb2..79061b8 100644 ---- a/src/lib/OpenEXRCore/unpack.c -+++ b/src/lib/OpenEXRCore/unpack.c -@@ -37,7 +39,7 @@ half_to_float8 (float* out, const uint16_t* src) - } - #endif - --#if (defined(__x86_64__) || defined(_M_X64)) && \ -+#if (defined(__x86_64__) || defined(_M_X64)) && defined(__AVX__) && \ - (defined(__F16C__) || defined(__GNUC__) || defined(__clang__)) - - # if defined(__F16C__) diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index d6a4128d35c77f..ecc7989b572eed 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openexr - REF v3.1.5 - SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c + REF v3.1.7 + SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5 HEAD_REF master - PATCHES avx.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS @@ -18,7 +17,7 @@ vcpkg_cmake_configure( ${OPTIONS} -DBUILD_TESTING=OFF -DOPENEXR_INSTALL_EXAMPLES=OFF - -DDOCS=OFF + -DBUILD_DOCS=OFF OPTIONS_DEBUG -DOPENEXR_BUILD_TOOLS=OFF -DOPENEXR_INSTALL_TOOLS=OFF diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index f848f10af7da3c..a17182491693e2 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openexr", - "version": "3.1.5", - "port-version": 1, + "version": "3.1.7", "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", diff --git a/ports/openigtlink/vcpkg.json b/ports/openigtlink/vcpkg.json index a7cf96f2e80ac3..c517b0e6ad488e 100644 --- a/ports/openigtlink/vcpkg.json +++ b/ports/openigtlink/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openigtlink", - "version-string": "3.0", - "port-version": 3, + "version": "3.0", + "port-version": 4, "description": "OpenIGTLink is an open-source network communication interface specifically designed for image-guided interventions.", "homepage": "https://github.com/openigtlink/OpenIGTLink", "dependencies": [ diff --git a/ports/openimageio/fix-msvc-build.patch b/ports/openimageio/fix-msvc-build.patch new file mode 100644 index 00000000000000..0643adf94bc477 --- /dev/null +++ b/ports/openimageio/fix-msvc-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/python/py_oiio.cpp b/src/python/py_oiio.cpp +index 6031d2c23..e71105da5 100644 +--- a/src/python/py_oiio.cpp ++++ b/src/python/py_oiio.cpp +@@ -153,7 +153,7 @@ oiio_bufinfo::oiio_bufinfo(const py::buffer_info& pybuf, int nchans, int width, + format = TypeUnknown; // No idea what's going on -- error + error = Strutil::fmt::format( + "Python array shape is [{:,}] but expecting h={}, w={}, ch={}", +- cspan(pybuf.shape), height, width, nchans); ++ cspan(pybuf.shape), height, width, nchans); + } + } else if (pixeldims == 1) { + // Reading a 1D scanline span diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index cebea9096be19b..2fb385123181e4 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio REF "v${VERSION}" - SHA512 e7dd7aba8dc0baa9bc50f362c21119bf4008edbd03a0c9f31bb03e01b5b0cc18c39f8a368885a4d756f6b475965138409c7e91eeae90b0ebc18d253ff314f025 + SHA512 e8b232bb3c1bb66cc6c4f023dcf6e29633a1aee64c49a2860c2157c0885960c40114ee3988d4f132e6e55670b8b1e01b5b4cd4462651ae047a89d22de527581c HEAD_REF master PATCHES fix-dependencies.patch @@ -11,6 +11,7 @@ vcpkg_from_github( imath-version-guard.patch fix-openimageio_include_dir.patch fix-openexr-target-missing.patch + fix-msvc-build.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -48,6 +49,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF + -DOIIO_BUILD_TESTS=OFF -DUSE_DCMTK=OFF -DUSE_NUKE=OFF -DUSE_OpenVDB=OFF diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 2b21cb460437dc..7283dcbce474fb 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openimageio", - "version": "2.4.9.0", + "version": "2.4.11.1", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", diff --git a/ports/openldap/portfile.cmake b/ports/openldap/portfile.cmake index dd617ce45edeba..23656b5f762aa5 100644 --- a/ports/openldap/portfile.cmake +++ b/ports/openldap/portfile.cmake @@ -12,8 +12,8 @@ if(NOT "${AUTOCONF_VERSION_STR}" STREQUAL "" AND "${AUTOCONF_VERSION_STR}" MATCH vcpkg_list(APPEND EXTRA_PATCHES m4.patch) endif() -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES openssl.patch diff --git a/ports/openldap/vcpkg.json b/ports/openldap/vcpkg.json index ef517374780882..9f744e3b3195c8 100644 --- a/ports/openldap/vcpkg.json +++ b/ports/openldap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openldap", "version": "2.5.13", + "port-version": 1, "description": "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.", "homepage": "https://www.openldap.org/software/", "license": "OLDAP-2.8", diff --git a/ports/openmama/fix-dependencies.diff b/ports/openmama/fix-dependencies.diff new file mode 100644 index 00000000000000..f731726c0a8aaf --- /dev/null +++ b/ports/openmama/fix-dependencies.diff @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1332a55..2ed3770 100755 +@@ -123,7 +125,8 @@ find_package(Threads REQUIRED) + find_package(APR REQUIRED) + + if (WITH_PROTON) +- find_package(Proton REQUIRED) ++ find_package(PROTON NAMES Proton REQUIRED) ++ set(PROTON_LIBRARIES Proton::qpid-proton) + endif() + + if (WITH_UNITTEST) +diff --git a/cmake/FindUUID.cmake b/cmake/FindUUID.cmake +index 7a11c70..07f21ed 100644 +--- a/cmake/FindUUID.cmake ++++ b/cmake/FindUUID.cmake +@@ -90,6 +90,9 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS) + + if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES) + set(UUID_FOUND TRUE) ++ elseif(UUID_INCLUDE_DIRS AND APPLE) ++ set(UUID_LIBRARIES "") ++ set(UUID_FOUND TRUE) + endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES) + + if (UUID_FOUND) diff --git a/ports/openmama/git-no-tags.diff b/ports/openmama/git-no-tags.diff new file mode 100644 index 00000000000000..5a28cfbe443277 --- /dev/null +++ b/ports/openmama/git-no-tags.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1332a55..2ed3770 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,8 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) + COMMAND "${GIT_BIN}" diff-index --quiet HEAD -- + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + RESULT_VARIABLE is_current_source_dir_dirty) ++endif() ++if(OPENMAMA_VERSION_GIT) + # Strip out unwanted part of version from git + message(STATUS "OPENMAMA_VERSION_GIT: ${OPENMAMA_VERSION_GIT}") + STRING(REGEX REPLACE "^OpenMAMA-" "" OPENMAMA_VERSION ${OPENMAMA_VERSION_GIT}) diff --git a/ports/openmama/portfile.cmake b/ports/openmama/portfile.cmake index 49ffdf0d675095..44c3b3a18bdaea 100644 --- a/ports/openmama/portfile.cmake +++ b/ports/openmama/portfile.cmake @@ -1,41 +1,37 @@ -vcpkg_find_acquire_program(FLEX) -vcpkg_find_acquire_program(GIT) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO finos/OpenMAMA - REF OpenMAMA-${VERSION}-release + REF "OpenMAMA-${VERSION}-release" SHA512 bf6a9343546ace80b8a72072f97aa85988a3d0d047e2a60d05de638afce89b4e4f2bcae28b8e93ca808e8c0e4a83de9035ff785f69f9b4ac4ccd2616e792fa08 HEAD_REF next + PATCHES + git-no-tags.diff + fix-dependencies.diff ) +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(GIT) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOPENMAMA_DEPENDENCY_ROOT=${CURRENT_INSTALLED_DIR}" -DINSTALL_RUNTIME_DEPENDENCIES=OFF - -DFLEX_EXECUTABLE=${FLEX} - -DGIT_BIN=${GIT} - -DOPENMAMA_VERSION=${VERSION} + "-DFLEX_EXECUTABLE=${FLEX}" + "-DGIT_BIN=${GIT}" + "-DOPENMAMA_VERSION=${VERSION}" -DWITH_EXAMPLES=OFF -DWITH_TESTTOOLS=OFF ) - vcpkg_cmake_install() - -# Copy across license files and copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md" "${SOURCE_PATH}/LICENSE-3RD-PARTY.txt") - -# Clean up LICENSE file - vcpkg doesn't expect it to be there -file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/debug/LICENSE.md") - -# Vcpkg does not expect include files to be in the debug directory -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup( - PACKAGE_NAME OpenMAMA - CONFIG_PATH lib/cmake/OpenMAMA - DO_NOT_DELETE_PARENT_CONFIG_PATH +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenMAMA) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/LICENSE.md" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE.md" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/config" ) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/lib/cmake") \ No newline at end of file + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/openmama/vcpkg.json b/ports/openmama/vcpkg.json index 7ee29c80ccb740..c5b014d2caaf6f 100644 --- a/ports/openmama/vcpkg.json +++ b/ports/openmama/vcpkg.json @@ -1,16 +1,29 @@ { "name": "openmama", "version-semver": "6.3.2", + "port-version": 2, "description": "OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages", "homepage": "https://github.com/finos/OpenMAMA", "license": "LGPL-2.1", - "supports": "windows & (x64 | x86)", "dependencies": [ "apr", "apr-util", "libevent", - "qpid-proton", - "vcpkg-cmake", - "vcpkg-cmake-config" + { + "name": "libuuid", + "platform": "!windows & !osx" + }, + { + "name": "qpid-proton", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index 4ff603ec495830..08a20a20fad4a9 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 f7b177121863ef79df6106639d18a89c028442b1314340638273b12025c4dc2cf9b5316cb7e6ecca8b65a51ee40a306a6b0970d7cce727fbb269a14f89af3161 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES keep_isystem.patch diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index e123cf9b1620c1..94e54a572a4ae4 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmpi", "version": "4.1.3", - "port-version": 1, + "port-version": 2, "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)" diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index d2a74ae993e0d2..4511137bb6fb53 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,10 +1,10 @@ { "name": "openmvg", "version": "2.0", - "port-version": 6, + "port-version": 7, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "license": "MPL-2.0-no-copyleft-exception", - "supports": "!(osx & arm64)", + "supports": "x86 | x64", "dependencies": [ "cereal", { diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 05559d42f0821c..17e94cbe6f027f 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openssl/openssl REF "openssl-${VERSION}" - SHA512 877b4bc4b59126bdaf626b01322c8ac5325945234acd14907e4a23019f1fd38ec17b5fae9ff60aa9b6b0089c29b0e4255a19cd2a1743c3db82a616286c60d3b9 + SHA512 7073fd82ce17a63d77babb6a184c14c7341e4b1f8f5a6caeaa1a6d9c78d6a12bb6d9cbad5d39d16412be6d1c12eac60364644664a8e26e3940476973ba07fd19 PATCHES disable-apps.patch disable-install-docs.patch @@ -40,6 +40,12 @@ vcpkg_list(SET CONFIGURE_OPTIONS no-tests ) +set(INSTALL_FIPS "") +if("fips" IN_LIST FEATURES) + vcpkg_list(APPEND INSTALL_FIPS install_fips) + vcpkg_list(APPEND CONFIGURE_OPTIONS enable-fips) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_list(APPEND CONFIGURE_OPTIONS shared) else() diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 0753b62b9bca6d..9f49558ce91e2f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version": "3.1.0", - "port-version": 1, + "version": "3.1.1", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", @@ -20,6 +19,10 @@ } ], "features": { + "fips": { + "description": "Enable fips", + "supports": "!static" + }, "tools": { "description": "Install openssl executable and scripts", "supports": "!uwp" diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index a5a5da413d8db0..c1ce2774536a36 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -77,7 +77,7 @@ vcpkg_build_nmake( "LD=${ld}" "LDFLAGS=${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}" PROJECT_NAME "makefile" - TARGET install_dev install_modules + TARGET install_dev install_modules ${INSTALL_FIPS} LOGFILE_ROOT install OPTIONS "INSTALL_PDBS=${OPENSSL_BUILD_MAKES_PDBS}" # install-pdbs.patch @@ -89,6 +89,9 @@ set(scripts "bin/c_rehash.pl" "misc/CA.pl" "misc/tsget.pl") if("tools" IN_LIST FEATURES) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/openssl.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/openssl.cnf") + if("fips" IN_LIST FEATURES) + file(RENAME "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fipsmodule.cnf") + endif() foreach(script IN LISTS scripts) file(COPY "${CURRENT_PACKAGES_DIR}/${script}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}") @@ -96,6 +99,7 @@ if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES openssl AUTO_CLEAN) else() file(REMOVE "${CURRENT_PACKAGES_DIR}/openssl.cnf") + file(REMOVE "${CURRENT_PACKAGES_DIR}/fipsmodule.cnf") foreach(script IN LISTS scripts) file(REMOVE "${CURRENT_PACKAGES_DIR}/${script}" "${CURRENT_PACKAGES_DIR}/debug/${script}") endforeach() @@ -125,4 +129,5 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist" "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf" "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist" + "${CURRENT_PACKAGES_DIR}/debug/fipsmodule.cnf" ) diff --git a/ports/opentelemetry-cpp/add-missing-dependencies.patch b/ports/opentelemetry-cpp/add-missing-dependencies.patch new file mode 100644 index 00000000000000..585fd8a4e155df --- /dev/null +++ b/ports/opentelemetry-cpp/add-missing-dependencies.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake +index 1aa1ba0..10e2f58 100644 +--- a/cmake/opentelemetry-proto.cmake ++++ b/cmake/opentelemetry-proto.cmake +@@ -285,6 +285,10 @@ else() # cmake 3.8 or lower + target_link_libraries(opentelemetry_proto INTERFACE ${Protobuf_LIBRARIES}) + endif() + ++if(TARGET gRPC::grpc++) ++ target_link_libraries(opentelemetry_proto PUBLIC gRPC::grpc++) ++endif() ++ + if(BUILD_SHARED_LIBS) + set_property(TARGET opentelemetry_proto PROPERTY POSITION_INDEPENDENT_CODE ON) + endif() diff --git a/ports/opentelemetry-cpp/add-missing-find-dependency.patch b/ports/opentelemetry-cpp/add-missing-find-dependency.patch new file mode 100644 index 00000000000000..fc125e580079f3 --- /dev/null +++ b/ports/opentelemetry-cpp/add-missing-find-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in +index adae58dd..26427722 100644 +--- a/cmake/opentelemetry-cpp-config.cmake.in ++++ b/cmake/opentelemetry-cpp-config.cmake.in +@@ -69,6 +69,8 @@ set(OPENTELEMETRY_VERSION + # ############################################################################## + + find_package(Threads) ++include(CMakeFindDependencyMacro) ++find_dependency(absl) + + set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") + set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index a2d5f488e7d63d..154a01c2f9633c 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -9,7 +9,15 @@ vcpkg_from_github( SHA512 eb7dde38134fd9f51f22a2288a3a1db9eeec3dce3889c02fea82e20738a697449be73d632c3d1889ff159f0274d57bfd066db506149b221fe6ced8f18fdc1237 HEAD_REF main PATCHES - support_absl_cxx17.patch + # Use the compiler's default C++ version. Picking a version with + # CMAKE_CXX_STANDARD is not needed as the Abseil port already picked + # one and propagates that version across all its downstream deps. + use-default-cxx-version.patch + # When compiling code generated by gRPC we need to link the gRPC library + # too. + add-missing-dependencies.patch + # Missing find_dependency for Abseil + add-missing-find-dependency.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -22,6 +30,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS otlp WITH_OTLP otlp-http WITH_OTLP_HTTP zpages WITH_ZPAGES + otlp-grpc WITH_OTLP_GRPC ) # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. @@ -49,7 +58,10 @@ vcpkg_cmake_configure( -DWITH_EXAMPLES=OFF -DWITH_LOGS_PREVIEW=ON -DOPENTELEMETRY_INSTALL=ON + -DWITH_ABSEIL=ON ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + WITH_OTLP_GRPC ) vcpkg_cmake_install() @@ -58,4 +70,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/opentelemetry-cpp/support_absl_cxx17.patch b/ports/opentelemetry-cpp/support_absl_cxx17.patch deleted file mode 100644 index 545d01fd30c82e..00000000000000 --- a/ports/opentelemetry-cpp/support_absl_cxx17.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9df8f5ca..f68830cc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -344,6 +344,11 @@ if(WITH_OTLP) - endif() - include(CMakeDependentOption) - -+ if (ABSL_USE_CXX17) -+ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") -+ set(CMAKE_CXX_STANDARD 17) -+ set(WITH_STL ON) -+ endif() - cmake_dependent_option( - WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK" ON - "gRPC_FOUND" OFF) diff --git a/ports/opentelemetry-cpp/use-default-cxx-version.patch b/ports/opentelemetry-cpp/use-default-cxx-version.patch new file mode 100644 index 00000000000000..53a31faf91b704 --- /dev/null +++ b/ports/opentelemetry-cpp/use-default-cxx-version.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4fa064..a868106 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,21 +126,6 @@ endif() + option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" + ${OPENTELEMETRY_INSTALL_default}) + +-if(NOT DEFINED CMAKE_CXX_STANDARD) +- if(WITH_STL) +- # Require at least C++17. C++20 is needed to avoid gsl::span +- if(CMAKE_VERSION VERSION_GREATER 3.11.999) +- # Ask for 20, may get anything below +- set(CMAKE_CXX_STANDARD 20) +- else() +- # Ask for 17, may get anything below +- set(CMAKE_CXX_STANDARD 17) +- endif() +- else() +- set(CMAKE_CXX_STANDARD 11) +- endif() +-endif() +- + if(WITH_STL) + # These definitions are needed for test projects that do not link against + # opentelemetry-api library directly. We ensure that variant implementation diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 2af422e4a8399a..aa00547dcf9cf8 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", "version-semver": "1.8.3", - "port-version": 2, + "port-version": 6, "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." @@ -10,6 +10,7 @@ "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", "license": "Apache-2.0", "dependencies": [ + "abseil", "curl", "nlohmann-json", { @@ -37,20 +38,38 @@ }, "otlp": { "description": "Whether to include the OpenTelemetry Protocol in the SDK", + "dependencies": [ + "protobuf" + ] + }, + "otlp-grpc": { + "description": "Whether to include the OTLP gRPC exporter in the SDK", "dependencies": [ "grpc", { "name": "grpc", "host": true }, - "protobuf" + { + "name": "opentelemetry-cpp", + "default-features": false, + "features": [ + "otlp" + ] + } ] }, "otlp-http": { "description": "Whether to include the OpenTelemetry Protocol over HTTP in the SDK", "dependencies": [ "curl", - "protobuf" + { + "name": "opentelemetry-cpp", + "default-features": false, + "features": [ + "otlp" + ] + } ] }, "prometheus": { diff --git a/ports/optional-bare/vcpkg.json b/ports/optional-bare/vcpkg.json index f6d4b07dad9217..a358a79d846161 100644 --- a/ports/optional-bare/vcpkg.json +++ b/ports/optional-bare/vcpkg.json @@ -1,7 +1,7 @@ { "name": "optional-bare", - "version-string": "1.1.0", - "port-version": 2, + "version": "1.1.0", + "port-version": 3, "description": "A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library", "dependencies": [ { diff --git a/ports/opus/fix-pkgconfig-version.patch b/ports/opus/fix-pkgconfig-version.patch index e513b6199a46a4..ef9f7229c4191f 100644 --- a/ports/opus/fix-pkgconfig-version.patch +++ b/ports/opus/fix-pkgconfig-version.patch @@ -1,13 +1,15 @@ -diff --git a/opus_functions.cmake b/opus_functions.cmake -index a3ac1c0..ef2d4c0 100644 ---- a/opus_functions.cmake -+++ b/opus_functions.cmake -@@ -43,6 +43,8 @@ function(get_library_version OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR) - endfunction() +diff --git a/cmake/OpusPackageVersion.cmake b/cmake/OpusPackageVersion.cmake +index 447ce3b..15ebd8e 100644 +--- a/cmake/OpusPackageVersion.cmake ++++ b/cmake/OpusPackageVersion.cmake +@@ -4,7 +4,9 @@ endif() + set(__opus_version INCLUDED) - function(get_package_version PACKAGE_VERSION) + function(get_package_version PACKAGE_VERSION PROJECT_VERSION) +- + set(PACKAGE_VERSION "0" CACHE STRING "opus package version") ++ set(PROJECT_VERSION "0" CACHE STRING "opus project version") + return() find_package(Git) - if(Git_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git") - execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "v*" + if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git") + execute_process(COMMAND ${GIT_EXECUTABLE} diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index e42acf3a3caf8a..9638e34d5882f6 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/opus - REF 5c94ec3205c30171ffd01056f5b4622b7c0ab54c - SHA512 2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea + REF "v${VERSION}" + SHA512 86df35cd62ebf3551b2739effb8f818d635656d91d386d7d600a424a92c4c0d6bfbc3986f1ec6cf4950910ac87b28dc9640b9df3b9a6a5a75eb37ae71782b72e HEAD_REF master PATCHES fix-pkgconfig-version.patch ) @@ -30,7 +30,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DPACKAGE_VERSION=1.3.1 + -DPACKAGE_VERSION=${VERSION} -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR} -DOPUS_INSTALL_PKG_CONFIG_MODULE=ON -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=ON diff --git a/ports/opus/vcpkg.json b/ports/opus/vcpkg.json index cc909fc47b759b..33c35ee47dbb77 100644 --- a/ports/opus/vcpkg.json +++ b/ports/opus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opus", - "version": "1.3.1", - "port-version": 9, + "version": "1.4", "description": "Totally open, royalty-free, highly versatile audio codec", "homepage": "https://github.com/xiph/opus", "license": "BSD-3-Clause", diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index 8b4ca89d3ac549..e7d041161728f8 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO orocos/orocos_kinematics_dynamics - REF v1.4.0 - SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8 + REF "v${VERSION}" + SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d HEAD_REF master PATCHES export-include-dir.patch ) diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json index 70ae85e678057f..475a66f1c62c8c 100644 --- a/ports/orocos-kdl/vcpkg.json +++ b/ports/orocos-kdl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "orocos-kdl", - "version": "1.4", - "port-version": 6, + "version": "1.5.1", "description": "Kinematics and Dynamics Library.", "homepage": "https://github.com/orocos/orocos_kinematics_dynamics", "dependencies": [ diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 99c09ebec6b79b..868e6ddb59e584 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -74,7 +74,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # The package osg can be configured to use different OpenGL profiles via a custom triplet file: # Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3, and GLES2+GLES3 if(NOT DEFINED osg_OPENGL_PROFILE) - set(osg_OPENGL_PROFILE "GL3") + set(osg_OPENGL_PROFILE "GL2") endif() # Plugin control variables are used only if prerequisites are satisfied. diff --git a/ports/osg/usage b/ports/osg/usage index 51e9c25a58b14c..7b7388febe6337 100644 --- a/ports/osg/usage +++ b/ports/osg/usage @@ -1,4 +1,5 @@ The package osg can be configured to use different OpenGL profiles via a custom triplet file. Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3 and GLES2+GLES3. -The default value is GL3. -set(osg_OPENGL_PROFILE GL2) +The default value is GL2. If you want use other profiles, please add the following +code to a custom triplet file. +set(osg_OPENGL_PROFILE GL3) diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 34daa77fea1bf0..9cf0765685839b 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 18, + "port-version": 19, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, diff --git a/ports/osgearth/find-package.patch b/ports/osgearth/find-package.patch index 4ce2b8c5e7cb75..135b1447705ba8 100644 --- a/ports/osgearth/find-package.patch +++ b/ports/osgearth/find-package.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 36ea6c81f..8ed39eb24 100755 +index cf8245b8b..233390a5f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -124,9 +124,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit +@@ -127,9 +127,9 @@ mark_as_advanced(OSGEARTH_ASSUME_SINGLE_GL_CONTEXT) # Mobile/GLES: IF (OSGEARTH_USE_GLES) @@ -14,7 +14,7 @@ index 36ea6c81f..8ed39eb24 100755 ENDIF (OSGEARTH_USE_GLES) -@@ -144,35 +144,52 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") +@@ -147,35 +147,54 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") endif() # required @@ -44,7 +44,7 @@ index 36ea6c81f..8ed39eb24 100755 -find_package(Protobuf) -find_package(WEBP) -find_package(Blend2D) --find_package(blosc) +-find_package(Blosc) +find_package(GEOS CONFIG REQUIRED) +set(GEOS_LIBRARY GEOS::geos_c) +find_package(SQLITE3 NAMES unofficial-sqlite3 REQUIRED) @@ -55,8 +55,10 @@ index 36ea6c81f..8ed39eb24 100755 +find_package(Protobuf REQUIRED) +find_package(WEBP NAMES WebP CONFIG REQUIRED) +set(WEBP_LIBRARY WebP::webp) -+find_package(BLEND2D CONFIG REQUIRED) -+set(BLEND2D_LIBRARY blend2d::blend2d) ++if(WITH_BLEND2D) ++ find_package(BLEND2D CONFIG REQUIRED) ++ set(BLEND2D_LIBRARY blend2d::blend2d) ++endif() +find_package(BLOSC REQUIRED) if(OSGEARTH_ENABLE_PROFILING) @@ -65,8 +67,8 @@ index 36ea6c81f..8ed39eb24 100755 endif() if(OSGEARTH_BUILD_ZIP_PLUGIN) -- find_package(LIBZIP) -+ find_package(LIBZIP CONFIG REQUIRED) +- find_package(LibZip) ++ find_package(libzip CONFIG REQUIRED) + set(LIBZIP_LIBRARY libzip::zip) endif() @@ -81,7 +83,7 @@ index 36ea6c81f..8ed39eb24 100755 endif() # Sqlite enables the MBTiles format: -@@ -214,7 +231,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile +@@ -221,7 +240,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile # Duktape is the JavaScript interpreter SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") IF (WITH_EXTERNAL_DUKTAPE) @@ -90,7 +92,7 @@ index 36ea6c81f..8ed39eb24 100755 ENDIF (WITH_EXTERNAL_DUKTAPE) # Whether to install shaders (glsl files). -@@ -225,7 +242,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak +@@ -232,7 +251,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak # TinyXML is an XML parsing library SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") IF (WITH_EXTERNAL_TINYXML) @@ -100,11 +102,11 @@ index 36ea6c81f..8ed39eb24 100755 ENDIF (WITH_EXTERNAL_TINYXML) # postfix settings for various configs -@@ -300,6 +318,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS) +@@ -307,6 +327,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS) SET(OSGEARTH_DYNAMIC_OR_STATIC "SHARED") ELSE() SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") -+ ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC) ++ add_definitions(-DOSGEARTH_LIBRARY_STATIC) ENDIF() diff --git a/ports/osgearth/fix-osgearth-config.patch b/ports/osgearth/fix-osgearth-config.patch deleted file mode 100644 index 1da0de4568f2e6..00000000000000 --- a/ports/osgearth/fix-osgearth-config.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in -index 3f27dffe9..c787e7668 100644 ---- a/osgEarthConfig.cmake.in -+++ b/osgEarthConfig.cmake.in -@@ -6,52 +6,54 @@ set(XPREFIX OSGEARTH) - - - --if (osgearth_USE_STATIC_LIBS) -+if (osgEarth_USE_STATIC_LIBS) - set(XPREFIX ${XPREFIX}_STATIC) - endif() - --set(osgearth_DEFINITIONS ${${XPREFIX}_CFLAGS}) -+set(osgEarth_DEFINITIONS ${${XPREFIX}_CFLAGS}) - --find_path(osgearth_INCLUDE_DIR -- NAMES OSGEARTH/RTREE.H -+find_path(osgEarth_INCLUDE_DIR -+ NAMES osgEarth/rtree.h - HINTS ${${XPREFIX}_INCLUDE_DIRS} - ) - --set(OSGEARTH_NAMES osgearth) -+set(OSGEARTH_NAMES osgEarth) - --find_library(osgearth_LIBRARY -+find_library(osgEarth_LIBRARY - NAMES ${OSGEARTH_NAMES} - HINTS ${${XPREFIX}_LIBRARY_DIRS} - ) - --set(osgearth_LIBRARIES ${osgearth_LIBRARY}) --set(osgearth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) --set(osgearth_LIBRARY_DIR ${osgearth_LIBRARY_DIRS}) --set(osgearth_INCLUDE_DIRS ${osgearth_INCLUDE_DIR}) --set(osgearth_LDFLAGS ${${XPREFIX}_LDFLAGS}) -+set(osgEarth_LIBRARIES ${osgEarth_LIBRARY}) -+set(osgEarth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) -+set(osgEarth_LIBRARY_DIR ${osgEarth_LIBRARY_DIRS}) -+set(osgEarth_INCLUDE_DIRS ${osgEarth_INCLUDE_DIR}) -+set(osgEarth_LDFLAGS ${${XPREFIX}_LDFLAGS}) - - include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(osgearth DEFAULT_MSG -- osgearth_LIBRARY -- osgearth_INCLUDE_DIR -+find_package_handle_standard_args(osgEarth DEFAULT_MSG -+ osgEarth_LIBRARY -+ osgEarth_INCLUDE_DIR - ) - --string (REPLACE ";" " " osgearth_LDFLAGS "${osgearth_LDFLAGS}") -+string (REPLACE ";" " " osgEarth_LDFLAGS "${osgEarth_LDFLAGS}") - --set_target_properties(osgearth -+add_library(osgEarth UNKNOWN IMPORTED) -+ -+set_target_properties(osgEarth - PROPERTIES -- IMPORTED_LOCATION "${osgearth_LIBRARIES}" -- INTERFACE_INCLUDE_DIRECTORIES "${osgearth_INCLUDE_DIRS}" -- INTERFACE_LINK_LIBRARIES "${osgearth_LDFLAGS}" -- INTERFACE_COMPILE_OPTIONS "${osgearth_DEFINITIONS}" -+ IMPORTED_LOCATION "${osgEarth_LIBRARIES}" -+ INTERFACE_INCLUDE_DIRECTORIES "${osgEarth_INCLUDE_DIRS}" -+ INTERFACE_LINK_LIBRARIES "${osgEarth_LDFLAGS}" -+ INTERFACE_COMPILE_OPTIONS "${osgEarth_DEFINITIONS}" - ) - -- message(STATUS "osgearth_FOUND: ${osgearth_FOUND}") -- message(STATUS "osgearth_INCLUDE_DIRS: ${osgearth_INCLUDE_DIRS}") -- message(STATUS "osgearth_LIBRARIES: ${osgearth_LIBRARIES}") -- message(STATUS "osgearth_LDFLAGS: ${osgearth_LDFLAGS}") -- message(STATUS "osgearth_DEFINITIONS: ${osgearth_DEFINITIONS}") -+ message(STATUS "osgEarth_FOUND: ${osgEarth_FOUND}") -+ message(STATUS "osgEarth_INCLUDE_DIRS: ${osgEarth_INCLUDE_DIRS}") -+ message(STATUS "osgEarth_LIBRARIES: ${osgEarth_LIBRARIES}") -+ message(STATUS "osgEarth_LDFLAGS: ${osgEarth_LDFLAGS}") -+ message(STATUS "osgEarth_DEFINITIONS: ${osgEarth_DEFINITIONS}") - - - --check_required_components(osgearth) -\ No newline at end of file -+check_required_components(osgEarth) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 385b257fcbeb2e..f38385cd4b1143 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF 6b5fb806a9190f7425c32db65d3ea905a55a9c16 #version 3.3 - SHA512 fe79ce6c73341f83d4aee8cb4da5341dead56a92f998212f7898079b79725f46b2209d64e68fe3b4d99d3c5c25775a8efd1bf3c3b3a049d4f609d3e30172d3bf + REF "osgearth-${VERSION}" + SHA512 f65c31922bebcbf722474a047dc29c8c1ceec9c037b0704811af2627fc2d0a124b6e95888e7d3b9b0e5acc146a88ebf8669e3f864a75a91751c3a4571d05a630 HEAD_REF master PATCHES link-libraries.patch find-package.patch remove-tool-debug-suffix.patch remove-lerc-gltf.patch - fix-osgearth-config.patch export-plugins.patch ) @@ -33,11 +32,12 @@ if("tools" IN_LIST FEATURES) endif() file(REMOVE - "${SOURCE_PATH}/CMakeModule/FindGEOS.cmake" - "${SOURCE_PATH}/CMakeModule/FindLibZip.cmake" - "${SOURCE_PATH}/CMakeModule/FindOSG.cmake" - "${SOURCE_PATH}/CMakeModule/FindSqlite3.cmake" - "${SOURCE_PATH}/CMakeModule/FindWEBP.cmake" + "${SOURCE_PATH}/CMakeModules/FindBlend2D.cmake" + "${SOURCE_PATH}/CMakeModules/FindGEOS.cmake" + "${SOURCE_PATH}/CMakeModules/FindLibZip.cmake" + "${SOURCE_PATH}/CMakeModules/FindOSG.cmake" + "${SOURCE_PATH}/CMakeModules/FindSqlite3.cmake" + "${SOURCE_PATH}/CMakeModules/FindWEBP.cmake" "${SOURCE_PATH}/src/osgEarth/tinyxml.h" # https://github.com/gwaldron/osgearth/issues/1002 ) @@ -46,7 +46,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools OSGEARTH_BUILD_TOOLS - blend2d CMAKE_REQUIRE_FIND_PACKAGE_BLEND2D + blend2d WITH_BLEND2D ) vcpkg_cmake_configure( @@ -54,6 +54,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DLIB_POSTFIX= + -DCMAKE_CXX_STANDARD=11 -DOSGEARTH_BUILD_SHARED_LIBS=${BUILD_SHARED} -DOSGEARTH_BUILD_EXAMPLES=OFF -DOSGEARTH_BUILD_TESTS=OFF @@ -84,11 +85,12 @@ if("tools" IN_LIST FEATURES) file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/${osg_plugins_subdir}") endif() endif() - vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp - osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_bakefeaturetiles osgearth_boundarygen + osgearth_clamp osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer osgearth_createtile osgearth_mvtindex AUTO_CLEAN ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/osgearth/remove-lerc-gltf.patch b/ports/osgearth/remove-lerc-gltf.patch index 4c6f0fdb26989f..e39fbfab6a4dd2 100644 --- a/ports/osgearth/remove-lerc-gltf.patch +++ b/ports/osgearth/remove-lerc-gltf.patch @@ -1,8 +1,8 @@ diff --git a/src/osgEarthDrivers/CMakeLists.txt b/src/osgEarthDrivers/CMakeLists.txt -index d178f951b..010896310 100644 +index 79acbe9c4..89e28b141 100644 --- a/src/osgEarthDrivers/CMakeLists.txt +++ b/src/osgEarthDrivers/CMakeLists.txt -@@ -30,7 +30,6 @@ add_subdirectory(earth) +@@ -31,7 +31,6 @@ add_subdirectory(earth) add_subdirectory(engine_rex) add_subdirectory(featurefilter_intersect) add_subdirectory(featurefilter_join) @@ -10,11 +10,9 @@ index d178f951b..010896310 100644 add_subdirectory(kml) add_subdirectory(mapinspector) add_subdirectory(monitor) -@@ -40,7 +39,6 @@ add_subdirectory(sky_simple) - add_subdirectory(template) - add_subdirectory(terrainshader) - add_subdirectory(webp) --add_subdirectory(lerc) - add_subdirectory(vdatum_egm2008) - add_subdirectory(vdatum_egm84) - add_subdirectory(vdatum_egm96) +@@ -61,5 +60,4 @@ endif() + + IF(NOT APPLE AND NOT ANDROID) + add_subdirectory(fastdxt) +- add_subdirectory(lerc) + ENDIF() diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index df0a3246e73903..36d07a1f686268 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,13 +1,13 @@ { "name": "osgearth", - "version": "3.3", - "port-version": 5, + "version": "3.4", "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "license": "LGPL-3.0-or-later", - "supports": "!(x86 | wasm32)", + "supports": "!(arm | x86 | wasm32)", "dependencies": [ "basisu", + "blosc", "cfitsio", "draco", "geos", diff --git a/ports/p-ranav-csv/vcpkg.json b/ports/p-ranav-csv/vcpkg.json index bfb54b0532893a..041781021b3964 100644 --- a/ports/p-ranav-csv/vcpkg.json +++ b/ports/p-ranav-csv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "p-ranav-csv", - "version-string": "2019-07-11", - "port-version": 2, + "version-date": "2019-07-11", + "port-version": 3, "description": "[deprecated] CSV for modern C++", "homepage": "https://github.com/p-ranav/csv", "dependencies": [ diff --git a/ports/p-ranav-csv2/vcpkg.json b/ports/p-ranav-csv2/vcpkg.json index c639c65e6be383..c2dd345a25639d 100644 --- a/ports/p-ranav-csv2/vcpkg.json +++ b/ports/p-ranav-csv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "p-ranav-csv2", - "version-string": "2020-12-14", - "port-version": 3, + "version-date": "2020-12-14", + "port-version": 4, "description": "CSV for modern C++", "homepage": "https://github.com/p-ranav/csv2", "dependencies": [ diff --git a/ports/paho-mqtt/fix-ODR-libuuid-linux.patch b/ports/paho-mqtt/fix-ODR-libuuid-linux.patch new file mode 100644 index 00000000000000..2542769df479b0 --- /dev/null +++ b/ports/paho-mqtt/fix-ODR-libuuid-linux.patch @@ -0,0 +1,38 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4c06409..29f53c0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -95,6 +95,12 @@ ADD_LIBRARY(common_obj_static OBJECT ${common_src}) + SET_TARGET_PROPERTIES(common_obj_static PROPERTIES + POSITION_INDEPENDENT_CODE ON + COMPILE_DEFINITIONS "PAHO_MQTT_STATIC=1") ++ IF(WIN32 OR APPLE) ++ ELSE() ++ find_package(unofficial-libuuid CONFIG REQUIRED) ++ target_link_libraries(common_obj_static PRIVATE unofficial::UUID::uuid) ++ target_compile_definitions(common_obj_static PUBLIC LIBUUID) ++ ENDIF() + ENDIF() + + IF (PAHO_BUILD_SHARED) +@@ -149,7 +155,6 @@ ENDIF() + IF (PAHO_BUILD_STATIC) + ADD_LIBRARY(paho-mqtt3c-static STATIC $ MQTTClient.c) + ADD_LIBRARY(paho-mqtt3a-static STATIC $ MQTTAsync.c MQTTAsyncUtils.c) +- + TARGET_LINK_LIBRARIES(paho-mqtt3c-static ${LIBS_SYSTEM}) + TARGET_LINK_LIBRARIES(paho-mqtt3a-static ${LIBS_SYSTEM}) + IF (NOT WIN32) +@@ -249,6 +254,12 @@ IF (PAHO_WITH_SSL) + TARGET_INCLUDE_DIRECTORIES(common_ssl_obj_static PUBLIC ${OPENSSL_INCLUDE_DIR}) + SET_PROPERTY(TARGET common_ssl_obj_static PROPERTY POSITION_INDEPENDENT_CODE ON) + SET_PROPERTY(TARGET common_ssl_obj_static PROPERTY COMPILE_DEFINITIONS "OPENSSL=1;PAHO_MQTT_STATIC=1") ++ IF(WIN32 OR APPLE) ++ ELSE() ++ find_package(unofficial-libuuid CONFIG REQUIRED) ++ target_link_libraries(common_ssl_obj_static PRIVATE unofficial::UUID::uuid) ++ target_compile_definitions(common_ssl_obj_static PUBLIC LIBUUID) ++ ENDIF() + + ADD_LIBRARY(paho-mqtt3cs-static STATIC $ MQTTClient.c SSLSocket.c) + ADD_LIBRARY(paho-mqtt3as-static STATIC $ MQTTAsync.c MQTTAsyncUtils.c SSLSocket.c) diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 5257c91bec00cb..55039855ce7a8d 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c - REF eff2da4875725509fc97641b118d6badf3e3a08f # v1.3.10 - SHA512 5e190ffd978dad0f60b70bdad2727e567539aff2c55e38023dfbcbe9b50bcbe75d8230c501c09e9c0a0329bed3fd149d5d59d65ad0ba0f84a54f641b4f01390a + REF "v${VERSION}" + SHA512 3152b557a8ab7c9b9c80277283e0f5e9965ce4c2ebbdaef0f238908d49e6fa1281aa72932ea112a836144b79656e4abe6e0cbd93840429a52e501a2c6b12d313 HEAD_REF master PATCHES fix-unresolvedsymbol-arm.patch + fix-ODR-libuuid-linux.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) @@ -28,14 +29,24 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_copy_tools(TOOL_NAMES MQTTVersion AUTO_CLEAN) endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake" - [[# Generated by CMake]] - [[# Generated by CMake -include(CMakeFindDependencyMacro) -find_dependency(OpenSSL)]] -) +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake" + [[# Generated by CMake]] + [[# Generated by CMake + include(CMakeFindDependencyMacro) + find_dependency(OpenSSL)]] + ) +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake" + [[# Generated by CMake]] + [[# Generated by CMake + include(CMakeFindDependencyMacro) + find_dependency(OpenSSL) + find_dependency(unofficial-libuuid CONFIG)]] + ) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json index 2bed81bb8a8858..ff004a0e7713e6 100644 --- a/ports/paho-mqtt/vcpkg.json +++ b/ports/paho-mqtt/vcpkg.json @@ -1,10 +1,14 @@ { "name": "paho-mqtt", - "version-semver": "1.3.10", + "version": "1.3.12", "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", "homepage": "https://github.com/eclipse/paho.mqtt.c", "license": "EPL-2.0", "dependencies": [ + { + "name": "libuuid", + "platform": "!osx & !windows" + }, "openssl", { "name": "vcpkg-cmake", diff --git a/ports/pango/freetype2-pc.patch b/ports/pango/freetype2-pc.patch deleted file mode 100644 index f707099897f64b..00000000000000 --- a/ports/pango/freetype2-pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 723e0c2..c348730 100644 ---- a/meson.build -+++ b/meson.build -@@ -312,7 +312,7 @@ endif - - # The first version of freetype with a pkg-config file is 2.1.5, - # CMake uses 'freetype' rather than 'freetype2' for the package name --freetype_package_name = cc.get_argument_syntax() == 'msvc' ? \ -+freetype_package_name = false ? \ - 'freetype' : 'freetype2' - - freetype_dep = dependency(freetype_package_name, diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index c6e410ddf73ac5..fcc9f94d2ee4db 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/pango REF "${VERSION}" - SHA512 30be64784fac2539741c5e085ed0cf515fdd2044e71b6c08121dfb838e50d1a31f4f9e53d9869b65aa1fa246ab5cc1bec18503a08dcf0337aece84290472e336 + SHA512 5de67e711a1f25bd2c741162bb8306ae380d134f95b9103db6e96864d3a1100321ce106d8238dca54e746cd8f1cfdbe50cc407878611d3d09694404f3f128c73 HEAD_REF master - PATCHES - freetype2-pc.patch ) if("introspection" IN_LIST FEATURES) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 106b4b906b2fc4..e7f7ac562adef3 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pango", - "version": "1.50.12", - "port-version": 2, + "version": "1.50.14", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-only", diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index 828d864f74d359..27b7b28fe18cb5 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 bffc55eedc4f278480a74afcf119b79a295bf5775123f582746ba425e19e2690d627baa9a9813b70db9e063db7efe959f365567dd7bcbc1fc862212ba8225a98 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) @@ -15,10 +15,9 @@ vcpkg_configure_meson( OPTIONS -Dmsvc14x-parallel-installable=false -Dbuild-documentation=false - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_BINARIES + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson() diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json index d44b90deebc002..49117f5ac452b4 100644 --- a/ports/pangomm/vcpkg.json +++ b/ports/pangomm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pangomm", "version": "2.50.1", + "port-version": 2, "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", "homepage": "https://gitlab.gnome.org/GNOME/pangomm", - "license": "LGPL-2.1", + "license": "LGPL-2.1-or-later", "supports": "!arm", "dependencies": [ "cairo", diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index 1a6217be836991..058e76a389f1d2 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF v1.3.8 - SHA512 499f132aa1513942762ae5214e9a37915529d60142439d32276d9e68a446c93ecea66caa32ac00bea683e2c932101cd999c8839a89211e91032f777f236181f7 + REF "v${VERSION}" + SHA512 2b9445ecf71d3b5705304e970dea1db314c80b4ee112436939bffeaac43db6199ed566bec0e68f95a4dfab415cfe6aaecd7083ef9d7b8f6b6c612e4f24612f43 HEAD_REF master ) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index d370b7296db947..463ab880328708 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "parallel-hashmap", - "version": "1.3.8", + "version": "1.3.11", "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", "license": "Apache-2.0", "dependencies": [ diff --git a/ports/parallelstl/vcpkg.json b/ports/parallelstl/vcpkg.json index 96875cd55cbe13..8cae816e0651e0 100644 --- a/ports/parallelstl/vcpkg.json +++ b/ports/parallelstl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "parallelstl", - "version-string": "20200330", - "port-version": 2, + "version": "20200330", + "port-version": 3, "description": "Parallel STL is an implementation of the C++ standard library algorithms with support for execution policies, as specified in ISO/IEC 14882:2017 standard, commonly called C++17.", "homepage": "https://github.com/intel/parallelstl", "dependencies": [ diff --git a/ports/parquet/vcpkg.json b/ports/parquet/vcpkg.json index c604f1a9f7fd72..8fbce11828280d 100644 --- a/ports/parquet/vcpkg.json +++ b/ports/parquet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "parquet", - "version-string": "0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format. It is now part of the arrow library.", "dependencies": [ "arrow" diff --git a/ports/pbc/portfile.cmake b/ports/pbc/portfile.cmake index 235cb9f51440f7..6a2d35fe432b8b 100644 --- a/ports/pbc/portfile.cmake +++ b/ports/pbc/portfile.cmake @@ -8,10 +8,10 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) SHA512 d75d4ceb3f67ee62c7ca41e2a91ee914fbffaeb70256675aed6734d586950ea8e64e2f16dc069d71481eddb703624df8d46497005fb58e75cf098dd7e7961333 ) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH + vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${PBC_VERSION} + SOURCE_BASE ${PBC_VERSION} PATCHES linux.patch ) diff --git a/ports/pbc/vcpkg.json b/ports/pbc/vcpkg.json index b7a040aa838fdd..55136eac45d6fa 100644 --- a/ports/pbc/vcpkg.json +++ b/ports/pbc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pbc", "version": "0.5.14", - "port-version": 6, + "port-version": 7, "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", "homepage": "https://crypto.stanford.edu/pbc", "supports": "!uwp & !arm", diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json index 9ca986c2e6a049..c54999db97f77b 100644 --- a/ports/pcapplusplus/vcpkg.json +++ b/ports/pcapplusplus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pcapplusplus", - "version-string": "22.11", + "version": "22.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, diff --git a/ports/pcg/vcpkg.json b/ports/pcg/vcpkg.json index ce5e0de213f9b1..ebabf6470810b7 100644 --- a/ports/pcg/vcpkg.json +++ b/ports/pcg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pcg", - "version-string": "2021-04-06", - "port-version": 1, + "version-date": "2021-04-06", + "port-version": 2, "description": "Permuted Congruential Generator" } diff --git a/ports/pciids/acquire_pciids.cmake b/ports/pciids/acquire_pciids.cmake new file mode 100644 index 00000000000000..6f8e8ec2b72c53 --- /dev/null +++ b/ports/pciids/acquire_pciids.cmake @@ -0,0 +1,9 @@ +function(acquire_pciids out_var) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pciutils/pciids + REF 4e3f51b4b7ba7ffd3cca463d6a19daf0f4270252 + SHA512 952b56affffdf9ecf78f6125cf4216bd01d85c55e49ec4b2dfb3a77bae2258dec6b4e2d28824d6408f072667480ef7e5f7279fd69bae65c071b7b3816fe9f504 + ) + set(${out_var} "${SOURCE_PATH}/pci.ids" PARENT_SCOPE) +endfunction() diff --git a/ports/pciids/portfile.cmake b/ports/pciids/portfile.cmake new file mode 100644 index 00000000000000..200ee48c0263c0 --- /dev/null +++ b/ports/pciids/portfile.cmake @@ -0,0 +1,15 @@ +# This package doesn't "install" the pciids data file but +# provides a maintainer function which does the download. + +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + +include("${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake") +acquire_pciids(pciids_path) +cmake_path(GET pciids_path PARENT_PATH pciids_dir) + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +vcpkg_install_copyright(FILE_LIST "${pciids_dir}/README") diff --git a/ports/pciids/vcpkg-port-config.cmake b/ports/pciids/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..9945df984cce5f --- /dev/null +++ b/ports/pciids/vcpkg-port-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake") diff --git a/ports/pciids/vcpkg.json b/ports/pciids/vcpkg.json new file mode 100644 index 00000000000000..edcb67c193b456 --- /dev/null +++ b/ports/pciids/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "pciids", + "version-date": "2023-04-11", + "description": "Maintainer function to acquire a PCI ID Repository database snapshot", + "homepage": "https://pci-ids.ucw.cz/", + "license": "GPL-2.0-or-later OR BSD-3-Clause", + "supports": "native" +} diff --git a/ports/pcl/devendor-zlib.patch b/ports/pcl/devendor-zlib.patch new file mode 100644 index 00000000000000..9ca7bdd4a5f936 --- /dev/null +++ b/ports/pcl/devendor-zlib.patch @@ -0,0 +1,76 @@ +diff --git a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h +index 12787e1..b500233 100644 +--- a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h ++++ b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h +@@ -31,13 +31,16 @@ + + #if !defined(Z_PREFIX) + /* decorates zlib functions with a "z_" prefix to prevent symbol collision. */ +-#define Z_PREFIX + #endif ++#define z_deflate deflate ++#define z_inflate inflate ++#define z_Bytef Bytef + + #if !defined(MY_ZCALLOC) + /* have zlib use oncalloc() and onfree() for memory managment*/ +-#define MY_ZCALLOC + #endif ++#define zcalloc pcl_zcalloc ++#define zcfree pcl_zcfree + + #include "zlib.h" + +diff --git a/surface/src/3rdparty/opennurbs/openNURBS.cmake b/surface/src/3rdparty/opennurbs/openNURBS.cmake +index 51ca678..4ee5192 100644 +--- a/surface/src/3rdparty/opennurbs/openNURBS.cmake ++++ b/surface/src/3rdparty/opennurbs/openNURBS.cmake +@@ -102,6 +102,8 @@ set(OPENNURBS_INCLUDES + include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/opennurbs_workspace.h + include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/opennurbs_xform.h + include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/opennurbs_zlib.h ++) ++file(REMOVE + include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/crc32.h + include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/deflate.h + include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/inffast.h +@@ -222,6 +224,8 @@ set(OPENNURBS_SOURCES + src/3rdparty/opennurbs/opennurbs_xform.cpp + src/3rdparty/opennurbs/opennurbs_zlib.cpp + src/3rdparty/opennurbs/opennurbs_zlib_memory.cpp ++) ++file(REMOVE + src/3rdparty/opennurbs/adler32.c + src/3rdparty/opennurbs/compress.c + src/3rdparty/opennurbs/crc32.c +diff --git a/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp b/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp +index 688c803..d1bc977 100644 +--- a/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp ++++ b/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp +@@ -68,7 +68,6 @@ + + #endif // if WIN64 else WIN32 + +-#pragma comment(lib, "\"" OPENNURBS_ZLIB_OUTPUT_ROOT_DIR "/" OPENNURBS_CONFIGURATION_DIR "/" OPENNURBS_ZLIB_FILE_NAME "\"") + + #endif // ON_DLL_EXPORTS + +@@ -641,7 +640,7 @@ struct ON_CompressedBufferHelper + sizeof_x_buffer = 16384 + }; + unsigned char buffer[sizeof_x_buffer]; +- z_stream strm; ++ z_stream strm = []() { z_stream zs; zs.zalloc = zcalloc; zs.zfree = zcfree; return zs; } (); + std::size_t m_buffer_compressed_capacity; + }; + +diff --git a/surface/src/on_nurbs/on_nurbs.cmake b/surface/src/on_nurbs/on_nurbs.cmake +index 20d4269..a7b5631 100644 +--- a/surface/src/on_nurbs/on_nurbs.cmake ++++ b/surface/src/on_nurbs/on_nurbs.cmake +@@ -55,3 +55,5 @@ else() + set(ON_NURBS_SOURCES ${ON_NURBS_SOURCES} src/on_nurbs/nurbs_solve_eigen.cpp) + endif() + ++find_package(ZLIB REQUIRED) ++set(ON_NURBS_LIBRARIES ${ON_NURBS_LIBRARIES} ${ZLIB_LIBRARIES}) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 26a23c293848d4..edfca73590b189 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -16,62 +16,59 @@ vcpkg_from_github( outofcore_viewer_remove_include.patch fix_opennurbs_win32.patch disable_kinfu_for_cuda12.patch + devendor-zlib.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) -if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "Feature cuda only supports 64-bit compilation.") -endif() - -if ("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Feature tools only supports dynamic build") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - openni2 WITH_OPENNI2 - qt WITH_QT - pcap WITH_PCAP + apps BUILD_apps cuda WITH_CUDA cuda BUILD_CUDA cuda BUILD_GPU - tools BUILD_tools - opengl WITH_OPENGL + examples BUILD_examples libusb WITH_LIBUSB + opengl WITH_OPENGL + openni2 WITH_OPENNI2 + pcap WITH_PCAP + qt WITH_QT + simulation BUILD_simulation + surface-on-nurbs BUILD_surface_on_nurbs + tools BUILD_tools visualization WITH_VTK visualization BUILD_visualization - examples BUILD_examples - apps BUILD_apps # These 2 apps need openni1 #apps BUILD_apps_in_hand_scanner #apps BUILD_apps_3d_rec_framework - simulation BUILD_simulation ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - # BUILD - -DBUILD_surface_on_nurbs=ON # PCL + -DPCL_ALLOW_BOTH_SHARED_AND_STATIC_DEPENDENCIES=ON -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} -DPCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32=${PCL_SHARED_LIBS} -DPCL_SHARED_LIBS=${PCL_SHARED_LIBS} - -DPCL_ALLOW_BOTH_SHARED_AND_STATIC_DEPENDENCIES=ON # WITH - -DWITH_PNG=ON - -DWITH_QHULL=ON - -DWITH_OPENNI=OFF - -DWITH_ENSENSO=OFF -DWITH_DAVIDSDK=OFF + -DWITH_DOCS=OFF -DWITH_DSSDK=OFF + -DWITH_ENSENSO=OFF + -DWITH_OPENMP=OFF + -DWITH_OPENNI=OFF + -DWITH_PNG=ON + -DWITH_QHULL=ON -DWITH_RSSDK=OFF -DWITH_RSSDK2=OFF - -DWITH_OPENMP=OFF # FEATURES ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DBUILD_apps=OFF + -DBUILD_examples=OFF + -DBUILD_tools=OFF MAYBE_UNUSED_VARIABLES PCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32 PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32 @@ -111,12 +108,17 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(BUILD_tools OR BUILD_apps OR BUILD_examples) - file(GLOB EXEFILES_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(GLOB EXEFILES_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(COPY ${EXEFILES_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pcl") - file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/pcl") + file(GLOB tool_names + LIST_DIRECTORIES false + RELATIVE "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + ) + if(VCPKG_TARGET_EXECUTABLE_SUFFIX) + string(REPLACE "." "[.]" suffix "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(TRANSFORM tool_names REPLACE "${suffix}\$" "") + endif() + vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN) endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index ec9c0770298844..cd78ce66f45983 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,11 +1,10 @@ { "name": "pcl", "version": "1.13.0", - "port-version": 1, + "port-version": 3, "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "license": "BSD-3-Clause", - "supports": "!(arm64 & windows)", "dependencies": [ "boost-asio", "boost-date-time", @@ -55,6 +54,7 @@ }, "cuda": { "description": "CUDA support for PCL", + "supports": "x64", "dependencies": [ "cuda" ] @@ -77,7 +77,10 @@ ] }, "opengl": { - "description": "OpenGL support for PCL" + "description": "OpenGL support for PCL", + "dependencies": [ + "opengl" + ] }, "openni2": { "description": "OpenNI2 support for PCL", @@ -130,8 +133,15 @@ } ] }, + "surface-on-nurbs": { + "description": "Fitting NURBS to point clouds", + "dependencies": [ + "zlib" + ] + }, "tools": { "description": "Build PCL utilities", + "supports": "!static", "dependencies": [ "boost-accumulators" ] diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index 8f5ac8c855d093..6287bc7c9dd2d8 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -13,20 +13,21 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" INSTALL_PDB) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_STATIC_CRT) -set(JIT ON) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(JIT OFF) -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + jit PCRE2_SUPPORT_JIT +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DPCRE2_STATIC_RUNTIME=${BUILD_STATIC_CRT} -DPCRE2_BUILD_PCRE2_8=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON - -DPCRE2_SUPPORT_JIT=${JIT} -DPCRE2_SUPPORT_UNICODE=ON -DPCRE2_BUILD_TESTS=OFF -DPCRE2_BUILD_PCRE2GREP=OFF diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index df88f3c5c73618..8b6338038f9fdc 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre2", "version": "10.40", - "port-version": 1, + "port-version": 2, "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", "homepage": "https://github.com/PCRE2Project/pcre2", "license": "BSD-3-Clause", @@ -19,5 +19,26 @@ "host": true }, "zlib" - ] + ], + "default-features": [ + "platform-default-features" + ], + "features": { + "jit": { + "description": "Build JIT support", + "supports": "!emscripten" + }, + "platform-default-features": { + "description": "Enable default features", + "dependencies": [ + { + "name": "pcre2", + "features": [ + "jit" + ], + "platform": "!emscripten" + } + ] + } + } } diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index bb06b4d04cfeca..559361d80ccf5d 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/CAPI - REF v2.1.0 - SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd + REF "v${VERSION}" + SHA512 6fe2136831e37c2f87643b3c971a1397d8912c230e9bfde53a51ec1769bc5c2f08482395263906975c5d40dbabd32852a5a145a159cdcf2548390a0aff72a295 HEAD_REF master ) diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json index f02d1afdfc5177..8626a5050e8cd4 100644 --- a/ports/pdal-c/vcpkg.json +++ b/ports/pdal-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pdal-c", - "version-string": "2.1", + "version": "2.2.0", "description": "C API for the Point Data Abstraction Library (PDAL)", "homepage": "https://github.com/PDAL/CAPI#readme", "supports": "!(windows & staticcrt)", diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 1c29b56898fdba..af6cca16c610a8 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -1,9 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42cca1e..43b0ced 100644 +index 1705a8426..248edcd38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} - target_link_libraries(${PDAL_BASE_LIB_NAME} +@@ -269,7 +269,7 @@ target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} @@ -13,7 +12,7 @@ index 42cca1e..43b0ced 100644 ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake -index bfaa5b2..e73ec9e 100644 +index dfe3dc024..42a78d646 100644 --- a/cmake/zstd.cmake +++ b/cmake/zstd.cmake @@ -4,7 +4,14 @@ diff --git a/ports/pdal/fix-gcc-13-build.patch b/ports/pdal/fix-gcc-13-build.patch new file mode 100644 index 00000000000000..888826c1717bd7 --- /dev/null +++ b/ports/pdal/fix-gcc-13-build.patch @@ -0,0 +1,12 @@ +diff --git a/plugins/e57/libE57Format/include/E57Format.h b/plugins/e57/libE57Format/include/E57Format.h +index 267d8c77bb..89d2b36a09 100644 +--- a/plugins/e57/libE57Format/include/E57Format.h ++++ b/plugins/e57/libE57Format/include/E57Format.h +@@ -31,6 +31,7 @@ + + //! @file E57Format.h header file for the E57 API + ++#include + #include + #include + #include diff --git a/ports/pdal/fix-gcc8-compatibility.patch b/ports/pdal/fix-gcc8-compatibility.patch deleted file mode 100644 index 58eea53bc25f0d..00000000000000 --- a/ports/pdal/fix-gcc8-compatibility.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 5b48ba8..e031e2b 100644 ---- a/pdal/util/CMakeLists.txt -+++ b/pdal/util/CMakeLists.txt -@@ -46,3 +46,10 @@ set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES - CLEAN_DIRECT_OUTPUT 1) - - set_property(GLOBAL PROPERTY _UTIL_INCLUDED TRUE) -+ -+# Compatibility for GCC8: std::filesystem requires linking with libstdc++fs -+target_link_libraries( -+ ${PDAL_UTIL_LIB_NAME} -+ PRIVATE -+ "$<$,$,9.0>>:-lstdc++fs>" -+) diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch index 79a379cb9cea96..8143a568dfcfe5 100644 --- a/ports/pdal/fix-unix-compiler-options.patch +++ b/ports/pdal/fix-unix-compiler-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 679b4e7..08965d9 100644 +index 1705a8426..d13d41786 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -187,7 +187,7 @@ add_subdirectory(apps) +@@ -192,7 +192,7 @@ add_subdirectory(apps) # so that users only need link libpdalcpp. # if (APPLE) diff --git a/ports/pdal/gdal-3.7.patch b/ports/pdal/gdal-3.7.patch new file mode 100644 index 00000000000000..4d3944e0a92870 --- /dev/null +++ b/ports/pdal/gdal-3.7.patch @@ -0,0 +1,22 @@ +diff --git a/pdal/Geometry.cpp b/pdal/Geometry.cpp +index 608bf86..8b010d3 100644 +--- a/pdal/Geometry.cpp ++++ b/pdal/Geometry.cpp +@@ -153,7 +153,7 @@ Geometry& Geometry::operator=(const Geometry& input) + + bool Geometry::srsValid() const + { +- OGRSpatialReference *srs = m_geom->getSpatialReference(); ++ const OGRSpatialReference *srs = m_geom->getSpatialReference(); + return srs && srs->GetRoot(); + } + +@@ -172,7 +172,7 @@ Utils::StatusWithReason Geometry::transform(SpatialReference out) + return StatusWithReason(-2, + "Geometry::transform() failed. NULL target SRS."); + +- OGRSpatialReference *inSrs = m_geom->getSpatialReference(); ++ const OGRSpatialReference *inSrs = m_geom->getSpatialReference(); + SrsTransform transform(*inSrs, OGRSpatialReference(out.getWKT().data())); + if (m_geom->transform(transform.get()) != OGRERR_NONE) + return StatusWithReason(-1, "Geometry::transform() failed."); diff --git a/ports/pdal/mingw.patch b/ports/pdal/mingw.patch new file mode 100644 index 00000000000000..3f6cb229bc9d7b --- /dev/null +++ b/ports/pdal/mingw.patch @@ -0,0 +1,13 @@ +diff --git a/io/OptechReader.cpp b/io/OptechReader.cpp +index bd12e70..2b7846b 100644 +--- a/io/OptechReader.cpp ++++ b/io/OptechReader.cpp +@@ -60,7 +60,7 @@ std::string OptechReader::getName() const + return s_info.name; + } + +-#ifndef _WIN32 ++#ifndef _MSC_VER + const size_t OptechReader::MaximumNumberOfReturns; + const size_t OptechReader::MaxNumRecordsInBuffer; + const size_t OptechReader::NumBytesInRecord; diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 5e9aa1848459a8..c2b330354c7c10 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/PDAL - REF 2.4.3 - SHA512 0293760c778be88e98e9c056730674c4e25bdba9094ff590e439a1ed1f61c880b7c03449b9cbc92190e12b3c0894cb337d93b2534c954f91277a0ee5cde5c78a + REF "${VERSION}" + SHA512 cefc610682f8dafd5c186ed612edc2db904690c3a53d5111ece0965d197053b064bd8cbd9adab293c47ec1894949b5e33623b0f0e6b6cad35617a20f0039bd79 HEAD_REF master PATCHES fix-dependency.patch @@ -12,7 +12,9 @@ vcpkg_from_github( fix-find-library-suffix.patch no-pkgconfig-requires.patch no-rpath.patch - fix-gcc8-compatibility.patch #Upstream PR: https://github.com/PDAL/PDAL/pull/3864 + fix-gcc-13-build.patch #upstream PR: https://github.com/PDAL/PDAL/pull/4039 + gdal-3.7.patch + mingw.patch ) # Prefer pristine CMake find modules + wrappers and config files from vcpkg. @@ -35,10 +37,6 @@ file(APPEND "${SOURCE_PATH}/pdal/JsonFwd.hpp" "namespace NL = nlohmann;\n") unset(ENV{OSGEO4W_HOME}) -if("laszip" IN_LIST FEATURES) - message(WARNING "The 'laszip' feature is obsolete and will be removed in the future.") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES draco BUILD_PLUGIN_DRACO @@ -49,10 +47,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD zstd WITH_ZSTD ) -if(BUILD_PLUGIN_DRACO) - vcpkg_find_acquire_program(PKGCONFIG) -endif() - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/pdal/usage b/ports/pdal/usage index eaf37886430891..759bf7feb72e5f 100644 --- a/ports/pdal/usage +++ b/ports/pdal/usage @@ -1,7 +1,7 @@ The package pdal provides CMake variables: find_package(PDAL CONFIG REQUIRED) - target_include_directories(${PDAL_INCLUDE_DIRS}) + target_include_directories(main PRIVATE ${PDAL_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${PDAL_LIBRARIES}) If necessary, override the default plugin search path by setting the diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index bf0410c6ac6b18..1736914d96302e 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdal", - "version": "2.4.3", - "port-version": 2, + "version": "2.5.3", + "port-version": 1, "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, @@ -64,9 +64,6 @@ "zlib" ] }, - "laszip": { - "description": "Obsolete. PDAL includes LAZperf." - }, "liblzma": { "description": "Support for compression/decompression with LZMA", "dependencies": [ diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 7869f2185a6e18..4ecc39a21ac049 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -39,4 +39,5 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-pdcurses-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") +vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE") diff --git a/ports/pdcurses/unofficial-pdcurses-config.cmake b/ports/pdcurses/unofficial-pdcurses-config.cmake new file mode 100644 index 00000000000000..07fb8ce1f25317 --- /dev/null +++ b/ports/pdcurses/unofficial-pdcurses-config.cmake @@ -0,0 +1,32 @@ +if(NOT TARGET unofficial::pdcurses::pdcurses) + add_library(unofficial::pdcurses::pdcurses UNKNOWN IMPORTED) + get_filename_component(z_vcpkg_pdcurses_root "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH) + get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH) + + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_pdcurses_root}/include" + ) + + find_library(Z_VCPKG_PDCURSES_LIBRARY_RELEASE NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/lib" NO_DEFAULT_PATH) + find_file(Z_VCPKG_PDCURSES_DLL_RELEASE NAMES pdcurses.dll PATHS "${z_vcpkg_pdcurses_root}/bin" NO_DEFAULT_PATH) + if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}") + set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_IMPLIB_RELEASE "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Z_VCPKG_PDCURSES_DLL_RELEASE}") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_PDCURSES_DLL_RELEASE}") + endif() + + find_library(Z_VCPKG_PDCURSES_LIBRARY_DEBUG NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/debug/lib" NO_DEFAULT_PATH) + find_file(Z_VCPKG_PDCURSES_DLL_DEBUG NAMES pdcurses.dll PATHS "${z_vcpkg_pdcurses_root}/debug/bin" NO_DEFAULT_PATH) + if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}") + set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_IMPLIB_DEBUG "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}") + endif() + if(EXISTS "${Z_VCPKG_PDCURSES_DLL_DEBUG}") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_PDCURSES_DLL_DEBUG}") + endif() + + unset(z_vcpkg_pdcurses_root) +endif() diff --git a/ports/pdcurses/vcpkg.json b/ports/pdcurses/vcpkg.json index fa26f9b12d3599..d568179c9a94d0 100644 --- a/ports/pdcurses/vcpkg.json +++ b/ports/pdcurses/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pdcurses", - "version-string": "3.9", - "port-version": 3, + "version": "3.9", + "port-version": 5, "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", "homepage": "https://pdcurses.org/", + "license": null, "supports": "windows & !uwp & !mingw" } diff --git a/ports/pdqsort/vcpkg.json b/ports/pdqsort/vcpkg.json index 60a5647ea36fbb..d286162170c0b8 100644 --- a/ports/pdqsort/vcpkg.json +++ b/ports/pdqsort/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdqsort", - "version-string": "2019-07-30", - "port-version": 1, + "version-date": "2019-07-30", + "port-version": 2, "description": "Pattern-defeating quicksort (pdqsort) is a novel sorting algorithm", "homepage": "https://github.com/orlp/pdqsort" } diff --git a/ports/pegtl-2/vcpkg.json b/ports/pegtl-2/vcpkg.json index 6b313eee026eeb..c81ec51114d0cc 100644 --- a/ports/pegtl-2/vcpkg.json +++ b/ports/pegtl-2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pegtl-2", - "version-string": "2.8.3", - "port-version": 2, + "version": "2.8.3", + "port-version": 3, "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). This version maintains compatibility with C++11.", "homepage": "https://github.com/taocpp/PEGTL", "dependencies": [ diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 5746327c2bad58..47a5e546b6bfa8 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF e65017d398a3b733aedab70bb64b8055472d47aa - SHA512 05ca3754a9c1c94a205c6823e4442dca1f11a890aadd4b0c96f6ccd8946eec061c0a723bc67f8b57b074154e1ab1171bdcdd035926f55e42b5517b9d5ecae873 + REF cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe + SHA512 174148310e9d2fd37c67c3e5f4fd84c66847647732ebed29878e967b44aa87bcf91c304b2193ebf11b8586e458cd13f12d6ceec2fbf33a1aaeb552a100a6307f HEAD_REF 3.x ) diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index e2455acb924f91..924de17d12ef42 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pegtl", - "version-semver": "3.2.6", + "version-semver": "3.2.7", "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", diff --git a/ports/pfultz2-linq/vcpkg.json b/ports/pfultz2-linq/vcpkg.json index c1ff1d4e21bbfa..2c7c45b9f4df7d 100644 --- a/ports/pfultz2-linq/vcpkg.json +++ b/ports/pfultz2-linq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pfultz2-linq", - "version-string": "2019-05-14", - "port-version": 2, + "version-date": "2019-05-14", + "port-version": 3, "description": "Linq for list comprehension in C++", "dependencies": [ "boost-fusion", diff --git a/ports/picojson/vcpkg.json b/ports/picojson/vcpkg.json index 540a2ad3d50907..4b4ac192c5c4cd 100644 --- a/ports/picojson/vcpkg.json +++ b/ports/picojson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "picojson", - "version-string": "1.3.0", - "port-version": 2, + "version": "1.3.0", + "port-version": 3, "description": "A header-file-only, JSON parser serializer in C++.", "homepage": "https://github.com/kazuho/picojson" } diff --git a/ports/picosha2/vcpkg.json b/ports/picosha2/vcpkg.json index 45091e449f79e2..56ab0dcd0cd7f1 100644 --- a/ports/picosha2/vcpkg.json +++ b/ports/picosha2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "picosha2", - "version-string": "2018-07-30", - "port-version": 1, + "version-date": "2018-07-30", + "port-version": 2, "description": "PicoSHA2 - a C++ SHA256 hash generator", "homepage": "https://github.com/okdshin/PicoSHA2" } diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake index 9cb354f57595d1..df06adb9e6e26c 100644 --- a/ports/platform-folders/portfile.cmake +++ b/ports/platform-folders/portfile.cmake @@ -26,7 +26,7 @@ endif() if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MinGW) vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH cmake) else() - vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH lib/cmake) + vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH lib/cmake/platform_folders) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/platform-folders/vcpkg.json b/ports/platform-folders/vcpkg.json index ac2e0c27ed0d8c..2c6ae3d6218dec 100644 --- a/ports/platform-folders/vcpkg.json +++ b/ports/platform-folders/vcpkg.json @@ -1,6 +1,7 @@ { "name": "platform-folders", "version": "4.2.0", + "port-version": 1, "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"", "homepage": "https://github.com/sago007/PlatformFolders", "license": "MIT", diff --git a/ports/plf-list/vcpkg.json b/ports/plf-list/vcpkg.json index e86191647f677a..c1f91d67b1ada1 100644 --- a/ports/plf-list/vcpkg.json +++ b/ports/plf-list/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plf-list", - "version-string": "2019-08-10", - "port-version": 1, + "version-date": "2019-08-10", + "port-version": 2, "description": "A drop-in replacement for std::list with 293% faster insertion, 57% faster erasure, 17% faster iteration and 77% faster sorting on average", "homepage": "https://www.plflib.org/" } diff --git a/ports/plf-nanotimer/vcpkg.json b/ports/plf-nanotimer/vcpkg.json index 26e8a22e466f31..8d4b15c71e20d7 100644 --- a/ports/plf-nanotimer/vcpkg.json +++ b/ports/plf-nanotimer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plf-nanotimer", - "version-string": "2019-08-10", - "port-version": 1, + "version-date": "2019-08-10", + "port-version": 2, "description": "A simple C++ 03/11/etc timer class for ~microsecond-precision cross-platform benchmarking", "homepage": "https://www.plflib.org/" } diff --git a/ports/plf-stack/vcpkg.json b/ports/plf-stack/vcpkg.json index 6c0a75f6815c0f..096fc1b81d212e 100644 --- a/ports/plf-stack/vcpkg.json +++ b/ports/plf-stack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plf-stack", - "version-string": "2019-08-10", - "port-version": 1, + "version-date": "2019-08-10", + "port-version": 2, "description": "A C++ data container replicating std::stack functionality but with better performance", "homepage": "https://www.plflib.org/" } diff --git a/ports/plib/portfile.cmake b/ports/plib/portfile.cmake index 603aeb3ffe1616..514b587438cb85 100644 --- a/ports/plib/portfile.cmake +++ b/ports/plib/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" ) diff --git a/ports/plib/vcpkg.json b/ports/plib/vcpkg.json index 4579c4a4685c70..35892d993bac63 100644 --- a/ports/plib/vcpkg.json +++ b/ports/plib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plib", "version": "1.8.5", - "port-version": 6, + "port-version": 7, "description": "A suite of portable game libraries", "license": "LGPL-2.0-only", "supports": "!osx & !uwp", diff --git a/ports/plustache/vcpkg.json b/ports/plustache/vcpkg.json index a0e805468f4ca4..857f6e11b1e95d 100644 --- a/ports/plustache/vcpkg.json +++ b/ports/plustache/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plustache", - "version-string": "0.4.0", - "port-version": 3, + "version": "0.4.0", + "port-version": 4, "description": "{{mustaches}} for C++", "dependencies": [ "boost-algorithm", diff --git a/ports/pngpp/portfile.cmake b/ports/pngpp/portfile.cmake index f839743076237f..a01bd1975659cf 100644 --- a/ports/pngpp/portfile.cmake +++ b/ports/pngpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 c54a74c0c20212bd0dcf86386c0c11dd824ad14952917ba0ff4c184b6547744458728a4f06018371acb7d5b842b641708914ccaa81bad8e72e173903f494ca85 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES fix-stderror-win.patch diff --git a/ports/pngpp/vcpkg.json b/ports/pngpp/vcpkg.json index bff3b699402b7d..95374c479d5cd4 100644 --- a/ports/pngpp/vcpkg.json +++ b/ports/pngpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pngpp", "version": "0.2.10", - "port-version": 1, + "port-version": 2, "description": "A C++ wrapper for libpng library.", "dependencies": [ "libpng" diff --git a/ports/pngwriter/vcpkg.json b/ports/pngwriter/vcpkg.json index 10cb62ec9aec50..bb57c111a29f79 100644 --- a/ports/pngwriter/vcpkg.json +++ b/ports/pngwriter/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pngwriter", - "version-string": "0.7.0", - "port-version": 4, + "version": "0.7.0", + "port-version": 5, "description": "PNGwriter is a very easy to use open source graphics library that uses PNG as its output format", "dependencies": [ "freetype", diff --git a/ports/podofo/0002-HAVE_UNISTD_H.patch b/ports/podofo/0002-HAVE_UNISTD_H.patch deleted file mode 100644 index 6aed4b27972ec5..00000000000000 --- a/ports/podofo/0002-HAVE_UNISTD_H.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/podofo_config.h.in b/podofo_config.h.in -index fea9ada..a813c7b 100644 ---- a/podofo_config.h.in -+++ b/podofo_config.h.in -@@ -59,3 +59,10 @@ - #cmakedefine PODOFO_HAVE_OPENSSL_NO_RC4 - #cmakedefine PODOFO_HAVE_LIBIDN - #cmakedefine PODOFO_HAVE_UNISTRING_LIB -+ -+/* Fix build for MacOS 10.13 */ -+#if defined(__APPLE__) && !defined(__IOS__) -+#cmakedefine01 HAVE_UNISTD_H -+#else -+#cmakedefine HAVE_UNISTD_H -+#endif diff --git a/ports/podofo/0003-uwp_fix.patch b/ports/podofo/0003-uwp_fix.patch deleted file mode 100644 index 4801447c7f9421..00000000000000 --- a/ports/podofo/0003-uwp_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/podofo/base/PdfCompilerCompat.h b/src/podofo/base/PdfCompilerCompat.h -index 146731d..7041712 100644 ---- a/src/podofo/base/PdfCompilerCompat.h -+++ b/src/podofo/base/PdfCompilerCompat.h -@@ -113,6 +113,10 @@ - #define NOMINMAX - #endif - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -+#include -+#endif -+ - // Integer types - fixed size types guaranteed to work anywhere - // because we detect the right underlying type name to use with - // CMake. Use typedefs rather than macros for saner error messages diff --git a/ports/podofo/0005-fix-crypto.patch b/ports/podofo/0005-fix-crypto.patch deleted file mode 100644 index a873ee4c9efa19..00000000000000 --- a/ports/podofo/0005-fix-crypto.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f23dd5a..fd9e8ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -315,11 +315,12 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) - FIND_PACKAGE(ZLIB REQUIRED) - MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}") - --FIND_PACKAGE(LIBCRYPTO) -+FIND_PACKAGE(OpenSSL) - --IF(LIBCRYPTO_FOUND) -+IF(OpenSSL_FOUND) - SET(PODOFO_HAVE_OPENSSL TRUE) -- INCLUDE_DIRECTORIES(${LIBCRYPTO_INCLUDE_DIR}) -+ LIST(APPEND OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) -+ ADD_DEFINITIONS(-DPODOFO_HAVE_OPENSSL_1_1) - MESSAGE("Found OpenSSL's libCrypto headers in ${LIBCRYPTO_INCLUDE_DIR}, library at ${LIBCRYPTO_LIBRARIES}") - ELSE(LIBCRYPTO_FOUND) - MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled") -@@ -396,8 +397,6 @@ ENDIF(CppUnit_FOUND) - - ENDIF(NOT PODOFO_BUILD_LIB_ONLY) - --FIND_PACKAGE(OpenSSL) -- - FIND_PACKAGE(FREETYPE REQUIRED) - MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") - diff --git a/ports/podofo/fix-compiler.patch b/ports/podofo/fix-compiler.patch deleted file mode 100644 index e698da3e041ac4..00000000000000 --- a/ports/podofo/fix-compiler.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt -index 16f0798..12fc0e8 100644 ---- a/src/podofo/CMakeLists.txt -+++ b/src/podofo/CMakeLists.txt -@@ -1,5 +1,7 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - -+set(CMAKE_CXX_STANDARD 14) -+ - IF(NOT PODOFO_MAIN_CMAKELISTS_READ) - MESSAGE(FATAL_ERROR "Run cmake on the CMakeLists.txt in the project root, not the one in the 'src' directory. You will need to delete CMakeCache.txt from the current directory.") - ENDIF(NOT PODOFO_MAIN_CMAKELISTS_READ) diff --git a/ports/podofo/fix-x64-osx.patch b/ports/podofo/fix-x64-osx.patch deleted file mode 100644 index 621f0f68e8e43e..00000000000000 --- a/ports/podofo/fix-x64-osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/podofo/base/PdfDate.cpp b/src/podofo/base/PdfDate.cpp -index cefa221..75d80e4 100644 ---- a/src/podofo/base/PdfDate.cpp -+++ b/src/podofo/base/PdfDate.cpp -@@ -196,7 +196,7 @@ PdfDate::PdfDate( const PdfString & sDate ) - - strncpy(m_szDate,sDate.GetString(),PDF_DATE_BUFFER_SIZE); - -- struct tm _tm{}; -+ struct tm _tm; memset (&_tm, 0, sizeof(struct tm)); - _tm.tm_mday = 1; - - const char * pszDate = sDate.GetString(); diff --git a/ports/podofo/freetype.patch b/ports/podofo/freetype.patch deleted file mode 100644 index f241690f719136..00000000000000 --- a/ports/podofo/freetype.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/modules/FindFREETYPE.cmake b/cmake/modules/FindFREETYPE.cmake -index 41114798f..0911dc092 100644 ---- a/cmake/modules/FindFREETYPE.cmake -+++ b/cmake/modules/FindFREETYPE.cmake -@@ -15,9 +15,13 @@ SET(FREETYPE_FIND_QUIETLY 1) - # first we try to find ft2build.h in the new location as - # of freetype 2.5.1 - FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h -+ PATHS - /usr/include/freetype2 - /usr/local/include/freetype2 - /usr/X11/include/freetype2 -+ PATH_SUFFIXES -+ freetype2 -+ include/freetype2 - NO_CMAKE_SYSTEM_PATH - ) - diff --git a/ports/podofo/install-cmake-config.patch b/ports/podofo/install-cmake-config.patch index 1373e5839ba39c..90881aa7264613 100644 --- a/ports/podofo/install-cmake-config.patch +++ b/ports/podofo/install-cmake-config.patch @@ -1,49 +1,52 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index df623ef..8e653b8 100644 +index 597847b..da988ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -569,10 +569,4 @@ CONFIGURE_FILE(${PoDoFo_SOURCE_DIR}/podofo_config.h.in ${PoDoFo_BINARY_DIR}/podo +@@ -258,11 +258,6 @@ endif() # To use these dependencies set PODOFO_DIR to the podofo BUILD directory in # your build (eg -DPODOFO_DIR=/path/to/podofo when running cmake to configure - # the app that'll use podofo). See: FIND_PACKAGE(...) in the cmake docs. --IF(PODOFO_BUILD_SHARED) -- EXPORT(TARGETS podofo_shared FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake") --ENDIF(PODOFO_BUILD_SHARED) --IF(PODOFO_BUILD_STATIC) -- EXPORT(TARGETS podofo_static FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake") --ENDIF(PODOFO_BUILD_STATIC) + # the app that'll use podofo). See: find_package(...) in the cmake docs. +-if(PODOFO_BUILD_SHARED) +- export(TARGETS podofo_shared FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") +-else() +- export(TARGETS podofo_static podofo_private FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") +-endif() + # Enable packaging + set(CPACK_PACKAGE_DESCRIPTION "A C++ PDF manipulation library") diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt -index bba6b5f..16f0798 100644 +index 3a148fb..4ca1420 100644 --- a/src/podofo/CMakeLists.txt +++ b/src/podofo/CMakeLists.txt -@@ -275,10 +275,14 @@ IF(PODOFO_BUILD_STATIC) - CACHE INTERNAL "Which PoDoFo library variant to depend on") - SET(USING_SHARED_PODOFO FALSE) - INSTALL(TARGETS podofo_static -+ EXPORT PoDoFoConfig - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "${LIBDIRNAME}" - ARCHIVE DESTINATION "${LIBDIRNAME}" - ) -+ INSTALL(EXPORT PoDoFoConfig +@@ -77,11 +77,15 @@ if(PODOFO_BUILD_STATIC) + CLEAN_DIRECT_OUTPUT 1 + OUTPUT_NAME "podofo" + ) +- install(TARGETS podofo_static ++ install(TARGETS podofo_static podofo_private ++ EXPORT podofo-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++ install(EXPORT podofo-config + DESTINATION share/podofo -+ ) - ENDIF(PODOFO_BUILD_STATIC) - - IF(PODOFO_BUILD_SHARED) -@@ -301,10 +305,14 @@ IF(PODOFO_BUILD_SHARED) - CACHE INTERNAL "Which PoDoFo library variant to depend on") - SET(USING_SHARED_PODOFO TRUE) - INSTALL(TARGETS podofo_shared -+ EXPORT PoDoFoConfig - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "${LIBDIRNAME}" - ARCHIVE DESTINATION "${LIBDIRNAME}" - ) -+ INSTALL(EXPORT PoDoFoConfig ++ ) + set(PODOFO_LIBRARIES podofo_static podofo_private + CACHE INTERNAL "Which podofo library variant to depend on") + endif() +@@ -102,10 +106,14 @@ if(PODOFO_BUILD_SHARED) + # Since we're building a shared podofo, prefer to depend on this one for + # tests and tools over the static library (if built). + install(TARGETS podofo_shared ++ EXPORT podofo-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++ install(EXPORT podofo-config + DESTINATION share/podofo -+ ) - ++ ) - # Create a pkg-config file for linking against shared library + # Create a pkg-config file for linking against shared library + # if pkg-config is available on the system. diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index d9cc0308bb4d8e..ac7151ef69f367 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -1,74 +1,58 @@ -set(PODOFO_VERSION 0.9.8) -if (VCPKG_TARGET_IS_UWP) - set(ADDITIONAL_PATCH "0003-uwp_fix.patch") -endif() - -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO podofo/podofo - REF ${PODOFO_VERSION} - FILENAME "podofo-${PODOFO_VERSION}.tar.gz" - SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1 + REF "${VERSION}" + SHA512 674024af031392253bc9ea02e392fa7b4a5c8894f3129e05f27133774ccf8b696e225789e886dedbe90bc2323c318b76e79857453a56d6014d7a5514e3f861a2 PATCHES - 0002-HAVE_UNISTD_H.patch - freetype.patch - ${ADDITIONAL_PATCH} - 0005-fix-crypto.patch - fix-x64-osx.patch install-cmake-config.patch - fix-compiler.patch ) -set(PODOFO_NO_FONTMANAGER ON) -if("fontconfig" IN_LIST FEATURES) - set(PODOFO_NO_FONTMANAGER OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fontconfig CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig + INVERTED_FEATURES + fontconfig CMAKE_DISABLE_FIND_PACKAGE_Fontconfig +) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PODOFO_BUILD_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PODOFO_BUILD_STATIC) -set(IS_WIN32 OFF) -if(VCPKG_TARGET_IS_WINDOWS) - set(IS_WIN32 ON) -endif() - file(REMOVE "${SOURCE_PATH}/cmake/modules/FindOpenSSL.cmake") file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} + -DPKG_CONFIG_FOUND=true # enable pc file for shared linkage -DPODOFO_BUILD_LIB_ONLY=1 - -DPODOFO_BUILD_SHARED=${PODOFO_BUILD_SHARED} -DPODOFO_BUILD_STATIC=${PODOFO_BUILD_STATIC} - -DPODOFO_NO_FONTMANAGER=${PODOFO_NO_FONTMANAGER} - -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=${PODOFO_NO_FONTMANAGER} - -DCMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO=${IS_WIN32} - -DCMAKE_DISABLE_FIND_PACKAGE_LIBIDN=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_Boost - CMAKE_DISABLE_FIND_PACKAGE_CppUnit - CMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO + -DCMAKE_DISABLE_FIND_PACKAGE_Libidn=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/PoDoFoConfig.cmake" - "# Create imported target podofo_shared" -[[ -include(CMakeFindDependencyMacro) +vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/podofo-config.cmake" + "# Generated by CMake" + "include(CMakeFindDependencyMacro) +find_dependency(Freetype) +find_dependency(JPEG) +find_dependency(LibXml2) find_dependency(OpenSSL) -# Create imported target podofo_shared -]] -) +find_dependency(PNG) +find_dependency(TIFF) +find_dependency(ZLIB) +if(\"${CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig}\") + find_dependency(Fontconfig) +endif() +\n# Generated by CMake") vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/podofo/usage b/ports/podofo/usage new file mode 100644 index 00000000000000..b21f4bb792ea9d --- /dev/null +++ b/ports/podofo/usage @@ -0,0 +1,4 @@ +podofo provides CMake targets: + + find_package(podofo CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,podofo_shared,podofo_static>) diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index d27ed0bfc1615b..24398f4254cf2c 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,16 +1,24 @@ { "name": "podofo", - "version": "0.9.8", + "version": "0.10.0", + "port-version": 1, "description": "PoDoFo is a library to work with the PDF file format", - "homepage": "https://sourceforge.net/projects/podofo/", - "license": "LGPL-2.0-only", + "homepage": "https://github.com/podofo/podofo", + "license": "LGPL-2.0-or-later", "supports": "!uwp", "dependencies": [ "freetype", "libjpeg-turbo", "libpng", + { + "name": "libxml2", + "default-features": false + }, "openssl", - "tiff", + { + "name": "tiff", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true @@ -21,12 +29,28 @@ }, "zlib" ], + "default-features": [ + "fontmanager" + ], "features": { "fontconfig": { - "description": "Enable font manager support on Unix platforms", + "description": "Use Fontconfig", "dependencies": [ "fontconfig" ] + }, + "fontmanager": { + "description": "Enable font manager", + "dependencies": [ + { + "name": "podofo", + "default-features": false, + "features": [ + "fontconfig" + ], + "platform": "!windows" + } + ] } } } diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json index 424fb357893e8d..4c53dd031e164c 100644 --- a/ports/polyclipping/vcpkg.json +++ b/ports/polyclipping/vcpkg.json @@ -1,7 +1,7 @@ { "name": "polyclipping", - "version-string": "6.4.2", - "port-version": 11, + "version": "6.4.2", + "port-version": 12, "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", "homepage": "https://sourceforge.net/projects/polyclipping/", "dependencies": [ diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index 25ae5978621bc2..45900a41fa56ce 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -1,15 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF 750e78f8d7ebfc291e1c0dce3a0763c3a4b86737 - SHA512 c542288cfde258bcb54960593f2b596b6a967cf128a691e4b8ad699127567c58dc55ce2bbf21f4d3ccbaa2d794bcacd3540503b039ee58c614a854f13d51d30e + REF 71d273463a3c4e30ec0a4031c4b477b85ea773fb + SHA512 5092453ee55d679bb88ac8d98bbfadbe2aca9eb211b8d7a5bce4e6bb377dd292518d4861fd5281c51915f9ba609b6f2b0c0e0271f92cc0da148ee8d3225d1081 HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - capstone POLYHOOK_DISASM_CAPSTONE - zydis POLYHOOK_DISASM_ZYDIS exception POLYHOOK_FEATURE_EXCEPTION detours POLYHOOK_FEATURE_DETOURS inlinentd POLYHOOK_FEATURE_INLINENTD @@ -31,7 +29,7 @@ vcpkg_cmake_configure( -DPOLYHOOK_BUILD_SHARED_LIB=${BUILD_SHARED_LIB} -DPOLYHOOK_BUILD_STATIC_RUNTIME=${BUILD_STATIC_RUNTIME} -DPOLYHOOK_USE_EXTERNAL_ASMJIT=ON - -DPOLYHOOK_USE_EXTERNAL_CAPSTONE=ON + -DPOLYHOOK_USE_EXTERNAL_ASMTK=ON -DPOLYHOOK_USE_EXTERNAL_ZYDIS=ON ) @@ -43,4 +41,4 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME PolyHook_2 CONFIG_PATH lib/PolyHook_2) # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/polyhook2/vcpkg.json b/ports/polyhook2/vcpkg.json index 3e1c552d81338b..d4990b6f8f0108 100644 --- a/ports/polyhook2/vcpkg.json +++ b/ports/polyhook2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "polyhook2", - "version-date": "2022-03-01", + "version-date": "2023-02-24", "description": "C++17, x86/x64 Hooking Library v2.0", "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", "license": "MIT", @@ -16,29 +16,21 @@ } ], "default-features": [ - "capstone", "detours", "exception", "inlinentd", "pe", - "virtuals", - "zydis" + "virtuals" ], "features": { - "capstone": { - "description": "Capstone disassembler integration.", + "detours": { + "description": "Implement detour functionality", "dependencies": [ - { - "name": "capstone", - "features": [ - "x86" - ] - } + "asmjit", + "asmtk", + "zydis" ] }, - "detours": { - "description": "Implement detour functionality" - }, "exception": { "description": "Implement all exception hooking functionality" }, @@ -53,12 +45,6 @@ }, "virtuals": { "description": "Implement all virtual table hooking functionality" - }, - "zydis": { - "description": "Zydis disassembler integration.", - "dependencies": [ - "zydis" - ] } } } diff --git a/ports/ponder/vcpkg.json b/ports/ponder/vcpkg.json index bd06df5b813353..b881cb9b43f547 100644 --- a/ports/ponder/vcpkg.json +++ b/ports/ponder/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ponder", - "version-string": "3.0.0", - "port-version": 4, + "version": "3.0.0", + "port-version": 5, "description": "A C++ multi-purpose reflection library.", "homepage": "https://github.com/billyquith/ponder", "dependencies": [ diff --git a/ports/portable-file-dialogs/portfile.cmake b/ports/portable-file-dialogs/portfile.cmake new file mode 100644 index 00000000000000..8731108891d3d2 --- /dev/null +++ b/ports/portable-file-dialogs/portfile.cmake @@ -0,0 +1,11 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO samhocevar/portable-file-dialogs + REF "${VERSION}" + SHA512 8f3f59534024357b1d4b9054f20f482bfb159c1666be1695220c1be8f028be6adac0d9d82aad7230922a5eea5971c051a8699e60bc99207813776f35ce6937b6 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/portable-file-dialogs.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/portable-file-dialogs/vcpkg.json b/ports/portable-file-dialogs/vcpkg.json new file mode 100644 index 00000000000000..d7074d3c922623 --- /dev/null +++ b/ports/portable-file-dialogs/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "portable-file-dialogs", + "version": "0.1.0", + "description": "Portable GUI dialogs library", + "homepage": "https://github.com/samhocevar/portable-file-dialogs", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ppconsul/vcpkg.json b/ports/ppconsul/vcpkg.json index ac3b3e7f9e9498..6812951a87a8b1 100644 --- a/ports/ppconsul/vcpkg.json +++ b/ports/ppconsul/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ppconsul", - "version-string": "0.5", - "port-version": 4, + "version": "0.5", + "port-version": 5, "description": "A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure.", "homepage": "https://github.com/oliora/ppconsul", "dependencies": [ diff --git a/ports/ppmagic/vcpkg.json b/ports/ppmagic/vcpkg.json index 7bf584f3354678..79dcecfb67b7ef 100644 --- a/ports/ppmagic/vcpkg.json +++ b/ports/ppmagic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ppmagic", - "version-string": "2020-07-03", - "port-version": 1, + "version-date": "2020-07-03", + "port-version": 2, "description": "C/C++ preprocessor macros that you can use to simplify your life.", "homepage": "https://github.com/kobalicek/ppmagic" } diff --git a/ports/pprint/vcpkg.json b/ports/pprint/vcpkg.json index 8c14c0a9cf3f99..f1f1722b25fbb6 100644 --- a/ports/pprint/vcpkg.json +++ b/ports/pprint/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pprint", - "version-string": "2019-07-19", - "port-version": 2, + "version-date": "2019-07-19", + "port-version": 3, "description": "Pretty Printer for Modern C++", "homepage": "https://github.com/p-ranav/pprint", "dependencies": [ diff --git a/ports/pqp/vcpkg.json b/ports/pqp/vcpkg.json index d36723e0c6dd0c..f8fd0220194c59 100644 --- a/ports/pqp/vcpkg.json +++ b/ports/pqp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pqp", - "version-string": "1.3", - "port-version": 6, + "version": "1.3", + "port-version": 7, "description": "a proximity query package", "homepage": "https://gamma.cs.unc.edu/SSV/", "dependencies": [ diff --git a/ports/proxygen/fix-dependency.patch b/ports/proxygen/fix-dependency.patch new file mode 100644 index 00000000000000..734368b0dbdbd8 --- /dev/null +++ b/ports/proxygen/fix-dependency.patch @@ -0,0 +1,84 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6bf0f17..343ec2b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,13 +66,13 @@ endif() + # + # IMPORTANT: If you change this, make the analogous update in: + # cmake/proxygen-config.cmake.in +-find_package(fmt REQUIRED) +-find_package(folly REQUIRED) +-find_package(wangle REQUIRED) ++find_package(fmt CONFIG REQUIRED) ++find_package(folly CONFIG REQUIRED) ++find_package(wangle CONFIG REQUIRED) + if (BUILD_QUIC) +- find_package(mvfst REQUIRED) ++ find_package(mvfst CONFIG REQUIRED) + else() +- find_package(Fizz REQUIRED) ++ find_package(fizz CONFIG REQUIRED) + endif() + find_package(zstd CONFIG REQUIRED) + find_package(ZLIB REQUIRED) +@@ -128,27 +128,8 @@ SET(GFLAG_DEPENDENCIES "") + SET(PROXYGEN_EXTRA_LINK_LIBRARIES "") + SET(PROXYGEN_EXTRA_INCLUDE_DIRECTORIES "") + +-find_package(gflags CONFIG QUIET) +-if (gflags_FOUND) +- message("module path: ${CMAKE_MODULE_PATH}") +- message(STATUS "Found gflags from package config") +- if (TARGET gflags-shared) +- list(APPEND GFLAG_DEPENDENCIES gflags-shared) +- elseif (TARGET gflags) +- list(APPEND GFLAG_DEPENDENCIES gflags) +- else() +- message(FATAL_ERROR +- "Unable to determine the target name for the GFlags package.") +- endif() +- list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES}) +- list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR}) +-else() +- find_package(Gflags REQUIRED MODULE) +- list(APPEND PROXYGEN_EXTRA_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY}) +- list(APPEND PROXYGEN_EXTRA_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR}) +- list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY}) +- list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR}) +-endif() ++find_package(gflags CONFIG REQUIRED) ++list(APPEND CMAKE_REQUIRED_LIBRARIES gflags::gflags) + + include(ProxygenTest) + +diff --git a/cmake/proxygen-config.cmake.in b/cmake/proxygen-config.cmake.in +index 8c1426d..f8b89a4 100644 +--- a/cmake/proxygen-config.cmake.in ++++ b/cmake/proxygen-config.cmake.in +@@ -17,19 +17,20 @@ + @PACKAGE_INIT@ + + include(CMakeFindDependencyMacro) +-find_dependency(fmt) +-find_dependency(folly) +-find_dependency(wangle) ++find_dependency(fmt CONFIG) ++find_dependency(folly CONFIG) ++find_dependency(wangle CONFIG) + if ("@BUILD_QUIC@") +- find_dependency(mvfst) ++ find_dependency(mvfst CONFIG) + endif() +-find_dependency(Fizz) ++find_dependency(fizz CONFIG) ++find_dependency(gflags CONFIG) + # For now, anything that depends on Proxygen has to copy its FindZstd.cmake + # and issue a `find_package(Zstd)`. Uncommenting this won't work because + # this Zstd module exposes a library called `zstd`. The right fix is + # discussed on D24686032. + # +-# find_dependency(Zstd) ++find_dependency(zstd CONFIG) + find_dependency(ZLIB) + find_dependency(OpenSSL) + find_dependency(Threads) diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index f8abe645d9e29e..24b7a7f144c928 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF 0c932f6c57095838494520ec4ce7243a7f0c1234 #v2022.07.11.00 - SHA512 496189c37be8f42821cb5357e501b02f013858f1917854000777ac5c0403d078837e89dc3eef5f66f30f83c7506e40316d730725d7f97070090ac6549e766093 + REF "v${VERSION}" + SHA512 b08110c4bb4d83a80786aa517edc88d2d9233934705a5deb3da70542251c737113500a11a4cd55d72928635be7c2833e806d1c5391892269a0dd1fe8d4e80187 HEAD_REF master PATCHES remove-register.patch fix-zstd-zlib-dependency.patch + fix-dependency.patch ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 25080b933846cf..927729615c7248 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2022.07.11.00", + "version-string": "2023.05.15.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", @@ -16,6 +16,7 @@ "boost-thread", "fizz", "folly", + "gflags", { "name": "gperf", "host": true diff --git a/ports/psimd/vcpkg.json b/ports/psimd/vcpkg.json index 00c0b8dbbfe20b..44ba8f56594e63 100644 --- a/ports/psimd/vcpkg.json +++ b/ports/psimd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "psimd", - "version-string": "2021-02-21", - "port-version": 1, + "version-date": "2021-02-21", + "port-version": 2, "description": "Portable 128-bit SIMD intrinsics", "homepage": "https://github.com/Maratyszcza/psimd", "dependencies": [ diff --git a/ports/pthread/vcpkg.json b/ports/pthread/vcpkg.json index 7cc1edb464f4a3..be099cd310d2d1 100644 --- a/ports/pthread/vcpkg.json +++ b/ports/pthread/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pthread", - "version-string": "3.0.0", - "port-version": 1, + "version": "3.0.0", + "port-version": 2, "description": "empty package, linking to other port", "dependencies": [ "pthreads" diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 8f2a804fbac9ed..682ffa0993dc2c 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -17,8 +17,6 @@ else() list(APPEND PATCH_FILES use-mt.patch) endif() -list(APPEND PATCH_FILES fix-pthread_getname_np.patch fix-install.patch) - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO pthreads4w @@ -27,6 +25,9 @@ vcpkg_from_sourceforge( PATCHES fix-arm-macro.patch fix-arm64-version_rc.patch # https://sourceforge.net/p/pthreads4w/code/merge-requests/6/ + fix-pthread_getname_np.patch + fix-install.patch + whitespace_in_path.patch ${PATCH_FILES} ) diff --git a/ports/pthreads/vcpkg.json b/ports/pthreads/vcpkg.json index 127ddf938fc9bb..40c9c979314433 100644 --- a/ports/pthreads/vcpkg.json +++ b/ports/pthreads/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pthreads", "version": "3.0.0", - "port-version": 13, + "port-version": 14, "description": "Meta-package that provides PThreads4W on Windows, or assumes presence of system pthreads on POSIX systems.", "homepage": "https://sourceforge.net/projects/pthreads4w/", "license": "Apache-2.0", diff --git a/ports/pthreads/whitespace_in_path.patch b/ports/pthreads/whitespace_in_path.patch new file mode 100644 index 00000000000000..77a24c1cb1877e --- /dev/null +++ b/ports/pthreads/whitespace_in_path.patch @@ -0,0 +1,27 @@ +--- a/Makefile Sat Apr 29 09:21:07 2023 ++++ b/Makefile Sat Apr 29 09:19:07 2023 +@@ -223,15 +223,15 @@ + + # Very basic install. It assumes "realclean" was done just prior to build target. + install: +- if not exist $(DLLDEST) mkdir $(DLLDEST) +- if not exist $(LIBDEST) mkdir $(LIBDEST) +- if not exist $(HDRDEST) mkdir $(HDRDEST) +- if exist pthreadV*.dll copy pthreadV*.dll $(DLLDEST) +- if exist pthreadV*.lib copy pthreadV*.lib $(LIBDEST) +- copy _ptw32.h $(HDRDEST) +- copy pthread.h $(HDRDEST) +- copy sched.h $(HDRDEST) +- copy semaphore.h $(HDRDEST) ++ if not exist "$(DLLDEST)" mkdir "$(DLLDEST)" ++ if not exist "$(LIBDEST)" mkdir "$(LIBDEST)" ++ if not exist "$(HDRDEST)" mkdir "$(HDRDEST)" ++ if exist pthreadV*.dll copy pthreadV*.dll "$(DLLDEST)" ++ if exist pthreadV*.lib copy pthreadV*.lib "$(LIBDEST)" ++ copy _ptw32.h "$(HDRDEST)" ++ copy pthread.h "$(HDRDEST)" ++ copy sched.h "$(HDRDEST)" ++ copy semaphore.h "$(HDRDEST)" + + $(DLLS): $(DLL_OBJS) + $(CC) /LDd /Zi $(DLL_OBJS) /link /implib:$*.lib $(XLIBS) /out:$@ diff --git a/ports/python2/portfile.cmake b/ports/python2/portfile.cmake index 227ffed4115918..3280a319e0f2b1 100644 --- a/ports/python2/portfile.cmake +++ b/ports/python2/portfile.cmake @@ -48,8 +48,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES ${_PYTHON_PATCHES} ) diff --git a/ports/python2/vcpkg.json b/ports/python2/vcpkg.json index ce26b439f40ce8..28d9853f12b183 100644 --- a/ports/python2/vcpkg.json +++ b/ports/python2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python2", "version": "2.7.18", - "port-version": 5, + "port-version": 6, "description": "The Python programming language as an embeddable library", "homepage": "https://www.python.org", "license": "Python-2.0", diff --git a/ports/python3/0012-force-disable-curses.patch b/ports/python3/0012-force-disable-curses.patch index d0986e80d8dedb..01e5dcf15bb3bc 100644 --- a/ports/python3/0012-force-disable-curses.patch +++ b/ports/python3/0012-force-disable-curses.patch @@ -1,5 +1,14 @@ +From 08599a02debaa2ea015d1221dd2c8ca0481640a3 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 26 Apr 2023 05:17:09 +0000 +Subject: [PATCH 12/14] force disable curses + +--- + Modules/Setup | 4 ++++ + 1 file changed, 4 insertions(+) + diff --git a/Modules/Setup b/Modules/Setup -index 87c6a15..7ad53f5 100644 +index 87c6a152f8..7ad53f5b4f 100644 --- a/Modules/Setup +++ b/Modules/Setup @@ -375,3 +375,7 @@ xxsubtype xxsubtype.c @@ -10,3 +19,6 @@ index 87c6a15..7ad53f5 100644 +*disabled* +_curses +_curses_panel +-- +2.25.1 + diff --git a/ports/python3/0013-configure-no-libcrypt.patch b/ports/python3/0013-configure-no-libcrypt.patch index dfeb9b77b76f8e..f75ac86c3004c6 100644 --- a/ports/python3/0013-configure-no-libcrypt.patch +++ b/ports/python3/0013-configure-no-libcrypt.patch @@ -1,8 +1,18 @@ +From f2c5695f17ec59f4badd374daabccf362bbd5f24 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 26 Apr 2023 05:17:22 +0000 +Subject: [PATCH 13/14] configure no libcrypt + +--- + configure | 3 +++ + configure.ac | 3 +++ + 2 files changed, 6 insertions(+) + diff --git a/configure b/configure -index 15c7c54b0953..70f28b0c7064 100755 +index bad619963a..c443360280 100755 --- a/configure +++ b/configure -@@ -13227,6 +13227,8 @@ done +@@ -13239,6 +13239,8 @@ done # We search for both crypt and crypt_r as one or the other may be defined # This gets us our -lcrypt in LIBS when required on the target platform. @@ -11,7 +21,7 @@ index 15c7c54b0953..70f28b0c7064 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 $as_echo_n "checking for library containing crypt... " >&6; } if ${ac_cv_search_crypt+:} false; then : -@@ -13368,6 +13370,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +@@ -13380,6 +13382,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -20,10 +30,10 @@ index 15c7c54b0953..70f28b0c7064 100755 for ac_func in clock_gettime do : diff --git a/configure.ac b/configure.ac -index 6c65b2914bf6..afdc68363cea 100644 +index cc69015b10..a6c72c1014 100644 --- a/configure.ac +++ b/configure.ac -@@ -4085,6 +4085,8 @@ AC_CHECK_FUNCS(setpgrp, +@@ -4056,6 +4056,8 @@ AC_CHECK_FUNCS(setpgrp, # We search for both crypt and crypt_r as one or the other may be defined # This gets us our -lcrypt in LIBS when required on the target platform. @@ -32,7 +42,7 @@ index 6c65b2914bf6..afdc68363cea 100644 AC_SEARCH_LIBS(crypt, crypt) AC_SEARCH_LIBS(crypt_r, crypt) -@@ -4099,6 +4101,7 @@ char *r = crypt_r("", "", &d); +@@ -4070,6 +4072,7 @@ char *r = crypt_r("", "", &d); [AC_DEFINE(HAVE_CRYPT_R, 1, [Define if you have the crypt_r() function.])], []) ) @@ -40,3 +50,6 @@ index 6c65b2914bf6..afdc68363cea 100644 AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ +-- +2.25.1 + diff --git a/ports/python3/0014-fix-get-python-inc-output.patch b/ports/python3/0014-fix-get-python-inc-output.patch new file mode 100644 index 00000000000000..a20d2673ac1949 --- /dev/null +++ b/ports/python3/0014-fix-get-python-inc-output.patch @@ -0,0 +1,44 @@ +From b6ffa6e7a0f7a013fb111e618a7f7e2c58e9d548 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 26 Apr 2023 05:17:44 +0000 +Subject: [PATCH 14/14] fix get python inc output + +--- + Lib/distutils/sysconfig.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 3414a761e7..e6ae456ee9 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -45,7 +45,7 @@ + get_makefile_filename, + get_python_version, + ) +- ++from os.path import dirname + # This is better than + # from sysconfig import _CONFIG_VARS as _config_vars + # because it makes sure that the global dictionary is initialized +@@ -292,6 +292,7 @@ def get_python_inc(plat_specific=0, prefix=None): + incdir = os.path.join(get_config_var('srcdir'), 'Include') + return os.path.normpath(incdir) + python_dir = 'python' + get_python_version() + build_flags ++ prefix = dirname(dirname(BASE_PREFIX)) + return os.path.join(prefix, "include", python_dir) + elif os.name == "nt": + if python_build: +@@ -299,7 +300,9 @@ def get_python_inc(plat_specific=0, prefix=None): + # pyconfig.h + return (os.path.join(prefix, "include") + os.path.pathsep + + os.path.join(prefix, "PC")) +- return os.path.join(prefix, "include") ++ python_dir = 'python' + get_python_version() + build_flags ++ prefix = dirname(dirname(BASE_PREFIX)) ++ return os.path.join(prefix, "include", python_dir) + else: + raise DistutilsPlatformError( + "I don't know where Python installs its C header files " +-- +2.25.1 + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 14248aaaa705a5..bc07fbdea13f9f 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,6 +18,7 @@ set(PATCHES 0010-dont-skip-rpath.patch 0012-force-disable-curses.patch 0013-configure-no-libcrypt.patch # https://github.com/python/cpython/pull/28881 + 0014-fix-get-python-inc-output.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index a45ff7f8fdb60f..41d65148f7aed9 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.10.7", - "port-version": 5, + "port-version": 6, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 9d8a91c269d261..599801eaeaeed7 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -19,6 +19,8 @@ vcpkg_from_github( 0003-Define-NOMINMAX-for-botan-plugin-with-MSVC.patch ) +vcpkg_find_acquire_program(PKGCONFIG) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca) set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca) @@ -62,6 +64,7 @@ vcpkg_cmake_configure( -DQCA_SUFFIX=OFF -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features -DOSX_FRAMEWORK=OFF + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" OPTIONS_DEBUG -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG} OPTIONS_RELEASE diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index ed3534d2e51cb3..dde4c6dcd4a54d 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qca", "version": "2.3.5", - "port-version": 1, + "port-version": 2, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://userbase.kde.org/QCA", "dependencies": [ @@ -29,11 +29,7 @@ "botan": { "description": "Build with botan", "dependencies": [ - "botan", - { - "name": "pkgconf", - "host": true - } + "botan" ] } } diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch deleted file mode 100644 index 106ba1c8e66508..00000000000000 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 49cd799..6535465 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -54,7 +54,7 @@ if (UNIX AND NOT APPLE) - set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS}) - set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS}) - endif() --if(BUILD_STATIC) -+if(NOT BUILD_SHARED_LIBS) - add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS}) - target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) - else() diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index ae300ba026f247..2f404860a994a0 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF d5fefaa35fb53e299b7f39b0d8f541954c710d94 - SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22 + REF "${VERSION}" + SHA512 d7b1501cd8d15aead7eca38172f3335d5a5f3165f948658df09016b773a870f024d16bf472ed7a65cb178408177a6af9db647892942818e53d044f67648e3435 HEAD_REF master PATCHES - config_changes.patch qt.patch ) @@ -23,19 +21,19 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DADS_VERSION=${VERSION} -DQT_VERSION_MAJOR=6 - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE -DBUILD_STATIC=${BUILD_STATIC} - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_Qt5 ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "qtadvanceddocking" CONFIG_PATH "lib/cmake/qtadvanceddocking") +vcpkg_cmake_config_fixup(PACKAGE_NAME "qt6advanceddocking" CONFIG_PATH "lib/cmake/qt6advanceddocking") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/qt6advanceddocking/qt6advanceddockingConfig.cmake" +"include(CMakeFindDependencyMacro)" +[[include(CMakeFindDependencyMacro) +find_dependency(Qt6 COMPONENTS Core Gui Widgets)]]) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/license") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/license") file(INSTALL "${SOURCE_PATH}/gnu-lgpl-v2.1.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/qt-advanced-docking-system/qt.patch b/ports/qt-advanced-docking-system/qt.patch index 08d5062ea14b19..29643835b14ab4 100644 --- a/ports/qt-advanced-docking-system/qt.patch +++ b/ports/qt-advanced-docking-system/qt.patch @@ -1,11 +1,11 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 653546544..2091bce16 100644 +index 2ec56aa..054ea73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.5) project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT}) -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) - find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED) if (UNIX AND NOT APPLE) include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS}) diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json index 4ce52db41dc703..50ec23d894ec26 100644 --- a/ports/qt-advanced-docking-system/vcpkg.json +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt-advanced-docking-system", - "version": "3.8.2", - "port-version": 2, + "version": "4.0.3", "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", "license": "LGPL-2.1-only", diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 81b4169543e262..4f8ed2aaac160e 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, @@ -182,10 +182,7 @@ }, { "name": "qtwebview", - "default-features": false, - "features": [ - "qml" - ] + "default-features": false }, { "name": "qtwebview", diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index 40ed73730f1419..d97b1694edbfe3 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 38be8612d9f4d0..7528557f389e01 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index 98fd62f866f285..cb3e6eb5ed387e 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 ActiveQt Module - ActiveX components", "license": null, "supports": "windows", diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index ccfd3980443360..6c2d9fb38bdc47 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 androidextras Module;", "license": null, "supports": "android", diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index ef2838ad377ce1..bb3409c25a285d 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,53 +1,53 @@ # 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 8) +set(QT_PATCH_VER 9) 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-3d 3b7b9e2009c9cb9a8c1246651d7c2446bdc4ef73abea9199204fde64575ddbe4dbbab599c030347b26ef1600f354e0d940abb946c952968ca19b26b25bf580b6) -set(QT_HASH_qt5-activeqt 018a2dbaccb23e9f5ecb8f5cdf42a34199a54bbb70d4857f4cf875854460bc6a0150adbb5681f1305ba95f1809918038d2346d1acc980cb0f8522a68019538e7) -set(QT_HASH_qt5-androidextras 46874ad3f12b33d603af3e7c4a17837835213c9ef4a0a9da00305124bfa1eeee669e02ff0a74ee72b44edd8b903e2043803df0d2892c2d28fcd381ce6d13f8e4) -set(QT_HASH_qt5-base 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce) -set(QT_HASH_qt5-charts 1c57e2f92d33c038ddf17fa5f8863b474f229fb2d8f2eb16e8f48455c98b3f500d3a7d73423c0512b6c44ad33227fac3fca624bfcdbc4bbcf64da54f79b4ac7b) -set(QT_HASH_qt5-connectivity d600e7b600a8cc204333b69bbbd37bc6f4d578bf50406a705c9bc9b04a0399461c8cc8e3bf89a8e0a8820897e9d586d77543570de6229a0cfed312b422b9fda6) -set(QT_HASH_qt5-datavis3d 607359e2489ed33b12f56ace2aedef71e1342d88835d4f81346008f180c8ee74d3f2897e812b7bc9ac6c586908a9ee426d61e226c4faab3baa9d162a604665cc) -set(QT_HASH_qt5-declarative c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73) -set(QT_HASH_qt5-doc 1e24ab1e8813928cc5240740d2a979a1194ea125ca45fb3b11154f750cc6cc3f3c9c5977f5cacbca1bec3cdee527ebf1d93b02adde5d0f604a3252903f083220) -set(QT_HASH_qt5-gamepad f1002906dd53f4c6108b1a7965454e9d30f433b954f90218927b943eb65a63a280f00eea78d21847f91789923e3211a7b8aa599c32157873d1f42153d2e309db) -set(QT_HASH_qt5-graphicaleffects bac9d18492b7ce0092ae9e3b27bcbc2fa421531eb76b3f4c69d20eeaa0520201eca850a2cc692c38f00b8efb24015cd28f53bd892b350e3c1d1337003b399c28) -set(QT_HASH_qt5-imageformats e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd) -set(QT_HASH_qt5-location a337fade917150c13fa2ea22ad1949f41541cea4ceb1f732ab53c20c2f19a63dcfc6f9f544ca64fdb5703d3ac8d2ec6e832f1f199a32e73a2f6c51febf53f514) -set(QT_HASH_qt5-macextras f79f337fa2555a472560cc71748a6b3c52c406704c71795f59ee6e1e2c777bb7dd9e68461e923e9953439a052a8547f2f5a85b4dcb58c850f93a22a80faacb2d) -set(QT_HASH_qt5-mqtt c0dd94fbdda9f031bdde89ccfe7ec4b306a8c96740f523d9807a7f1af951635f65b851b0f0dfe260bc21ca77fd2b47042218d6fa73695e509ea020b438867e69) -set(QT_HASH_qt5-multimedia d448a612845e0afb896d6d0292506a8fae7da0b735ee4d139ab69123c93e67723aa41280dea7e704df89e43b849e7f6da3eeea1de94eee167b43d7c35a1a39cd) -set(QT_HASH_qt5-networkauth 1680d6ec84b2fba24c837ff808c5b9e13b73a84c7353f6d533e10986f23f879e0d3ce9cc4ce84000b4cfbd5904e12d975210977f5376b070075c2ec814eb2baf) -set(QT_HASH_qt5-purchasing 9bff75d85b331211cdc74405c01dfb4bdd142015ea66f8292bbefa140c0a6268509ed2c635f440779e78a6433994908ef5d50a74270a5377d9a37286de278953) -set(QT_HASH_qt5-quickcontrols 4b93b1cc69f455bc0e3e06e9702a25791f1dcd9f3b5454ce791ab66cbc5a9ad2f3a91cf664bc2e66369c64d8d52555a02262bc8333866f1d5ff9335de1ea4040) -set(QT_HASH_qt5-quickcontrols2 d42fd70f1d9d1d951e5a8eee886311bf70f0c9b21718b3b76b87ee38fee010c654abc82259e73883c9aca36dafcefb25e5297bf34213cafe4da6a68c4f45d816) -set(QT_HASH_qt5-remoteobjects a6610df5da8811f0cc19a24759b84fcf84f19e6dbba8e3d45e1edefad1eef750fd56b0fe95992385790207b09f7a0cfe94eec13eddb6ae2c13b5305789f01bc7) -set(QT_HASH_qt5-script 977bb6d134c499e010d96383fd2e81c10c2864af305770353b378af1eb81debe6bd4cfa304b296ce100af87155066ce7a09b68d83c74de6e4113e2b01a1c5638) -set(QT_HASH_qt5-scxml f1e560e3091eb60b70e5b7ab187511708d16c1b2e8a0c1a6d7a95358eb3ed998bdf0e57b7855e38a773509805790603e3e8e64627f52f05f305d8a29108db9f2) -set(QT_HASH_qt5-sensors 333bc05dd3bf4ba8ca4069279bf5e73f59475dd0d6e0411f16dc796f4cceb4354a7730be931ad868ef7052ebf8e36e151155dbe6576e9f33a38494bb589611d9) -set(QT_HASH_qt5-serialbus 7877834f775d98464a5a220348ba395b91d6c4ce0cb794f2cd56d0878e8a7a36a1aff69abbcaa231a4ee42950b2b9db9db578d27dacaa48382522b0dd9bbe88a) -set(QT_HASH_qt5-serialport 974ae97ec9bdbb4bcecc80a07c343efe4ed686c968810e76fb0e4cd62165949c30d57a37035ac08916850cc2d207fabc0aa09e593184e65fc6d74b36bfbdc444) -set(QT_HASH_qt5-speech 01b625f44ea0ce799ab338f76ca17701025f288b0e83d8d36f5ad0f8b1fd505bb3fa109ace6942c19b0d5734e01aae1c69b28f7da98f986066dcd0ae0d175cee) -set(QT_HASH_qt5-svg a110a815e7399fc96b0197b96e9c6dec289b9a2c38393711ccfc536c087791009f8452e222f9364b5b133930fa4dea77d7bea2f250511c0511a1a76aa511dcda) -set(QT_HASH_qt5-tools 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f) -set(QT_HASH_qt5-translations 384767c1726db54935c982452b03002e209f4b090b3374c725617a3f5f3af70e8d895b7826039fa04f537fd4e0491a143190fb580298c74edaad0d72b8545917) -set(QT_HASH_qt5-virtualkeyboard b2f4dddf67556d5d83ee5d0587909ebc745daa9b161b2a12e7e2135b37229b35c7ee2e3a30296f805e5e83648828c973aa2e62e130f2bac739fd228cea38a327) -set(QT_HASH_qt5-wayland 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d) -set(QT_HASH_qt5-webchannel d607b74f6f433be874e42808259fdc6fa69e1ec754544e1f7d614b6a65ed266cdba76e0a7cd535d65045bc708045c8757c1b3826c7885bc08a787458b60ae1cc) -set(QT_HASH_qt5-webengine 2c4df48de31cb93a77ba9a5119bc57749ba0509f25348d16f97111c446f122d336e5a03f580c9371a487992f3c98190c622bb7ae314b26fbdfdf27a535504dd9) -set(QT_HASH_qt5-webglplugin 1d23543b439e5aa2c1356d7ee1023bfb11c868289c156fe8e81fb8c94358f42649ea11766029feaea9f107ad592fb0a4e7881e108a5cea5691efbbccf59470b6) -set(QT_HASH_qt5-websockets d44f8beab7536882cb4c8b9250a9e39a274b549b0ff6ea003f16c614a9e5f1bef7d0526acacd3d4382dea9ddc86be1631903df72a605b4cde06aa109320fe05f) -set(QT_HASH_qt5-webview 1afa2c5b7e4a0f422986ac982345d398af9cf468c2e8690205e5d7a820b0eb8c44e4a6d711735d039a05c44c1c6c4f41faf7bfe4cb2bbbd248b278a3e6c72cb5) -set(QT_HASH_qt5-winextras c6e230913e255b81fd199448df7a1131e54e3d172703ec88c304f0c22ee58c0780dd1b3a6da87864a3abc465c8e747f12c2cea81ceb572d0222026b50c0bfa5e) -set(QT_HASH_qt5-x11extras a7b2cd611ec863b43cbf16a09868a9543b4dfc3c40b21c23317a3520345a9464e2ad34f884f3619fa67fdf563bc2d1a8b31d97d063766a8988454ee4a8c8e1fd) -set(QT_HASH_qt5-xmlpatterns 150a1425b763d42d8fa8f06a520ed5280ac6d7874e5ef0b617bd5a452ea1899d96909a4d04bae030256f7acc8a76f6f434a7aafd0a0756abf3f1534ef4a0a0b6) +set(QT_HASH_qt5-3d 4c88af3855c22ab6dd17fca835eabc0facec446e254b329f76b7c61002bc4b47e7029aba6336e47b89c30c2dd50090e925042af8199f1fbb1f65558784cdc9ce) +set(QT_HASH_qt5-activeqt b4d728bc1a28a15c3fc14d40a6dd2801c898d17a9c18c773b794abb629432efd6888cb56517a8fac0764eeacc436040d4406e05f322a43b84fafa036c2ba5d2c) +set(QT_HASH_qt5-androidextras 9ca134cafaa5fc84a15781bf85fa69aaa47ea4b21099c35da842743c9781417fc7cda06f0dd3f9f8d25ae710bcbe40917a4723428809c03054801dd932be7d31) +set(QT_HASH_qt5-base 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3) +set(QT_HASH_qt5-charts b8b4390121780c4a562eaa563920a38637930a473e5b8e10fbb485c80c9a049825c73ff1c1786a869bc9603bb03d74b6d666064e6f98006edc5dba366c25f316) +set(QT_HASH_qt5-connectivity e47621e95aa4ca8438787c4333fdaec6aef828372eb73029836256c03eb6c0faed41f89ab928d28cf1113ca53c8a94d69d07bd1dc06fa90272f0286244b49fde) +set(QT_HASH_qt5-datavis3d 154d7253c69c32a76b12200b25d6edaa0c671d5293abdcf09972c1525f366279a02fec7f9b6e73fb98d0d9919b3635cb3e9c32b54c43f056ecf06ba27b44459d) +set(QT_HASH_qt5-declarative ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7) +set(QT_HASH_qt5-doc 05bcfdb39bd55d5b9741413c3cef601743f7b2cbca716b87b2655cc5e60c273ad58831572c7215b2f41258d2c92ab07348d5adfb1b10b5720b917891bee7bcc1) +set(QT_HASH_qt5-gamepad f6ee08fc3872b078fb64e63a074b0230674dd670cf087b864c16ec3ecdbf374374257eb18aeae1e8e2c16850fddb3f4fef99efc4ddd597ab66b2a9fc8158cb93) +set(QT_HASH_qt5-graphicaleffects ea9a9cf069ab5df82ac29842f093ef4b795ccd6a4bb7ca3c0ff538bfe2ed6473e24a7b8e7b9c28cf8ad7550b2314515567e5f53b7d913ae96593f0b2cdbad2b8) +set(QT_HASH_qt5-imageformats 9713c781200c8abb1a6f1a2dfb851fc38dcb2428ca3dbf29aa392d938671978804a67587bbbc5a5f75703cc754da4673dd9a4b567c9c03ed61d329889156c437) +set(QT_HASH_qt5-location 37517c304240921c600e2aad19baff0efbb5e01c5cc78e5370fb4b084f2a6ba4da94d39ddcbcd33a5f0af37f017d39bb775a40cda195e16697aa70c9d17b6bcf) +set(QT_HASH_qt5-macextras 14a42b108d2afa1d95fb42a2b87be3f25da0b2a3ac8b004eb31e2c634943b5ffb6db0de37d6df734080977ef80f3601e283dd5727ef7cc61f247714ac9095299) +set(QT_HASH_qt5-mqtt 9d77abfc15754f09d74c08f97e1b3eb43cce7bbb6b5da7e3c385741e62b93a8761b084d314edf332a18901b7ce312bd896428951191caf62208ba533adbca0af) +set(QT_HASH_qt5-multimedia f167e7910c19a55858a4b8e53c293908ef50e8a299b5dc6a346c2c877b4f65aa6da17807ec3f297530515b4558c74e97d54d6013c27400c1c4964c7c4dbef6cd) +set(QT_HASH_qt5-networkauth 9857f0e368e0c2bb4dfa772653a17cd34754e95ae64414f70ca78c1ec3a38ac850c462db9aa5fee4ee9143cd2fe0a5485fc0948cc3459a4842e221ab08356356) +set(QT_HASH_qt5-purchasing 771a9e9100cd6b8bd872e05def2eefe942a5bcb3832e61e3251c38100fcbdaaa6aac543c5c70b82379bd4d888a71ae0feac22765245ca169ee34a41af4b05b84) +set(QT_HASH_qt5-quickcontrols 62c732414aa3660ae6c702a533e3ed090a293a6ecfc0bcc75b54d3dc9e0ecb657002e3f840107a07a1d749938148c0e63cd9f1021831f6c44ab133f9780b9c88) +set(QT_HASH_qt5-quickcontrols2 f77a59cb6704438bc7b81f816454dad56bebdf4ce7f015c21a05b09f0c508525750a0cf232da8d7428464aa68de9a2bcbd000906fa781aff1e60e8ee5d70802e) +set(QT_HASH_qt5-remoteobjects 1ab0bf1ec6d251f0b4b406380c2870c21c4fbd47868b212efc46546d7059831aebba32caf85de6a51c96edc6bb40c3fdc2b3b7b733f2501e1ccb4c04ab0197fc) +set(QT_HASH_qt5-script 83a69b3f428fe8322c4ff5bf96736f8e76c0825b06742ef000c22bd0c71598c648b03481f40d86d5233d74096b34c5158a576731a06f12e01b680fd42e31c602) +set(QT_HASH_qt5-scxml f6c6bdcb651055fd3a9b18fae1860f0d72afe83a08b387cb1393d0b1966eaaf1d8ce4530e6faa3a4e4a18d97a8e36937303b99e29d7dba17b6bcda61a5eb9872) +set(QT_HASH_qt5-sensors beba10a61e6d9f31dc9f24826b4a01b48fa656d424a97164c59d7be9a9e063f1b0820f95c157651ca0cac60d6f9aa188b90a122be565bcb488e7f0e42887140d) +set(QT_HASH_qt5-serialbus f044929a2a4e8401fbd84a3e160f070c7af75bf6dd44e7353160ed30bb453853c0d8b421e03b73309d249dc149ef19192721f8152881ddc37f0be2e410884cfe) +set(QT_HASH_qt5-serialport e22d20a0b20d0dc8c6bce3dcf1137b2cce28e370df9d0250f2a777dd73153d0156b0c6cfe88bc4257cdc209fbf640c8a06fada147d40ee638deb716148812da3) +set(QT_HASH_qt5-speech c614798cca4485d9880fe8bc19df563b29673f8fc111ce8129e8e1a8f1c8f769f76c9a7754e8cde43e7223ef7fed899bff9e91bcebe113281eb44f39aa7bfe4a) +set(QT_HASH_qt5-svg e091c059492662fad713d1f99bfa5e21a8f8e77e24b067d176a6e732b420a22e3777fa99a880c6f992a19b2e5b16c01f131da875d9e08e6a515108b468192fe5) +set(QT_HASH_qt5-tools ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067) +set(QT_HASH_qt5-translations 58168e68529bd84f363d5c46182be45f5ef143e44c6878326a2d05ada7b70adc812c8d024ca8650ac52a1e2d6dc22788b57d4f5527de7d8619d34ebbba71165b) +set(QT_HASH_qt5-virtualkeyboard d9169a5d5b09d8854ce6b402a7333e8a561272aeb05ffb3a8055ea6e9a18b2d79ac404c85d57e4b78db0c6ef61352e2d7fddd8c510ff1cdaaa6665a9a20fd96e) +set(QT_HASH_qt5-wayland d108d63ceeb3b1a8905ad7f53a7271fca6a3506679d352b7290cdf8c00e1c180b6c561ee013a674002b89e23f58cfb7b909dfc5a8fdec6cece7e0a782be77978) +set(QT_HASH_qt5-webchannel 6b9c38c3d22708a14402282d4134475336cce2874887ece00316866cbc59714e395924cc9a449653ab050431c4ece5e0eb454ce2f4c13252bae7abd8fae93bb4) +set(QT_HASH_qt5-webengine 7142ac2e59e4aa2bedbe35e6242c1359fc9c51bd7db9f31d89f01dc2843f38bf7f80869e603a57190791a97aef9ba1064eb0f90cf09e5293f61f250c455cb07a) +set(QT_HASH_qt5-webglplugin 647832ee6351c0fec45eaf5b737aaac74f7c76bc72126faa49f67523b1e0ef965209842de5b4e3256f8df30999bb7d67160e5181d9f3df1d6d7dbb3ac8502dc7) +set(QT_HASH_qt5-websockets 3e9b63656c16893a67d62f452c70decfca160ab192b3da2f25f3f72e513a58e3ec678ad05e618d1e48c05708f55d38ca02d4b1f3efdbea5e544f5cec16f6a5ac) +set(QT_HASH_qt5-webview 15d9b7f446d5b579e596b8e7766fc24380d5f92547186a4de08708f40c1847e690c679312130518470a40a86baea686a38a2a0c237affd13bdc5302e3c313c6f) +set(QT_HASH_qt5-winextras 249fa333d2e0eb38417af40740bd7721aec9eb706e0c98ab43589ca892679689201e4ba9e89586b5c388126a57cb84965932cd113a6c4e638fe10a4f5ff9ddbb) +set(QT_HASH_qt5-x11extras 695e23626f1d3b51fa4d20d0845be749581b0cdf3633598f457cfac4d790e3d52881f5e51e35a95d42f481a73ddc7d50a22d562c65a0bca2a9e586615ab6ec7b) +set(QT_HASH_qt5-xmlpatterns 60cdee139c04dbd2c381f65fcd579af0b2b6f40234870a782c8b7342c8d0caf92fef94acb959260e4ef615b2c60b5527cd44b8efa85f04ceb4a3659a47a0ee89) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff new file mode 100644 index 00000000000000..eec93f03362ac4 --- /dev/null +++ b/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff @@ -0,0 +1,13 @@ +--- a/src/network/access/qhsts.cpp ++++ b/src/network/access/qhsts.cpp +@@ -364,8 +364,8 @@ quoted-pair = "\" CHAR + bool QHstsHeaderParser::parse(const QList> &headers) + { + for (const auto &h : headers) { +- // We use '==' since header name was already 'trimmed' for us: +- if (h.first == "Strict-Transport-Security") { ++ // We compare directly because header name was already 'trimmed' for us: ++ if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) { + header = h.second; + // RFC6797, 8.1: + // diff --git a/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff new file mode 100644 index 00000000000000..a19d76948fa158 --- /dev/null +++ b/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff @@ -0,0 +1,45 @@ +--- a/src/gui/painting/qfixed_p.h ++++ b/src/gui/painting/qfixed_p.h +@@ -54,6 +54,7 @@ + #include + #include "QtCore/qdebug.h" + #include "QtCore/qpoint.h" ++#include + #include "QtCore/qsize.h" + + QT_BEGIN_NAMESPACE +@@ -182,6 +183,14 @@ Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return i * 64 < + Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > i * 64; } + Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return i * 64 > f.value(); } + ++inline bool qAddOverflow(QFixed v1, QFixed v2, QFixed *r) ++{ ++ int val; ++ bool result = add_overflow(v1.value(), v2.value(), &val); ++ r->setValue(val); ++ return result; ++} ++ + #ifndef QT_NO_DEBUG_STREAM + inline QDebug &operator<<(QDebug &dbg, const QFixed &f) + { return dbg << f.toReal(); } +--- a/src/gui/text/qtextlayout.cpp ++++ b/src/gui/text/qtextlayout.cpp +@@ -2163,11 +2163,14 @@ found: + eng->maxWidth = qMax(eng->maxWidth, line.textWidth); + } else { + eng->minWidth = qMax(eng->minWidth, lbh.minw); +- eng->maxWidth += line.textWidth; ++ if (qAddOverflow(eng->maxWidth, line.textWidth, &eng->maxWidth)) ++ eng->maxWidth = QFIXED_MAX; + } + +- if (line.textWidth > 0 && item < eng->layoutData->items.size()) +- eng->maxWidth += lbh.spaceData.textWidth; ++ if (line.textWidth > 0 && item < eng->layoutData->items.size()) { ++ if (qAddOverflow(eng->maxWidth, lbh.spaceData.textWidth, &eng->maxWidth)) ++ eng->maxWidth = QFIXED_MAX; ++ } + + line.textWidth += trailingSpace; + if (lbh.spaceData.length) { diff --git a/ports/qt5-base/patches/qtbug_96392.patch b/ports/qt5-base/patches/qtbug_96392.patch new file mode 100644 index 00000000000000..2f70dfe601a0f6 --- /dev/null +++ b/ports/qt5-base/patches/qtbug_96392.patch @@ -0,0 +1,27 @@ +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -842,7 +842,8 @@ "// Check if EGL is compatible with X. Some EGL implementations, typically on", + "// embedded devices, are not intended to be used together with X. EGL support", + "// has to be disabled in plugins like xcb in this case since the native display,", + "// window and pixmap types will be different than what an X-based platform", +- "// plugin would expect." ++ "// plugin would expect.", ++ "#define USE_X11" + ], + "include": [ "EGL/egl.h", "X11/Xlib.h" ], + "main": [ +--- a/src/platformsupport/eglconvenience/qt_egl_p.h ++++ b/src/platformsupport/eglconvenience/qt_egl_p.h +@@ -61,7 +61,11 @@ # endif + # if !defined(Q_OS_INTEGRITY) + # define WIN_INTERFACE_CUSTOM // NV + # endif // Q_OS_INTEGRITY +-#endif // QT_EGL_NO_X11 ++#else // QT_EGL_NO_X11 ++// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130 ++// that needs USE_X11 to be defined. ++# define USE_X11 ++#endif + + #ifdef QT_EGL_WAYLAND + # define WAYLAND // NV diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b92543eab51a6d..94923ba74692ce 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_buildpath_length_warning(37) -if (VCPKG_TARGET_IS_LINUX) - message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html") - message(WARNING -[[ -qt5-base for qt5-x11extras requires several libraries from the system package manager. Please refer to - https://github.com/microsoft/vcpkg/blob/master/scripts/azure-pipelines/linux/provision-image.sh - for a complete list of them. -]] +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "qt5-base currently requires some packages from the system package manager. " + "They can be installed on Ubuntu systems via " + "sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libgl1-mesa-dev libxrender-dev " + "libxi-dev libxkbcommon-dev libxkbcommon-x11-dev. For more information, see " + "https://doc.qt.io/qt-5/linux.html and https://doc.qt.io/qt-5/linux-requirements.html" ) elseif(VCPKG_TARGET_IS_MINGW AND CMAKE_HOST_WIN32) find_program(MINGW32_MAKE mingw32-make PATHS ENV PATH NO_DEFAULT_PATH REQUIRED) @@ -48,12 +46,17 @@ endif() qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH PATCHES + # CVE fixes from https://download.qt.io/official_releases/qt/5.15/ + patches/CVE-2023-32762-qtbase-5.15.diff + patches/CVE-2023-32763-qtbase-5.15.diff + patches/winmain_pro.patch #Moves qtmain to manual-link patches/windows_prf.patch #fixes the qtmain dependency due to the above move patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only patches/egl.patch #Fix egl detection logic. + patches/qtbug_96392.patch #Backport fix for QTBUG-96392 patches/mysql_plugin_include.patch #Fix include path of mysql plugin patches/mysql-configure.patch #Fix mysql project patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 @@ -267,9 +270,6 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() elseif(VCPKG_TARGET_IS_LINUX) list(APPEND CORE_OPTIONS -fontconfig -xcb-xlib -xcb -linuxfb) - if (NOT EXISTS "/usr/include/GL/glu.h") - message(FATAL_ERROR "qt5 requires libgl1-mesa-dev and libglu1-mesa-dev, please use your distribution's package manager to install them.\nExample: \"apt-get install libgl1-mesa-dev libglu1-mesa-dev\"") - endif() list(APPEND RELEASE_OPTIONS "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread" "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}" diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 8d599946a12b9d..0ea26af9e08924 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", - "version": "5.15.8", - "port-version": 5, + "version": "5.15.9", + "port-version": 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, diff --git a/ports/qt5-canvas3d/vcpkg.json b/ports/qt5-canvas3d/vcpkg.json index f26c201b8e2fcc..9b66bfbaffd21b 100644 --- a/ports/qt5-canvas3d/vcpkg.json +++ b/ports/qt5-canvas3d/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-canvas3d", - "version-string": "0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "Qt5 Canvas 3d Module;", "dependencies": [ { diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index f53252cd6e629f..11b513e885252e 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", "license": null, "dependencies": [ diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index 37bd4a126366e6..acad64bd0d641c 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index 7d8b342381fe2f..eb075aab45b313 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", "license": null, "dependencies": [ diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index b813567f98ec1b..7ab4aeb3578b24 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -1,5 +1,12 @@ -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH) +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") + +if("d3d12" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -d3d12) +else() + list(APPEND CORE_OPTIONS -no-d3d12) +endif() + +qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH BUILD_OPTIONS ${CORE_OPTIONS}) if(NOT QT_UPDATE_VERSION) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index 8e16645972d4d1..ef52ef3c70241c 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-declarative", - "version": "5.15.8", + "version": "5.15.9", + "port-version": 1, "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "license": null, "dependencies": [ @@ -10,5 +11,26 @@ }, "qt5-imageformats", "qt5-svg" - ] + ], + "default-features": [ + "platform-default-features" + ], + "features": { + "d3d12": { + "description": "Provides a Direct3D 12 backend for the scenegraph.", + "supports": "windows" + }, + "platform-default-features": { + "description": "Enable platform-dependent default features", + "dependencies": [ + { + "name": "qt5-declarative", + "features": [ + "d3d12" + ], + "platform": "windows" + } + ] + } + } } diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index e4890bc98fcb4d..01e63806a15a5f 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 8e4e26e9d6bfc5..4713ad14aa9286 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index ef93d37fbe997b..9594e1f23aadf7 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index d82fc421793d2a..fd97931e4b5eb7 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -1,47 +1,49 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") list(APPEND CORE_OPTIONS - -system-tiff - -system-webp - -jasper -no-mng # must be explicitly disabled to not automatically pick up mng - -verbose) - -x_vcpkg_pkgconfig_get_modules(PREFIX tiff MODULES libtiff-4 LIBS) + -verbose +) -find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(JPEG_DEBUG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if("jasper" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -jasper) -find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + x_vcpkg_pkgconfig_get_modules(PREFIX jasper MODULES jasper LIBS) -if(NOT VCPKG_TARGET_IS_OSX AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) - set(FREEGLUT_NEEDED ON) -endif() + file(READ "${CURRENT_INSTALLED_DIR}/share/jasper/vcpkg_abi_info.txt" jasper_abi_info) + if(jasper_abi_info MATCHES "(^|;)opengl(;|$)") + find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + endif() -if(FREEGLUT_NEEDED) - find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + list(APPEND OPT_REL "JASPER_LIBS=${jasper_LIBS_RELEASE} ${FREEGLUT_RELEASE}") + list(APPEND OPT_DBG "JASPER_LIBS=${jasper_LIBS_DEBUG} ${FREEGLUT_DEBUG}") +else() + list(APPEND CORE_OPTIONS -no-jasper) endif() -x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS) - -set(OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}" - "WEBP_LIBS=${webp_LIBS_RELEASE}" - "JASPER_LIBS=${JASPER_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies -set(OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}" - "WEBP_LIBS=${webp_LIBS_DEBUG}" - "JASPER_LIBS=${JASPER_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") +if("tiff" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -system-tiff) -if(FREEGLUT_NEEDED) - set(OPT_REL "${OPT_REL} ${FREEGLUT_RELEASE}") - set(OPT_DBG "${OPT_DBG} ${FREEGLUT_DEBUG}") + x_vcpkg_pkgconfig_get_modules(PREFIX tiff MODULES libtiff-4 LIBS) + list(APPEND OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}") + list(APPEND OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}") +else() + list(APPEND CORE_OPTIONS -no-tiff) endif() -list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] +if("webp" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -system-webp) + + x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS) + list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] + # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies + list(APPEND OPT_REL "WEBP_LIBS=${webp_LIBS_RELEASE}") + list(APPEND OPT_DBG "WEBP_LIBS=${webp_LIBS_DEBUG}") +else() + list(APPEND CORE_OPTIONS -no-webp) +endif() -qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) \ No newline at end of file +qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index f02fc3610e4091..16df8c3290a116 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,20 +1,52 @@ { "name": "qt5-imageformats", - "version": "5.15.8", + "version": "5.15.9", "port-version": 1, "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ - "jasper", - "libwebp", { "name": "qt5-base", "default-features": false - }, + } + ], + "default-features": [ "tiff", - { - "name": "vcpkg-pkgconfig-get-modules", - "host": true + "webp" + ], + "features": { + "jasper": { + "description": "Enable JPEG-2000 support using the JasPer library", + "dependencies": [ + { + "name": "jasper", + "default-features": false + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] + }, + "tiff": { + "description": "Enable TIFF support", + "dependencies": [ + "tiff", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] + }, + "webp": { + "description": "Enable WEBP support", + "dependencies": [ + "libwebp", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] } - ] + } } diff --git a/ports/qt5-location/missing-include.patch b/ports/qt5-location/missing-include.patch new file mode 100644 index 00000000000000..8d2b5b33c50116 --- /dev/null +++ b/ports/qt5-location/missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp +index c7dc8b3..0fb25b8 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + namespace mbgl { + namespace util { + diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index c8d591b2da5e63..7c964477e2ce28 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -1,3 +1,3 @@ message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.") include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() +qt_submodule_installation(PATCHES missing-include.patch) diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 9b9eafabb847b9..d6300500d7c04b 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-location", - "version": "5.15.8", + "version": "5.15.9", + "port-version": 1, "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", "license": null, "dependencies": [ diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index 524d4815bcb036..856458fbf9aa62 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", "license": null, "supports": "osx", diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index 3e50c86cd8ace7..7681b47b1cc941 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index 6ec6658c2d45a7..b3c1da79f59c52 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", "license": null, "dependencies": [ diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 73bd06c26be6f6..4b93f4bf695910 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index 1a745e052740da..8d321193ca368c 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index d032323ac54f6e..4444c0ab43a3dc 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index 974fc3939e00af..49626086ff03f9 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 10ea118ef94053..17eb3cd04cea1a 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.8", + "version": "5.15.9", "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": [ diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index 830f115ace9777..2b686cc2845c9d 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index 3c4a886dff8d56..79ebc709aadcdb 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", "license": null, "dependencies": [ diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index 987f6fc608de85..b34ea02dab6ced 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", "license": null, "dependencies": [ diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index 46a810a2423d86..e2ff3418f89df0 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index 5031b80adb9bf8..98b2a3c9b0519c 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", "license": null, "dependencies": [ diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index 92b62825b9a94d..bf26488a78bdad 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff b/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff new file mode 100644 index 00000000000000..8f60fba03ac517 --- /dev/null +++ b/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff @@ -0,0 +1,32 @@ +--- a/src/svg/qsvgfont_p.h ++++ b/src/svg/qsvgfont_p.h +@@ -74,6 +74,7 @@ public: + class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted + { + public: ++ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000; + QSvgFont(qreal horizAdvX); + + void setFamilyName(const QString &name); +@@ -86,9 +87,7 @@ public: + void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const; + public: + QString m_familyName; +- qreal m_unitsPerEm; +- qreal m_ascent; +- qreal m_descent; ++ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM; + qreal m_horizAdvX; + QHash m_glyphs; + }; +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -2668,7 +2668,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent, + + qreal unitsPerEm = toDouble(unitsPerEmStr); + if (!unitsPerEm) +- unitsPerEm = 1000; ++ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM; + + if (!name.isEmpty()) + font->setFamilyName(name); diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index ca67a6846fa234..1f8e4520e78e13 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -1,2 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES "static_svg_link_fix.patch") \ No newline at end of file +qt_submodule_installation( + PATCHES + "CVE-2023-32573-qtsvg-5.15.diff" # CVE fix from https://download.qt.io/official_releases/qt/5.15/ + "static_svg_link_fix.patch" +) diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 1302454f9250f8..003b1fa77f22c8 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-svg", - "version": "5.15.8", + "version": "5.15.9", + "port-version": 1, "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index b9119665df47b4..ba55ae9a5610fc 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", "license": null, "dependencies": [ diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index 681c7e9070b3e6..e0684e721dc725 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index 8ab5d4c036fcc9..ec2a394076f792 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,12 +1,12 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.8", + "version": "5.15.9", + "port-version": 1, "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", - "qt5-quickcontrols", "qt5-svg" ] } diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index fe1e93cfaea100..f3136dffc5abf9 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index 352c9bd2dd1c59..04575ff35e4a05 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.8", + "version": "5.15.9", "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": [ diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index d2c096df96757e..c734aa85b33f23 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.8", - "port-version": 3, + "version": "5.15.9", "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 455734a7995d07..c804008753a343 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Webglplugin Module", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 2424b7e430c3b4..e8cc4ef4e94e52 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", "license": null, "dependencies": [ diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index 4a873d25ef6e77..fd53a15524ab4e 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.8", + "version": "5.15.9", "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": [ diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 98d6d2b67bbe1f..6121f828d70f4f 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", "license": null, "supports": "windows", diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index 13470ffc8b4342..5be1a0e5c72ac5 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.8", - "port-version": 1, + "version": "5.15.9", "description": "Qt5 x11extras Module;", "license": null, "supports": "!windows", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index d01b201f874a4f..7a4a54553d4503 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.8", + "version": "5.15.9", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", "license": null, "dependencies": [ diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index 3d818a24864614..de6acce4c02af5 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5", - "version": "5.15.8", - "port-version": 1, + "version": "5.15.9", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/portfile.cmake b/ports/qt5compat/portfile.cmake index 452cf48be9eedd..d13a078b9417bc 100644 --- a/ports/qt5compat/portfile.cmake +++ b/ports/qt5compat/portfile.cmake @@ -19,7 +19,12 @@ INVERTED_FEATURES #For iconv feature to work the following must be true: #CONDITION NOT FEATURE_icu AND FEATURE_textcodec AND NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND WrapIconv_FOUND -#TODO: check if qtbase was built with ICU and fail if iconv is given here. +if("iconv" IN_LIST FEATURES) + include("${SCRIPT_PATH}/port_status.cmake") + if(qtbase_with_icu) + message(FATAL_ERROR "qtbase was built with ICU. The iconv feature is not compatible with ICU.") + endif() +endif() set(TOOL_NAMES) qt_install_submodule(PATCHES ${${PORT}_PATCHES} diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 9d17a62bd024ca..616651262421fd 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.4.3", + "version": "6.5.1", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index c17be503fee78d..b3281b5663fc8d 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.4.3", + "version": "6.5.1", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/bump-cmake-version.patch b/ports/qtapplicationmanager/bump-cmake-version.patch deleted file mode 100644 index 31b99c71d204ff..00000000000000 --- a/ports/qtapplicationmanager/bump-cmake-version.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2236c0..904c5b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - --cmake_minimum_required(VERSION 3.16) -+cmake_minimum_required(VERSION 3.19) - - include(.cmake.conf) - project(QtApplicationManager # special case diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 2a9e77ca64892f..7280aff8a30572 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -2,7 +2,6 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES - bump-cmake-version.patch wrapper-fixes.patch stack-walker-arm64.patch ) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 03da0c873efbcb..e1cc282637f41a 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/GLIB2-static.patch b/ports/qtbase/GLIB2-static.patch index c384b741cef8b8..5bbcb289da4a03 100644 --- a/ports/qtbase/GLIB2-static.patch +++ b/ports/qtbase/GLIB2-static.patch @@ -73,3 +73,31 @@ index 24a194c..91c8e41 100644 include(FeatureSummary) set_package_properties(GLIB2 PROPERTIES +diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake +index 7d52f48..2b1b221 100644 +--- a/src/corelib/configure.cmake ++++ b/src/corelib/configure.cmake +@@ -25,7 +25,7 @@ endif() + qt_find_package(WrapSystemDoubleConversion + PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion + MODULE_NAME core QMAKE_LIB doubleconversion) +-qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib) ++qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE MODULE_NAME core QMAKE_LIB glib) + qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data + MODULE_NAME core QMAKE_LIB icu) + +diff --git a/src/network/configure.cmake b/src/network/configure.cmake +index aef7f15..21b0c1d 100644 +--- a/src/network/configure.cmake ++++ b/src/network/configure.cmake +@@ -10,8 +10,8 @@ + qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli) + qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy) + qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi) +-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject) +-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio) ++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject) ++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio) + + + #### Tests diff --git a/ports/qtbase/clang-cl_QGADGET_fix.diff b/ports/qtbase/clang-cl_QGADGET_fix.diff index 37bec5f9fccc46..0304bcc47dee87 100644 --- a/ports/qtbase/clang-cl_QGADGET_fix.diff +++ b/ports/qtbase/clang-cl_QGADGET_fix.diff @@ -4,7 +4,7 @@ index e40cd85..ba68a01 100644 +++ b/src/corelib/kernel/qmetatype.h @@ -18,6 +18,7 @@ #endif - #include + #include +#include #include diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch index 6d0a9527e26470..3811da601f3751 100644 --- a/ports/qtbase/clang-cl_source_location.patch +++ b/ports/qtbase/clang-cl_source_location.patch @@ -2,12 +2,12 @@ diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 823b2057b..4a8cd4fa8 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h -@@ -49,8 +49,8 @@ +@@ -16,8 +16,8 @@ #include --#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) -+#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) +-#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) ++#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) && defined(__cpp_consteval) #include #if defined(__cpp_lib_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 7a553973e32e9e..e8d1fb0a367257 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -150,6 +150,7 @@ function(qt_cmake_configure) ${disable_parallel} OPTIONS -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Because Qt doesn't correctly scope find_package calls. #-DQT_HOST_PATH= # For crosscompiling #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc @@ -191,6 +192,16 @@ function(qt_cmake_configure) QT_SYNCQT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE ${_qarg_OPTIONS_MAYBE_UNUSED} + INPUT_bundled_xcb_xinput + INPUT_freetype + INPUT_harfbuzz + INPUT_libjpeg + INPUT_libmd4c + INPUT_libpng + INPUT_opengl + INPUT_openssl + INPUT_xcb + INPUT_xkbcommon ) set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) endfunction() diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index f8796f3f322183..deb11de26462ef 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,50 +1,48 @@ -set(qtbase_HASH "a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43") -set(qttools_HASH "24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382") -set(qtdeclarative_HASH "ba1a477d4e388e93cdbf76c594650b431fbea1212af110fda994fa1ebca0d6cf2dba699c995744deba71bad2a9c45d214b671ddef01a995d7c6c82c61ef82aa2") -set(qtsvg_HASH "75c20eff54f45e5a501ea965677b708e211a3fa435d3304868ca1b6e3cf0b4ef89e61631e4936b1ef789a06be1d3d43ec9db64be2498159eecfde1cce21e76c0") -set(qt5compat_HASH "22e3d6360afdb83b4bd122153cf3bba09d8593dbdd65ccf5b80e032b9de437f868b05c7170e636fd6bd8f42dd1eb56b07f21b73fd0c4a5437fcb72aa070d830b") -set(qtshadertools_HASH "11d6111c4b645d2d31b19c6cf788726546f484bd9c6a3940bdb2ce82f76eecf56a47655065fb87bf488a12968ea26e48e4c0c8b3ff9d702339bd497bef31630e") -set(qtquicktimeline_HASH "8310e0b360859e59157b5968647a5bb82bfd09f2f61c1b289669e551781e8fd1285f3efb8ed1324013ad14b192f0d9963c8584cfec98a136c82f5956ac1de9ae") -set(qtquick3d_HASH "511c8585ea8686b1e1cf2e3dd47ac5650ba312d583da7e86dc86aaff6769a5751e3d75ff3fd07664098ba6488f75c9dab68d060b0394ad0182c35c44b5306970") -set(qttranslations_HASH "200dd7418263474be95de25023ddd881f1cbc46fe4a0767aa33733414564aef9615b36429f511698d012704c4e94088026b3d9e454d9078e8975b48119c45c0d") -set(qtwayland_HASH "15d74d057c09a734dd10617d018f4dc54e6be4fef5dc96d6eefd6b3f47952bbdb98bc39cbc9545c7ae1a9ec87a512a72d2f019ee47210bfab8cbae0cf01e4ae4") -set(qtdoc_HASH "a96f9112b9ad557695779ee2039ad3ff93c8476d0f6fa7eff7177f0a05f4089d8b25030795f1428fe69a7423151241022a6bee812e6dcc5b047e13d39934e405") -set(qtcoap_HASH "43dae7eaa19811aeeb5c140949421c2449671e71cfc8d553bd608e6bbdf344a4bd58b2a3405d51b3e621c1b817487b0adf87e51841f237a2ae6df96573a6c735") -set(qtopcua_HASH "c7664a438323653e809dccfbaf81717c4abcbabc552bf678461ee28bef05bed78d4c4e1c520f08d334f4f45bb4777831de20cbcc1d5e242ddbc63d5a2f4df709") -set(qtimageformats_HASH "8e165986394c184520412533fbe088577d3a5661fecee8ef7938467ad329da28aa2771721f7ed84c75f1878426d24a17812aee3c492da68618cf6bbcc5580a36") -set(qtmqtt_HASH "e0de3d3a3c12ac7c407f002b6e680583c1d9ca437013ce277f18cb0de97b39269c6eb45ca3de46589de9177d8c62ea4020d55a514ace4667e8ff3e7780df5f2d") -set(qtnetworkauth_HASH "ccb488646f450541ce8546463c99d45d567339f676948e62c013fc0d7588af408c617bb0bec1d122b3fcb42e79d5ce04f5f779ad6d515fa9f223af70f06c84d9") -set(qt3d_HASH "d283e42effdb1b7199e4bf6fba3769b0ba3358b855d166fcad00cfc71858a5e71324e902d4ce163137a18b413c4463967563825ee8b902142c4c7559ff08efe5") -set(qtactiveqt_HASH "5fa17905697d1dbda9852b9f2555348e1c5fb428062806b5b78db22924927ebcf4db4932c04de155f517caf08487fb74d6afa30a223ed762bb46df61552ae149") -set(qtdatavis3d_HASH "0d687d29b20bf80a4274267c94bdfbf64048764f213dbf98361a00ee98c85bb2a3c25c1fe4aa17fc4d981cd54ea727bd0cec884b4fdb7e245f1801fc917a9123") -set(qtdeviceutilities_HASH "936a73e571f79c6c499b2c0705414ebb6eb45bb9209af6db9183285f37d81d8caac3c273ca1695f3cc1bf637a42c96242eb83b1f2034b5e9f0bcaa211368e85b") -set(qtlottie_HASH "1a3e7a462a1a886dfe556816dcb7811f0488ccca64106aebcc8178951f9e3db78dfd977c81b2eaa003b2ceddbd5d42bd1753fda80ad5562cf3e38699eafd1d0f") -set(qtscxml_HASH "0d6b31b1c5f29f19fb15ee5a77e100c5df122f1ccba6229131456f4d66ee99978b0392a0f3c61ae1e31923041a973e80dc23df7814ed704a4d80d75b60741fac") -set(qtvirtualkeyboard_HASH "943a96a35df368d63102b296c7e173d9d2929665c86044c33b1eec7bdc42f7fd6d6e5ed2f75caf582ecdb6cba5738d52121d3ed466cc26f1da58c36ea3a32a4f") -set(qtcharts_HASH "369e5e69596a0fc4be1c3ab936d32e3690d2efe5bf28344ef71022af209813a5f1435f11ad7ed42f3dd825471d2e2d38c33564bfa514ddf8dc173b708afa3994") -set(qtconnectivity_HASH "2d5f0c6ca5ed5e0a8ef056344441b2828834a334129e337d51596c774f0e121e9f393a6a2f7ca24b8186ee28e8d398316abdf3f32fda6cd097c3139d92dd30aa") -set(qtpositioning_HASH "ad8fa75430ef94596673de15c1067bcf648c76a5e938348b26ee44dae97f17c3d36e5a283a9ee78760be57df3d1390f36f476e47f26928dd72e466e469c795a7") -set(qtmultimedia_HASH "1e3d6d9d78acf10863fe2d4624ed044d86149fe8a72c8c47150975eff6f76edcb8a7d4dcdb73ab127ed3cc4414b7f7100b0e9e9c633e50c90ef3c0d36134d9b5") -set(qtremoteobjects_HASH "019bc17922eb72b2bb79d527c1d53bcf7f5b67f66a33ab79cd10391099de671eb3b7f978b8b493a560c6c943587b0a942f887f4ddeb87860ca3e6e30f30541be") -set(qtsensors_HASH "a1a39ab73cb15384fa29e62d8193e796bfb5e8349fd85eff106e9fb6fd45677db39f200f5b8e47be268c34d8ff35142e608adc33b85cd4dcc5180f5c3220deba") -set(qtserialbus_HASH "1ec94eebbb1e123ebcb353577f8de33710d623df364492ad33cb949ba81b36b4dfbbccbbce394d766fab2434ccc561dc47dc5d5b95b986160bf21096c78a77b4") -set(qtserialport_HASH "4871035b714732e7a40579c9a31b0cd955ec9360a996bbffeb16781a89b8df55d9be4408947832f2c6c39646f4d3b64cfb0bf91a83fc73e1808defd108048cd4") -set(qtwebchannel_HASH "6bab95a2df742c6ff023a72a3b192e7c5e56e23834dc7513aadc09d5ce0fadabf4b5590a9911b1dc8c83a7e1c984c4ac57c6957a3fa168de10af5d540d7d6af3") -set(qtwebengine_HASH "e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39") -set(qtwebsockets_HASH "231135ac75f704aeebe5286cd30640bacb6192f08785ac94fe848d6d5164597db314054c9d48a2300e9967c609681802b82055ab6bf806b3a351d891d3855bf3") -set(qtwebview_HASH "585b73cb0ca6a9e8b9fd16c92720e3bb7535bf142049c9453cf9f479b656827d450885e6bc1b09c0f8c9462f80f722f58a388f283d2b132cf83936e28c6f217a") -set(qtinterfaceframework_REF 35892bfbfa4c405bba2a648d1a4d4d17b1bc62b2) -set(qtapplicationmanager_HASH "2771edec2d8195158fcdfaaa08641db7363695e569e100fc0a949300b6616403bc1c8946526d3e6f0ec0a20b0e117c0bcd0b0d7f8fc09dfe3e6bc95326ff9f30") -set(qtlanguageserver_HASH "291239b61470c86cc1d371a533ddb4f8c289590831d3f835cff551dd24049061dcab7bdade904a1397f2c3cc8701747bc2568bad1d034ed8c51aad04257a83fa") -set(qthttpserver_HASH "25dfb101dd57143ee97122c46a8fd85668d16c0b7520285f72ea37db6d9e0c43876a3d5c1016ecc4cb4ec08f2ed9813afbaa1b4812e6816159b11d620bb8dadf") -set(qtquick3dphysics_REF fc155dd34fa53a8c7520f1c150a2b8eeb4c760c3) -set(qtspeech_HASH "f101c9a27b300f5b7dfb502f342dc565f206a119f667d02ed23ec0103a2d0d8025d15bccb42bacd238853f695523691dc22e1a4b703f0ea13aab0922c922cb1f") - -# Not in newer releases -set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629") +set(qtbase_HASH "7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a") +set(qttools_HASH "fa29a29bf9a723f88aaa5654e333daee90d8dc2f5c88653018a5e754c8115eec3c55940897817e0321dd4c9470d6d008e921ab7e20a714028fa38d04753bfb20") +set(qtdeclarative_HASH "7ec840e42b1042263aa41c5d339cfa8a7921e3c5f217e710df0737b2c5c44b1e6c0fae155af934087f5a623d9370f30f83ec5691eb473e52b46486f4938173c7") +set(qtsvg_HASH "4df0e02aa9b21091eb71a536befc52d8e7bd5f6d9fa757fcf0ac2f11e44d3f84b44d73551e44bd6a1045891bc9c0ed471820a94b8f014b3a82cccf32b10ac437") +set(qt5compat_HASH "513de021e2ab3413399b9f8cb7e86e744af468e28f1d11c1024d49650ac6658939e7e96607432511aa4095e6e122b9434f36e43ea712e657b10d7dfa0bd08b7d") +set(qtshadertools_HASH "547c5e0c6220c6200f440ed1d6f3373423fceea09de8d1dc81c5d49f7e24beee6d460341828d74844a2e1af1181c702d93247dd95b273a0b1e110dcdcab69557") +set(qtquicktimeline_HASH "72fa2c96beabf2ad734bf458f5a41edb7178bcf9c53184425ac33e75d648bd617ebc393a4036226846e3ca407fa17fca7bb15a23b7c75f12796353deddb962fc") +set(qtquick3d_HASH "a06ac092d923e103ca2902f363a1a47c7696ba3b356f61473d8b461ef3663aad80c8fbc8a22efd04def76ce2a7b7a3a16b7be5a9f9f58f198b18ee27d2f913e8") +set(qttranslations_HASH "c04839aa7071a8d5fc4a351e7266f4985dfaa5fbe0952fb32850676145d9adaceacb49c15b64831622a3f213fc87b7019d99bb7d2ffe6dc5a70ba62a2a252766") +set(qtwayland_HASH "9074adfb5ea9cc18896dade6706ef5a863033130f23aa11e0a7b2ae6e4df2fb64b636815e2489debb1032919a8ad20d39813d40b3ba7a87cebd801c9fae0d4f0") +set(qtdoc_HASH "9a2bd23c356687797f99b90c7a2bf6f283a7752e97cd8b35929ddb90800281c11b5dd7627090ad3cb7308f084b5fe20bee45118ec8c210e3c1b24d44c07a94b4") +set(qtcoap_HASH "1b19616c83983397cef046c98d73b152e562af7be7c69416372e885f1dc2c9a6f8ec6ec0fe99ebb0cd10e44fd91713cef4e5f375d04badb03e4f76e3b7e10991") +set(qtopcua_HASH "80ab237127ab3084d012d0fc0a608ee749398043584c047271d09f7591eef096ff6494e2de6cccc884653aaab830b2e8cab8a068e839766a4d21a079898220ef") +set(qtimageformats_HASH "41b82b829579d81e964212ecb6adf56a02fbe0293c33718c428977eb55df2008ea0af6214e051b5415fdfc828c532276be7b9cfb1523d8fc4dc07d4b337d49e3") +set(qtmqtt_HASH "5c296848e32ba4ed97b8e40f4f97d3af3c5b46ac56b86be63c672972b5e04cf02f5a4caa79005db89e0b71d590b9182cd3c0f0c106801331713fb06176bd3e59") +set(qtnetworkauth_HASH "04ddad0dd13ccef59790d9f0db394752076b0663a76c049a0a987e4841b5ad72fa053cbbb998cae9120481f683c5a488bb0b980fc3f6801b83078ac423a7079d") +set(qt3d_HASH "a5b3e4431c8924eb75cd23a806d05334aa9bca884bcbc0973359fb4c79370774fde26ca485826b1aa861362d65b51aafca93a909aed265a59cc0e60d9aceabb3") +set(qtactiveqt_HASH "0daf2748948b963a17865908c469976a55f1f53af57ba79f534191a613f900ab07e1149c351c26e24e2b8e4e73e1f1c16e263d10e1384d31484ee92452dcb7e2") +set(qtdatavis3d_HASH "2aebe20de8010e49d49c35decccaafedf540b0ffb35bd0a4d7dad974cee3378063cfddea79a8e5bcfa9b23f5745feeaa4c81ffb7cad3e654721d06dca61b78c6") +set(qtdeviceutilities_HASH "f29add1d30296a884ccd031dff083e65ff5efc8e5946401bfafa576552698deec231bcf6bc0b1df973622c522aa004d6adc8f10face19246df16efa58a702e84") +set(qtlottie_HASH "788079a5246c3a3abfdd7525f13e8e7966adb86bb0259fe7a8049a55ea5aa536f67bb6b3e21b1c1e8951e0aa422950fd25aa795262a89ab71cd813f929e14ad2") +set(qtscxml_HASH "5be0c7fc913880500e360860a9b1f50dc868b4e4b02c6e774578221754a88ece44d90d80ea85aa74b23cc3790a20f1e2b00b7d395612143d42e7c63708ed9dd7") +set(qtvirtualkeyboard_HASH "46c39666319ef00c1570e1a4f6bcdf3a8ae15042c2ee77f0f21ff907fe587a8382b9f29ac756f4bb02b62cd7569c584a7a5e80889ab44141e6fbc0245eaef291") +set(qtcharts_HASH "fe48ce2f4c3ba57f7ab23e7e5c02bdc303f1902ffa5b786e07d62b63b29551a0a3653764ca55c6b57b52f77b7a71795801e2fb942df1d8ccd03f594c92e6f94f") +set(qtconnectivity_HASH "a02f1859e5a02c0df0cebc2c3b0660febbc2f22ba6924558be47e51b3a135fb8376c580f1b5fe21f5b7b22f790bcefa431270accc31c95c0118d43ff0e2a37b8") +set(qtpositioning_HASH "67006663299b14a85a4a7cab2a03ec39f3b938c0f2f09520e3869509bedd24a2053e6f964bcca4d02df71c21d184b253f46cf1dd59e9da5c22cefbd1910ca305") +set(qtlocation_HASH "31190ca57feb4ed8b72d5bb5896a81da56632f873609470e760b390a3839f84bf8f6771c6acfcccec6781c694642b85ea34b0c7321528df5a0529af3d2bc5ad1") +set(qtmultimedia_HASH "2085d223869b627a2e5590a08081eb23ca34f8122c6492867db4596d5414e9c3eeca9338cf1745638ee60f0c559cbaa73aaab14c40785accf60a0d7e177fb937") +set(qtremoteobjects_HASH "86928e5a5da758dd4af1b9cd2d8de99c1b75b07064bcee983ee32abc747ce863b91c2efa3fe2a05de453acf27c775aa2161380d198480da17e37bf746cbd383c") +set(qtsensors_HASH "c5ef5ded692eacba8c85d756fc3b9a56681af8695f2a4f1e2b0bc18b07cc3b4159a7bfe06ff8163158ead8370e5a496601e2ca77a15acd9e7e25e1dcaedff086") +set(qtserialbus_HASH "f5588739797d445db536629cfac4246d74ce4beace3712e9ea55c8d4d682cfb312ed199ba7d5227f4429a36e88537d0e2cf3e5d414d86f78a7c3ee4ba41da038") +set(qtserialport_HASH "2a85f98d6eca51896a8e32bb531326c8479fde8d09ef2936ba1acb2bbfcf565ccdbffde29fee3b685709b8e1aa3a77437515607f280b483937c417dd15d55793") +set(qtwebchannel_HASH "a61a22b84f10f1ca5272e87de501f1c75f15a8f9a0aa5ff18d4df74a60bb8bec589289164863b6539cff4796c7c19a5ba126027e41107fccc43cf7523def1b0c") +set(qtwebengine_HASH "68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428") +set(qtwebsockets_HASH "cd11d6b50e60c5246cd6469a0bf4ce75afd3ab57c8e082a71c25d5a0662e1a23276e232106dd3e8893ce60ca86cc2ab6c213433fbb194efdf1a9be4ae53f2b4d") +set(qtwebview_HASH "669debc9b7a7562a1343bb65a7d1775c42404dd356184fc5d5180f5674cb8682e8e391f9673985263b8c2a7be1c0f6d5de1d2a20d6489cc5ef685b7a1280a01d") +set(qtinterfaceframework_REF "158de49df4e9ba3cc0bdbda18eeb3f223a023ef0") +set(qtapplicationmanager_HASH "406b469f295ed8bb337a2503e2a03b8c8c8838559dd596b21035d8a6d59e0d1089f54424d5ec30e298737ae0af945822eae16e4730318192c0276655e4b03042") +set(qtlanguageserver_HASH "85faa9e1fc6daa2dbbd0d061a9d467f9832feb8871871dc2b8d177c235224f69636f3909f27063511bdace50e121674a1745007afc2a3d36d250241e03db4808") +set(qthttpserver_HASH "acf6b1cafe84abbd277d1aaef0f1adb5be5256addb1d34ab079764ed757413f41dd44a1e396d5b274bab283d56d657dd3d8ea2c2ccd870f4009039fc01c0c5e9") +set(qtquick3dphysics_HASH "c5077b1756dba045c3a9388b1632f9ed2d44eb92b6b309c7852b7ab02a5f5d6e8a3c50e307b7005f27355d09e183b5866b213bd003009884be4258f747d0d839") +set(qtspeech_HASH "59c2f25e2b93f453fc9f674a5292ab10318de6a861a13bf4128d9166edc51efa9f0b615386fe6291c410e7f0fced138a98ff58a004653b06c522c96173e1fa6d") +set(qtgrpc_HASH "41a774d7c28a59e18c24107709d2b9e78abd28afa0f8ada2719e760d5c9092b7aea5d009a29d72ad7b8f88f443288113ca1c8d4c28bc386b642a95f3ca51fd66") +set(qtquickeffectmaker_HASH "fbc9c56aaed95469940151131901d6ebbd1c29b56d8eecce51c1dee16e80cd6cd446c6cbf247c618a8382ecbbf537c68fefd273aa644f5a85600e1cd812f6027") # Keep for beta/rc -#set(qttools_qlitehtml_REF 0) -#set(qttools_litehtml_REF 0) -#set(qttools_litehtml_HASH 0) -#set(qtwebengine_chromium_REF 0) \ No newline at end of file +#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) +#set(qtwebengine_chromium_REF 0b138dc30d0aec7930c76a2595065629948ad9f7) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 49b944565365e7..071c2db52a0144 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -7,7 +7,7 @@ ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake ## 7. Set QT_UPDATE_VERSION back to 0 -set(QT_VERSION 6.4.3) +set(QT_VERSION 6.5.1) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) @@ -17,10 +17,6 @@ if(PORT MATCHES "(qtquickcontrols2)") return() endif() -if(PORT MATCHES "qtlocation") # No 6.3.1 tag/branch - set(QT_VERSION 6.3.0) -endif() - ### Setting up the git tag. set(QT_PORTS qt @@ -58,7 +54,7 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.2) ## New in 6.2 qtconnectivity qtpositioning - qtlocation + qtlocation # back in 6.5 as tech preview qtmultimedia qtremoteobjects qtsensors @@ -87,13 +83,20 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0) qtquick3dphysics qtspeech) endif() +if(QT_VERSION VERSION_GREATER_EQUAL 6.5.0) + list(APPEND QT_PORTS + ## New in 6.5.0 + qtgrpc + qtquickeffectmaker + ) +endif() # 1. By default, modules come from the official release # 2. These modules are mirrored to github and have tags matching the release -set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager qthttpserver) +set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager) # 3. These modules are mirrored to github and have branches matching the release -set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation) +set(QT_FROM_GITHUB_BRANCH qtdeviceutilities) # 4. These modules are not mirrored to github and not part of the release -set(QT_FROM_QT_GIT qtinterfaceframework qtquick3dphysics) +set(QT_FROM_QT_GIT qtinterfaceframework) # For beta releases uncomment the next two lines and comment the lines with QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, QT_FROM_QT_GIT #set(QT_FROM_QT_GIT ${QT_PORTS}) #list(POP_FRONT QT_FROM_QT_GIT) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index cb304e1beefccb..cc7e2974ffa91f 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -10,15 +10,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") set(${PORT}_PATCHES allow_outside_prefix.patch - clang-cl_source_location.patch config_install.patch fix_cmake_build.patch harfbuzz.patch fix_egl.patch fix_egl_2.patch - clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. installed_dir.patch GLIB2-static.patch # alternative is to force pkg-config + clang-cl_source_location.patch + clang-cl_QGADGET_fix.diff ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -33,6 +33,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" ) endif() +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "qtbase currently requires packages from the system package manager. " + "They can be installed on Ubuntu systems via sudo apt-get install " + "'^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev " + "libxkbcommon-x11-dev.") +endif() + # Features can be found via searching for qt_feature in all configure.cmake files in the source: # The files also contain information about the Platform for which it is searched # Always use FEATURE_ in vcpkg_cmake_configure @@ -266,7 +273,12 @@ set(TOOL_NAMES qtpaths qtpaths6 windeployqt + windeployqt6 macdeployqt + macdeployqt6 + androiddeployqt6 + syncqt + tracepointgen ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} @@ -302,6 +314,8 @@ file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) +file(CONFIGURE OUTPUT "${CURRENT_PACKAGES_DIR}/share/${PORT}/port_status.cmake" CONTENT "set(qtbase_with_icu ${FEATURE_icu})\n") + set(other_files qt-cmake qt-cmake-private qt-cmake-standalone-test @@ -323,6 +337,7 @@ list(APPEND other_files target_qt.conf qt-cmake-private-install.cmake qt-testrunner.py + sanitizer-testrunner.py ) foreach(_config debug release) @@ -428,6 +443,12 @@ string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEX string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") file(WRITE "${hostinfofile}" "${_contents}") +if(NOT VCPKG_CROSSCOMPILING OR EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake" + "PACKAGE_PREFIX_DIR}/bin/syncqt" + "PACKAGE_PREFIX_DIR}/tools/Qt6/bin/syncqt") +endif() + set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") if(EXISTS "${configfile}") file(READ "${configfile}" _contents) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 7523c8a31a0bcb..dfece584e0abc7 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.1", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, @@ -209,6 +208,14 @@ "freetype" ] }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "osx" + }, { "name": "qtbase", "default-features": false, diff --git a/ports/qtbase/windeployqt.debug.bat b/ports/qtbase/windeployqt.debug.bat index 54a50ff8d1f89a..796dc4f3e8a393 100644 --- a/ports/qtbase/windeployqt.debug.bat +++ b/ports/qtbase/windeployqt.debug.bat @@ -6,5 +6,5 @@ set BAKCD=!CD! cd /D %mypath%\..\..\..\debug\bin set PATH=!CD!;%PATH% cd %BAKCD% -"%mypath%\windeployqt.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* +"%mypath%\windeployqt6.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* endlocal diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 0641ee353e024f..1ca0391407989e 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.4.3", + "version": "6.5.1", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 515c6930f508ae..b9087cdd7fd870 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index ff6633b743d4a2..1f7d2a083f898a 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 20949a208c0431..00c117f1e817a9 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index a112c4760c9e08..528d03ee584d6f 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 82ab496affecd1..2e50c22e967a4e 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.4.3", + "version": "6.5.1", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 9ced6ea943b706..e3f1ec222e9fc5 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgrpc/portfile.cmake b/ports/qtgrpc/portfile.cmake new file mode 100644 index 00000000000000..142bb026d49347 --- /dev/null +++ b/ports/qtgrpc/portfile.cmake @@ -0,0 +1,16 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES qtprotobufgen qtgrpcgen) +# native_grpc ->grpc WrapgRPC +# grp -> qt[network] +# qtprotobufgen -> protobuf WrapProtobuf +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS + ) diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json new file mode 100644 index 00000000000000..cd086d2df04194 --- /dev/null +++ b/ports/qtgrpc/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "qtgrpc", + "version": "6.5.1", + "description": "Qt framework based gRPC clients and services.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "grpc", + "default-features": false + }, + { + "name": "protobuf", + "default-features": false + }, + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtgrpc", + "host": true, + "default-features": false + } + ] +} diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index c6f2a6750bf835..285fd5533ea7e6 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Extension: Qt HTTP Server", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/no_target_promotion_latest.patch b/ports/qtimageformats/no_target_promotion_latest.patch index 1b76e36b58ed74..244e09f4b1bd6f 100644 --- a/ports/qtimageformats/no_target_promotion_latest.patch +++ b/ports/qtimageformats/no_target_promotion_latest.patch @@ -17,5 +17,5 @@ index 7fdd7ddbd..f189c472c 100644 +if(TARGET JPEG::JPEG) + set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) +endif() - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case - find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index a6682002535aa1..7e76171744c26f 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.4.3", + "version": "6.5.1", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index 0a76f2969dbd41..da7180d7355e90 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -49,3 +49,5 @@ if(NOT VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/6.5.1/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "") diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index eecf56e9d5d66a..24e73a5e57b86a 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index 9ba4f70e5704c3..adee6c641bd4af 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.4.3", + "version": "6.5.1", "description": "An implementation of the Language Server Protocol", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/portfile.cmake b/ports/qtlocation/portfile.cmake index 15fa294cde72d4..d4afa6dfbc7342 100644 --- a/ports/qtlocation/portfile.cmake +++ b/ports/qtlocation/portfile.cmake @@ -1,7 +1,5 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -message(STATUS "Upstream decided to split this into qtpositioning and qtlocation. qtlocation however is currently empty!") -# set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -# include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") # set(${PORT}_PATCHES) @@ -17,8 +15,8 @@ message(STATUS "Upstream decided to split this into qtpositioning and qtlocation # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" # ) -# qt_install_submodule(PATCHES ${${PORT}_PATCHES} - # CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - # CONFIGURE_OPTIONS_RELEASE - # CONFIGURE_OPTIONS_DEBUG - # ) +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index be27b210af053c..32047556622d6b 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, @@ -17,6 +17,16 @@ ], "platform": "linux" }, - "qtpositioning" + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtshadertools", + "default-features": false + } ] } diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 99a5af264f5449..3416701277d243 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.4.3", + "version": "6.5.1", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 306dd5e727ca8d..993cceadb61081 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 2d2bd8fc638bcb..90062d6c696963 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -61,7 +61,7 @@ endif() if("ffmpeg" IN_LIST FEATURES) # Note: Requires pulsadio on linux and wmfsdk on windows list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='yes'") - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'") else() list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='yes'") diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 81b385eab20d75..8ea9bde7b0e260 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 8c38f4aca0ea1b..2cf636cf2ae99c 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 80738f36bb885e..403ef2b322cbef 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -1,6 +1,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(${PORT}_PATCHES ) + # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -16,17 +18,19 @@ INVERTED_FEATURES if("open62541" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system -DHAVE_open62541=true) + vcpkg_find_acquire_program(PYTHON3) else() list(APPEND FEATURE_OPTIONS -DINPUT_open62541=no) endif() -if(NOT "open62541" IN_LIST FEATURES AND NOT "gds" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL=ON) +if("uacpp" IN_LIST FEATURES) + message(WARNING "\nPlease note that you have to install the Unified Automation C++ SDK yourself.\n") endif() qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + "-DPYTHON_EXECUTABLE=${PYTHON3}" CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index cebb3ebf0488e0..75b2a8833cb41f 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/devendor-poly2tri.patch b/ports/qtpositioning/devendor-poly2tri.patch new file mode 100644 index 00000000000000..85e18ca986a910 --- /dev/null +++ b/ports/qtpositioning/devendor-poly2tri.patch @@ -0,0 +1,37 @@ +diff --color -Naur a/src/3rdparty/clip2tri/CMakeLists.txt b/src/3rdparty/clip2tri/CMakeLists.txt +--- a/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 16:59:42.377052155 +0200 ++++ b/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 23:05:44.950379088 +0200 +@@ -4,6 +4,7 @@ + ## Bundled_Clip2Tri Generic Library: + ##################################################################### + ++find_package(poly2tri) + qt_internal_add_3rdparty_library(Bundled_Clip2Tri + QMAKE_LIB_NAME _clip2tri + STATIC +@@ -13,11 +14,12 @@ + clip2tri.cpp clip2tri.h + INCLUDE_DIRECTORIES + ../clipper +- ../poly2tri + LIBRARIES + Qt::Bundled_Clipper # special case +- Qt::Bundled_Poly2Tri # special case ++ poly2tri::poly2tri + ) ++target_link_libraries(Bundled_Clip2Tri PRIVATE poly2tri::poly2tri) ++set_target_properties(poly2tri::poly2tri PROPERTIES INTERFACE_QT_PACKAGE_NAME poly2tri) + qt_disable_warnings(Bundled_Clip2Tri) + qt_set_symbol_visibility_hidden(Bundled_Clip2Tri) + +diff --color -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2023-05-13 16:59:42.379052157 +0200 ++++ b/src/CMakeLists.txt 2023-05-13 17:00:19.256085781 +0200 +@@ -2,7 +2,6 @@ + # SPDX-License-Identifier: BSD-3-Clause + + # special case begin +-add_subdirectory(3rdparty/poly2tri) + add_subdirectory(3rdparty/clipper) + add_subdirectory(3rdparty/clip2tri) + add_subdirectory(positioning) diff --git a/ports/qtpositioning/portfile.cmake b/ports/qtpositioning/portfile.cmake index 005fe5f33f42a6..dc9da8a1d03215 100644 --- a/ports/qtpositioning/portfile.cmake +++ b/ports/qtpositioning/portfile.cmake @@ -1,6 +1,9 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(${PORT}_PATCHES + devendor-poly2tri.patch) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 4a89009aac84bc..e4821141bc5a0d 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,10 +1,11 @@ { "name": "qtpositioning", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ + "poly2tri", { "name": "qtbase", "default-features": false diff --git a/ports/qtquick3d/portfile.cmake b/ports/qtquick3d/portfile.cmake index 43449146fa1777..fc2e1d75cecf4b 100644 --- a/ports/qtquick3d/portfile.cmake +++ b/ports/qtquick3d/portfile.cmake @@ -22,6 +22,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 9daaf7278118fe..f947f2d0c9c778 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.4.3", + "version": "6.5.1", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 7c85a586d38125..11f9703bb94030 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.4.3", + "version": "6.5.1", "description": "Physics engine integration for Qt Quick 3D", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/portfile.cmake b/ports/qtquickeffectmaker/portfile.cmake new file mode 100644 index 00000000000000..effa2d5b11050e --- /dev/null +++ b/ports/qtquickeffectmaker/portfile.cmake @@ -0,0 +1,14 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES qqem) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS + ) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json new file mode 100644 index 00000000000000..19f27a80eafd61 --- /dev/null +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "qtquickeffectmaker", + "version": "6.5.1", + "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "native", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtquick3d", + "default-features": false + }, + { + "name": "qtshadertools", + "default-features": false + } + ] +} diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index b1f8fc9aa080e1..128870b2c9436b 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.4.3", + "version": "6.5.1", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 2d27cc8d9cc9bc..1500d39f540413 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index b196eed46dd927..c7f173227a8f64 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.4.3", + "version": "6.5.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index f7db1f3e45bb15..274cce6123e389 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index d5a9868b332561..a28ffce67a9727 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.4.3", + "version": "6.5.1", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index c15abfd6d9cb81..661cebecb0f571 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 2ae2a15243cc59..a0d4044eeabadf 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.4.3", + "version": "6.5.1", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/portfile.cmake b/ports/qtspeech/portfile.cmake index 0fcc4e80133677..3b411aac08d172 100644 --- a/ports/qtspeech/portfile.cmake +++ b/ports/qtspeech/portfile.cmake @@ -22,6 +22,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON CONFIGURE_OPTIONS_MAYBE_UNUSED QT_BUILD_EXAMPLES QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index b369d40c49d317..26bd33f25591cd 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Speech support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index ff593dc7b09f7a..b22081dd4df7c6 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/devendor-litehtml.patch b/ports/qttools/devendor-litehtml.patch index 442244b62c6183..ed3b43a1527256 100644 --- a/ports/qttools/devendor-litehtml.patch +++ b/ports/qttools/devendor-litehtml.patch @@ -54,3 +54,16 @@ endif() - -endif() +diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt +index 5d2bf2b67c..abd9b513d3 100644 +--- a/src/assistant/CMakeLists.txt ++++ b/src/assistant/CMakeLists.txt +@@ -34,7 +34,7 @@ if(TARGET qlitehtml) + # but found in the system, because they are imported only to the subdirectory scope + # where find_package was called. But that's fine, we wouldn't be able to set compiler flags + # on them anyway. +- if(TARGET litehtml) ++ if(0) + qt_internal_set_exceptions_flags(litehtml OFF) + qt_disable_warnings(litehtml) + endif() diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index e42f50ef463fbc..bb46599a62d529 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -98,9 +98,12 @@ if(VCPKG_TARGET_IS_OSX) list(APPEND OSX_APP_FOLDERS qdbusviewer.app) endif() foreach(_appfolder IN LISTS OSX_APP_FOLDERS) - message(STATUS "Moving: ${_appfolder}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") + # Folders are only existing in case of native builds + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}") + message(STATUS "Moving: ${_appfolder}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") + endif() endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 02dec90249ef63..ec102190f5a800 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, @@ -76,7 +76,14 @@ "qdoc": { "description": "Build QDoc.", "dependencies": [ - "llvm" + { + "name": "llvm", + "default-features": false, + "features": [ + "clang", + "enable-rtti" + ] + } ] }, "qml": { diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 7e7d5c682bc9f3..47c94ae4584a19 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 7709bdb2ffa554..ea5b8430e0233f 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.4.3", + "version": "6.5.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 62a197ac2b25dd..b9937bb35127d1 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.4.3", + "version": "6.5.1", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 5531260cb82d3e..1e93d34aadffd3 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index dbe7936eccd391..a9a9f8b5d27314 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -1,8 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES - ) +set(${PORT}_PATCHES "") set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) @@ -106,6 +105,7 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} -DNodejs_EXECUTABLE=${NODEJS} + -DQT_FEATURE_webengine_jumbo_build=0 OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index e7bac0c5f2bc66..175c4ecc4044a5 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 7961411c0d34c9..f5f25df8c7ce9c 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/portfile.cmake b/ports/qtwebview/portfile.cmake index 8a3f752c50a958..23218658c53d73 100644 --- a/ports/qtwebview/portfile.cmake +++ b/ports/qtwebview/portfile.cmake @@ -6,17 +6,13 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebEngineQuick "webengine" CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick "webengine" CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index bc5b98cb6e5f68..a42ca6e1fade45 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.4.3", + "version": "6.5.1", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, @@ -11,18 +11,13 @@ "features": [ "gui" ] + }, + { + "name": "qtdeclarative", + "default-features": false } ], "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, "webengine": { "description": "Build with Webengine", "supports": "!static", diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index d55a7293018052..2a1561f9b8900f 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.29 - SHA512 0610e666943f29f4fcf6188f2673837a24da749c2071f2463667bfef67262aba6425612db82d9f0553f7717dc7b8214e01dfafcf29145510d39a9e2024a749fc + REF QuantLib-v1.30 + SHA512 7948f33fac124e615051863a1780ed2f98a626577174b54d0a276e604d3b034828e3d6c0c528687c4c0b974829dde830daf6be70f8de51467c9fc0f9a76eb525 HEAD_REF master + PATCHES remove-amortizingbonds-all.patch ) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/quantlib/remove-amortizingbonds-all.patch b/ports/quantlib/remove-amortizingbonds-all.patch new file mode 100644 index 00000000000000..abbeb90c9227a6 --- /dev/null +++ b/ports/quantlib/remove-amortizingbonds-all.patch @@ -0,0 +1,12 @@ +diff --git a/ql/CMakeLists.txt b/ql/CMakeLists.txt +index fc137f41d..7ac42a58b 100644 +--- a/ql/CMakeLists.txt ++++ b/ql/CMakeLists.txt +@@ -2220,7 +2220,6 @@ set(QL_GENERATED_HEADERS + ${PROJECT_BINARY_DIR}/ql/cashflows/all.hpp + ${PROJECT_BINARY_DIR}/ql/currencies/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/all.hpp +- ${PROJECT_BINARY_DIR}/ql/experimental/amortizingbonds/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/asian/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/averageois/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/barrieroption/all.hpp diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index 8c6d48583490c7..7b9e0cbc652db0 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.29", + "version": "1.30", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "license": "BSD-3-Clause", diff --git a/ports/quaternions/vcpkg.json b/ports/quaternions/vcpkg.json index b6d8b22e2c72ef..d4a51b77f26d3f 100644 --- a/ports/quaternions/vcpkg.json +++ b/ports/quaternions/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quaternions", - "version-string": "1.0.0", - "port-version": 1, + "version": "1.0.0", + "port-version": 2, "description": "A C++11 library to work with quaternions, as a single header file.", "homepage": "https://github.com/ferd36/quaternions", "dependencies": [ diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 9e9586fbe000ae..3e2bf0cfcbe826 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 2205c74e1e1160b1be925f45f956bb35a0339a62deb66640f9ad9d54f7f5461298cc958d67cfd3c09466d7bd8f6a7965829dfb3d2f94d87d4ec1dfe6849cdc1d + SHA512 35b1c2fa0c41cd0adc295da7182d54dd40990d6717608d7b9214f7c99e860787c3e5988908a525f44a674ddd8ea479532cec25fcf48113a957ee8abaf4d83441 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 5dcfa8ca99ec62..36861e5b0f7340 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "2.7.0", + "version": "2.9.1", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/ports/rabit/vcpkg.json b/ports/rabit/vcpkg.json index 49deccd6458dd1..a979746a602016 100644 --- a/ports/rabit/vcpkg.json +++ b/ports/rabit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rabit", - "version-string": "0.1", - "port-version": 4, + "version": "0.1", + "port-version": 5, "description": "rabit is a light weight library that provides a fault tolerant interface of Allreduce and Broadcast. It is designed to support easy implementations of distributed machine learning programs, many of which fall naturally under the Allreduce abstraction.", "homepage": "https://github.com/dmlc/rabit", "supports": "!uwp", diff --git a/ports/ragel/vcpkg.json b/ports/ragel/vcpkg.json index c829e5a05da61b..cc6d62c38884d2 100644 --- a/ports/ragel/vcpkg.json +++ b/ports/ragel/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ragel", - "version-string": "6.10", - "port-version": 5, + "version": "6.10", + "port-version": 6, "description": "Ragel State Machine Compiler", "homepage": "https://www.colm.net/files/ragel", "dependencies": [ diff --git a/ports/range-v3-vs2015/vcpkg.json b/ports/range-v3-vs2015/vcpkg.json index 289515dca67458..73f543efd879e1 100644 --- a/ports/range-v3-vs2015/vcpkg.json +++ b/ports/range-v3-vs2015/vcpkg.json @@ -1,7 +1,7 @@ { "name": "range-v3-vs2015", - "version-string": "20151130-vcpkg5", - "port-version": 1, + "version": "20151130-vcpkg5", + "port-version": 2, "description": "Range library for C++11/14/17.", "homepage": "https://github.com/Microsoft/Range-V3-VS2015" } diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 232fe2203a7a5d..a2dc96d73db1ed 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/rapidjson - REF 232389d4f1012dddec4ef84861face2d2ba85709 # accessed on 2022-06-28 - SHA512 0d7d751179abdaa6ebf6167d522651a2d13bc024d20c7e3f775c7397a8aab4cd866a6c91a55521ad7847e910822fcf982625c7308c74f5df663e6fd81336c9fc + REF 949c771b03de448bdedea80c44a4a5f65284bfeb # accessed on 2023-04-27 + SHA512 dc0a16230188ccd3ef8f1abffb3213948dd34b17df68330a28bb82a4e3f636e13add3ff33f03774322697140456c704223102e6517d5122fa099260704b7c363 FILE_DISAMBIGUATOR 2 HEAD_REF master ) diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index c62de944b8ce36..a343edc2bc2d87 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rapidjson", - "version-date": "2022-06-28", - "port-version": 3, + "version-date": "2023-04-27", "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", "license": "MIT", diff --git a/ports/rapidxml-ns/vcpkg.json b/ports/rapidxml-ns/vcpkg.json index a0422d1eb69c65..4521213c0e139e 100644 --- a/ports/rapidxml-ns/vcpkg.json +++ b/ports/rapidxml-ns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rapidxml-ns", - "version-string": "1.13.2", - "port-version": 1, + "version": "1.13.2", + "port-version": 2, "description": "RapidXML with added XML namespaces support." } diff --git a/ports/rapidxml/vcpkg.json b/ports/rapidxml/vcpkg.json index d43ff6cf8cb603..3b6225ce5ecf3e 100644 --- a/ports/rapidxml/vcpkg.json +++ b/ports/rapidxml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rapidxml", - "version-string": "1.13", - "port-version": 5, + "version": "1.13", + "port-version": 6, "description": "RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility.", "homepage": "https://sourceforge.net/projects/rapidxml" } diff --git a/ports/rappture/include_functional.patch b/ports/rappture/include_functional.patch new file mode 100644 index 00000000000000..b3606d220a2ab6 --- /dev/null +++ b/ports/rappture/include_functional.patch @@ -0,0 +1,12 @@ +diff --git a/src/core/RpUnits.h b/src/core/RpUnits.h +index a640205..e697424 100644 +--- a/src/core/RpUnits.h ++++ b/src/core/RpUnits.h +@@ -59,6 +59,7 @@ enum RP_UNITS_CONSTS { + #include + #include + #include ++#include + + #include "RpDict.h" + #include "RpUnitsStd.h" diff --git a/ports/rappture/portfile.cmake b/ports/rappture/portfile.cmake index e79ec308553930..7451fffa28659d 100644 --- a/ports/rappture/portfile.cmake +++ b/ports/rappture/portfile.cmake @@ -6,17 +6,18 @@ vcpkg_download_distfile(ARCHIVE SHA512 3b42569d056c5e80762eada3aff23d230d4ba8f6f0078de44d8571a713dde91e31e66fe3c37ceb66e934a1410b338fb481aeb5a29ef56b53da4ad2e8a2a2ae59 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/rappture.patch" + rappture.patch + include_functional.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() @@ -26,10 +27,6 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file( - INSTALL ${SOURCE_PATH}/license.terms - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.terms") diff --git a/ports/rappture/vcpkg.json b/ports/rappture/vcpkg.json index 65e4caed60b975..ab94b10d500bd7 100644 --- a/ports/rappture/vcpkg.json +++ b/ports/rappture/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rappture", "version": "1.9", - "port-version": 2, + "port-version": 4, "description": "Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.", "license": null, "dependencies": [ diff --git a/ports/raylib/fix-project-version.patch b/ports/raylib/fix-project-version.patch new file mode 100644 index 00000000000000..a89ce733b4ac28 --- /dev/null +++ b/ports/raylib/fix-project-version.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9087f8e..5092bdf 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,7 @@ + # Setup the project and settings + project(raylib C) +-set(PROJECT_VERSION 4.2.0) +-set(API_VERSION 420) ++set(PROJECT_VERSION 4.5.0) ++set(API_VERSION 450) + + include(GNUInstallDirs) + include(JoinPaths) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index b1cf363de40a81..c55b47f88f269a 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -15,16 +15,18 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) endif() if(VCPKG_TARGET_IS_EMSCRIPTEN) - set(ADDITIONAL_OPTIONS "-DPLATFORM=Web") + set(ADDITIONAL_OPTIONS "-DPLATFORM=Web") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib - REF ${VERSION} + REF "${VERSION}" SHA512 a959abbb577a8951251a469d6505093fd20988444dcf055e26cb0b484ef4024211b2cca45187accbd465c56bc50e02d450b6f7f7cfde2cdaedcdce422f80dcbc HEAD_REF master - PATCHES ${patches} + PATCHES + fix-project-version.patch #Upstream change https://github.com/raysan5/raylib/commit/0d4db7ad7f6fd442ed165ebf8ab8b3f4033b04e7, please remove in next update. + ${patches} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED) @@ -59,6 +61,10 @@ vcpkg_cmake_configure( -DENABLE_ASAN=OFF -DENABLE_UBSAN=OFF -DENABLE_MSAN=OFF + MAYBE_UNUSED_VARIABLES + SHARED + STATIC + SUPPORT_HIGH_DPI ) vcpkg_cmake_install() @@ -81,4 +87,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) ) endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index d7f001464039a8..6abf1f8200e42e 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "raylib", "version-semver": "4.5.0", + "port-version": 1, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib", diff --git a/ports/readline/vcpkg.json b/ports/readline/vcpkg.json index cc79a73bf237d8..ae7aec6b49de43 100644 --- a/ports/readline/vcpkg.json +++ b/ports/readline/vcpkg.json @@ -1,7 +1,7 @@ { "name": "readline", - "version-string": "0", - "port-version": 3, + "version": "0", + "port-version": 4, "description": "GNU readline and history libraries", "supports": "!uwp", "dependencies": [ diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt deleted file mode 100644 index a82f7d91d432cb..00000000000000 --- a/ports/recast/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(recast) - -set(SRC - DebugUtils/Source/DebugDraw.cpp - DebugUtils/Source/DetourDebugDraw.cpp - DebugUtils/Source/RecastDebugDraw.cpp - DebugUtils/Source/RecastDump.cpp - Detour/Source/DetourAlloc.cpp - Detour/Source/DetourCommon.cpp - Detour/Source/DetourNavMesh.cpp - Detour/Source/DetourNavMeshBuilder.cpp - Detour/Source/DetourNavMeshQuery.cpp - Detour/Source/DetourNode.cpp - DetourCrowd/Source/DetourCrowd.cpp - DetourCrowd/Source/DetourLocalBoundary.cpp - DetourCrowd/Source/DetourObstacleAvoidance.cpp - DetourCrowd/Source/DetourPathCorridor.cpp - DetourCrowd/Source/DetourPathQueue.cpp - DetourCrowd/Source/DetourProximityGrid.cpp - DetourTileCache/Source/DetourTileCache.cpp - DetourTileCache/Source/DetourTileCacheBuilder.cpp - Recast/Source/Recast.cpp - Recast/Source/RecastAlloc.cpp - Recast/Source/RecastArea.cpp - Recast/Source/RecastContour.cpp - Recast/Source/RecastFilter.cpp - Recast/Source/RecastLayers.cpp - Recast/Source/RecastMesh.cpp - Recast/Source/RecastMeshDetail.cpp - Recast/Source/RecastRasterization.cpp - Recast/Source/RecastRegion.cpp -) - -add_library(recast ${SRC}) - -target_include_directories( - recast PUBLIC - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ -) - -install( - TARGETS recast - EXPORT unofficial-recast-config - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast) - -if(NOT DISABLE_INSTALL_HEADERS) - install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils/Include) - install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour/Include) - install(DIRECTORY DetourCrowd/Include/ DESTINATION include/recast/DetourCrowd/Include) - install(DIRECTORY DetourTileCache/Include/ DESTINATION include/recast/DetourTileCache/Include) - install(DIRECTORY Recast/Include/ DESTINATION include/recast/Recast/Include) -endif() diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index ebace1d11c492a..d7c7ca948ced45 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -1,24 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO recastnavigation/recastnavigation - REF 1.5.1 - SHA512 09900d8893e0c633a79e6188d15e68d1047040a0f2bceb2542f486dded64e69b918eaae159def81416a014fae26a46502783a2a712462bee4be2a3edf7bef47f - HEAD_REF master -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast) - -vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +message(WARNING "This port is a stub port retained for compatibility. Use 'recastnavigation' instead.") \ No newline at end of file diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json index 003d3d40e50cea..541b6560f3c10e 100644 --- a/ports/recast/vcpkg.json +++ b/ports/recast/vcpkg.json @@ -1,18 +1,10 @@ { "name": "recast", - "version": "1.5.1", - "port-version": 6, - "description": "Navigation-mesh Toolset for Games", + "version-string": "deprecated", + "description": "A stub package that pulls in recastnavigation. Do not depend on this package.", "homepage": "https://github.com/recastnavigation/recastnavigation", "license": "Zlib", "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "recastnavigation" ] } diff --git a/ports/recastnavigation/portfile.cmake b/ports/recastnavigation/portfile.cmake new file mode 100644 index 00000000000000..69dcac3626ef37 --- /dev/null +++ b/ports/recastnavigation/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO recastnavigation/recastnavigation + REF v${VERSION} + SHA512 7567aaa78219cc490a6f76210fba1f130f0c17aeaa06432ab1207e0fd03404abe31042e8b03971aa0d04ad65d39469f13575fe0072fb920c38581d39568b70fb + HEAD_REF master +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRECASTNAVIGATION_DEMO=OFF + -DRECASTNAVIGATION_TESTS=OFF + -DRECASTNAVIGATION_EXAMPLES=OFF + +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/recastnavigation) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/recastnavigation/vcpkg.json b/ports/recastnavigation/vcpkg.json new file mode 100644 index 00000000000000..08a5e13e306096 --- /dev/null +++ b/ports/recastnavigation/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "recastnavigation", + "version": "1.6.0", + "description": "Navigation-mesh Toolset for Games", + "homepage": "https://github.com/recastnavigation/recastnavigation", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/refprop-headers/portfile.cmake b/ports/refprop-headers/portfile.cmake index befb0184be48b9..a39b5601b93c19 100644 --- a/ports/refprop-headers/portfile.cmake +++ b/ports/refprop-headers/portfile.cmake @@ -1,16 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CoolProp/REFPROP-headers - REF 8df35c7cb557d385bb66431e92e836104a63a33c - SHA512 4424d036c3cd6c9028fffbeda0919d38f4b0a290fb141c6d1ff26c70cd416d9a0d2e1584c51b6ad2e989e84a8a71660f62dadaa88bb22428972165ba01131cb2 + REF b4faab1b73911c32c4b69c526c7e92f74edb67de + SHA512 601fcc70e7e12419e03e71b140c2fcec80eafb19f24f9871355679662802815f98cce2d167638658ba04ba7da0e811b2cf5393ced4dbe40cb2930dee75acced5 HEAD_REF master + PATCHES + unicode-build.diff # https://github.com/CoolProp/REFPROP-headers/issues/21 ) -file(INSTALL ${SOURCE_PATH}/REFPROP_lib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/REFPROP_lib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/refprop-headers - RENAME copyright -) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/refprop-headers/unicode-build.diff b/ports/refprop-headers/unicode-build.diff new file mode 100644 index 00000000000000..4dc210a4c3d09c --- /dev/null +++ b/ports/refprop-headers/unicode-build.diff @@ -0,0 +1,13 @@ +diff --git a/REFPROP_lib.h b/REFPROP_lib.h +index 60fb64a..df10d2c 100644 +--- a/REFPROP_lib.h ++++ b/REFPROP_lib.h +@@ -762,7 +762,7 @@ extern "C" { + #ifndef UNICODE + msg = dllPath; + #else +- std::wstring wStr = t; ++ std::wstring wStr = dllPath; + msg = std::string(wStr.begin(), wStr.end()); + #endif + RPPath_loaded = msg; diff --git a/ports/refprop-headers/vcpkg.json b/ports/refprop-headers/vcpkg.json index f0b73813b5494e..a91b600282334d 100644 --- a/ports/refprop-headers/vcpkg.json +++ b/ports/refprop-headers/vcpkg.json @@ -1,7 +1,7 @@ { "name": "refprop-headers", - "version-string": "2019-04-14", - "port-version": 1, - "description": "The REFPROP Headers", - "homepage": "https://github.com/CoolProp/REFPROP-headers" + "version-date": "2022-12-07", + "description": "Header files for the REFPROP fluid property library", + "homepage": "https://github.com/CoolProp/REFPROP-headers", + "license": "MIT" } diff --git a/ports/riffcpp/vcpkg.json b/ports/riffcpp/vcpkg.json index da8294954481ba..08a05d946d6f06 100644 --- a/ports/riffcpp/vcpkg.json +++ b/ports/riffcpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "riffcpp", - "version-string": "2.2.4", - "port-version": 2, + "version": "2.2.4", + "port-version": 3, "description": "Simple library for reading RIFF files", "homepage": "https://github.com/libdmusic/riffcpp", "dependencies": [ diff --git a/ports/rmlui/add-robin-hood.patch b/ports/rmlui/add-robin-hood.patch index 4a39a8a5a1aa96..618a9e9b62b8f2 100644 --- a/ports/rmlui/add-robin-hood.patch +++ b/ports/rmlui/add-robin-hood.patch @@ -1,20 +1,20 @@ diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake -index 9c3042c..c3820df 100644 +index cd2918a7..f063a879 100644 --- a/CMake/FileList.cmake +++ b/CMake/FileList.cmake -@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES +@@ -123,7 +123,6 @@ set(Core_PUB_HDR_FILES ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_map.hpp + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_set.hpp - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62432f1..d9287c9 100644 +index 0b552524..190e8c8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN ) +@@ -427,6 +427,8 @@ if( ENABLE_SVG_PLUGIN ) message("-- Can SVG plugin be enabled - yes - lunasvg library found") endif() @@ -24,13 +24,13 @@ index 62432f1..d9287c9 100644 if(NOT BUILD_FRAMEWORK) #=================================== diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h -index dc42753..5249e1d 100644 +index 018ab3b1..4bc20613 100644 --- a/Include/RmlUi/Config/Config.h +++ b/Include/RmlUi/Config/Config.h @@ -57,7 +57,7 @@ #else - #include "../Core/Containers/chobo/flat_map.hpp" - #include "../Core/Containers/chobo/flat_set.hpp" + #include "../Core/Containers/itlib/flat_map.hpp" + #include "../Core/Containers/itlib/flat_set.hpp" -#include "../Core/Containers/robin_hood.h" +#include #endif // RMLUI_NO_THIRDPARTY_CONTAINERS diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 511d2cac598fa1..99e09b6f67af7c 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mikke89/RmlUi - REF 5.0 - SHA512 10136893eb695b098fe6d718e23ce331c549faf3eb73413a5bb143ddd3601726b8bc42382c4e575d2abfff838ad3e6af1d4945426223a9c6f0fd048b481819dd + REF 5.1 + SHA512 06bf1a24c6ff3f164ef1af80186d5f974e6a5467f6f0d50ec33bb14516e4899321fe7a5b9c4912def908a53711bf302bc782cf78117e0930862f5d1ad07dec18 HEAD_REF master PATCHES add-robin-hood.patch diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json index d27047c29d1a97..09d80db3c8ab02 100644 --- a/ports/rmlui/vcpkg.json +++ b/ports/rmlui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rmlui", - "version": "5.0", + "version": "5.1", "maintainers": "Michael R. P. Ragazzon ", "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", "homepage": "https://github.com/mikke89/RmlUi", diff --git a/ports/rply/vcpkg.json b/ports/rply/vcpkg.json index 613505914fc799..a81d6dee8f90f8 100644 --- a/ports/rply/vcpkg.json +++ b/ports/rply/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rply", - "version-string": "1.1.4", - "port-version": 2, + "version": "1.1.4", + "port-version": 3, "description": "ANSI C Library for PLY file format input and output", "homepage": "http://w3.impa.br/~diego/software/rply", "dependencies": [ diff --git a/ports/rsasynccpp/portfile.cmake b/ports/rsasynccpp/portfile.cmake index 4fa5cbb8105bc6..db6090c761882e 100644 --- a/ports/rsasynccpp/portfile.cmake +++ b/ports/rsasynccpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO renestein/Rstein.AsyncCpp REF 0.0.7 - SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55 + SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55 HEAD_REF master ) @@ -26,20 +26,13 @@ else() endif() endif() -if (TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(MSBUILD_PLATFORM "x86") -else () - set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) -endif() - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH RStein.AsyncCppLib.sln LICENSE_SUBPATH LICENSE - PLATFORM ${MSBUILD_PLATFORM} - DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} - RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} + PLATFORM "${TRIPLET_SYSTEM_ARCH}" + DEBUG_CONFIGURATION "${DEBUG_CONFIGURATION}" + RELEASE_CONFIGURATION "${RELEASE_CONFIGURATION}" ) file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/" diff --git a/ports/rsasynccpp/vcpkg.json b/ports/rsasynccpp/vcpkg.json index b74ead2502a87e..31091d0f92bce9 100644 --- a/ports/rsasynccpp/vcpkg.json +++ b/ports/rsasynccpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsasynccpp", "version": "0.0.7", - "port-version": 1, + "port-version": 2, "maintainers": "Rene Stein ", "description": "Task Parallel Library (TPL)/dataflow/actors/async primitives for C++ based on C++ 20 coroutines.", "homepage": "https://github.com/renestein/Rstein.AsyncCpp", diff --git a/ports/rsm-mmio/portfile.cmake b/ports/rsm-mmio/portfile.cmake index cec066167175f0..83bc1f462c824c 100644 --- a/ports/rsm-mmio/portfile.cmake +++ b/ports/rsm-mmio/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/mmio - REF 1.1.0 - SHA512 54c63c345d9e0a284d13078d525fcbe73d793462968121fee89a19c810cdac736aca9c81f4c8b4f5ea51db1c47ad0c55e7cea38772049e4939b0d6e280f9a332 + REF 2.0.0 + SHA512 a1b0d586c12708233c0379b16a9f60bab27f12cb414736ee245e37888622ac352e834a58808127087788f930311125e2b26e6dad156c72e68143f95910cda48f HEAD_REF main ) diff --git a/ports/rsm-mmio/vcpkg.json b/ports/rsm-mmio/vcpkg.json index b88664f9c89b99..f88d47d5e8d8da 100644 --- a/ports/rsm-mmio/vcpkg.json +++ b/ports/rsm-mmio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "rsm-mmio", - "version-semver": "1.1.0", - "port-version": 2, - "description": "A cross-platform memory-mapped io library for C++ ", + "version-semver": "2.0.0", + "description": "A cross-platform memory-mapped io library for C++", "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio", + "license": "MIT", "supports": "!osx & !uwp", "dependencies": [ { diff --git a/ports/rsocket/fix-rsockserver-build-error.patch b/ports/rsocket/fix-rsockserver-build-error.patch new file mode 100644 index 00000000000000..080f8a3fcf8b81 --- /dev/null +++ b/ports/rsocket/fix-rsockserver-build-error.patch @@ -0,0 +1,153 @@ +diff --git a/rsocket/RSocketServer.cpp b/rsocket/RSocketServer.cpp +index 1e20281..3a9f6b2 100644 +--- a/rsocket/RSocketServer.cpp ++++ b/rsocket/RSocketServer.cpp +@@ -125,7 +125,7 @@ void RSocketServer::acceptConnection( + weakConSet = std::weak_ptr(connectionSet_), + scheduledResponder = useScheduledResponder_]( + std::unique_ptr conn, +- SetupParameters params) mutable { ++ SetupParameters params) mutable noexcept{ + if (auto connectionSet = weakConSet.lock()) { + RSocketServer::onRSocketSetup( + serviceHandler, +@@ -135,12 +135,15 @@ void RSocketServer::acceptConnection( + std::move(params)); + } + }, +- std::bind( +- &RSocketServer::onRSocketResume, +- this, +- serviceHandler, +- std::placeholders::_1, +- std::placeholders::_2)); ++ [this, serviceHandler=serviceHandler]( ++ std::unique_ptr connection, ++ ResumeParameters resumeParameters) mutable noexcept{ ++ this->onRSocketResume( ++ serviceHandler, ++ std::move(connection), ++ resumeParameters ++ ); ++ }); + } + + void RSocketServer::onRSocketSetup( +@@ -206,7 +209,7 @@ void RSocketServer::onRSocketSetup( + void RSocketServer::onRSocketResume( + std::shared_ptr serviceHandler, + std::unique_ptr connection, +- ResumeParameters resumeParams) { ++ ResumeParameters resumeParams) noexcept{ + auto result = serviceHandler->onResume(resumeParams.token); + if (result.hasError()) { + stats_->resumeFailedNoState(); +diff --git a/rsocket/RSocketServer.h b/rsocket/RSocketServer.h +index 39dae66..e2346ef 100644 +--- a/rsocket/RSocketServer.h ++++ b/rsocket/RSocketServer.h +@@ -118,7 +118,7 @@ class RSocketServer { + void onRSocketResume( + std::shared_ptr serviceHandler, + std::unique_ptr connection, +- rsocket::ResumeParameters setupPayload); ++ rsocket::ResumeParameters setupPayload)noexcept; + + const std::unique_ptr duplexConnectionAcceptor_; + bool started{false}; +diff --git a/yarpl/flowable/AsyncGeneratorShim.h b/yarpl/flowable/AsyncGeneratorShim.h +index 72d212c..79a09f1 100644 +--- a/yarpl/flowable/AsyncGeneratorShim.h ++++ b/yarpl/flowable/AsyncGeneratorShim.h +@@ -96,7 +96,7 @@ class AsyncGeneratorShim { + value.emplace(std::move(*item)); + } + } catch (const std::exception& ex) { +- value.emplaceException(std::current_exception(), ex); ++ value.emplaceException(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex); + } catch (...) { + value.emplaceException(std::current_exception()); + } +diff --git a/yarpl/flowable/Flowable.h b/yarpl/flowable/Flowable.h +index 9dff78b..bccd70d 100644 +--- a/yarpl/flowable/Flowable.h ++++ b/yarpl/flowable/Flowable.h +@@ -494,7 +494,7 @@ std::shared_ptr> Flowable::fromGenerator( + } + } catch (const std::exception& ex) { + subscriber.onError( +- folly::exception_wrapper(std::current_exception(), ex)); ++ folly::exception_wrapper(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex)); + } catch (...) { + subscriber.onError(std::runtime_error( + "Flowable::fromGenerator() threw from Subscriber:onNext()")); +diff --git a/yarpl/flowable/FlowableOperator.h b/yarpl/flowable/FlowableOperator.h +index 314ba7f..fe63504 100644 +--- a/yarpl/flowable/FlowableOperator.h ++++ b/yarpl/flowable/FlowableOperator.h +@@ -178,7 +178,7 @@ class MapOperator : public FlowableOperator { + this->subscriberOnNext(flowable->function_(std::move(value))); + } + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->terminateErr(std::move(ew)); + } + } +@@ -190,7 +190,7 @@ class MapOperator : public FlowableOperator { + } + } catch (const std::exception& exn) { + this->terminateErr( +- folly::exception_wrapper{std::current_exception(), exn}); ++ folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}); + } + } + +@@ -570,7 +570,7 @@ class FlatMapOperator : public FlowableOperator { + try { + mappedStream = flowable_->function_(std::move(value)); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + { + std::lock_guard g(onErrorExGuard_); + onErrorEx_ = ew; +diff --git a/yarpl/flowable/Subscriber.h b/yarpl/flowable/Subscriber.h +index d1dc3b5..582f9c4 100644 +--- a/yarpl/flowable/Subscriber.h ++++ b/yarpl/flowable/Subscriber.h +@@ -301,7 +301,7 @@ class Base : public LambdaSubscriber { + next_(std::move(value)); + } catch (const std::exception& exn) { + this->cancel(); +- auto ew = folly::exception_wrapper{std::current_exception(), exn}; ++ auto ew = folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + LOG(ERROR) << "'next' method should not throw: " << ew.what(); + onErrorImpl(ew); + return; +diff --git a/yarpl/observable/ObservableOperator.h b/yarpl/observable/ObservableOperator.h +index 451c6bd..0e60b48 100644 +--- a/yarpl/observable/ObservableOperator.h ++++ b/yarpl/observable/ObservableOperator.h +@@ -196,7 +196,7 @@ class MapOperator : public ObservableOperator { + try { + this->observerOnNext(observable_->function_(std::move(value))); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->terminateErr(std::move(ew)); + } + } +diff --git a/yarpl/single/SingleOperator.h b/yarpl/single/SingleOperator.h +index 0b3e739..4defd64 100644 +--- a/yarpl/single/SingleOperator.h ++++ b/yarpl/single/SingleOperator.h +@@ -197,7 +197,7 @@ class MapOperator : public SingleOperator { + auto map_operator = this->getOperator(); + this->observerOnSuccess(map_operator->function_(std::move(value))); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->observerOnError(std::move(ew)); + } + } diff --git a/ports/rsocket/portfile.cmake b/ports/rsocket/portfile.cmake index f6ec73c4aa721d..3ee27b265b8401 100644 --- a/ports/rsocket/portfile.cmake +++ b/ports/rsocket/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( fix-find-dependencies.patch use-cpp-17.patch fix-folly.patch + fix-rsockserver-build-error.patch ) vcpkg_cmake_configure( diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json index 018579f0bffca1..190c786aec3d32 100644 --- a/ports/rsocket/vcpkg.json +++ b/ports/rsocket/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsocket", "version-string": "2021.08.30.00", - "port-version": 1, + "port-version": 2, "description": "C++ implementation of RSocket http://rsocket.io", "homepage": "https://github.com/rsocket/rsocket-cpp", "dependencies": [ diff --git a/ports/rtabmap/fix_qt_deploy_plugins.patch b/ports/rtabmap/fix_qt_deploy_plugins.patch deleted file mode 100644 index 979ee8313d2889..00000000000000 --- a/ports/rtabmap/fix_qt_deploy_plugins.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt -index f0cef72c..f007eb83 100644 ---- a/app/src/CMakeLists.txt -+++ b/app/src/CMakeLists.txt -@@ -53,7 +53,14 @@ ENDIF() - INSTALL(TARGETS rtabmap_app - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime - BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime) -- -+ -+qt_generate_deploy_app_script( -+ TARGET rtabmap_app -+ FILENAME_VARIABLE deploy_script -+ NO_UNSUPPORTED_PLATFORM_ERROR -+) -+install(SCRIPT ${deploy_script}) -+ - IF(APPLE AND BUILD_AS_BUNDLE) - INSTALL(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" ${PROJECT_NAME} - WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 710db46e5ad6eb..2147226e9d6e83 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( SHA512 47fa00e760cd9089d42dc27cc0120f2dc2ad4b32b6a05e87fb5320fd6fe3971e68958984714895640989543be9252fd0fb96ccebf0d00d70afbad224022a7a53 HEAD_REF master PATCHES - fix_qt_deploy_plugins.patch fix_autouic.patch ) @@ -118,24 +117,22 @@ if("tools" IN_LIST FEATURES) # Remove duplicate files that were added by qtdeploy # that would be already deployed by vcpkg_copy_tools - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tmp) - file(GLOB RTABMAP_REL_LIBS ${CURRENT_PACKAGES_DIR}/tmp/rtabmap*) - file(COPY ${RTABMAP_REL_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tmp") + file(GLOB RTABMAP_REL_LIBS "${CURRENT_PACKAGES_DIR}/tmp/rtabmap*") + file(COPY ${RTABMAP_REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tmp") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/translations") - file(RENAME ${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) #qt.conf - file(WRITE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "[Paths] - Prefix = .") + file(COPY "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qt.conf" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "./../../../" "./../../") # Debug - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/tmp) - file(GLOB RTABMAP_DBG_LIBS ${CURRENT_PACKAGES_DIR}/debug/tmp/rtabmap*) - file(COPY ${RTABMAP_DBG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/tmp") + file(GLOB RTABMAP_DBG_LIBS "${CURRENT_PACKAGES_DIR}/debug/tmp/rtabmap*") + file(COPY ${RTABMAP_DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tmp") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/plugins") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/translations") - endif() endif() diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index 86754dd8dba660..ecbc94570e5b81 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtabmap", "version": "0.21.0", + "port-version": 1, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "license": "BSD-3-Clause", diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake index f71ca0adfe9806..826730a3b6d52e 100644 --- a/ports/ryu/portfile.cmake +++ b/ports/ryu/portfile.cmake @@ -1,3 +1,42 @@ +function(bazel_build build_type) + set(c_flags "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(linker_flags "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") + set(log_suffix "rel") + if (${build_type} STREQUAL "debug") + set(c_flags "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + set(linker_flags "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(log_suffix "dbg") + set(destination_modifier "/debug") + endif () + + separate_arguments(conly_opts NATIVE_COMMAND "${c_flags}") + separate_arguments(link_opts NATIVE_COMMAND "${linker_flags}") + + if (DEFINED ENV{CC}) + list(JOIN conly_opts ":" joined_opts) + set(ENV{BAZEL_CXXOPTS} "${joined_opts}") + list(JOIN link_opts ":" joined_opts) + set(ENV{BAZEL_LINKOPTS} "${joined_opts}") + endif () + + list(TRANSFORM conly_opts PREPEND "--conlyopt=") + list(TRANSFORM link_opts PREPEND "--linkopt=") + + vcpkg_execute_build_process( + COMMAND "${BAZEL}" --batch ${BAZEL_OUTPUT} build ${BAZEL_COMPILER} ${BAZEL_CPU} ${conly_opts} ${link_opts} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "build-${TARGET_TRIPLET}-${log_suffix}" + ) + + if ("${CMAKE_STATIC_LIBRARY_SUFFIX}" STREQUAL ".lib") + file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/ryu.lib" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") + file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") + else () + file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/libryu.a" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") + file(INSTALL "${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a" DESTINATION "${CURRENT_PACKAGES_DIR}${destination_modifier}/lib") + endif () +endfunction() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ulfjack/ryu @@ -6,76 +45,63 @@ vcpkg_from_github( HEAD_REF master ) -find_program(BAZEL bazel PATHS ${CURRENT_HOST_INSTALLED_DIR}/tools REQUIRED) -get_filename_component(BAZEL_DIR ${BAZEL} DIRECTORY) -vcpkg_add_to_path(PREPEND ${BAZEL_DIR}) -set(ENV{BAZEL_BIN_PATH} ${BAZEL}) +find_program(BAZEL bazel PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" REQUIRED) +get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${BAZEL_DIR}") +set(ENV{BAZEL_BIN_PATH} "${BAZEL}") vcpkg_cmake_get_vars(cmake_vars_file) -include(${cmake_vars_file}) - -if (CMAKE_HOST_WIN32) - set(ENV{BAZEL_VS} $ENV{VSInstallDir}) - set(ENV{BAZEL_VC} $ENV{VCInstallDir}) -endif () - -if (VCPKG_DETECTED_CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin) - set(ENV{SDKROOT} ${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}) -endif () - -function(prepare_bazel_opts flags opts switch) - string(STRIP ${${flags}} ${flags}) - if (${flags}) - string(REGEX REPLACE "[ ]+-" ";-" ${flags} ${${flags}}) - foreach (OPT IN LISTS ${flags}) - if (${opts}) - string(REGEX REPLACE "^([^ ]+)[ ]+\"?([^\"]+)\"?$" \\1\\2 OPT ${OPT}) - set(${opts} ${${opts}};${switch}=${OPT}) - else () - set(${opts} ${switch}=${OPT}) - endif () - endforeach () - set(${opts} ${${opts}} PARENT_SCOPE) +include("${cmake_vars_file}") +if (VCPKG_HOST_IS_WINDOWS) + if (VCPKG_DETECTED_MSVC) + set(ENV{BAZEL_VC} "$ENV{VCInstallDir}") + elseif (VCPKG_TARGET_IS_MINGW) + if (NOT "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") + message(FATAL_ERROR "${TARGET_TRIPLET} is not supported on Windows!") + endif () + set(BAZEL_COMPILER "--compiler=mingw-gcc") + # BAZEL_SH can be propagated to the build environment using VCPKG_KEEP_ENV_VARS + if (NOT DEFINED ENV{BAZEL_SH}) + message("BAZEL_SH is not specified, trying to guess...") + get_filename_component(DIR "${VCPKG_DETECTED_CMAKE_C_COMPILER}" DIRECTORY) + # Bazel expects Mingw-w64 to be installed in MSYS2 (pacman -S mingw-w64-x86_64-toolchain). + # From BAZEL_SH it finds MSYS2 root, adds "mingw64" to the root and uses this path as the location of Mingw-w64. + # It is also possible to use non-MSYS2 binaries with Bazel if they are installed to a directory + # whose name ends with "mingw64", such as c:\mingw64 or c:\TDM-GCC-64\mingw64. + string(REGEX REPLACE /mingw64/bin$ "" MSYS2_ROOT "${DIR}") + set(ENV{BAZEL_SH} "${MSYS2_ROOT}/usr/bin/bash.exe") + message("BAZEL_SH $ENV{BAZEL_SH}") + endif () + else () + message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!") + endif () + if ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") + set(BAZEL_CPU "--cpu=x64_x86_windows") + elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") + set(BAZEL_CPU "--cpu=x64_windows") + elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM") + set(BAZEL_CPU "--cpu=x64_arm_windows") + elseif ("${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64") + set(BAZEL_CPU "--cpu=arm64_windows") + else () + message(FATAL_ERROR "${TARGET_TRIPLET} is not supported!") endif () -endfunction() - -prepare_bazel_opts(VCPKG_COMBINED_C_FLAGS_RELEASE CONLY_OPTS_RELEASE --conlyopt) -prepare_bazel_opts(VCPKG_COMBINED_C_FLAGS_DEBUG CONLY_OPTS_DEBUG --conlyopt) -prepare_bazel_opts(VCPKG_COMBINED_CXX_FLAGS_RELEASE CXX_OPTS_RELEASE --cxxopt) -prepare_bazel_opts(VCPKG_COMBINED_CXX_FLAGS_DEBUG CXX_OPTS_DEBUG --cxxopt) -prepare_bazel_opts(VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE LINK_OPTS_RELEASE --linkopt) -prepare_bazel_opts(VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG LINK_OPTS_DEBUG --linkopt) - -vcpkg_execute_build_process( - COMMAND ${BAZEL} --batch build ${CONLY_OPTS_RELEASE} ${CXX_OPTS_RELEASE} ${LINK_OPTS_RELEASE} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-rel -) - -if (CMAKE_HOST_WIN32) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) else () - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) + if (NOT DEFINED ENV{USER}) + set(ENV{USER} "root") + set(BAZEL_OUTPUT "--output_user_root=/tmp/bazel") + endif () + set(ENV{BAZEL_USE_CPP_ONLY_TOOLCHAIN} "1") + set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") endif () -vcpkg_execute_build_process( - COMMAND ${BAZEL} --batch build ${CONLY_OPTS_DEBUG} ${CXX_OPTS_DEBUG} ${LINK_OPTS_DEBUG} --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-dbg -) - -if (CMAKE_HOST_WIN32) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -else () - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +bazel_build("release") +if (NOT VCPKG_BUILD_TYPE) + bazel_build("debug") endif () -file(INSTALL ${SOURCE_PATH}/LICENSE-Boost DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/ryu/ryu.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ryu/) -file(INSTALL ${SOURCE_PATH}/ryu/ryu2.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ryu/) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE-Boost" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/ryu/ryu.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/ryu") +file(INSTALL "${SOURCE_PATH}/ryu/ryu2.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/ryu") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/ryu/vcpkg.json b/ports/ryu/vcpkg.json index 2002de45d678fc..95a3a8e7710585 100644 --- a/ports/ryu/vcpkg.json +++ b/ports/ryu/vcpkg.json @@ -1,10 +1,9 @@ { "name": "ryu", "version": "2.0", - "port-version": 7, + "port-version": 9, "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.", "homepage": "https://github.com/ulfjack/ryu", - "supports": "!(uwp | arm | x86)", "dependencies": [ { "name": "vcpkg-cmake-get-vars", diff --git a/ports/sais/vcpkg.json b/ports/sais/vcpkg.json index 531a2c03b19fdf..35161b92c9fdeb 100644 --- a/ports/sais/vcpkg.json +++ b/ports/sais/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sais", - "version-string": "2.4.1", - "port-version": 4, + "version": "2.4.1", + "port-version": 5, "description": "An implementation of the induced sorting algorithm", "dependencies": [ { diff --git a/ports/sajson/vcpkg.json b/ports/sajson/vcpkg.json index 8c4fe873581549..5c831dc146830b 100644 --- a/ports/sajson/vcpkg.json +++ b/ports/sajson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sajson", - "version-string": "2018-09-21", - "port-version": 2, + "version-date": "2018-09-21", + "port-version": 3, "description": "Lightweight, extremely high-performance JSON parser for C++11", "dependencies": [ { diff --git a/ports/scenepic/portfile.cmake b/ports/scenepic/portfile.cmake index a52ef472b69c3e..8a7f976465c237 100644 --- a/ports/scenepic/portfile.cmake +++ b/ports/scenepic/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/scenepic REF "v${VERSION}" - SHA512 2d9dfcefa7a054cf0addb12113ab65cb7dd3a8a6f7b42f60558a5d47a6de45a9e801be3266b81358ff8ac075dd9e9e2b9369905d62f2383531d6e28e93406ac9 + SHA512 2ec8cdaa54a4432386175c545c4114d0682015cb34f77968622eac0b9ef6ccd8a5f14ba663339995bf109b472958407f694d40adf6025c02e464e94ef4fe5bd0 HEAD_REF main PATCHES "fix_dependencies.patch" diff --git a/ports/scenepic/vcpkg.json b/ports/scenepic/vcpkg.json index 162453df24c2f4..3e709eb0964fb0 100644 --- a/ports/scenepic/vcpkg.json +++ b/ports/scenepic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "scenepic", - "version": "1.0.16", + "version": "1.1.0", "port-version": 1, "description": "A Powerful, easy to use, and portable visualization toolkit for mixed 3D and 2D content", "homepage": "https://microsoft.github.io/scenepic/", diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index 50d61e642baf6c..6fa9f61c114706 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -12,10 +12,10 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static") list(APPEND PATCHES 0002-static-crt.patch) endif() -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF 4.4.6 + SOURCE_BASE 4.4.6 PATCHES ${PATCHES} ) diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json index 2a934dc634bcc6..d3e134a2b3700c 100644 --- a/ports/scintilla/vcpkg.json +++ b/ports/scintilla/vcpkg.json @@ -1,7 +1,7 @@ { "name": "scintilla", "version": "4.4.6", - "port-version": 1, + "port-version": 2, "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", "supports": "!(uwp | linux | osx)" diff --git a/ports/scylla-wrapper/vcpkg.json b/ports/scylla-wrapper/vcpkg.json index 79d6d09a5fb8d5..2b3ff60aa66c07 100644 --- a/ports/scylla-wrapper/vcpkg.json +++ b/ports/scylla-wrapper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "scylla-wrapper", - "version-string": "2018-08-26-16e6f435", - "port-version": 2, + "version": "2018-08-26-16e6f435", + "port-version": 3, "description": "This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b).", "supports": "windows & !uwp & !arm & !static", "dependencies": [ diff --git a/ports/sdl1-mixer/SDL_mixer.vcxproj.in b/ports/sdl1-mixer/SDL_mixer.vcxproj.in new file mode 100644 index 00000000000000..1ea5182d7414c3 --- /dev/null +++ b/ports/sdl1-mixer/SDL_mixer.vcxproj.in @@ -0,0 +1,302 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33} + SDL_mixer + + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + @LIB_TYPE@ + v141 + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28307.799 + + + .\Debug\ + .\Debug\ + true + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + .\Release\ + .\Release\ + false + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/SDL_mixer.tlb + + + + /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) + Disabled + ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + @CRT_TYPE_DBG@ + .\Debug/SDL_mixer.pch + Level3 + true + OldStyle + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;SDL.lib;%(AdditionalDependencies) + true + .\Debug/SDL_mixer.pdb + Windows + MachineX86 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Debug/SDL_mixer.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/SDL_mixer.tlb + + + + /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) + Disabled + ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + @CRT_TYPE_DBG@ + .\Debug/SDL_mixer.pch + Level3 + true + OldStyle + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;SDL.lib;%(AdditionalDependencies) + true + .\Debug/SDL_mixer.pdb + Windows + MachineX64 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Debug/SDL_mixer.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/SDL_mixer.tlb + + + + /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/SDL_mixer.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;SDL.lib;%(AdditionalDependencies) + .\Release/SDL_mixer.pdb + Windows + MachineX86 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Release/SDL_mixer.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/SDL_mixer.tlb + + + + /D OGG_DYNAMIC=\"vorbisfile.dll\" %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ..\timidity;..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC="mikmod.dll";OGG_MUSIC;OGG_DYNAMIC="vorbisfile.dll";FLAC_MUSIC;FLAC_DYNAMIC="FLAC.dll";MP3_MUSIC;MPG123_DYNAMIC="mpg123.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/SDL_mixer.pch + Level3 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;SDL.lib;%(AdditionalDependencies) + .\Release/SDL_mixer.pdb + Windows + MachineX64 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Release/SDL_mixer.bsc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {ebda67ca-4a23-4f22-bfbc-b8dbe0580d4f} + false + + + {b162b6f1-e876-4d5f-a1f6-e3a6dc2f4a2c} + false + + + + + + \ No newline at end of file diff --git a/ports/sdl1-mixer/SDL_mixer_2017.sln.in b/ports/sdl1-mixer/SDL_mixer_2017.sln.in new file mode 100644 index 00000000000000..1437f385883a79 --- /dev/null +++ b/ports/sdl1-mixer/SDL_mixer_2017.sln.in @@ -0,0 +1,70 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1321 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_mixer", "SDL_mixer.vcxproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "native_midi", "native_midi\native_midi.vcxproj", "{EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playmus", "playmus\playmus.vcxproj", "{72CB0DD4-051D-486C-9CB3-75FE16F7D87A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playwave", "playwave\playwave.vcxproj", "{AC86CEAA-9908-476F-B15F-C7193CEF81BD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timidity", "timidity\timidity.vcxproj", "{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|Win32.Build.0 = Debug|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.ActiveCfg = Debug|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Debug|x64.Build.0 = Debug|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.ActiveCfg = Release|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|Win32.Build.0 = Release|Win32 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.ActiveCfg = Release|x64 + {F7E944B3-0815-40CD-B3E4-90B2A15B0E33}.Release|x64.Build.0 = Release|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|Win32.Build.0 = Debug|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.ActiveCfg = Debug|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Debug|x64.Build.0 = Debug|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.ActiveCfg = Release|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|Win32.Build.0 = Release|Win32 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.ActiveCfg = Release|x64 + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F}.Release|x64.Build.0 = Release|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.ActiveCfg = Debug|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|Win32.Build.0 = Debug|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.ActiveCfg = Debug|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Debug|x64.Build.0 = Debug|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.ActiveCfg = Release|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|Win32.Build.0 = Release|Win32 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.ActiveCfg = Release|x64 + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A}.Release|x64.Build.0 = Release|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|Win32.Build.0 = Debug|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.ActiveCfg = Debug|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Debug|x64.Build.0 = Debug|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.ActiveCfg = Release|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|Win32.Build.0 = Release|Win32 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.ActiveCfg = Release|x64 + {AC86CEAA-9908-476F-B15F-C7193CEF81BD}.Release|x64.Build.0 = Release|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.ActiveCfg = Debug|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|Win32.Build.0 = Debug|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.ActiveCfg = Debug|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Debug|x64.Build.0 = Debug|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.ActiveCfg = Release|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|Win32.Build.0 = Release|Win32 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.ActiveCfg = Release|x64 + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F6077CF7-C552-4A55-AB30-0E159B015586} + EndGlobalSection +EndGlobal diff --git a/ports/sdl1-mixer/mpg123_ssize_t.patch b/ports/sdl1-mixer/mpg123_ssize_t.patch new file mode 100644 index 00000000000000..8cead248762400 --- /dev/null +++ b/ports/sdl1-mixer/mpg123_ssize_t.patch @@ -0,0 +1,41 @@ +diff --git a/dynamic_mp3.c b/dynamic_mp3.c +index 7c3209f0..ba80ee7a 100644 +--- a/dynamic_mp3.c ++++ b/dynamic_mp3.c +@@ -63,7 +63,7 @@ int Mix_InitMP3(void) + #else + FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) + #endif +- FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) ++ FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, mpg123_ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) + FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) + FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) + if (mpg123.mpg123_init() != MPG123_OK) { +diff --git a/dynamic_mp3.h b/dynamic_mp3.h +index 2e4c48af..ad63bf76 100644 +--- a/dynamic_mp3.h ++++ b/dynamic_mp3.h +@@ -43,7 +43,7 @@ typedef struct { + #else + int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); + #endif +- int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); ++ int (*mpg123_replace_reader_handle)( mpg123_handle *mh, mpg123_ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); + off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); + const char* (*mpg123_strerror)(mpg123_handle *mh); + } mpg123_loader; +diff --git a/music_mpg.c b/music_mpg.c +index 531615a2..7d92c28b 100644 +--- a/music_mpg.c ++++ b/music_mpg.c +@@ -67,8 +67,8 @@ mpg_err(mpg123_handle* mpg, int code) + + /* we're gonna override mpg123's I/O with these wrappers for RWops */ + static +-ssize_t rwops_read(void* p, void* dst, size_t n) { +- return (ssize_t)MP3_RWread((struct mp3file_t *)p, dst, 1, n); ++mpg123_ssize_t rwops_read(void* p, void* dst, size_t n) { ++ return (mpg123_ssize_t)MP3_RWread((struct mp3file_t *)p, dst, 1, n); + } + + static diff --git a/ports/sdl1-mixer/native_midi.vcxproj.in b/ports/sdl1-mixer/native_midi.vcxproj.in new file mode 100644 index 00000000000000..eb31ce1dbec55d --- /dev/null +++ b/ports/sdl1-mixer/native_midi.vcxproj.in @@ -0,0 +1,179 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {EBDA67CA-4A23-4F22-BFBC-B8DBE0580D4F} + + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28307.799 + + + .\Release\ + .\Release\ + + + .\Debug\ + .\Debug\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/native_midi.pch + Level3 + + + 0x0409 + + + true + .\Release/native_midi.bsc + + + + + Disabled + ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + .\Debug/native_midi.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/native_midi.bsc + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/native_midi.pch + Level3 + + + 0x0409 + + + true + .\Release/native_midi.bsc + + + + + X64 + + + Disabled + ..\..;..\..\native_midi;@CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + .\Debug/native_midi.pch + Level3 + true + OldStyle + + + 0x0409 + + + true + .\Debug/native_midi.bsc + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ports/sdl1-mixer/playmus.vcxproj.in b/ports/sdl1-mixer/playmus.vcxproj.in new file mode 100644 index 00000000000000..ba6e37f8e4ec7b --- /dev/null +++ b/ports/sdl1-mixer/playmus.vcxproj.in @@ -0,0 +1,247 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {72CB0DD4-051D-486C-9CB3-75FE16F7D87A} + 10.0.17763.0 + + + + Application + v141 + false + + + Application + v141 + false + + + Application + v141 + false + + + Application + v141 + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28307.799 + + + .\Debug\ + .\Debug\ + true + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + .\Release\ + .\Release\ + false + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/playmus.tlb + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_DBG@ + .\Debug/playmus.pch + Level3 + true + OldStyle + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + true + .\Debug/playmus.pdb + Windows + MachineX86 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Debug/playmus.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/playmus.tlb + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_DBG@ + .\Debug/playmus.pch + Level3 + true + OldStyle + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + true + .\Debug/playmus.pdb + Windows + MachineX64 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Debug/playmus.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/playmus.tlb + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/playmus.pch + Level3 + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/playmus.pdb + Windows + MachineX86 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Release/playmus.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/playmus.tlb + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/playmus.pch + Level3 + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/playmus.pdb + Windows + MachineX64 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Release/playmus.bsc + + + + + + + + {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} + false + + + + + + \ No newline at end of file diff --git a/ports/sdl1-mixer/playwave.vcxproj.in b/ports/sdl1-mixer/playwave.vcxproj.in new file mode 100644 index 00000000000000..05fe6234148c50 --- /dev/null +++ b/ports/sdl1-mixer/playwave.vcxproj.in @@ -0,0 +1,247 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {AC86CEAA-9908-476F-B15F-C7193CEF81BD} + 10.0.17763.0 + + + + Application + v141 + false + + + Application + v141 + false + + + Application + v141 + false + + + Application + v141 + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28307.799 + + + .\Release\ + .\Release\ + false + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + .\Debug\ + .\Debug\ + true + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/playwave.tlb + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/playwave.pch + Level3 + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/playwave.pdb + Windows + MachineX86 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Release/playwave.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/playwave.tlb + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/playwave.pch + Level3 + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/playwave.pdb + Windows + MachineX64 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Release/playwave.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/playwave.tlb + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_DBG@ + .\Debug/playwave.pch + Level3 + true + OldStyle + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + true + .\Debug/playwave.pdb + Windows + MachineX86 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Debug/playwave.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/playwave.tlb + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + @CRT_TYPE_DBG@ + .\Debug/playwave.pch + Level3 + true + OldStyle + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + SDL.lib;manual-link\SDLmain.lib;winmm.lib;dxguid.lib;%(AdditionalDependencies) + true + .\Debug/playwave.pdb + Windows + MachineX64 + @CURRENT_INSTALLED_DIR@/lib;%(AdditionalLibraryDirectories) + + + true + .\Debug/playwave.bsc + + + + + + + + {f7e944b3-0815-40cd-b3e4-90b2a15b0e33} + false + + + + + + \ No newline at end of file diff --git a/ports/sdl1-mixer/portfile.cmake b/ports/sdl1-mixer/portfile.cmake new file mode 100644 index 00000000000000..299e9db2c7d119 --- /dev/null +++ b/ports/sdl1-mixer/portfile.cmake @@ -0,0 +1,79 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsdl-org/SDL_mixer + REF d8b2c98ca3db62fa3d4e1dbb8801c6f57a10b8bf + SHA512 e22b2e26d9c7296e79589d5108118c65f5fb76e7e9d6996129e19b63313f9aa3a4c0657010e45fa040792fa81c488dae3ec6fac09e147d3b4430d612837e0132 + HEAD_REF SDL-1.2 + PATCHES + mpg123_ssize_t.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + configure_file("${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL_mixer_2017.sln" COPYONLY) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LIB_TYPE StaticLibrary) + else() + set(LIB_TYPE DynamicLibrary) + endif() + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(CRT_TYPE_DBG MultiThreadedDebugDLL) + set(CRT_TYPE_REL MultiThreadedDLL) + else() + set(CRT_TYPE_DBG MultiThreadedDebug) + set(CRT_TYPE_REL MultiThreaded) + endif() + + configure_file("${CURRENT_PORT_DIR}/SDL_mixer.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL_mixer.vcxproj" @ONLY) + configure_file("${CURRENT_PORT_DIR}/native_midi.vcxproj.in" "${SOURCE_PATH}/VisualC/native_midi/native_midi.vcxproj" @ONLY) + configure_file("${CURRENT_PORT_DIR}/timidity.vcxproj.in" "${SOURCE_PATH}/VisualC/timidity/timidity.vcxproj" @ONLY) + configure_file("${CURRENT_PORT_DIR}/playmus.vcxproj.in" "${SOURCE_PATH}/VisualC/playmus/playmus.vcxproj" @ONLY) + configure_file("${CURRENT_PORT_DIR}/playwave.vcxproj.in" "${SOURCE_PATH}/VisualC/playwave/playwave.vcxproj" @ONLY) + + # This text file gets copied as a library, and included as one in the package + file(REMOVE "${SOURCE_PATH}/external/libmikmod/COPYING.LIB") + + # Remove unused external dlls + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libFLAC-8.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libmikmod-2.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libmpg123-0.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libogg-0.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libvorbis-0.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x86/libvorbisfile-3.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libFLAC-8.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libmikmod-2.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libmpg123-0.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libogg-0.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libvorbis-0.dll") + file(REMOVE "${SOURCE_PATH}/VisualC/external/lib/x64/libvorbisfile-3.dll") + + file(WRITE "${SOURCE_PATH}/Directory.Build.props" " + + + + ${CURRENT_PACKAGES_DIR}/include;${CURRENT_PACKAGES_DIR}/include/SDL;${CURRENT_INSTALLED_DIR}/include;${CURRENT_INSTALLED_DIR}/include/SDL + + + ") + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH VisualC/SDL_mixer_2017.sln + #INCLUDES_SUBPATH include + LICENSE_SUBPATH COPYING + #ALLOW_ROOT_INCLUDES + ) + file(COPY "${SOURCE_PATH}/SDL_mixer.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/SDL") +else() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + ) + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/sdl1-mixer/timidity.vcxproj.in b/ports/sdl1-mixer/timidity.vcxproj.in new file mode 100644 index 00000000000000..2689aefac0b203 --- /dev/null +++ b/ports/sdl1-mixer/timidity.vcxproj.in @@ -0,0 +1,201 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C} + timidity + + + + StaticLibrary + false + v141 + + + StaticLibrary + false + v141 + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.28307.799 + + + .\Release\ + .\Release\ + + + .\Debug\ + .\Debug\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/timidity.pch + Level3 + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + 0x0409 + + + true + .\Release/timidity.bsc + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + .\Debug/timidity.pch + Level3 + true + OldStyle + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + 0x0409 + + + true + .\Debug/timidity.bsc + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + @CRT_TYPE_REL@ + true + .\Release/timidity.pch + Level3 + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + 0x0409 + + + true + .\Release/timidity.bsc + + + + + X64 + + + Disabled + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + @CRT_TYPE_DBG@ + .\Debug/timidity.pch + Level3 + true + OldStyle + @CURRENT_PACKAGES_DIR@/include/SDL;@CURRENT_INSTALLED_DIR@/include/SDL + + + 0x0409 + + + true + .\Debug/timidity.bsc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ports/sdl1-mixer/usage b/ports/sdl1-mixer/usage new file mode 100644 index 00000000000000..886069e417af04 --- /dev/null +++ b/ports/sdl1-mixer/usage @@ -0,0 +1,4 @@ +The package sdl1-mixer is compatible with built-in CMake targets: + + find_package(SDL_mixer REQUIRED) + target_link_libraries(main PRIVATE ${SDL_MIXER_LIBRARY}) diff --git a/ports/sdl1-mixer/vcpkg.json b/ports/sdl1-mixer/vcpkg.json new file mode 100644 index 00000000000000..52ef800e7f63e8 --- /dev/null +++ b/ports/sdl1-mixer/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "sdl1-mixer", + "version-date": "2023-03-25", + "port-version": 2, + "description": "An audio mixer that supports various file formats for Simple Directmedia Layer.", + "homepage": "https://www.libsdl.org", + "license": "Zlib", + "supports": "!osx & !uwp & !arm", + "dependencies": [ + "libflac", + "libmikmod", + "libogg", + "libvorbis", + "mpg123", + "sdl1" + ] +} diff --git a/ports/sdl1-net/vcpkg.json b/ports/sdl1-net/vcpkg.json index d76a7ba213f092..6be7f0e4c61168 100644 --- a/ports/sdl1-net/vcpkg.json +++ b/ports/sdl1-net/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1-net", - "version-string": "1.2.8", - "port-version": 5, + "version": "1.2.8", + "port-version": 6, "description": "Networking library for SDL", "dependencies": [ "sdl1", diff --git a/ports/sdl1/SDL1_2017.sln b/ports/sdl1/SDL1_2017.sln.in similarity index 100% rename from ports/sdl1/SDL1_2017.sln rename to ports/sdl1/SDL1_2017.sln.in diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index 3f46fe3894be95..c4fe695caec34f 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -13,14 +13,14 @@ vcpkg_from_github( configure_file("${SOURCE_PATH}/include/SDL_config.h.default" "${SOURCE_PATH}/include/SDL_config.h" COPYONLY) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/") - + configure_file("${CURRENT_PORT_DIR}/SDL1_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL1_2017.sln" COPYONLY) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIB_TYPE StaticLibrary) else() set(LIB_TYPE DynamicLibrary) endif() - + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(CRT_TYPE_DBG MultiThreadedDebugDLL) set(CRT_TYPE_REL MultiThreadedDLL) @@ -28,13 +28,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(CRT_TYPE_DBG MultiThreadedDebug) set(CRT_TYPE_REL MultiThreaded) endif() - + configure_file("${CURRENT_PORT_DIR}/SDL.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj" @ONLY) configure_file("${CURRENT_PORT_DIR}/SDLmain.vcxproj.in" "${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj" @ONLY) - - # This text file gets copied as a library, and included as one in the package + + # This text file gets copied as a library, and included as one in the package file(REMOVE_RECURSE "${SOURCE_PATH}/src/hermes/COPYING.LIB") - + vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH VisualC/SDL1_2017.sln @@ -42,13 +42,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) LICENSE_SUBPATH COPYING ALLOW_ROOT_INCLUDES ) - + #Take all the fils into include/SDL to sovle conflict with SDL2 port file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/doxyfile") file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/SDL") - + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib") if(NOT DEFINED VCPKG_BUILD_TYPE) @@ -74,10 +74,10 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" ) - + vcpkg_install_make() vcpkg_fixup_pkgconfig() - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3" diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index 43968e5ed3e424..113aea6732338f 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1", "version": "1.2.15", - "port-version": 17, + "port-version": 18, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org", "license": "LGPL-2.1-or-later", diff --git a/ports/sdl2-gfx/vcpkg.json b/ports/sdl2-gfx/vcpkg.json index b5ba5206abc802..a6b0345c715dd9 100644 --- a/ports/sdl2-gfx/vcpkg.json +++ b/ports/sdl2-gfx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-gfx", - "version-string": "1.0.4", - "port-version": 9, + "version": "1.0.4", + "port-version": 10, "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.", "dependencies": [ "sdl2", diff --git a/ports/sdl2-mixer-ext/fix-dependencies.patch b/ports/sdl2-mixer-ext/fix-dependencies.patch new file mode 100644 index 00000000000000..a662dcf9ce54f5 --- /dev/null +++ b/ports/sdl2-mixer-ext/fix-dependencies.patch @@ -0,0 +1,304 @@ +diff --git a/src/codecs/music_ffmpeg.cmake b/src/codecs/music_ffmpeg.cmake +index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac430ca50d 100644 +--- a/src/codecs/music_ffmpeg.cmake ++++ b/src/codecs/music_ffmpeg.cmake +@@ -3,7 +3,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) + option(USE_FFMPEG_DYNAMIC "Use dynamical loading of FFMPEG" ON) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(FFMPEG QUIET) ++ find_package(FFMPEG REQUIRED) + message("FFMPEG: [${FFMPEG_avcodec_FOUND}] ${FFMPEG_INCLUDE_DIRS} ${FFMPEG_swresample_LIBRARY} ${FFMPEG_avformat_LIBRARY} ${FFMPEG_avcodec_LIBRARY} ${FFMPEG_avutil_LIBRARY}") + if(USE_FFMPEG_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS +@@ -16,10 +16,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) + message("Dynamic FFMPEG: ${FFMPEG_avutil_DYNAMIC_LIBRARY} ${FFMPEG_avcodec_DYNAMIC_LIBRARY} ${FFMPEG_avformat_DYNAMIC_LIBRARY} ${FFMPEG_swresample_DYNAMIC_LIBRARY}") + endif() + set(FFMPEG_LINK_LIBRARIES +- ${FFMPEG_swresample_LIBRARY} +- ${FFMPEG_avformat_LIBRARY} +- ${FFMPEG_avcodec_LIBRARY} +- ${FFMPEG_avutil_LIBRARY} ++ ${FFMPEG_LIBRARIES} + ) + else() + message(WARNING "FFMPEG libraries are not a part of AudioCodecs yet. Using any available from the system.") +@@ -41,7 +38,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) + set(FFMPEG_swresample_FOUND 1) + endif() + +- if(FFMPEG_avcodec_FOUND AND FFMPEG_avformat_FOUND AND FFMPEG_avutil_FOUND AND FFMPEG_swresample_FOUND) ++ if(1) + set(FFMPEG_FOUND 1) + endif() + +diff --git a/src/codecs/music_flac.cmake b/src/codecs/music_flac.cmake +index 8fb69ed54894dc2657e6da326015a606f567eb9d..9caf2b1a817258b957416f20aa57a5cd21f06c3c 100644 +--- a/src/codecs/music_flac.cmake ++++ b/src/codecs/music_flac.cmake +@@ -3,7 +3,10 @@ if(USE_FLAC) + option(USE_FLAC_DYNAMIC "Use dynamical loading of FLAC" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(FLAC QUIET) ++ find_package(FLAC CONFIG REQUIRED) ++ get_target_property(FLAC_INCLUDE_DIRS FLAC::FLAC INTERFACE_INCLUDE_DIRECTORIES) ++ set(FLAC_LIBRARIES FLAC::FLAC) ++ set(FLAC_FOUND 1) + message("FLAC: [${FLAC_FOUND}] ${FLAC_INCLUDE_DIRS} ${FLAC_LIBRARIES}") + if(USE_FLAC_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DFLAC_DYNAMIC=\"${FLAC_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_fluidsynth.cmake b/src/codecs/music_fluidsynth.cmake +index ee90c2708aa3857514dd4154dcc94ec17a8f22ec..d4d8d921e9863857a4bdce45b87b30e330379b2c 100644 +--- a/src/codecs/music_fluidsynth.cmake ++++ b/src/codecs/music_fluidsynth.cmake +@@ -6,7 +6,10 @@ if(USE_MIDI_FLUIDSYNTH AND NOT USE_MIDI_FLUIDLITE AND MIXERX_LGPL) + message(WARNING "AudioCodecs doesn't ship FluidSynth, it will be recognized from a system!!!") + endif() + +- find_package(FluidSynth QUIET) ++ find_package(FluidSynth CONFIG REQUIRED) ++ get_target_property(FluidSynth_INCLUDE_DIRS FluidSynth::libfluidsynth INTERFACE_INCLUDE_DIRECTORIES) ++ set(FluidSynth_LIBRARIES FluidSynth::libfluidsynth) ++ set(FluidSynth_FOUND 1) + message("FluidSynth: [${FluidSynth_FOUND}] ${FluidSynth_INCLUDE_DIRS} ${FluidSynth_LIBRARIES}") + if(USE_MIDI_FLUIDSYNTH_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DFLUIDSYNTH_DYNAMIC=\"${FluidSynth_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_gme.cmake b/src/codecs/music_gme.cmake +index 7e0df24427f4793bd19f2def937853d949957340..a407ccb4c41eb3c900e3a07687e2a15eae166b96 100644 +--- a/src/codecs/music_gme.cmake ++++ b/src/codecs/music_gme.cmake +@@ -3,7 +3,14 @@ if(USE_GME AND MIXERX_LGPL) + option(USE_GME_DYNAMIC "Use dynamical loading of Game Music Emulators library" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(GME QUIET) ++ find_path(GME_INCLUDE_DIRS "gme.h" PATH_SUFFIXES gme) ++ find_library(GME_LIBRARY_RELEASE NAMES gme PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) ++ find_library(GME_LIBRARY_DEBUG NAMES gme PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) ++ include(SelectLibraryConfigurations) ++ select_library_configurations(GME) ++ find_package(ZLIB REQUIRED) ++ list(APPEND GME_LIBRARIES ${ZLIB_LIBRARIES}) ++ set(GME_FOUND 1) + message("GME: [${GME_FOUND}] ${GME_INCLUDE_DIRS} ${GME_LIBRARIES}") + if(USE_GME_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DGME_DYNAMIC=\"${GME_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_midi_adl.cmake b/src/codecs/music_midi_adl.cmake +index 0d3b302f1d73ba01ec6a3b187559f1892f8a4c76..26864407f0e26d2affde07829d28407d8eea1a9f 100644 +--- a/src/codecs/music_midi_adl.cmake ++++ b/src/codecs/music_midi_adl.cmake +@@ -3,7 +3,15 @@ if(USE_MIDI_ADLMIDI AND MIXERX_GPL) + option(USE_MIDI_ADLMIDI_DYNAMIC "Use dynamical loading of libADLMIDI library" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(ADLMIDI QUIET) ++ find_package(libADLMIDI CONFIG REQUIRED) ++ if(SDL_MIXER_X_STATIC) ++ set(_adlmidi libADLMIDI::ADLMIDI_static) ++ else() ++ set(_adlmidi libADLMIDI::ADLMIDI_shared) ++ endif() ++ get_target_property(ADLMIDI_INCLUDE_DIRS ${_adlmidi} INTERFACE_INCLUDE_DIRECTORIES) ++ set(ADLMIDI_LIBRARIES ${_adlmidi}) ++ set(ADLMIDI_FOUND 1) + message("ADLMIDI: [${ADLMIDI_FOUND}] ${ADLMIDI_INCLUDE_DIRS} ${ADLMIDI_LIBRARIES}") + if(USE_MIDI_ADLMIDI_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DADLMIDI_DYNAMIC=\"${ADLMIDI_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_midi_opn.cmake b/src/codecs/music_midi_opn.cmake +index 34169046fe51bd6d1b27d314733b2a13209b7968..3dc4409dc7ea6b6a340f7082c0567bbf946c9132 100644 +--- a/src/codecs/music_midi_opn.cmake ++++ b/src/codecs/music_midi_opn.cmake +@@ -3,7 +3,15 @@ if(USE_MIDI_OPNMIDI AND MIXERX_GPL) + option(USE_MIDI_OPNMIDI_DYNAMIC "Use dynamical loading of libOPNMIDI library" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(OPNMIDI QUIET) ++ find_package(libOPNMIDI CONFIG REQUIRED) ++ if(SDL_MIXER_X_STATIC) ++ set(_opnmidi libOPNMIDI::OPNMIDI_static) ++ else() ++ set(_opnmidi libOPNMIDI::OPNMIDI_shared) ++ endif() ++ get_target_property(OPNMIDI_INCLUDE_DIRS ${_opnmidi} INTERFACE_INCLUDE_DIRECTORIES) ++ set(OPNMIDI_LIBRARIES ${_opnmidi}) ++ set(OPNMIDI_FOUND 1) + message("OPNMIDI: [${OPNMIDI_FOUND}] ${OPNMIDI_INCLUDE_DIRS} ${OPNMIDI_LIBRARIES}") + if(USE_MIDI_OPNMIDI_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DOPNMIDI_DYNAMIC=\"${OPNMIDI_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_modplug.cmake b/src/codecs/music_modplug.cmake +index 555bcd91574d1c65761121648b331715a5fe8dad..ad065be36cd0176aa7f08631a6df48e857f76e42 100644 +--- a/src/codecs/music_modplug.cmake ++++ b/src/codecs/music_modplug.cmake +@@ -4,7 +4,12 @@ if(USE_MODPLUG) + option(USE_MODPLUG_STATIC "Use linking with a static ModPlug" ON) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(ModPlug QUIET) ++ find_path(ModPlug_INCLUDE_DIRS "modplug.h" PATH_SUFFIXES libmodplug) ++ find_library(ModPlug_LIBRARY_RELEASE NAMES modplug PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) ++ find_library(ModPlug_LIBRARY_DEBUG NAMES modplug PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) ++ include(SelectLibraryConfigurations) ++ select_library_configurations(ModPlug) ++ set(ModPlug_FOUND 1) + message("ModPlug: [${ModPlug_FOUND}] ${ModPlug_INCLUDE_DIRS} ${ModPlug_LIBRARIES}") + if(USE_MODPLUG_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DMODPLUG_DYNAMIC=\"${ModPlug_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_mpg123.cmake b/src/codecs/music_mpg123.cmake +index c615896cd95e2854ced2d4188ea8e0d18870ad91..602a7b136ec135d55839cf7ab103df56357a8a4c 100644 +--- a/src/codecs/music_mpg123.cmake ++++ b/src/codecs/music_mpg123.cmake +@@ -4,7 +4,10 @@ if(USE_MP3_MPG123 AND MIXERX_LGPL) + option(USE_MP3_MPG123_DYNAMIC "Use dynamical loading of MPG123" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(Mpg123 QUIET) ++ find_package(MPG123 CONFIG REQUIRED) ++ get_target_property(MPG123_INCLUDE_DIR MPG123::libmpg123 INTERFACE_INCLUDE_DIRECTORIES) ++ set(MPG123_LIBRARIES MPG123::libmpg123) ++ set(MPG123_FOUND 1) + message("MPG123 found in ${MPG123_INCLUDE_DIR} folder") + if(USE_MP3_MPG123_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DMPG123_DYNAMIC=\"${MPG123_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_ogg.cmake b/src/codecs/music_ogg.cmake +index e7930f9c7e1a583f77306f6838933b991382872f..33a8a59e72e30e3cabd4e834895a23ae7b101324 100644 +--- a/src/codecs/music_ogg.cmake ++++ b/src/codecs/music_ogg.cmake +@@ -1,4 +1,4 @@ +-if(LIBOGG_NEEDED) ++if(0) + if(USE_SYSTEM_AUDIO_LIBRARIES) + find_package(OGG REQUIRED) + else() +diff --git a/src/codecs/music_ogg_vorbis.cmake b/src/codecs/music_ogg_vorbis.cmake +index 475c7ea67663d114a4fc0fef243e15fbf66a00c1..66fa87521c91d1f25fc335b026078b384509dc6a 100644 +--- a/src/codecs/music_ogg_vorbis.cmake ++++ b/src/codecs/music_ogg_vorbis.cmake +@@ -10,7 +10,10 @@ if(USE_OGG_VORBIS) + find_package(Tremor QUIET) + message("Tremor: [${Tremor_FOUND}] ${Tremor_INCLUDE_DIRS} ${Tremor_LIBRARIES}") + else() +- find_package(Vorbis QUIET) ++ find_package(Vorbis CONFIG REQUIRED) ++ get_target_property(Vorbis_INCLUDE_DIRS Vorbis::vorbisfile INTERFACE_INCLUDE_DIRECTORIES) ++ set(Vorbis_LIBRARIES Vorbis::vorbisfile) ++ set(Vorbis_FOUND 1) + message("Vorbis: [${Vorbis_FOUND}] ${Vorbis_INCLUDE_DIRS} ${Vorbis_LIBRARIES}") + endif() + +diff --git a/src/codecs/music_opus.cmake b/src/codecs/music_opus.cmake +index 61fb32e7ec1bcb4e21cb77607399f1f36317c481..44e0b5da00146492a2b34a65ab0c16846b1aeb84 100644 +--- a/src/codecs/music_opus.cmake ++++ b/src/codecs/music_opus.cmake +@@ -3,7 +3,10 @@ if(USE_OPUS) + option(USE_OPUS_DYNAMIC "Use dynamical loading of Opus" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(Opus QUIET) ++ find_package(OpusFile CONFIG REQUIRED) ++ get_target_property(Opus_INCLUDE_DIRS OpusFile::opusfile INTERFACE_INCLUDE_DIRECTORIES) ++ set(Opus_LIBRARIES OpusFile::opusfile) ++ set(Opus_FOUND 1) + message("Opus: [${Opus_FOUND}] ${Opus_INCLUDE_DIRS} ${Opus_LIBRARIES} ${LIBOPUS_LIB}") + if(USE_OPUS_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DOPUS_DYNAMIC=\"${OpusFile_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_wavpack.cmake b/src/codecs/music_wavpack.cmake +index ab841b8c8c9720d50ce15534361cc4ba80e6595d..688f7459789eae14df641e53c003daedc1916c12 100644 +--- a/src/codecs/music_wavpack.cmake ++++ b/src/codecs/music_wavpack.cmake +@@ -3,7 +3,10 @@ if(USE_WAVPACK) + option(USE_WAVPACK_DYNAMIC "Use dynamical loading of WAVPACK" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(WavPack QUIET) ++ find_package(WavPack CONFIG REQUIRED) ++ get_target_property(WavPack_INCLUDE_DIRS WavPack::WavPack INTERFACE_INCLUDE_DIRECTORIES) ++ set(WavPack_LIBRARIES WavPack::WavPack) ++ set(WavPack_FOUND 1) + message("WavPack: [${WavPack_FOUND}] ${WavPack_INCLUDE_DIRS} ${WavPack_LIBRARIES}") + if(USE_WAVPACK_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DWAVPACK_DYNAMIC=\"${WavPack_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_xmp.cmake b/src/codecs/music_xmp.cmake +index 2b41037b9cdb4160515982eb8511500baf9961ce..698c34fa2dc8fb8175d8b1ab61255bd0aa7c9d9f 100644 +--- a/src/codecs/music_xmp.cmake ++++ b/src/codecs/music_xmp.cmake +@@ -19,7 +19,15 @@ if(USE_XMP) + set(XMP_LIBRARIES ${XMPLITE_LIBRARIES}) + set(XMP_FOUND ${XMPLITE_FOUND}) + else() +- find_package(XMP) ++ find_package(libxmp CONFIG REQUIRED) ++ if(SDL_MIXER_X_STATIC) ++ set(_xmp libxmp::xmp_static) ++ else() ++ set(_xmp libxmp::xmp_shared) ++ endif() ++ get_target_property(XMP_INCLUDE_DIRS ${_xmp} INTERFACE_INCLUDE_DIRECTORIES) ++ set(XMP_LIBRARIES ${_xmp}) ++ set(XMP_FOUND 1) + message("XMP: [${XMP_FOUND}] ${XMP_INCLUDE_DIRS} ${XMP_LIBRARIES}") + if(USE_XMP_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DXMP_DYNAMIC=\"${XMP_DYNAMIC_LIBRARY}\") +diff --git a/SDL2_mixer_extConfig.cmake.in b/SDL2_mixer_extConfig.cmake.in +index 997d4e828150d10fa4113b3341220ca185fc29a5..2d781528151075385a2e837df3863900b8d36573 100644 +--- a/SDL2_mixer_extConfig.cmake.in ++++ b/SDL2_mixer_extConfig.cmake.in +@@ -6,10 +6,58 @@ set_package_properties(SDL2_mixer_ext PROPERTIES + + @PACKAGE_INIT@ + ++set(SDL_MIXER_X_USE_OGG_VORBIS @USE_OGG_VORBIS@) ++set(SDL_MIXER_X_USE_OPUS @USE_OPUS@) ++set(SDL_MIXER_X_USE_USE_FLAC @USE_FLAC@) ++set(SDL_MIXER_X_USE_USE_WAVPACK @USE_WAVPACK@) ++set(SDL_MIXER_X_USE_MP3_MPG123 @USE_MP3_MPG123@) ++set(SDL_MIXER_X_USE_XMP @USE_XMP@) ++set(SDL_MIXER_X_USE_MIDI_ADLMIDI @USE_MIDI_ADLMIDI@) ++set(SDL_MIXER_X_USE_MIDI_OPNMIDI @USE_MIDI_OPNMIDI@) ++set(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH @USE_MIDI_FLUIDSYNTH@) ++ + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") + endif() + + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") ++ include(CMakeFindDependencyMacro) ++ ++ if(SDL_MIXER_X_USE_OGG_VORBIS AND NOT TARGET Vorbis::vorbisfile) ++ find_dependency(Vorbis CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_OPUS AND NOT TARGET OpusFile::opusfile) ++ find_dependency(OpusFile CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_USE_FLAC AND NOT TARGET FLAC::FLAC) ++ find_dependency(FLAC CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_USE_WAVPACK AND NOT TARGET WavPack::WavPack) ++ find_dependency(WavPack CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MP3_MPG123 AND NOT TARGET MPG123::libmpg123) ++ find_dependency(MPG123 CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_XMP AND NOT TARGET libxmp::xmp_static) ++ find_dependency(libxmp CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_ADLMIDI AND NOT TARGET libADLMIDI::ADLMIDI_static) ++ find_dependency(libADLMIDI CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_OPNMIDI AND NOT TARGET libOPNMIDI::OPNMIDI_static) ++ find_dependency(libOPNMIDI CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH AND NOT TARGET FluidSynth::libfluidsynth) ++ find_dependency(FluidSynth CONFIG) ++ endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") + endif() diff --git a/ports/sdl2-mixer-ext/portfile.cmake b/ports/sdl2-mixer-ext/portfile.cmake new file mode 100644 index 00000000000000..8a1242081bbaba --- /dev/null +++ b/ports/sdl2-mixer-ext/portfile.cmake @@ -0,0 +1,96 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO WohlSoft/SDL-Mixer-X + REF 1bd1111949036645e92cf0f7aa635e904c590318 + SHA512 b3c87580ff639b015d0e3f00d584878f141896ac812ec036945025416019f7849e952a76135095358f427eb2d04ed8f68fd9721e1869dade78517f7372ad2f9c + HEAD_REF master + PATCHES + fix-dependencies.patch +) + +file(REMOVE + "${SOURCE_PATH}/cmake/find/FindOGG.cmake" # Conflicts with official configurations + "${SOURCE_PATH}/cmake/find/FindFFMPEG.cmake" # Using FindFFMPEG.cmake provided by vcpkg +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libvorbis USE_OGG_VORBIS + opusfile USE_OPUS + libflac USE_FLAC + wavpack USE_WAVPACK + mpg123 USE_MP3_MPG123 + libmodplug USE_MODPLUG + libxmp USE_XMP + libgme USE_GME + ffmpeg USE_FFMPEG + cmd USE_CMD + libadlmidi USE_MIDI_ADLMIDI + libopnmidi USE_MIDI_OPNMIDI + timidity USE_MIDI_TIMIDITY + fluidsynth USE_MIDI_FLUIDSYNTH + nativemidi USE_MIDI_NATIVE_ALT + nativemidi USE_MIDI_NATIVE +) + +if("libadlmidi" IN_LIST FEATURES OR + "libopnmidi" IN_LIST FEATURES OR + "timidity" IN_LIST FEATURES OR + "fluidsynth" IN_LIST FEATURES OR + "nativemidi" IN_LIST FEATURES) + set(USE_MIDI ON) +else() + set(USE_MIDI OFF) +endif() + +if("fluidsynth" IN_LIST FEATURES) + vcpkg_find_acquire_program(PKGCONFIG) + list(APPEND EXTRA_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${EXTRA_OPTIONS} + -DMIXERX_ENABLE_GPL=ON + -DMIXERX_ENABLE_LGPL=ON + -DUSE_SYSTEM_SDL2=ON + -DUSE_SYSTEM_AUDIO_LIBRARIES=ON + -DUSE_OGG_VORBIS_STB=OFF + -DUSE_DRFLAC=OFF + -DUSE_MP3_DRMP3=OFF + -DUSE_FFMPEG_DYNAMIC=OFF + -DUSE_MIDI=${USE_MIDI} + -DUSE_MIDI_EDMIDI=OFF + -DUSE_MIDI_FLUIDLITE=OFF + MAYBE_UNUSED_VARIABLES + USE_FFMPEG_DYNAMIC + USE_CMD + USE_MIDI_NATIVE + USE_MIDI_NATIVE_ALT +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME SDL2_mixer_ext + CONFIG_PATH lib/cmake/SDL2_mixer_ext) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +set(LICENSE_FILES + "${SOURCE_PATH}/COPYING.txt" + "${SOURCE_PATH}/GPLv2.txt" + "${SOURCE_PATH}/GPLv3.txt" + "${SOURCE_PATH}/SDL2_mixer_ext.License.txt" +) +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/sdl2-mixer-ext/usage b/ports/sdl2-mixer-ext/usage new file mode 100644 index 00000000000000..4655035fac6963 --- /dev/null +++ b/ports/sdl2-mixer-ext/usage @@ -0,0 +1,4 @@ +sdl2-mixer-ext provides CMake targets: + + find_package(SDL2_mixer_ext CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SDL2_mixer_ext::SDL2_mixer_ext,SDL2_mixer_ext::SDL2_mixer_ext_Static>) diff --git a/ports/sdl2-mixer-ext/vcpkg.json b/ports/sdl2-mixer-ext/vcpkg.json new file mode 100644 index 00000000000000..dd18c5a5d74eb3 --- /dev/null +++ b/ports/sdl2-mixer-ext/vcpkg.json @@ -0,0 +1,121 @@ +{ + "name": "sdl2-mixer-ext", + "version-date": "2023-05-04", + "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer", + "homepage": "https://wohlsoft.github.io/SDL-Mixer-X", + "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later", + "dependencies": [ + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cmd": { + "description": "Use external command for playing music (Linux only).", + "supports": "linux" + }, + "ffmpeg": { + "description": "Use FFMPEG to play WMA and AAC audio formats.", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false + } + ] + }, + "fluidsynth": { + "description": "Use FluidSynth to play MIDI audio format.", + "dependencies": [ + { + "name": "fluidsynth", + "default-features": false + } + ] + }, + "libadlmidi": { + "description": "Use libADLMIDI to play XMI, MUS, IMF and regular MIDI audio format with OPL3 (YMF262) emulator.", + "dependencies": [ + { + "name": "libadlmidi", + "default-features": false + } + ] + }, + "libflac": { + "description": "Use libflac to play FLAC audio format.", + "dependencies": [ + "libflac" + ] + }, + "libgme": { + "description": "Use libgme to play chip music (AY, GBS, GYM, HES, KSS, NSF/NSFE, SAP, SPC, VGM/VGZ).", + "dependencies": [ + { + "name": "libgme", + "default-features": false + } + ] + }, + "libmodplug": { + "description": "Use libmodplug to play tracker music including exclusive formats (AMS, DMF, DSM, MT2).", + "dependencies": [ + "libmodplug" + ] + }, + "libopnmidi": { + "description": "Use libOPNMIDI to play MIDI and RMI audio format with OPN2 (YM2612) emulator.", + "dependencies": [ + { + "name": "libopnmidi", + "default-features": false + } + ] + }, + "libvorbis": { + "description": "Use libvorbis to play OGG audio format.", + "dependencies": [ + "libvorbis" + ] + }, + "libxmp": { + "description": "Use libxmp to play tracker music including exclusive formats (ABK, DIGI, DTM, EMOD, FLX, FNK, GDM, IMF, J2B, LIQ, M15, MFP, MGT, MMDC, MTN, RTM, SFX, SPM, STIM, STX, WOW).", + "dependencies": [ + { + "name": "libxmp", + "default-features": false + } + ] + }, + "mpg123": { + "description": "Use mpg123 to play MP3 audio format.", + "dependencies": [ + "mpg123" + ] + }, + "nativemidi": { + "description": "Use Native MIDI Player to play MIDI audio format.", + "supports": "windows | osx" + }, + "opusfile": { + "description": "Use opusfile to play Opus audio format.", + "dependencies": [ + "opusfile" + ] + }, + "timidity": { + "description": "Use Timidity to play MIDI audio format." + }, + "wavpack": { + "description": "Use wavpack to play VW audio format.", + "dependencies": [ + "wavpack" + ] + } + } +} diff --git a/ports/seacas/fix-fmt-10.patch b/ports/seacas/fix-fmt-10.patch new file mode 100644 index 00000000000000..e5623355d0b6de --- /dev/null +++ b/ports/seacas/fix-fmt-10.patch @@ -0,0 +1,28 @@ +From 5a576de57ee1664d845c83f552f2100cc9303a26 Mon Sep 17 00:00:00 2001 +From: Greg Sjaardema +Date: Wed, 10 May 2023 15:28:53 -0600 +Subject: [PATCH] IOSS: Fix enum printing to work with fmt-10 + +--- + .../seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +index b6827aa177..59507085fc 100644 +--- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C ++++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +@@ -1,4 +1,4 @@ +-// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions ++// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions + // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with + // NTESS, the U.S. Government retains certain rights in this software. + // +@@ -802,7 +802,7 @@ namespace Iotm { + std::ostringstream errmsg; + fmt::print(errmsg, + "Error: Failed to find entity of type {} with name {} for Assembly {}.\n", +- type, members[j], assem->name()); ++ Ioss::Utils::entity_type_to_string(type), members[j], assem->name()); + IOSS_ERROR(errmsg); + } + } diff --git a/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake index 75a778313dc3a7..a5b0bcfb8ce1db 100644 --- a/ports/seacas/portfile.cmake +++ b/ports/seacas/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( deps-and-shared.patch fix-mpi.patch fix-headers.patch + fix-fmt-10.patch ) if(HDF5_WITH_PARALLEL AND NOT "mpi" IN_LIST FEATURES) diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 67c4fc9587ead6..002c91b33838d2 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seacas", "version-date": "2022-11-22", - "port-version": 3, + "port-version": 4, "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.", "homepage": "https://github.com/sandialabs/seacas", "license": null, diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 0b9d0af4e10e2e..476649d28ca0ff 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 108ef667765822fa8527838a64bbac61c59f85a4923c1a798bb84f1c8f74b3dfcaab2eedd71daec420c3e1281e0055bd4ed40f201f85238a0b820a27ed3c1558 + SHA512 343960b98e5337d44a41fb2cafbf246430763edf6773fe9bdcefafaac6c14016155d8c433d29950b469e63aef90376a604a6e38912fed6ef7d798d6ad17cf999 ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index cfd2bd020af1ee..f1c4a78d8b8374 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.1", + "version": "0.6.3", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/ports/septag-sx/vcpkg.json b/ports/septag-sx/vcpkg.json index 016f5fea6d6963..756100f37efc8e 100644 --- a/ports/septag-sx/vcpkg.json +++ b/ports/septag-sx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "septag-sx", - "version-string": "2019-05-07", - "port-version": 4, + "version-date": "2019-05-07", + "port-version": 5, "description": "Portable base library for C programmers, designed for performance and simplicity.", "supports": "!(uwp | arm)", "dependencies": [ diff --git a/ports/seqan/portfile.cmake b/ports/seqan/portfile.cmake index b343b82c43b3e1..c265da680f7fdc 100644 --- a/ports/seqan/portfile.cmake +++ b/ports/seqan/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 9a1b4fe9dff9ad49a8761798a6a6eaeebce683ccb5e2dd78ea4b8829093918606830a16ea458d67bf3f652531ddc55b550c12cb257be913bb187c8940d96a575 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/seqan/vcpkg.json b/ports/seqan/vcpkg.json index e49b11d09f34b1..bc89f206c9fe54 100644 --- a/ports/seqan/vcpkg.json +++ b/ports/seqan/vcpkg.json @@ -1,6 +1,6 @@ { "name": "seqan", - "version-string": "2.4.0", - "port-version": 2, + "version": "2.4.0", + "port-version": 3, "description": "SeqAn is an open source C++ library of efficient algorithms and data structures for the analysis of sequences with the focus on biological data." } diff --git a/ports/serd/vcpkg.json b/ports/serd/vcpkg.json index ae85876fdde9c5..f9b12dcbad6a9a 100644 --- a/ports/serd/vcpkg.json +++ b/ports/serd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "serd", - "version-string": "0.30.4", - "port-version": 1, + "version": "0.30.4", + "port-version": 2, "description": "Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle, TRiG, NTriples, and NQuads.", "homepage": "https://drobilla.net/software/serd", "license": "ISC", diff --git a/ports/sf2cute/vcpkg.json b/ports/sf2cute/vcpkg.json index 66679aef8b2cbc..81e1e3da9a935d 100644 --- a/ports/sf2cute/vcpkg.json +++ b/ports/sf2cute/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sf2cute", - "version-string": "0.2.0", - "port-version": 3, + "version": "0.2.0", + "port-version": 4, "description": "C++14 Library for SoundFont 2", "dependencies": [ { diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index f3379806d730a1..c187321e0e18ab 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML - REF 2.5.1 + REF "${VERSION}" HEAD_REF master SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 PATCHES @@ -32,17 +32,19 @@ vcpkg_copy_pdbs() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") file(COPY "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") file(GLOB FILES "${CURRENT_PACKAGES_DIR}/share/sfml/SFML*Targets-*.cmake") foreach(FILE ${FILES}) vcpkg_replace_string("${FILE}" "/lib/sfml-main" "/lib/manual-link/sfml-main") endforeach() endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") +endif() -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") vcpkg_fixup_pkgconfig() -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) -configure_file("${SOURCE_PATH}/license.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.md") diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index ba297ad701c105..3dc5a482414f08 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 14, + "port-version": 15, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", "license": "Zlib", diff --git a/ports/shader-slang/portfile.cmake b/ports/shader-slang/portfile.cmake index 256c1ebae26330..943f6c67d77c13 100644 --- a/ports/shader-slang/portfile.cmake +++ b/ports/shader-slang/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) if (VCPKG_TARGET_IS_WINDOWS) @@ -11,7 +10,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win64.zip" FILENAME "slang-${VERSION}-win64.zip" - SHA512 a3f9f1a30468588fc5706eacd3a4c2dc41b014a949b34fe8a16dc1a9a2cb3e85edfcabb46473a3599fe9cd95a2ca8cbae5ab39fdf626e6b5b614a94be48e6d4d + SHA512 db8404de1e1aa7b4deac258f1d3aed4287d6babc37538c76914da87e1bfcc5919d8013cf9054ae1c0aa32a5a14a25a668fd7f6fb23b8b2e1275bcfc9fe256eac ) set(SLANG_BIN_PATH "bin/windows-x64/release") elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") @@ -19,7 +18,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win32.zip" FILENAME "slang-${VERSION}-win32.zip" - SHA512 06012d3d7004f0565cda01b11fd7236e6828a8ea79ca93ad05e3e1a3e35571daf2cd6558e096dfd97c46c23ce74b802d71287e02eec5d7951c18e16c6c635da6 + SHA512 1045f37b02ae93c2b8a7b9a7b8c98cd5b7c2d1a86704888c778ae12bc5bd701284d356685010ba4405893c9c0bfec2e117b329c00d8c218e08df578d607a9f80 ) set(SLANG_BIN_PATH "bin/windows-x86/release") else() @@ -35,7 +34,7 @@ elseif (VCPKG_TARGET_IS_OSX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-x64.zip" FILENAME "slang-${VERSION}-macos-x64.zip" - SHA512 5914caa4ab9867fbceed6f0bb4f83f3b5400c05872baff40456460655efbdccb34b3590663f8ee80e953f3e584d0e729bc1da34ab8f80be33d1233ca4b043d71 + SHA512 627d77d83eef56e25815c30d0e99ae472c9189c760d1a620daebf49407c97e5e4da4b7880781c7788e85c5ccfba3a9e938e50ede2be0e93c0635050b11ad22a0 ) set(SLANG_BIN_PATH "bin/macos-x64/release") elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") @@ -43,7 +42,7 @@ elseif (VCPKG_TARGET_IS_OSX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-aarch64.zip" FILENAME "slang-${VERSION}-macos-aarch64.zip" - SHA512 9e792ba0dec87a892df566b48f4553691f20d48c74c7d111b93c6f55c83790a8857bd82c461746190d8507b4aef440aeadb267da9558692a6113cfda52d12c80 + SHA512 e898c20c60b4f3e8bbb262fef4cad88fba35b66dafb4784eec8b1603d8ee0293a71faeac1f84a9df96f33e206503ed717f7a068370e40a49bac90c009bbe4336 ) set(SLANG_BIN_PATH "bin/macos-aarch64/release") else() @@ -59,7 +58,7 @@ elseif(VCPKG_TARGET_IS_LINUX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-linux-x86_64.tar.gz" FILENAME "slang-${VERSION}-linux-x86_64.tar.gz" - SHA512 f6e3d49ddfdb79e0dc8183bd915ee4e2975428f1a6020498062cb54b0f078c86bcdc50d274c8ed22ba2f3ae823cb0b95d719a1067321fb0400c329f8c34149dd + SHA512 2291e7ee0e1998eb8cf3725154bade4ebd2873f18ba2dc04e598ffee63298780e6906a6257762a84ba4d81f32b1fb4548b1aaea4a79852f4fc6827faeba4426f ) set(SLANG_BIN_PATH "bin/linux-x64/release") else() @@ -99,7 +98,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO shader-slang/slang REF v${VERSION} - SHA512 ddb50eb59bebbb826844c4831f721bb40e28edb64d37d7463afb68cd27b653d7d8e1776000eaf70f4b5a882182ac06fa233dfe51167c2a3d170df89987da2cc2 + SHA512 cc89a8a8eeab494c2558d2699bad75520cb44640d17881b0e35f618df68090a7fcee03e812e77998fe953206790d284fdfa084a0d30d0b4fca33991fe9ec8775 HEAD_REF master ) diff --git a/ports/shader-slang/vcpkg.json b/ports/shader-slang/vcpkg.json index d0d16ce8f386a7..990f384cea8b78 100644 --- a/ports/shader-slang/vcpkg.json +++ b/ports/shader-slang/vcpkg.json @@ -1,7 +1,6 @@ { "name": "shader-slang", - "version": "0.24.43", - "port-version": 1, + "version": "0.27.20", "description": "Slang is a shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion, while also maintaining the highest possible performance on modern GPUs and graphics APIs. Slang is based on years of collaboration between researchers at NVIDIA, Carnegie Mellon University, and Stanford.", "homepage": "https://github.com/shader-slang/slang", "license": "MIT", diff --git a/ports/shapelib/portfile.cmake b/ports/shapelib/portfile.cmake index b7fe51a1e35226..89c00b2e133592 100644 --- a/ports/shapelib/portfile.cmake +++ b/ports/shapelib/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${SHAPELIB_HASH} ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES option-build-test.patch diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json index db87581cf10256..099b5147eecb17 100644 --- a/ports/shapelib/vcpkg.json +++ b/ports/shapelib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shapelib", "version": "1.5.0", - "port-version": 3, + "port-version": 4, "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", "homepage": "https://download.osgeo.org/shapelib", "dependencies": [ diff --git a/ports/shiftmedia-libgnutls/portfile.cmake b/ports/shiftmedia-libgnutls/portfile.cmake index 5676070784b573..85558d78e8df10 100644 --- a/ports/shiftmedia-libgnutls/portfile.cmake +++ b/ports/shiftmedia-libgnutls/portfile.cmake @@ -25,10 +25,10 @@ vcpkg_download_distfile( SHA512 6e534b3a623efa5f473977deeed4d24669ef0e0e3ac5fcadc88c5cf2d6ad0852a07c68cd70ac748d7f9a3793704ce1a54a7d17114458a8c1f2e42d410681c340 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH GNULIB_SOURCE_PATH +vcpkg_extract_source_archive( + GNULIB_SOURCE_PATH ARCHIVE "${GNULIB_SNAPSHOT}" - REF ${GNULIB_REF} + SOURCE_BASE ${GNULIB_REF} ) file(REMOVE_RECURSE "${SOURCE_PATH}/gnulib") diff --git a/ports/shiftmedia-libgnutls/vcpkg.json b/ports/shiftmedia-libgnutls/vcpkg.json index b208408b39930a..d2abccbc581b62 100644 --- a/ports/shiftmedia-libgnutls/vcpkg.json +++ b/ports/shiftmedia-libgnutls/vcpkg.json @@ -1,10 +1,11 @@ { "name": "shiftmedia-libgnutls", "version": "3.7.6", + "port-version": 2, "description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ", "homepage": "https://github.com/ShiftMediaProject/gnutls", "license": "LGPL-2.1-only", - "supports": "windows", + "supports": "windows & !arm & !mingw", "dependencies": [ "gettext", "gmp", diff --git a/ports/shiva-sfml/vcpkg.json b/ports/shiva-sfml/vcpkg.json index f47e49ee76ae82..7d7ddd54dad7e6 100644 --- a/ports/shiva-sfml/vcpkg.json +++ b/ports/shiva-sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shiva-sfml", - "version-string": "1.0", - "port-version": 3, + "version": "1.0", + "port-version": 4, "description": "shiva-sfml plugins of shiva C++ engine", "dependencies": [ { diff --git a/ports/shogun/vcpkg.json b/ports/shogun/vcpkg.json index 8ae367b8f26a7f..2126c253d467cd 100644 --- a/ports/shogun/vcpkg.json +++ b/ports/shogun/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shogun", - "version-string": "6.1.4", - "port-version": 8, + "version": "6.1.4", + "port-version": 9, "description": "Unified and efficient Machine Learning", "homepage": "https://github.com/shogun-toolbox/shogun", "dependencies": [ diff --git a/ports/signalrclient/vcpkg.json b/ports/signalrclient/vcpkg.json index 5df043d3119088..be5dbbe4fb0a9e 100644 --- a/ports/signalrclient/vcpkg.json +++ b/ports/signalrclient/vcpkg.json @@ -1,7 +1,7 @@ { "name": "signalrclient", - "version-string": "1.0.0-beta1-9", - "port-version": 3, + "version": "1.0.0-beta1-9", + "port-version": 4, "description": "C++ client for SignalR.", "homepage": "https://github.com/SignalR/SignalR-Client-Cpp", "dependencies": [ diff --git a/ports/sigslot/vcpkg.json b/ports/sigslot/vcpkg.json index 20bf9b068a55d1..6b2cf02949f020 100644 --- a/ports/sigslot/vcpkg.json +++ b/ports/sigslot/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sigslot", - "version-string": "1.0.0", - "port-version": 4, + "version": "1.0.0", + "port-version": 5, "description": "Portable C++ type-safe, thread-safe signal/slot library for ISO C++, Unix/BSD/Linux and Win32. Sigslot allows C++ code to use the signal/slot paradigm made popular by, for example, Qt." } diff --git a/ports/simde/fix-windows-minmax.patch b/ports/simde/fix-windows-minmax.patch deleted file mode 100644 index 52feeafc561041..00000000000000 --- a/ports/simde/fix-windows-minmax.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/simde/x86/sse.h b/simde/x86/sse.h -index 00119d3..a9dd705 100644 ---- a/simde/x86/sse.h -+++ b/simde/x86/sse.h -@@ -33,6 +33,7 @@ - #include "mmx.h" - - #if defined(_WIN32) -+ #define NOMINMAX - #include - #endif - diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake index 510d93d5de9d46..2901a1fe81e613 100644 --- a/ports/simde/portfile.cmake +++ b/ports/simde/portfile.cmake @@ -2,14 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO nemequ/simde - REF v0.7.2 - SHA512 E4EE5A4A7E8453F116F1325D147F91D358A300F41EA5566EA30FC19649BABABF3B87E3DC838D5608B578BD152207DF4156200FFC7FB98141BC7C0BB60C75F1F5 + REPO simd-everywhere/simde + REF "v${VERSION}" + SHA512 de17fca563c4db6766881e1c73142ad129a57febe55fa8ea1ae780226e60a84891b13d387e75574f2722d77e4013176e3c7dfaf17bccd8682b7d3d3ec8e92a54 HEAD_REF master - PATCHES - fix-windows-minmax.patch ) file(COPY "${SOURCE_PATH}/simde" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/simde/vcpkg.json b/ports/simde/vcpkg.json index cfa1b0664322a8..5d1bb54481268d 100644 --- a/ports/simde/vcpkg.json +++ b/ports/simde/vcpkg.json @@ -1,7 +1,6 @@ { "name": "simde", - "version": "0.7.2", - "port-version": 1, + "version": "0.7.6", "description": "Implementations of SIMD instruction sets for systems which don't natively support them", "homepage": "https://github.com/simd-everywhere/simde", "license": "MIT" diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index bbb80438cdf075..b672d179530f91 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO simdjson/simdjson REF "v${VERSION}" HEAD_REF master - SHA512 72f27b010e659025f9c8842daf79364d0d0f40cddd66858956ab4fa4f3f3a631fe342f440201d58ed9af42a4356aafafaac8d3caf3317dd1a6314dad3a71081a + SHA512 bdddf6a1afbe289fa075cbe05d9f70c29c61fa824be52e414d8344bd1c77117634bf44122629980e69571cf4bad1da5f2b9818ea878290cc360913fb2279d3e5 ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 6649e9425eb754..be59b4a4f76a94 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version": "3.1.6", + "version": "3.1.8", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/ports/simple-fft/vcpkg.json b/ports/simple-fft/vcpkg.json index 76b399066048cd..f0e5a9f8646b08 100644 --- a/ports/simple-fft/vcpkg.json +++ b/ports/simple-fft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "simple-fft", - "version-string": "2020-06-14", - "port-version": 1, + "version-date": "2020-06-14", + "port-version": 2, "description": "Header-only C++ library implementing fast Fourier transform of 1D, 2D and 3D data", "homepage": "https://github.com/d1vanov/Simple-FFT" } diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake index 04fd4a7b876444..e51e0374f9c282 100644 --- a/ports/sleef/portfile.cmake +++ b/ports/sleef/portfile.cmake @@ -22,3 +22,27 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Install DLL and PDB files +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + endif() +endif() diff --git a/ports/sleef/vcpkg.json b/ports/sleef/vcpkg.json index 039681d14a9cd0..60b71ed05f49e0 100644 --- a/ports/sleef/vcpkg.json +++ b/ports/sleef/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sleef", "version": "3.5.1", - "port-version": 3, + "port-version": 4, "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", "homepage": "https://sleef.org/", "license": "BSL-1.0", diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index 8f70125a180516..f43133c4fb2f72 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_cmake_configure( -DSLEEPY_VCPKG=ON -DAUTO_DOWNLOAD_LIBRARY=OFF -DUSE_BOOST_ASIO=ON + -DCMAKE_CXX_STANDARD=17 ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -40,4 +41,4 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleepy-discord) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 514e661cfb1889..50058d8b14fabe 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sleepy-discord", "version-date": "2022-02-05", + "port-version": 1, "description": "C++ library for the Discord chat client", "homepage": "https://yourwaifu.dev/sleepy-discord/", "dependencies": [ diff --git a/ports/sltbench/vcpkg.json b/ports/sltbench/vcpkg.json index 20c287a83564fa..be9227938f9e20 100644 --- a/ports/sltbench/vcpkg.json +++ b/ports/sltbench/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sltbench", - "version-string": "2.4.0", - "port-version": 1, + "version": "2.4.0", + "port-version": 2, "description": "C++ benchmark tool. Practical, stable and fast performance testing framework.", "homepage": "https://github.com/ivafanas/sltbench", "dependencies": [ diff --git a/ports/smpeg2/vcpkg.json b/ports/smpeg2/vcpkg.json index 4520ec7aa2e9be..3e48eac405d04d 100644 --- a/ports/smpeg2/vcpkg.json +++ b/ports/smpeg2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "smpeg2", - "version-string": "2.0.0", - "port-version": 8, + "version": "2.0.0", + "port-version": 9, "description": "SDL MPEG Player Library", "homepage": "https://www.libsdl.org/projects/smpeg/", "dependencies": [ diff --git a/ports/sndfile/vcpkg.json b/ports/sndfile/vcpkg.json index 2f91543bd334d0..2005e6331bcab2 100644 --- a/ports/sndfile/vcpkg.json +++ b/ports/sndfile/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sndfile", - "version-string": "0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "x Library to read, write and manipulate many soundfile types.", "dependencies": [ "libsndfile" diff --git a/ports/snowhouse/vcpkg.json b/ports/snowhouse/vcpkg.json index f8d9a392febfd1..da2f04571f42a4 100644 --- a/ports/snowhouse/vcpkg.json +++ b/ports/snowhouse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "snowhouse", - "version-string": "5.0.0", - "port-version": 1, + "version": "5.0.0", + "port-version": 2, "description": "An assertion library for C++" } diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 282bc713401523..a98071ea25f97c 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer - REF df7c3ee91b29079ae4e3525c34ad83a0d4e83d77 # v.5.7.4.2 - SHA512 4caee3a95723c9564fbd5430492cc82513885ca17003e18b31378fc347ed8ad1b0859bd1693ecaaf514e8f82b86c07d1913a86f007250e2f28a77adfa03918b1 + REF "v.${VERSION}" + SHA512 7bdd89ac3fefa2df4813872f34ab74183352addbb559c06d04f943a71de779add115da030ef96ba29708672a1daa6e72ccba72de39c4c02cbea173ea029874ad ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 995f4865f1966a..af737b50221270 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.7.4.2", + "version": "5.7.4.3", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause", diff --git a/ports/sokol/vcpkg.json b/ports/sokol/vcpkg.json index 375455b943865e..1094d1204a54be 100644 --- a/ports/sokol/vcpkg.json +++ b/ports/sokol/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sokol", - "version-string": "2019-09-09", - "port-version": 1, + "version-date": "2019-09-09", + "port-version": 2, "description": "Minimal cross-platform standalone C headers", "homepage": "https://github.com/floooh/sokol" } diff --git a/ports/sord/vcpkg.json b/ports/sord/vcpkg.json index 4db1a0c1129c29..1070a47ea2086e 100644 --- a/ports/sord/vcpkg.json +++ b/ports/sord/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sord", - "version-string": "0.16.4", - "port-version": 1, + "version": "0.16.4", + "port-version": 2, "description": "Sord is a lightweight C library for storing RDF statements in memory.", "homepage": "https://drobilla.net/software/sord", "license": "ISC", diff --git a/ports/spaceland/include_functional.patch b/ports/spaceland/include_functional.patch new file mode 100644 index 00000000000000..66f69bfe3844e3 --- /dev/null +++ b/ports/spaceland/include_functional.patch @@ -0,0 +1,24 @@ +diff --git a/src/sl/connectivity.hpp b/src/sl/connectivity.hpp +index 1942c6c..1b66b9d 100644 +--- a/src/sl/connectivity.hpp ++++ b/src/sl/connectivity.hpp +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + namespace sl { + +diff --git a/src/sl/hash.hpp b/src/sl/hash.hpp +index 3093a13..5f5b144 100644 +--- a/src/sl/hash.hpp ++++ b/src/sl/hash.hpp +@@ -24,6 +24,7 @@ + #define SL_HASH_HPP + + #include ++#include + + namespace sl { + diff --git a/ports/spaceland/portfile.cmake b/ports/spaceland/portfile.cmake index 3f22a823587d74..cad09f42025b06 100644 --- a/ports/spaceland/portfile.cmake +++ b/ports/spaceland/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES include_functional.patch ) vcpkg_cmake_configure( @@ -25,4 +26,4 @@ vcpkg_cmake_configure( vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/spaceland/vcpkg.json b/ports/spaceland/vcpkg.json index 8a729cac275880..f03ae94871cc91 100644 --- a/ports/spaceland/vcpkg.json +++ b/ports/spaceland/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spaceland", - "version-string": "7.8.2", - "port-version": 6, + "version": "7.8.2", + "port-version": 8, "description": "Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.", "dependencies": [ { diff --git a/ports/sparsepp/vcpkg.json b/ports/sparsepp/vcpkg.json index 50d619be5b1d32..1affc46082e0e8 100644 --- a/ports/sparsepp/vcpkg.json +++ b/ports/sparsepp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sparsepp", - "version-string": "1.22", - "port-version": 3, + "version": "1.22", + "port-version": 4, "description": "A fast, memory efficient hash map for C++", "dependencies": [ { diff --git a/ports/spdlog/fmt-10-support.patch b/ports/spdlog/fmt-10-support.patch new file mode 100644 index 00000000000000..6717370e4e3c88 --- /dev/null +++ b/ports/spdlog/fmt-10-support.patch @@ -0,0 +1,39 @@ +From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001 +From: H1X4 <10332146+H1X4Dev@users.noreply.github.com> +Date: Fri, 31 Mar 2023 20:39:32 +0300 +Subject: [PATCH] fix build for master fmt (non-bundled) (#2694) + +* fix build for master fmt (non-bundled) + +* update fmt_runtime_string macro + +* fix build of updated macro +--- + include/spdlog/common.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/include/spdlog/common.h b/include/spdlog/common.h +index e69201a81..5f671c5c6 100644 +--- a/include/spdlog/common.h ++++ b/include/spdlog/common.h +@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string; + template + using remove_cvref_t = typename std::remove_cv::type>::type; + ++template ++#if FMT_VERSION >= 90101 ++using fmt_runtime_string = fmt::runtime_format_string; ++#else ++using fmt_runtime_string = fmt::basic_runtime; ++#endif ++ + // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, + // in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view + template + struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> ++ std::is_convertible>::value || std::is_same, fmt_runtime_string>::value> + {}; + + # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 8d5cd5952d5f9d..1471705790d2a4 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.11.0 + REF "v${VERSION}" SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 HEAD_REF v1.x PATCHES fmt-header.patch # https://github.com/gabime/spdlog/pull/2545 + fmt-10-support.patch # Upstream patch: https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -18,12 +19,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if(NOT DEFINED SPDLOG_WCHAR_FILENAMES) set(SPDLOG_WCHAR_FILENAMES OFF) endif() -if(NOT VCPKG_TARGET_IS_WINDOWS) - if("wchar" IN_LIST FEATURES) - message(WARNING "Feature 'wchar' is only supported for Windows and has no effect on other platforms.") - elseif(SPDLOG_WCHAR_FILENAMES) - message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") - endif() +if(NOT VCPKG_TARGET_IS_WINDOWS AND SPDLOG_WCHAR_FILENAMES) + message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED) @@ -44,15 +41,12 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spdlog) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled") - # add support for integration other than cmake vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "// #define SPDLOG_FMT_EXTERNAL" "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif" ) -if(SPDLOG_WCHAR_SUPPORT AND VCPKG_TARGET_IS_WINDOWS) +if(SPDLOG_WCHAR_SUPPORT) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT" "#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif" @@ -65,7 +59,11 @@ if(SPDLOG_WCHAR_FILENAMES) ) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/spdlog/usage b/ports/spdlog/usage new file mode 100644 index 00000000000000..d0ce6557992d88 --- /dev/null +++ b/ports/spdlog/usage @@ -0,0 +1,8 @@ +The package spdlog provides CMake targets: + + find_package(spdlog CONFIG REQUIRED) + target_link_libraries(main PRIVATE spdlog::spdlog) + + # Or use the header-only version + find_package(spdlog CONFIG REQUIRED) + target_link_libraries(main PRIVATE spdlog::spdlog_header_only) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index a88014f9ad06e6..68704c84c18e8e 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "spdlog", "version-semver": "1.11.0", + "port-version": 1, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/ports/speexdsp/portfile.cmake b/ports/speexdsp/portfile.cmake index 55421684870aca..7ddc82d6f96274 100644 --- a/ports/speexdsp/portfile.cmake +++ b/ports/speexdsp/portfile.cmake @@ -12,10 +12,10 @@ else() FILENAME "speexdsp-1.2.1.tar.gz" SHA512 41b5f37b48db5cb8c5a0f6437a4a8266d2627a5b7c1088de8549fe0bf0bb3105b7df8024fe207eef194096e0726ea73e2b53e0a4293d8db8e133baa0f8a3bad3 ) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH + vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF "1.2.1" + SOURCE_BASE "1.2.1" PATCHES jitter_ctl.patch ) diff --git a/ports/speexdsp/vcpkg.json b/ports/speexdsp/vcpkg.json index 19fac1b3385cdd..37ff5881c07acb 100644 --- a/ports/speexdsp/vcpkg.json +++ b/ports/speexdsp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "speexdsp", "version": "1.2.1", + "port-version": 1, "description": "A patent-free, Open Source/Free Software DSP library.", "homepage": "https://speex.org/", "license": "BSD-3-Clause", diff --git a/ports/spirit-po/vcpkg.json b/ports/spirit-po/vcpkg.json index e088d9ebc5ad4b..abd11903addbd5 100644 --- a/ports/spirit-po/vcpkg.json +++ b/ports/spirit-po/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spirit-po", - "version-string": "1.1.2", - "port-version": 2, + "version": "1.1.2", + "port-version": 3, "description": "A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit.", "homepage": "https://github.com/cbeck88/spirit-po", "dependencies": [ diff --git a/ports/spix/portfile.cmake b/ports/spix/portfile.cmake deleted file mode 100644 index ed9443f4116d88..00000000000000 --- a/ports/spix/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO faaxm/spix - REF v0.5 - SHA512 fdc35ff4920a83d4b2d0abe84eae7c8f46cb259e525d4445b091eb01990bcdeade7e60a00795f4acccc09f0702fa61d17ba6c7b8bbf19ff218e8bd42e1eb7f7c - - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSPIX_BUILD_EXAMPLES=OFF - -DSPIX_BUILD_TESTS=OFF - -DSPIX_QT_MAJOR=6 -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/ports/spix/vcpkg.json b/ports/spix/vcpkg.json deleted file mode 100644 index f35646bb39a4c4..00000000000000 --- a/ports/spix/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "spix", - "version": "0.5", - "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.", - "homepage": "https://github.com/faaxm/spix", - "license": "MIT", - "dependencies": [ - "anyrpc", - { - "name": "qtbase", - "default-features": false - }, - "qtdeclarative", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/sprout/vcpkg.json b/ports/sprout/vcpkg.json index 22bab62af4b35c..ea8a92c10b17a5 100644 --- a/ports/sprout/vcpkg.json +++ b/ports/sprout/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sprout", - "version-string": "2019-06-20", - "port-version": 1, + "version-date": "2019-06-20", + "port-version": 2, "description": "C++11/14 constexpr based Containers, Algorithms, Random numbers, Parsing, Ray tracing, Synthesizer, and others", "homepage": "https://github.com/bolero-MURAKAMI/Sprout", "dependencies": [ diff --git a/ports/spscqueue/vcpkg.json b/ports/spscqueue/vcpkg.json index 682705aad756f7..162a8f81c12bde 100644 --- a/ports/spscqueue/vcpkg.json +++ b/ports/spscqueue/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spscqueue", - "version-string": "1.1", - "port-version": 2, + "version": "1.1", + "port-version": 3, "description": "A bounded single-producer single-consumer wait-free and lock-free queue written in C++11", "homepage": "https://github.com/rigtorp/SPSCQueue", "dependencies": [ diff --git a/ports/sqlite-modern-cpp/vcpkg.json b/ports/sqlite-modern-cpp/vcpkg.json index 39dbdc1d1fbb73..af618db59108c2 100644 --- a/ports/sqlite-modern-cpp/vcpkg.json +++ b/ports/sqlite-modern-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlite-modern-cpp", - "version-string": "3.2-936cd0c8", - "port-version": 1, + "version": "3.2-936cd0c8", + "port-version": 2, "description": "The C++14 wrapper around sqlite library", "homepage": "https://github.com/aminroosta/sqlite_modern_cpp", "dependencies": [ diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index c4fcadf9b168b0..f8e6ba6422b225 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -46,6 +46,10 @@ endif() if(NOT SQLITE3_SKIP_TOOLS) add_executable(sqlite3-bin shell.c) + set_target_properties(sqlite3-bin PROPERTIES + OUTPUT_NAME sqlite3 + PDB_NAME "sqlite3${CMAKE_EXECUTABLE_SUFFIX}.pdb" + ) target_link_libraries(sqlite3-bin PRIVATE sqlite3) if (WITH_ZLIB) @@ -55,7 +59,7 @@ if(NOT SQLITE3_SKIP_TOOLS) endif() install(TARGETS sqlite3-bin sqlite3 - RUNTIME DESTINATION tools + RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index f1a0d572f6c220..b42f2da21a9941 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -78,8 +78,8 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unoff file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") +if("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES sqlite3 DESTINATION "${CURRENT_PACKAGES_DIR}/tools" AUTO_CLEAN) endif() configure_file( diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 744147e558e27b..be282c11e0eb13 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlite3", "version": "3.40.1", - "port-version": 2, + "port-version": 3, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch b/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch deleted file mode 100644 index cb07f1ae109df4..00000000000000 --- a/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 72b1a42..552ff50 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -284,9 +284,9 @@ else (SQLITECPP_INTERNAL_SQLITE) - target_link_libraries(SQLiteCpp PRIVATE ${sqlcipher_LIBRARY}) - endif() - else() -- find_package (SQLite3 REQUIRED) -+ find_package (unofficial-sqlite3 CONFIG) - message(STATUS "Link to sqlite3 system library") -- target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3) -+ target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3) - if(SQLite3_VERSION VERSION_LESS "3.19") - set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") - endif() diff --git a/ports/sqlitecpp/add_runtime_destination.patch b/ports/sqlitecpp/add_runtime_destination.patch new file mode 100644 index 00000000000000..71b2b85261a74e --- /dev/null +++ b/ports/sqlitecpp/add_runtime_destination.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5723d0..ecc1ac2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -337,6 +337,7 @@ target_include_directories(SQLiteCpp + include(GNUInstallDirs) + install(TARGETS SQLiteCpp + EXPORT ${PROJECT_NAME}Targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT libraries) diff --git a/ports/sqlitecpp/fix_dependency.patch b/ports/sqlitecpp/fix_dependency.patch index a55c94cffebd8e..2277ca6e0b4113 100644 --- a/ports/sqlitecpp/fix_dependency.patch +++ b/ports/sqlitecpp/fix_dependency.patch @@ -1,11 +1,28 @@ -diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in -index 568922f..01196db 100644 ---- a/cmake/SQLiteCppConfig.cmake.in -+++ b/cmake/SQLiteCppConfig.cmake.in -@@ -1,5 +1,5 @@ - include(CMakeFindDependencyMacro) --find_dependency(SQLite3 REQUIRED) -+find_dependency(unofficial-sqlite3 REQUIRED) - if(@UNIX@) - set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@) - find_dependency(Threads REQUIRED) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df5693d..e5723d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -295,9 +295,9 @@ else (SQLITECPP_INTERNAL_SQLITE) + target_link_libraries(SQLiteCpp PRIVATE ${sqlcipher_LIBRARY}) + endif() + else() +- find_package (SQLite3 REQUIRED) ++ find_package (unofficial-sqlite3 CONFIG) + message(STATUS "Link to sqlite3 system library") +- target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3) ++ target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3) + if(SQLite3_VERSION VERSION_LESS "3.19") + set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") + endif() +diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in +index 2b48df4..d0feda9 100644 +--- a/cmake/SQLiteCppConfig.cmake.in ++++ b/cmake/SQLiteCppConfig.cmake.in +@@ -1,6 +1,6 @@ + include(CMakeFindDependencyMacro) + if(NOT @SQLITECPP_INTERNAL_SQLITE@) +- find_dependency(SQLite3 REQUIRED) ++ find_dependency(unofficial-sqlite3 REQUIRED) + endif() + if(@UNIX@) + set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@) diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index 14cf27e04a5e4c..de1cf99fb0d903 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -1,13 +1,11 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "SRombauts/SQLiteCpp" - REF 3.2.0 + REF ${VERSION} HEAD_REF master - SHA512 af57c3e82a8804174c52105ecc14ea7a2d4e293ef13b2fc371f2455890ea54683ed76adf4649e561686a6b4c3368676f5edcc54d9f22c4850be3ba32832d3272 + SHA512 9702b17c55b1b3bc46a72d5c204b560249e9c1f02647c864fd4ca54011e4b0238638800ee870baa5106512a9568338d3faa9c9f9799d42fbd558d10376e3b73a PATCHES - 0001-unofficial-sqlite3-and-sqlcipher.patch fix_dependency.patch + add_runtime_destination.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -28,7 +26,6 @@ vcpkg_cmake_configure( -DSQLITECPP_RUN_CPPCHECK=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITE_ENABLE_COLUMN_METADATA=ON - -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITECPP_USE_STATIC_RUNTIME=OFF # unconditionally off because vcpkg's toolchains already do the right thing # See https://github.com/SRombauts/SQLiteCpp/blob/e74403264ec7093060f4ed0e84bc9208997c8344/CMakeLists.txt#L40-L46 ${USE_STACK_PROTECTION} diff --git a/ports/sqlitecpp/vcpkg.json b/ports/sqlitecpp/vcpkg.json index 5e6213d7e00bbf..a78d9e6d57f5be 100644 --- a/ports/sqlitecpp/vcpkg.json +++ b/ports/sqlitecpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlitecpp", - "version": "3.2.0", - "port-version": 1, + "version": "3.3.0", "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "homepage": "https://github.com/SRombauts/SQLiteCpp", "license": "MIT", diff --git a/ports/sratom/vcpkg.json b/ports/sratom/vcpkg.json index 2b5251e9183b1e..45710911a5978f 100644 --- a/ports/sratom/vcpkg.json +++ b/ports/sratom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sratom", - "version-string": "0.6.4", - "port-version": 1, + "version": "0.6.4", + "port-version": 2, "description": "Sratom is a library for serialising LV2 atoms to and from RDF, particularly the Turtle syntax.", "homepage": "https://drobilla.net/software/sratom", "license": "ISC", diff --git a/ports/stackwalker/fix-build.patch b/ports/stackwalker/fix-build.patch new file mode 100644 index 00000000000000..9193a26055ee9a --- /dev/null +++ b/ports/stackwalker/fix-build.patch @@ -0,0 +1,23 @@ +diff --git "a/Main/StackWalker/StackWalker.h" "b/Main/StackWalker/StackWalker.h" +index 67eb90575..e906dbc26 100644 +--- "a/Main/StackWalker/StackWalker.h" ++++ "b/Main/StackWalker/StackWalker.h" +@@ -229,13 +229,11 @@ protected: + { \ + memset(&c, 0, sizeof(CONTEXT)); \ + c.ContextFlags = contextFlags; \ +- __asm { \ +- call x \ +- x: pop eax \ +- mov c.Eip, eax \ +- mov c.Ebp, ebp \ +- mov c.Esp, esp \ +- }; \ ++ __asm call x \ ++ __asm x: pop eax \ ++ __asm mov c.Eip, eax \ ++ __asm mov c.Ebp, ebp \ ++ __asm mov c.Esp, esp \ + } while (0); + // clang-format on + #endif diff --git a/ports/stackwalker/fix-exports.patch b/ports/stackwalker/fix-exports.patch new file mode 100644 index 00000000000000..3ff79bda4f3ae5 --- /dev/null +++ b/ports/stackwalker/fix-exports.patch @@ -0,0 +1,28 @@ +diff --git "a/CMakeLists.txt" "b/CMakeLists.txt" +index 82f0206a2..8160fd789 100644 +--- "a/CMakeLists.txt" ++++ "b/CMakeLists.txt" +@@ -79,12 +79,13 @@ add_library(${TARGET_StackWalker} STATIC + Main/StackWalker/StackWalker.cpp) + target_include_directories(${TARGET_StackWalker} PUBLIC + $ ++ $ + ) + +-install(TARGETS "${TARGET_StackWalker}" +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++install(TARGETS "${TARGET_StackWalker}" EXPORT stackwalker-config ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin + ) + + install(FILES "${CMAKE_SOURCE_DIR}/Main/StackWalker/StackWalker.h" +@@ -114,3 +115,5 @@ else() + + add_test(NAME ${TARGET_StackWalker_tests} COMMAND ${TARGET_StackWalker_tests}) + endif() ++ ++install(EXPORT stackwalker-config NAMESPACE unofficial::stackwalker:: DESTINATION share/stackwalker) diff --git a/ports/stackwalker/portfile.cmake b/ports/stackwalker/portfile.cmake new file mode 100644 index 00000000000000..4c180b05f33f98 --- /dev/null +++ b/ports/stackwalker/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JochenKalmbach/StackWalker + REF "${VERSION}" + SHA512 ce4004f114400ff66e25d7403c52ed4798a0e94d529335995df525f37d4238c750c8b1ee5801f71bd7128d39baa9af18e546a49da8587976720df6e9b372b851 + HEAD_REF master + PATCHES + fix-build.patch # https://github.com/JochenKalmbach/StackWalker/commit/97965daed94f1d859fff691e6ba28759db0f179f + fix-exports.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + -DStackWalker_DISABLE_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/stackwalker/vcpkg.json b/ports/stackwalker/vcpkg.json new file mode 100644 index 00000000000000..f88d23da9ea4a6 --- /dev/null +++ b/ports/stackwalker/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "stackwalker", + "version": "1.20", + "description": "StackWalker - Walking the callstack.", + "license": "BSD-2-Clause", + "supports": "windows & !arm & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/starlink-ast/cminpack.diff b/ports/starlink-ast/cminpack.diff new file mode 100644 index 00000000000000..c73b2b707c4de0 --- /dev/null +++ b/ports/starlink-ast/cminpack.diff @@ -0,0 +1,13 @@ +diff --git a/src/polymap.c b/src/polymap.c +index 0b436cc..1aee268 100644 +--- a/src/polymap.c ++++ b/src/polymap.c +@@ -165,7 +165,7 @@ f - AST_POLYTRAN: Fit a PolyMap inverse or forward transformation + #include "cmpmap.h" /* Compound mappings */ + #include "polymap.h" /* Interface definition for this class */ + #include "unitmap.h" /* Unit mappings */ +-#include "cminpack/cminpack.h" /* Levenberg - Marquardt minimization */ ++#include "cminpack-1/cminpack.h" /* Levenberg - Marquardt minimization */ + #include "pal.h" /* SLALIB function definitions */ + + /* Error code definitions. */ diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index 058b37badff5ac..9f0e6c61cec62b 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -1,19 +1,35 @@ +# There is no 9.2.10 tarball with generated `configure`. +# Reconfiguration needs a custom starlink autoconf. +# Cf. https://github.com/Starlink/ast/issues/21 vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Starlink/ast/releases/download/v9.2.7/ast-9.2.7.tar.gz" - FILENAME "ast-9.2.7.tar.gz" - SHA512 4778658fe6b08af29b51807e2d988f8425d99d630a14d8fef9ca4ea43016d676df419a93c4b2fdecc0549c28c0665f61e366bd4e7aa896ebb8e47f56d5af1887 + # regular: "https://github.com/Starlink/ast/releases/download/v${VERSION}/ast-${VERSION}.tar.gz" + URLS "https://github.com/Starlink/ast/files/8843897/ast-9.2.9.tar.gz" # not a release asset or tarball + FILENAME "starlink-ast-${VERSION}.tar.gz" + SHA512 af19cdf41e20d9e92850d90ea760bd21bc9a53ca5bb181a6e27322a610fd13cd6cef30aaf8de6193a2c3fe3c66428b3bd46492a6b22ac22f18cd9be712aa357b ) +vcpkg_download_distfile(UPDATE_DIFF + URLS "https://github.com/Starlink/ast/compare/v9.2.9...v${VERSION}.diff" + FILENAME "starlink-ast-v9.2.9...v${VERSION}.diff" + SHA512 fd1255eaefcfdb57273ba241fc604e3ab5eabd2212c17f10daac8fd23436f6d50272bfa35bac292097441ff5334e3d28d12ea6d7d90838f6058e05fc7067c966 +) +file(READ "${UPDATE_DIFF}" diff) +set(files_to_ignore "(configure\\.ac|Makefile|\\.gitignore|component\\.xml)") +string(REGEX REPLACE "diff --git a/${files_to_ignore}[^\n]*\n([-+@ i][^\n]*\n)*" "" diff "${diff}") +file(WRITE "${CURRENT_BUILDTREES_DIR}/update-${VERSION}.diff" "${diff}") -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + cminpack.diff + "${CURRENT_BUILDTREES_DIR}/update-${VERSION}.diff" ) +file(REMOVE_RECURSE "${SOURCE_PATH}/cminpack") +vcpkg_replace_string("${SOURCE_PATH}/configure" "9.2.9" "9.2.10") set(CONFIGURE_OPTIONS --without-fortran --with-external-cminpack - star_cv_cnf_trail_type=long - star_cv_cnf_f2c_compatible=no ) if ("yaml" IN_LIST FEATURES) @@ -33,13 +49,43 @@ vcpkg_configure_make( USE_WRAPPERS DETERMINE_BUILD_TRIPLET ADDITIONAL_MSYS_PACKAGES perl - OPTIONS ${CONFIGURE_OPTIONS} + OPTIONS + ${CONFIGURE_OPTIONS} ) - vcpkg_install_make() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") +# Avoid vcpkg artifact issues with symlinks +foreach(ast_lib IN ITEMS "${CURRENT_PACKAGES_DIR}/lib/libast" "${CURRENT_PACKAGES_DIR}/debug/lib/libast") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND EXISTS "${ast_lib}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(REMOVE "${ast_lib}_pass2${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(COPY_FILE "${ast_lib}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${ast_lib}_pass2${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() +endforeach() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/docs" + "${CURRENT_PACKAGES_DIR}/debug/help" + "${CURRENT_PACKAGES_DIR}/debug/manifests" + "${CURRENT_PACKAGES_DIR}/debug/news" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/docs" + "${CURRENT_PACKAGES_DIR}/help" + "${CURRENT_PACKAGES_DIR}/manifests" + "${CURRENT_PACKAGES_DIR}/news" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/ast" +) + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/COPYING.LESSER" + "${SOURCE_PATH}/COPYING" + "${SOURCE_PATH}/erfa/LICENSE" + COMMENT [[ +AST is distributed under the Lesser GPL licence (LGPL). + +The AST distribution includes a cut down subset of the C version of the SLALIB library written +by Pat Wallace. This subset contains only the functions needed by the AST library. It is built as +part of the process of building AST and is distributed under GPL. -# # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +The AST distribution includes the ERFA library. See LICENSE below. +]]) diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 5acdf6d3d990db..932834422422c5 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,22 +1,21 @@ { "name": "starlink-ast", - "version": "9.2.7", - "port-version": 1, + "version": "9.2.10", "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", - "supports": "windows", + "license": null, "dependencies": [ "cminpack" ], "features": { "pthreads": { - "description": "build with POSIX threads support", + "description": "Build with POSIX threads support", "dependencies": [ "pthreads" ] }, "yaml": { - "description": "build with YAML support", + "description": "Build with YAML support", "dependencies": [ "libyaml" ] diff --git a/ports/status-value-lite/portfile.cmake b/ports/status-value-lite/portfile.cmake index f5f24e83fc1a6d..637a543aea4f0e 100644 --- a/ports/status-value-lite/portfile.cmake +++ b/ports/status-value-lite/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES test BUILD_TESTS ) diff --git a/ports/status-value-lite/vcpkg.json b/ports/status-value-lite/vcpkg.json index 29ac75510948d1..2ab1839aab76d2 100644 --- a/ports/status-value-lite/vcpkg.json +++ b/ports/status-value-lite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "status-value-lite", - "version-string": "1.1.0", - "port-version": 2, + "version": "1.1.0", + "port-version": 3, "description": "status_value is a single-file header-only library for objects that represent a status and an optional value. It is intended for use with C++11 and later.", "homepage": "https://github.com/martinmoene/status-value-lite", "dependencies": [ diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake index 8f76db772f47f3..6eda59677a4a64 100644 --- a/ports/stb/portfile.cmake +++ b/ports/stb/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nothings/stb - REF 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 # committed on 2022-09-09 - SHA512 76e0ed7536146aac71f89d6246235221c1dc0bd035ae4b33d496213acf5be95413cae4455a3f1419f84113320f7bd662dc50b47788cbdc8e7208bbbbcfd23f98 + REF 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 # committed on 2023-04-11 + SHA512 55bc75284cf8a092c527d1ae18c461c9d0ab6aacdcf3b873abde54c06d9b8a0ae249ce47c7ad25809e075bfbb58e9c879d43e1df2708083860c07ac3bbb30d60 HEAD_REF master ) -file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h" "${SOURCE_PATH}/stb_vorbis.c") file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/stb/vcpkg.json b/ports/stb/vcpkg.json index 5a8feae323d935..e1057165f79d04 100644 --- a/ports/stb/vcpkg.json +++ b/ports/stb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "stb", - "version-date": "2022-09-09", + "version-date": "2023-04-11", + "port-version": 1, "description": "public domain header-only libraries", "homepage": "https://github.com/nothings/stb", "license": "MIT OR CC-PDDC" diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake index 5c62fba119389f..d05ff2c89d8edd 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -6,10 +6,17 @@ vcpkg_from_github( HEAD_REF main ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cpp17shims STLAB_USE_BOOST_CPP17_SHIMS +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) vcpkg_cmake_install() diff --git a/ports/stlab/vcpkg.json b/ports/stlab/vcpkg.json index 4c032353cca172..a4049bce60c603 100644 --- a/ports/stlab/vcpkg.json +++ b/ports/stlab/vcpkg.json @@ -1,6 +1,7 @@ { "name": "stlab", "version": "1.7.1", + "port-version": 1, "description": [ "stlab is the ongoing work of what was Adobe Software Technology Lab.", "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures." diff --git a/ports/stormlib/vcpkg.json b/ports/stormlib/vcpkg.json index 1b6a60a67378f0..2727c3b6cd08b7 100644 --- a/ports/stormlib/vcpkg.json +++ b/ports/stormlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "stormlib", - "version-string": "2019-05-10", - "port-version": 4, + "version-date": "2019-05-10", + "port-version": 5, "description": "StormLib is a library for opening and manipulating Blizzard MPQ files", "dependencies": [ "bzip2", diff --git a/ports/strict-variant/vcpkg.json b/ports/strict-variant/vcpkg.json index f95e19258ca59c..afcf6d20ce1a7c 100644 --- a/ports/strict-variant/vcpkg.json +++ b/ports/strict-variant/vcpkg.json @@ -1,6 +1,6 @@ { "name": "strict-variant", - "version-string": "0.5", - "port-version": 1, + "version": "0.5", + "port-version": 2, "description": "Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves." } diff --git a/ports/strtk/vcpkg.json b/ports/strtk/vcpkg.json index 41a303b3753a05..5fa1948a58f326 100644 --- a/ports/strtk/vcpkg.json +++ b/ports/strtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "strtk", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2020-09-14", + "port-version": 2, "description": "robust, optimized and portable string processing algorithms for the C++ language", "homepage": "https://github.com/ArashPartow/strtk", "dependencies": [ diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index a12ecf107bf62d..0cf6056ba3259b 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -6,10 +6,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu REF "v${VERSION}" - SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83 + SHA512 8feeb08404cad58724f0f6478bc785b56d8c725b549f1fdc07d3578c4e14bdbdbd8bcda1cdfd366a39417eda60765825e87cf781c68e6723a8246cb357b41439 HEAD_REF master PATCHES remove-make.inc.patch + superfluous-configure.patch ) vcpkg_cmake_configure( diff --git a/ports/superlu/superfluous-configure.patch b/ports/superlu/superfluous-configure.patch new file mode 100644 index 00000000000000..09b974be193877 --- /dev/null +++ b/ports/superlu/superfluous-configure.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d733990..11f429a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,7 +230,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_BINARY_DIR}/SRC/superlu_config.h) +-configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_SOURCE_DIR}/SRC/superlu_config.h) + + # Following is to configure a header file for FORTRAN code + configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_BINARY_DIR}/FORTRAN/superlu_config.h) diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index 0fab3f8db50543..a9d521ae331b25 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,7 +1,6 @@ { "name": "superlu", - "version": "5.3.0", - "port-version": 1, + "version": "6.0.0", "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", "license": "BSD-3-Clause-LBNL", diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index dc0329930041fe..63126844e41817 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine - REF 7b1880824c2cce98787ae29a317682ba6c294484 #v0.9.0 - SHA512 745b2616b88032ff047a28e46b703bc1912d109524f8aa411a5b7a650a6d89d3f16dc92812381e95b13bc5cf61218d2ff3db9d3809443264340eae180968cbcf + REF "v${VERSION}" + SHA512 e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934 HEAD_REF master ) @@ -13,6 +13,7 @@ vcpkg_check_features( flint WITH_FLINT mpfr WITH_MPFR tcmalloc WITH_TCMALLOC + llvm WITH_LLVM ) if(integer-class-boostmp IN_LIST FEATURES) diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 8257978180f68f..2384d9f1d9a7c9 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "symengine", - "version": "0.9.0", + "version": "0.10.1", "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", "license": "BSD-3-Clause", @@ -45,6 +45,15 @@ "gmp" ] }, + "llvm": { + "description": "Build with LLVM", + "dependencies": [ + { + "name": "llvm", + "default-features": false + } + ] + }, "mpfr": { "description": "Build with mpfr", "dependencies": [ diff --git a/ports/systemc/vcpkg.json b/ports/systemc/vcpkg.json index d41c5dec86e3c0..86fc788bfc073a 100644 --- a/ports/systemc/vcpkg.json +++ b/ports/systemc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "systemc", - "version-string": "2.3.3", - "port-version": 7, + "version": "2.3.3", + "port-version": 8, "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++", "dependencies": [ { diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index 9df8aadd770605..8a828a34098633 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -5,10 +5,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF "szip-${SZIP_VERSION}" + SOURCE_BASE "szip-${SZIP_VERSION}" PATCHES fix-linkage-config.patch mingw-lib-names.patch diff --git a/ports/szip/vcpkg.json b/ports/szip/vcpkg.json index f0f879ea47861b..42bb77dd849609 100644 --- a/ports/szip/vcpkg.json +++ b/ports/szip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "szip", "version": "2.1.1", - "port-version": 10, + "port-version": 11, "description": "Szip compression software, providing lossless compression of scientific data", "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip", "license": null, diff --git a/ports/tacopie/vcpkg.json b/ports/tacopie/vcpkg.json index 06b6fd1e6acf96..a726fe575c1202 100644 --- a/ports/tacopie/vcpkg.json +++ b/ports/tacopie/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tacopie", - "version-string": "3.2.0", - "port-version": 4, + "version": "3.2.0", + "port-version": 5, "description": "Tacopie is a TCP Client & Server C++11 library", "homepage": "https://github.com/cpp-redis/tacopie", "dependencies": [ diff --git a/ports/taocpp-json/vcpkg.json b/ports/taocpp-json/vcpkg.json index 28682b31620ce7..980575f02f93f2 100644 --- a/ports/taocpp-json/vcpkg.json +++ b/ports/taocpp-json/vcpkg.json @@ -1,7 +1,7 @@ { "name": "taocpp-json", - "version-string": "2020-09-14", - "port-version": 2, + "version-date": "2020-09-14", + "port-version": 3, "description": "C++ header-only JSON library", "dependencies": [ { diff --git a/ports/tap-windows6/vcpkg.json b/ports/tap-windows6/vcpkg.json index 777db703c20904..4a234c4bcf515b 100644 --- a/ports/tap-windows6/vcpkg.json +++ b/ports/tap-windows6/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tap-windows6", - "version-string": "9.21.2-0e30f5c", - "port-version": 1, + "version": "9.21.2-0e30f5c", + "port-version": 2, "description": "an NDIS 6 implementation of the TAP-Windows driver, used by OpenVPN and other apps. Note: This package only contains the headers for the driver." } diff --git a/ports/task-thread-pool/portfile.cmake b/ports/task-thread-pool/portfile.cmake new file mode 100644 index 00000000000000..f3476542cdd1b5 --- /dev/null +++ b/ports/task-thread-pool/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alugowski/task-thread-pool + REF v${VERSION} + SHA512 8f67e4d467c16bd0986f4fbfda6e7ca74760ddf3c4333660c764c97df0a21a40f36dc5af11c47f41e1cc0eb9c498ff2ca7b93a11a32dea296181592f5a05fd1d + HEAD_REF main +) + +file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/include/*.hpp") + +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-BSD.txt" "${SOURCE_PATH}/LICENSE-Boost.txt" "${SOURCE_PATH}/LICENSE-MIT.txt") diff --git a/ports/task-thread-pool/vcpkg.json b/ports/task-thread-pool/vcpkg.json new file mode 100644 index 00000000000000..b5cc94e8678137 --- /dev/null +++ b/ports/task-thread-pool/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "task-thread-pool", + "version": "1.0.7", + "description": "Fast and lightweight thread pool for C++11 and newer.", + "homepage": "https://github.com/alugowski/task-thread-pool", + "documentation": "https://github.com/alugowski/task-thread-pool/blob/main/README.md", + "license": "BSD-2-Clause OR MIT OR BSL-1.0" +} diff --git a/ports/taskflow/portfile.cmake b/ports/taskflow/portfile.cmake index fc38b85886f02b..2455b5db01a793 100644 --- a/ports/taskflow/portfile.cmake +++ b/ports/taskflow/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF v3.5.0 - SHA512 0e80a96eacce05cb09eb3e75634ba9f27c86d84b56903897e954e04fa68cadc3c2fe69857f8dc60da330c9abd5e4c7e1164f3c5f695ad8bb38a1ccbc001f8652 + REF "v${VERSION}" + SHA512 1bf17b69cdb29b982fc74b9091f5b6c8fc4fd3004b26afe7e73e71569738e492cf8663b71d98cfbc4e240c08ceb8a99bf51cccce95254710722f89929a4bbea8 HEAD_REF master ) @@ -25,4 +25,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Taskflow) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/taskflow/vcpkg.json b/ports/taskflow/vcpkg.json index 05a196997aea3d..bc1d048345281f 100644 --- a/ports/taskflow/vcpkg.json +++ b/ports/taskflow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "taskflow", - "version": "3.5.0", + "version": "3.6.0", "description": "Fast Parallel Tasking Programming Library using Modern C++", "homepage": "https://github.com/taskflow/taskflow", "license": "MIT", diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index c89c4481da93c1..c9f98efb4f0881 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) @@ -6,13 +5,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneTBB REF "v${VERSION}" - SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4 + SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c HEAD_REF onetbb_2021 ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + hwloc TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DTBB_TEST=OFF -DTBB_STRICT=OFF ) @@ -47,4 +52,4 @@ include(CMakeFindDependencyMacro) find_dependency(Threads) ${_contents}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index 4a591ba63a2b59..6b17fda36005b2 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -1,6 +1,8 @@ { + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", - "version": "2021.8.0", + "version": "2021.9.0", + "port-version": 1, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", @@ -14,5 +16,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "hwloc": { + "description": "Builds TBB with TBBBind support for Hibrid CPUs or NUMA architectures.", + "supports": "!static & !osx", + "dependencies": [ + "hwloc" + ] + } + } } diff --git a/ports/telnetpp/vcpkg.json b/ports/telnetpp/vcpkg.json index 1eb1cd72e7ddb5..2d713af60eba6a 100644 --- a/ports/telnetpp/vcpkg.json +++ b/ports/telnetpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "telnetpp", - "version-string": "2.1.2", - "port-version": 2, + "version": "2.1.2", + "port-version": 3, "description": "Telnet++ is an implementation of the Telnet Session Layer protocol using C++14", "homepage": "https://github.com/KazDragon/telnetpp", "supports": "!uwp", diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index e9c57002a37d63..81943bf955eadd 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -47,7 +47,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe" PACKAGE_NAME "Tensorpipe") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/ports/tensorpipe/support-test.patch b/ports/tensorpipe/support-test.patch index af128048582cc2..21a94c37bdc20e 100644 --- a/ports/tensorpipe/support-test.patch +++ b/ports/tensorpipe/support-test.patch @@ -1,8 +1,8 @@ diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index 53e8643..c49ada6 100644 +index 53e8643..09baaa0 100644 --- a/tensorpipe/test/CMakeLists.txt +++ b/tensorpipe/test/CMakeLists.txt -@@ -93,25 +93,24 @@ if(TP_USE_CUDA) +@@ -93,25 +93,30 @@ if(TP_USE_CUDA) channel/cuda_ipc/cuda_ipc_test.cc ) endif() @@ -25,13 +25,19 @@ index 53e8643..c49ada6 100644 -add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest - ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) +find_package(GTest CONFIG REQUIRED) ++ ++if (TARGET uv) ++ set(LIBUV_LIBRARY uv) ++else() ++ set(LIBUV_LIBRARY uv_a) ++endif() list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe - uv::uv - gmock - gtest_main) -+ unofficial::libuv::libuv ++ ${LIBUV_LIBRARY} + GTest::gmock + GTest::gtest_main) diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index fc9865ad28052e..3efe75d8656375 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorpipe", "version-date": "2022-03-16", - "port-version": 2, + "port-version": 3, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "license": "BSD-3-Clause", diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 128543c661cc2a..d45ea9f0d01291 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -65,5 +65,42 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# Install: +file(GLOB API_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/api/*.h") +file(INSTALL ${API_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/api") + +file(GLOB ARCH_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/arch/*.h") +file(INSTALL ${ARCH_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/arch") + +file(GLOB CCMAIN_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/ccmain/*.h") +file(INSTALL ${CCMAIN_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/ccmain") + +file(GLOB CCSTRUCT_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/ccstruct/*.h") +file(INSTALL ${CCSTRUCT_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/ccstruct") + +file(GLOB CCUTIL_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/ccutil/*.h") +file(INSTALL ${CCUTIL_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/ccutil") + +file(GLOB CLASSIFY_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/classify/*.h") +file(INSTALL ${CLASSIFY_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/classify") + +file(GLOB CUTIL_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/cutil/*.h") +file(INSTALL ${CUTIL_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/cutil") + +file(GLOB DICT_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/dict/*.h") +file(INSTALL ${DICT_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/dict") + +file(GLOB LSTM_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/lstm/*.h") +file(INSTALL ${LSTM_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/lstm") + +file(GLOB TEXTORD_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/textord/*.h") +file(INSTALL ${TEXTORD_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/textord") + +file(GLOB VIEWER_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/viewer/*.h") +file(INSTALL ${VIEWER_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/viewer") + +file(GLOB WORDREC_HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/src/wordrec/*.h") +file(INSTALL ${WORDREC_HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/tesseract/wordrec") + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 7da8109644f33a..ee2d8ce43e2fd8 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tesseract", "version": "5.3.0", + "port-version": 1, "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "license": "Apache-2.0", diff --git a/ports/tgc/vcpkg.json b/ports/tgc/vcpkg.json index bfc5a6829511c2..788296adf2de5d 100644 --- a/ports/tgc/vcpkg.json +++ b/ports/tgc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tgc", - "version-string": "2019-08-11", - "port-version": 3, + "version-date": "2019-08-11", + "port-version": 4, "description": "A tiny garbage collector for C", "homepage": "https://github.com/orangeduck/tgc", "dependencies": [ diff --git a/ports/thorvg/install-tools.patch b/ports/thorvg/install-tools.patch index 207d6ee1237df5..266598002be38b 100644 --- a/ports/thorvg/install-tools.patch +++ b/ports/thorvg/install-tools.patch @@ -1,22 +1,22 @@ diff --git a/src/bin/svg2png/meson.build b/src/bin/svg2png/meson.build -index 8011410..40cf3f9 100644 +index ed21489e..c3fb3188 100644 --- a/src/bin/svg2png/meson.build +++ b/src/bin/svg2png/meson.build -@@ -3,4 +3,5 @@ svg2png_src = files('svg2png.cpp', 'lodepng.cpp') - executable('svg2png', +@@ -4,4 +4,5 @@ executable('svg2png', svg2png_src, include_directories : headers, + cpp_args: compiler_flags, - link_with : thorvg_lib) + link_with : thorvg_lib, + install : true, install_dir : get_option('bindir')) diff --git a/src/bin/svg2tvg/meson.build b/src/bin/svg2tvg/meson.build -index 2df9fac..ffd5a20 100644 +index a40111aa..a02f4b8a 100644 --- a/src/bin/svg2tvg/meson.build +++ b/src/bin/svg2tvg/meson.build -@@ -3,4 +3,5 @@ svg2tvg_src = files('svg2tvg.cpp') - executable('svg2tvg', +@@ -4,4 +4,5 @@ executable('svg2tvg', svg2tvg_src, include_directories : headers, + cpp_args: compiler_flags, - link_with : thorvg_lib) + link_with : thorvg_lib, + install : true, install_dir : get_option('bindir')) diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index f2338c23664df0..9296715cd62e82 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg - REF v0.8.4 - SHA512 8e885a8c56efb129fb3ab90b9a7b765b84f5f520a9c7a5c92af4ffe61bac1b928165801b64ebc7db77046e1aaf2918ed0ffdf98cb9572dc6d46ed6de3f96b9b7 + REF v0.9.0 + SHA512 c0294a60f0b2e432bec62e1c44f0cb632420ec5c9390df210c8b8db5507fa8f5946bdc8a7879007e4e54865dc4538f4bf1e26d76f90a324cc5edd5cdf61c0fc0 HEAD_REF master PATCHES install-tools.patch diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index 228ec70b592fd3..32d91a7dcb4e00 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "thorvg", - "version": "0.8.4", + "version": "0.9.0", "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", diff --git a/ports/threadpool/vcpkg.json b/ports/threadpool/vcpkg.json index 3e16feecc429f1..8bd1f91d21079b 100644 --- a/ports/threadpool/vcpkg.json +++ b/ports/threadpool/vcpkg.json @@ -1,7 +1,7 @@ { "name": "threadpool", - "version-string": "0.2.5", - "port-version": 2, + "version": "0.2.5", + "port-version": 3, "description": "threadpool is a cross-platform C++ thread pool library. It provides a convenient way for dispatching asynchronous tasks and can be easily customized. threadpool is based on the high-quality Boost source libraries.", "homepage": "http://threadpool.sourceforge.net/", "dependencies": [ diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index f9f2b70f06c347..f83c03c112bca2 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -47,11 +47,11 @@ vcpkg_cmake_configure( -DBUILD_CPP=ON -DWITH_CPP=ON -DWITH_ZLIB=ON - -DCMAKE_FIND_PACKAGE_REQUIRE_ZLIB=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=TRUE -DWITH_LIBEVENT=ON - -DCMAKE_FIND_PACKAGE_REQUIRE_Libevent=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_Libevent=TRUE -DWITH_OPENSSL=ON - -DCMAKE_FIND_PACKAGE_REQUIRE_OpenSSL=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_OpenSSL=TRUE -DBUILD_TUTORIALS=OFF -DFLEX_EXECUTABLE=${FLEX} -DWITH_QT5=OFF @@ -64,9 +64,9 @@ vcpkg_cmake_configure( MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_GLIB CMAKE_DISABLE_FIND_PACKAGE_Gradle - CMAKE_FIND_PACKAGE_REQUIRE_Libevent - CMAKE_FIND_PACKAGE_REQUIRE_OpenSSL - CMAKE_FIND_PACKAGE_REQUIRE_ZLIB + CMAKE_REQUIRE_FIND_PACKAGE_Libevent + CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL + CMAKE_REQUIRE_FIND_PACKAGE_ZLIB ) @@ -90,4 +90,4 @@ if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json index 5b556459ad2491..e6ae5f223b80f6 100644 --- a/ports/thrift/vcpkg.json +++ b/ports/thrift/vcpkg.json @@ -1,6 +1,7 @@ { "name": "thrift", "version": "0.16.0", + "port-version": 1, "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.", "homepage": "https://github.com/apache/thrift", "license": "Apache-2.0", diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 39cf367c92de71..a9c290eab0b517 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -41,6 +41,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON -DZSTD_HAVE_DECOMPRESS_STREAM=ON + -DHAVE_JPEGTURBO_DUAL_MODE_8_12=OFF OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. MAYBE_UNUSED_VARIABLES diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 58b0ca7199c5c7..550fcb6de762f3 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", "version": "4.5.0", - "port-version": 2, + "port-version": 3, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": null, diff --git a/ports/tiny-aes-c/vcpkg.json b/ports/tiny-aes-c/vcpkg.json index 2357dd1ac40afb..5e91549cf0302d 100644 --- a/ports/tiny-aes-c/vcpkg.json +++ b/ports/tiny-aes-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiny-aes-c", - "version-string": "2019-07-31", - "port-version": 2, + "version-date": "2019-07-31", + "port-version": 3, "description": "Small portable AES128/192/256 in C", "homepage": "https://github.com/kokke/tiny-AES-c", "dependencies": [ diff --git a/ports/tiny-bignum-c/vcpkg.json b/ports/tiny-bignum-c/vcpkg.json index 383ff92fdf3cd5..049e4070066b80 100644 --- a/ports/tiny-bignum-c/vcpkg.json +++ b/ports/tiny-bignum-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiny-bignum-c", - "version-string": "2019-07-31", - "port-version": 2, + "version-date": "2019-07-31", + "port-version": 3, "description": "Small portable multiple-precision unsigned integer arithmetic in C", "homepage": "https://github.com/kokke/tiny-bignum-c", "dependencies": [ diff --git a/ports/tiny-dnn/vcpkg.json b/ports/tiny-dnn/vcpkg.json index 977ae26adf1669..58bd98b5209abe 100644 --- a/ports/tiny-dnn/vcpkg.json +++ b/ports/tiny-dnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiny-dnn", - "version-string": "2018-10-25", - "port-version": 1, + "version-date": "2018-10-25", + "port-version": 2, "description": "A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource.", "homepage": "https://github.com/tiny-dnn/tiny-dnn" } diff --git a/ports/tiny-regex-c/vcpkg.json b/ports/tiny-regex-c/vcpkg.json index 3ed8ca1d008277..202002ff2ea6ed 100644 --- a/ports/tiny-regex-c/vcpkg.json +++ b/ports/tiny-regex-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiny-regex-c", - "version-string": "2019-07-31", - "port-version": 2, + "version-date": "2019-07-31", + "port-version": 3, "description": "A small regex implementation in C", "homepage": "https://github.com/kokke/tiny-regex-c", "dependencies": [ diff --git a/ports/tinycthread/vcpkg.json b/ports/tinycthread/vcpkg.json index ff8d59ceca4486..a66b799eeb2f79 100644 --- a/ports/tinycthread/vcpkg.json +++ b/ports/tinycthread/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinycthread", - "version-string": "2019-08-06", - "port-version": 2, + "version-date": "2019-08-06", + "port-version": 3, "description": "Small, portable implementation of the C11 threads API", "homepage": "https://tinycthread.github.io/", "dependencies": [ diff --git a/ports/tinyexpr/vcpkg.json b/ports/tinyexpr/vcpkg.json index 1e9b2aeb680e2e..7b55dfe28dc98a 100644 --- a/ports/tinyexpr/vcpkg.json +++ b/ports/tinyexpr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyexpr", - "version-string": "2020-09-25", - "port-version": 1, + "version-date": "2020-09-25", + "port-version": 2, "description": "Tiny recursive descent parser and evaluation engine in C", "homepage": "https://codeplea.com/tinyexpr", "license": "Zlib", diff --git a/ports/tinynpy/vcpkg.json b/ports/tinynpy/vcpkg.json index aa85e174750fff..f706128051e57a 100644 --- a/ports/tinynpy/vcpkg.json +++ b/ports/tinynpy/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinynpy", - "version-string": "1.0.0", - "port-version": 5, + "version": "1.0.0", + "port-version": 6, "description": "tiny C++ loader/exporter of python numpy array NPY/NPZ files", "dependencies": [ { diff --git a/ports/tinythread/vcpkg.json b/ports/tinythread/vcpkg.json index 2516f97ab187ef..27ffb8cda95795 100644 --- a/ports/tinythread/vcpkg.json +++ b/ports/tinythread/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinythread", - "version-string": "1.1", - "port-version": 5, + "version": "1.1", + "port-version": 6, "description": "Implements a fairly compatible subset of the C++11 thread management classes", "homepage": "https://tinythreadpp.bitsnbites.eu/", "dependencies": [ diff --git a/ports/tinytoml/vcpkg.json b/ports/tinytoml/vcpkg.json index f7a894c86e93ea..d394ff4521c286 100644 --- a/ports/tinytoml/vcpkg.json +++ b/ports/tinytoml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinytoml", - "version-string": "20180219", - "port-version": 2, + "version": "20180219", + "port-version": 3, "description": "A header only C++11 library for parsing TOML.", "homepage": "https://github.com/mayah/tinytoml" } diff --git a/ports/tinyxml/vcpkg.json b/ports/tinyxml/vcpkg.json index 7a84ea10ca7dc5..65bb00a07a8c46 100644 --- a/ports/tinyxml/vcpkg.json +++ b/ports/tinyxml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyxml", - "version-string": "2.6.2", - "port-version": 9, + "version": "2.6.2", + "port-version": 10, "description": "A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.", "homepage": "https://sourceforge.net/projects/tinyxml", "dependencies": [ diff --git a/ports/tl-function-ref/vcpkg.json b/ports/tl-function-ref/vcpkg.json index 1a58e86da0dcd9..3760dd5cb3f029 100644 --- a/ports/tl-function-ref/vcpkg.json +++ b/ports/tl-function-ref/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tl-function-ref", - "version-string": "1.0.0", - "port-version": 3, + "version": "1.0.0", + "port-version": 4, "description": "A lightweight, non-owning reference to a callable.", "dependencies": [ { diff --git a/ports/tlx/vcpkg.json b/ports/tlx/vcpkg.json index cf5acdf1ca16c5..b30110a40c621f 100644 --- a/ports/tlx/vcpkg.json +++ b/ports/tlx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tlx", - "version-string": "0.5.20191212", - "port-version": 3, + "version": "0.5.20191212", + "port-version": 4, "description": "tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL", "homepage": "https://github.com/tlx/tlx", "dependencies": [ diff --git a/ports/tracy/003-fix-imgui-path.patch b/ports/tracy/003-fix-imgui-path.patch index 9e6d94ef84260a..be1bf9a57d0b43 100644 --- a/ports/tracy/003-fix-imgui-path.patch +++ b/ports/tracy/003-fix-imgui-path.patch @@ -6,8 +6,8 @@ index 24765f1a..dc2923c8 100644 CFLAGS += CXXFLAGS := $(CFLAGS) -std=c++17 DEFINES += -DIMGUI_ENABLE_FREETYPE --INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui -+INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) - LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl +-INCLUDES := $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -I../../../imgui ++INCLUDES := -I../../../imgui $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) + LIBS := $(shell pkg-config --libs freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -lpthread -ldl PROJECT := Tracy diff --git a/ports/tracy/004-fix-crash-handler.patch b/ports/tracy/004-fix-crash-handler.patch deleted file mode 100644 index cbfd57a59b15b6..00000000000000 --- a/ports/tracy/004-fix-crash-handler.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/public/client/TracyProfiler.cpp b/public/client/TracyProfiler.cpp -index ea168e4f..9287d433 100644 ---- a/public/client/TracyProfiler.cpp -+++ b/public/client/TracyProfiler.cpp -@@ -1454,7 +1454,7 @@ Profiler::~Profiler() - if( m_crashHandlerInstalled ) RemoveVectoredExceptionHandler( m_exceptionHandler ); - #endif - --#ifdef __linux__ -+#if defined __linux__ && !defined TRACY_NO_CRASH_HANDLER - if( m_crashHandlerInstalled ) - { - sigaction( TRACY_CRASH_SIGNAL, &m_prevSignal.pwr, nullptr ); -@@ -1520,7 +1520,7 @@ bool Profiler::ShouldExit() - - void Profiler::Worker() - { --#ifdef __linux__ -+#if defined __linux__ && !defined TRACY_NO_CRASH_HANDLER - s_profilerTid = syscall( SYS_gettid ); - #endif - diff --git a/ports/tracy/004-fix-missing-threads-dep.patch b/ports/tracy/004-fix-missing-threads-dep.patch new file mode 100644 index 00000000000000..76d5eb64c8bf98 --- /dev/null +++ b/ports/tracy/004-fix-missing-threads-dep.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d69f71eb..31429d23 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -143,5 +143,11 @@ install(FILES ${common_includes} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) + install(EXPORT TracyConfig + NAMESPACE Tracy:: +- FILE TracyConfig.cmake ++ FILE TracyTargets.cmake ++ DESTINATION share/Tracy) ++include(CMakePackageConfigHelpers) ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake" ++ INSTALL_DESTINATION share/Tracy) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake + DESTINATION share/Tracy) +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 00000000..fc913ab3 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,6 @@ ++@PACKAGE_INIT@ ++ ++include(CMakeFindDependencyMacro) ++find_dependency(Threads REQUIRED) ++ ++include("${CMAKE_CURRENT_LIST_DIR}/TracyTargets.cmake") +\ No newline at end of file diff --git a/ports/tracy/005-fix-imgui-path-legacy.patch b/ports/tracy/005-fix-imgui-path-legacy.patch new file mode 100644 index 00000000000000..a8b5abea241a12 --- /dev/null +++ b/ports/tracy/005-fix-imgui-path-legacy.patch @@ -0,0 +1,13 @@ +diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk +index 24765f1a..dc2923c8 100644 +--- a/profiler/build/unix/legacy.mk ++++ b/profiler/build/unix/legacy.mk +@@ -1,7 +1,7 @@ + CFLAGS += + CXXFLAGS := $(CFLAGS) -std=c++17 + DEFINES += -DIMGUI_ENABLE_FREETYPE +-INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui ++INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) + LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl + + PROJECT := Tracy diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 1e2403b95f276d..33c50cc12b2e21 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -7,14 +7,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF v0.9 - SHA512 00e8ff6d73d0428eb7a77fc5e0556458285922fbf9d5f0d42ed4f27ff98ffcd96b0f59bbaa3c103fd0903283ded6e7577d2a49362e5803cdbac0f3236af957cb + REF v0.9.1 + SHA512 988f492501e5a449ecc89b98d4e8cb6164b65dfe2b5daf17ccc3035f1a477162b77ce7a2cc4c62d7b8a8d530d80f2b439c779319a6bd15b6d37b4a36406d8f4c HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch 002-fix-capstone-5.patch 003-fix-imgui-path.patch - 004-fix-crash-handler.patch + 004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562 + 005-fix-imgui-path-legacy.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -84,6 +85,7 @@ function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}" OUTPUT_VARIABLE relative_path_makefile_dir) + set(ENV{LEGACY} 1) vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 14642e3d6dd395..0353c4cc4f2304 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tracy", - "version-semver": "0.9.0", - "port-version": 3, + "version-semver": "0.9.1", + "port-version": 1, "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/ports/tree-similarity/portfile.cmake b/ports/tree-similarity/portfile.cmake new file mode 100644 index 00000000000000..1d5e214216995d --- /dev/null +++ b/ports/tree-similarity/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DatabaseGroup/tree-similarity + REF 0.1.1 + SHA512 5367f4b694d686456c4ffaaf21c7372fb7012811f3b2ded00c6bc1d18d27ecb7a6a28b3c9bd7cb91cb42c5426321b0b12a2e14ab2c838aa8fc859128b372dded + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/ports/tree-similarity/usage b/ports/tree-similarity/usage new file mode 100644 index 00000000000000..0206b3f76372fb --- /dev/null +++ b/ports/tree-similarity/usage @@ -0,0 +1,4 @@ +The package idyntree provides CMake targets: + + find_path(TREE_SIMILARITY_INCLUDE_DIRS "tree-similiarity") + target_include_directories(main PRIVATE ${TREE_SIMILARITY_INCLUDE_DIRS}) \ No newline at end of file diff --git a/ports/tree-similarity/vcpkg.json b/ports/tree-similarity/vcpkg.json new file mode 100644 index 00000000000000..8b6c90a0a0870f --- /dev/null +++ b/ports/tree-similarity/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "tree-similarity", + "version-semver": "0.1.1", + "description": "Tree edit distance (TED) and similarity measurement library, offering multiple algorithm implementation such as APTED and LGM.", + "homepage": "https://github.com/DatabaseGroup/tree-similarity", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/treehopper/vcpkg.json b/ports/treehopper/vcpkg.json index 5bb63ce7cf073a..3287953f8d823d 100644 --- a/ports/treehopper/vcpkg.json +++ b/ports/treehopper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "treehopper", - "version-string": "1.11.3", - "port-version": 6, + "version": "1.11.3", + "port-version": 7, "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.", "homepage": "https://treehopper.io", "dependencies": [ diff --git a/ports/tsl-hopscotch-map/vcpkg.json b/ports/tsl-hopscotch-map/vcpkg.json index 8ddb35275dc17d..65a40b67cc90d0 100644 --- a/ports/tsl-hopscotch-map/vcpkg.json +++ b/ports/tsl-hopscotch-map/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tsl-hopscotch-map", - "version-string": "2.3.0", - "port-version": 2, + "version": "2.3.0", + "port-version": 3, "description": "C++ implementation of a fast hash map and hash set using hopscotch hashing", "dependencies": [ { diff --git a/ports/tsl-ordered-map/vcpkg.json b/ports/tsl-ordered-map/vcpkg.json index 58a063cfe1e13c..5676ffc9e9865d 100644 --- a/ports/tsl-ordered-map/vcpkg.json +++ b/ports/tsl-ordered-map/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tsl-ordered-map", - "version-string": "1.0.0", - "port-version": 2, + "version": "1.0.0", + "port-version": 3, "description": "C++ hash map and hash set which preserve the order of insertion", "dependencies": [ { diff --git a/ports/tsl-sparse-map/vcpkg.json b/ports/tsl-sparse-map/vcpkg.json index 652f0db08a7cc1..ecc0122189f5f0 100644 --- a/ports/tsl-sparse-map/vcpkg.json +++ b/ports/tsl-sparse-map/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tsl-sparse-map", - "version-string": "0.6.2", - "port-version": 2, + "version": "0.6.2", + "port-version": 3, "description": "C++ implementation of a memory efficient hash map and hash set", "dependencies": [ { diff --git a/ports/type-lite/portfile.cmake b/ports/type-lite/portfile.cmake index c30d27741a1601..ab0084cb8a6a97 100644 --- a/ports/type-lite/portfile.cmake +++ b/ports/type-lite/portfile.cmake @@ -6,20 +6,22 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test BUILD_TESTS +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test TYPE_LITE_OPT_BUILD_TESTS ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DTYPE_LITE_OPT_BUILD_TESTS=${BUILD_TESTS} - -DTYPE_LITE_OPT_BUILD_EXAMPLES=OFF + ${FEATURE_OPTIONS} + -DTYPE_LITE_OPT_BUILD_EXAMPLES=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/type-lite/vcpkg.json b/ports/type-lite/vcpkg.json index 58ec0d35803f9c..e101e6165537dd 100644 --- a/ports/type-lite/vcpkg.json +++ b/ports/type-lite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "type-lite", - "version-string": "0.1.0", - "port-version": 2, + "version": "0.1.0", + "port-version": 3, "description": "Strong types for C++98, C++11 and later in a single-file header-only library.", "homepage": "https://github.com/martinmoene/type-lite", "dependencies": [ diff --git a/ports/unicorn-lib/CMakeLists.txt b/ports/unicorn-lib/CMakeLists.txt index b668c3c09a77e0..4f0879e52d844c 100644 --- a/ports/unicorn-lib/CMakeLists.txt +++ b/ports/unicorn-lib/CMakeLists.txt @@ -4,30 +4,23 @@ project(Unicorn_Lib LANGUAGES CXX DESCRIPTION "Unicode library for C++ by Ross S set(CMAKE_CXX_STANDARD 17) option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." OFF) -include(SelectLibraryConfigurations) find_package(ZLIB REQUIRED) -find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH}) -find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH}) -select_library_configurations(PCRE2) +find_package(PkgConfig REQUIRED) +pkg_check_modules(PCRE2 IMPORTED_TARGET REQUIRED libpcre2-8) -file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp) -foreach(ITR ${UNICORN_LIB_SOURCES}) - if(ITR MATCHES "(.*)-test.cpp(.*)") - list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR}) - endif() -endforeach() -add_library(unicorn-lib ${UNICORN_LIB_SOURCES}) -target_include_directories( - unicorn-lib - PUBLIC ${PROJECT_SOURCE_DIR} -) -target_compile_definitions( - unicorn-lib - PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS -) +file(GLOB_RECURSE UNICORN_LIB_SOURCES "${PROJECT_SOURCE_DIR}/unicorn/*.cpp") +list(FILTER UNICORN_LIB_SOURCES EXCLUDE REGEX "(.*)-test.cpp(.*)") -target_link_libraries(unicorn-lib PUBLIC ${PCRE2_LIBRARY}) -target_link_libraries(unicorn-lib PUBLIC ZLIB::ZLIB) +add_library(unicorn-lib ${UNICORN_LIB_SOURCES}) +target_include_directories(unicorn-lib PUBLIC "${PROJECT_SOURCE_DIR}") +target_link_libraries(unicorn-lib PRIVATE PkgConfig::PCRE2 ZLIB::ZLIB) +if(WIN32) + target_compile_definitions(unicorn-lib PRIVATE -DNOMINMAX -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS) +else() + find_package(Iconv REQUIRED) + target_link_libraries(unicorn-lib PRIVATE Iconv::Iconv) + target_compile_definitions(unicorn-lib PRIVATE -D_XOPEN_SOURCE=700) +endif() if(NOT UNICORN_LIB_SKIP_HEADERS) install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp") diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index a206c633cb358c..25ef7557fb00e9 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -1,20 +1,21 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message("unicorn-lib is a static library, now build with static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2022-01-24 + REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2021-10-28 SHA512 b22264420174c950ca8025e861366118d79a53edce9297d84af9511e255af5971c3719f0b464f4a4886848edea7c2ba4ae32ce9abab135628d64adbde5fa7b0d HEAD_REF master ) -file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" OPTIONS_DEBUG -DUNICORN_LIB_SKIP_HEADERS=ON ) @@ -22,6 +23,4 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unicorn-lib/vcpkg.json b/ports/unicorn-lib/vcpkg.json index 9a7ed9aeb2b030..d62d1f99253699 100644 --- a/ports/unicorn-lib/vcpkg.json +++ b/ports/unicorn-lib/vcpkg.json @@ -1,11 +1,20 @@ { "name": "unicorn-lib", "version-date": "2022-01-24", + "port-version": 1, "description": "Unicode library for C++ by Ross Smith", "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", "license": "MIT", + "supports": "!uwp", "dependencies": [ - "pcre2", + { + "name": "libiconv", + "platform": "!windows" + }, + { + "name": "pcre2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/unqlite/vcpkg.json b/ports/unqlite/vcpkg.json index 4e7532c257ad39..62e52308e8e950 100644 --- a/ports/unqlite/vcpkg.json +++ b/ports/unqlite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "unqlite", - "version-string": "1.1.9", - "port-version": 1, + "version": "1.1.9", + "port-version": 2, "description": "An embedded NoSQL, transactional database engine", "homepage": "https://unqlite.org/", "license": "BSD-2-Clause", diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake index 51d8f57b3bd3fe..8c9f9ac98b358c 100644 --- a/ports/unrar/portfile.cmake +++ b/ports/unrar/portfile.cmake @@ -11,10 +11,10 @@ vcpkg_download_distfile(ARCHIVE FILENAME ${UNRAR_FILENAME} SHA512 ${UNRAR_SHA512} ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${UNRAR_VERSION} + SOURCE_BASE ${UNRAR_VERSION} PATCHES msbuild-use-default-sma.patch ) diff --git a/ports/unrar/vcpkg.json b/ports/unrar/vcpkg.json index 1be96cd167fcf3..4a85edde59ec6f 100644 --- a/ports/unrar/vcpkg.json +++ b/ports/unrar/vcpkg.json @@ -1,7 +1,7 @@ { "name": "unrar", "version": "6.1.7", - "port-version": 1, + "port-version": 2, "description": "rarlab's unrar library", "homepage": "https://www.rarlab.com", "license": null, diff --git a/ports/urdfdom/0006-pc_file_for_windows.patch b/ports/urdfdom/0006-pc_file_for_windows.patch new file mode 100644 index 00000000000000..83471eedfb6d9b --- /dev/null +++ b/ports/urdfdom/0006-pc_file_for_windows.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,11 +89,11 @@ + # Make the package config file +-if (NOT MSVC) ++ + set(PKG_DESC "Unified Robot Description Format") + set(PKG_DEPENDS "urdfdom_headers console_bridge") # make the list separated by spaces instead of ; + set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world") + set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig) +-endif() ++ + diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index 5a2e8a0aef8070..fdafe4f62d3293 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom - REF 99ec1f99f2d175f07cc26e63082502ee62982dac # 3.1.0 - SHA512 64bd96c6b56c300b92e2bd6a875c4bc3c4c5d2ee332a75a8d98099aee0db3e9c33fa7d75fdc4d013e7b6ac47296f524ef713639b06e66035135dfc2a8cca0276 + REF ${VERSION} + SHA512 6386954bc7883e82d9db7c785ae074b47ca31efb7cc2686101e7813768824bed5b46a774a1296453c39ff76673a9dc77305bb2ac96b86ecf93fab22062ef2258 HEAD_REF master PATCHES 0001_use_math_defines.patch 0005-fix-config-and-install.patch + 0006-pc_file_for_windows.patch ) vcpkg_cmake_configure( diff --git a/ports/urdfdom/vcpkg.json b/ports/urdfdom/vcpkg.json index 97764859ed28ed..f9ef20c91b9621 100644 --- a/ports/urdfdom/vcpkg.json +++ b/ports/urdfdom/vcpkg.json @@ -1,6 +1,6 @@ { "name": "urdfdom", - "version": "3.1.0", + "version": "3.1.1", "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.", "homepage": "https://github.com/ros/urdfdom", "license": "BSD-3-Clause", diff --git a/ports/urho3d/portfile.cmake b/ports/urho3d/portfile.cmake index 37f24735df2f76..81d126733212ba 100644 --- a/ports/urho3d/portfile.cmake +++ b/ports/urho3d/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE} -DURHO3D_PCH=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON ) vcpkg_cmake_install() @@ -116,4 +117,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/urho3d/vcpkg.json b/ports/urho3d/vcpkg.json index 4a3e308ed58a6e..680d5d0c2dec76 100644 --- a/ports/urho3d/vcpkg.json +++ b/ports/urho3d/vcpkg.json @@ -2,7 +2,7 @@ "$note": "Due to the upstream modification of the dependent source code, the internal port of vcpkg cannot be used.", "name": "urho3d", "version-date": "2021-03-01", - "port-version": 3, + "port-version": 4, "description": "Urho3D is a free lightweight, cross-platform 2D and 3D game engine implemented in C++ and released under the MIT license. Greatly inspired by OGRE and Horde3D.", "homepage": "https://github.com/urho3d/Urho3D", "supports": "!(arm | uwp)", diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index 60439d3ba258e3..7ba53a44444b27 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -1,5 +1,5 @@ # Don't file if the bin folder exists. We need exe and custom files. -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) message(STATUS [=[ The usd port does not work the the version of Threading Building Blocks (tbb) currently chosen by vcpkg's baselines, @@ -16,20 +16,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/USD REF "v${USD_VERSION}" - SHA512 2529aec788cab3ff4c47041f5bc0043fde81dcef8ca313f6390f2e5fb7a10b1b0b1dd47fd6c86e3b4cfc0a1b27bff4d9b94b96bfba6bec3d5ff8f6e2fccb9e11 + SHA512 fd3e7a90f837a5d016d94be34747b2c1daed3f01f252e4b1aa5cb195f32acaecca9373b8f5c7be9c235148f04b0afa47da9462b357ef1dd1e11cf20a7225ae66 HEAD_REF master PATCHES fix_build-location.patch ) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path("${PYTHON2_DIR}") - -IF (VCPKG_TARGET_IS_WINDOWS) -ELSE() +if(NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE ${SOURCE_PATH}/cmake/modules/FindTBB.cmake) -ENDIF() +endif() vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index 677fb73e4aea03..aa10eaf5a8121e 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "usd", - "version": "23.2", + "version": "23.5", "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, @@ -15,6 +15,7 @@ "boost-program-options", "boost-regex", "boost-system", + "boost-variant", "boost-vmd", "tbb", { diff --git a/ports/utfz/vcpkg.json b/ports/utfz/vcpkg.json index 987c48d977bacf..8b117915a76775 100644 --- a/ports/utfz/vcpkg.json +++ b/ports/utfz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "utfz", - "version-string": "1.2", - "port-version": 3, + "version": "1.2", + "port-version": 4, "description": "A tiny C++ library for parsing and encoding utf-8", "homepage": "https://github.com/IMQS/utfz", "dependencies": [ diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 1e39950bb3006d..7e2628480a861f 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,4 +1,4 @@ -set(UVATLAS_TAG mar2023) +set(UVATLAS_TAG apr2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas REF ${UVATLAS_TAG} - SHA512 f937c5881e963400c82bf5d780399e7733850a134f37aa40e819155fcef956631db19d4e14faa4db1381baad254015228afbb96523cce84c60087e877a6d5f59 + SHA512 e65eb32d80460ec6a679929dcb6d4518000e6697dd055616f59b564a87bb63a7696e0d78407a6e820d12e71ac0680d1aa382bf0408d7b2f5c3768db0bc867098 HEAD_REF main PATCHES openexr.patch ) @@ -41,7 +41,7 @@ if("tools" IN_LIST FEATURES) UVATLASTOOL_EXE URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe" FILENAME "uvatlastool-${UVATLAS_TAG}.exe" - SHA512 8c0986581415449b4d9cb5c056e6f4ad8313bb1481e97479eddbdea200061275c7c77823cdb2719cdc06e3b46bab5e907c1483752d42304978e015b26058ebf6 + SHA512 9009113286a28c19102c8fa4d8768f9d81ad563cc5698ba50ac8cb483b0e5734f1d86d6e398cabb1cf1f3801ec0dc567a78c2d91ee8d7c8d81bd1ef610be0a0c ) file(INSTALL @@ -62,4 +62,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 81960918bade5e..e454f71e698a18 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2023-03-30", + "version-date": "2023-04-28", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/ports/uvw/CMakeLists.txt b/ports/uvw/CMakeLists.txt deleted file mode 100644 index d768716f7a4ba0..00000000000000 --- a/ports/uvw/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(uvw) - -find_package(libuv CONFIG REQUIRED) - -add_library(uvw INTERFACE) -if (TARGET uv) - target_link_libraries(uvw INTERFACE uv) -else() - target_link_libraries(uvw INTERFACE uv_a) -endif() - -install(TARGETS uvw - EXPORT uvw - INCLUDES DESTINATION include/) - -install(EXPORT uvw - DESTINATION "share/uvw" - FILE uvw-targets.cmake - NAMESPACE uvw::) - -install(DIRECTORY - src/uvw/ - DESTINATION include/uvw/) - -install(FILES - src/uvw.hpp - DESTINATION include/ -) diff --git a/ports/uvw/fix-find-libuv.patch b/ports/uvw/fix-find-libuv.patch new file mode 100644 index 00000000000000..2fc3a91d58c2dc --- /dev/null +++ b/ports/uvw/fix-find-libuv.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 289c006..180383f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -193,6 +193,14 @@ if (BUILD_UVW_LIBS) + SOVERSION ${UVW_VERSION_MAJOR} + ) + endif() ++ ++find_package(libuv CONFIG REQUIRED) ++if (TARGET uv) ++ target_link_libraries(uvw PRIVATE uv) ++else() ++ target_link_libraries(uvw PRIVATE uv_a) ++endif() ++ + install( + EXPORT uvwConfig + NAMESPACE uvw:: diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake index 21145e6f9f1d25..d1802c241c5b3e 100644 --- a/ports/uvw/portfile.cmake +++ b/ports/uvw/portfile.cmake @@ -1,22 +1,28 @@ -#header-only library +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/uvw - REF 3db9e8f75a4351325e1ea00e17586af2b00cf1ea # v2.12.1_libuv_v1.44 - SHA512 35e799fe877abc26ae44d20c9b5b292497d1468d9f89c0fc19b96a0b0712e35084480100e2fe7324353e2c3805c2f018e89192357d974bfd009af9b58bfcb7ec + REF "v${VERSION}_libuv_v1.44" + SHA512 6794d71f88888e58d53fbea18eecb8e43a01f9965012a4b0f3c29bd5dd1280aac8dfe735d3df7f401d309e182fa7ed4e2e0b4aff49beaa1973dcd61153bbb1af + PATCHES + fix-find-libuv.patch ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_UVW_LIBS=${BUILD_STATIC} + -DFETCH_LIBUV=OFF + -DFIND_LIBUV=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/uvw/") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/uvw) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright/readme/package files -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/uvw/uvw-config.cmake b/ports/uvw/uvw-config.cmake deleted file mode 100644 index 3a6d792f9a68ba..00000000000000 --- a/ports/uvw/uvw-config.cmake +++ /dev/null @@ -1,2 +0,0 @@ -find_package(libuv CONFIG REQUIRED) -include ("${CMAKE_CURRENT_LIST_DIR}/uvw-targets.cmake") diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json index ea974cfb14223a..b499b2ebcf6f45 100644 --- a/ports/uvw/vcpkg.json +++ b/ports/uvw/vcpkg.json @@ -1,8 +1,7 @@ { "name": "uvw", - "version": "2.12.1", - "port-version": 2, - "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", + "version": "3.0.0", + "description": "A compilable static library, event based, tiny and easy to use libuv wrapper in modern C++.", "homepage": "https://github.com/skypjack/uvw", "license": "MIT", "dependencies": [ diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 4346b73823c4e2..5caab7b30a1cf1 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets REF "v${VERSION}" - SHA512 c686eaffd18a925661f2b3fbae108bdd227dc5e87981bf494e3299a9b7d8dbee2838b53eefc05d20eb9669643882dc0de4fdd6f1f57d1a878107bbe69aba6fa5 + SHA512 ceb950a3d4c2ffd58867ef1cc92d5405441dff603ceb6958ef5660f93c8e1da2346cecb43d209ab08d4feac9c1f023f7bff22a13f537dbb3eab0f122f27f70f6 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 742a2098dcd0d3..6f11f0a395a3c8 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.36.0", + "version-semver": "20.44.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "license": "Apache-2.0", diff --git a/ports/visit-struct/CMakeLists.txt b/ports/visit-struct/CMakeLists.txt index df4fa2890b76b8..ffb69d2c4e520a 100644 --- a/ports/visit-struct/CMakeLists.txt +++ b/ports/visit-struct/CMakeLists.txt @@ -4,13 +4,13 @@ project(visit_struct) add_library(visit_struct INTERFACE) install(TARGETS visit_struct - EXPORT visit_struct-targets + EXPORT unofficial-visit_struct-targets INCLUDES DESTINATION include) -install(EXPORT visit_struct-targets - FILE visit_struct-config.cmake - NAMESPACE visit_struct:: - DESTINATION share/visit_struct) +install(EXPORT unofficial-visit_struct-targets + FILE unofficial-visit_struct-config.cmake + NAMESPACE unofficial::visit_struct:: + DESTINATION share/unofficial-visit_struct) install(DIRECTORY include/visit_struct diff --git a/ports/visit-struct/portfile.cmake b/ports/visit-struct/portfile.cmake index 424248a94c4718..f10ab1152519c0 100644 --- a/ports/visit-struct/portfile.cmake +++ b/ports/visit-struct/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cbeck88/visit_struct - REF v1.0 - SHA512 1396d0d4c4d37f48434361d1e0ab4cb02c397aff1134678b26de713a27a4fcfa1c352890845502be645ba01e20314bf67731893fc6410b93e4521c1261d63c06 + REF "v${VERSION}" + SHA512 8d1f93344ef13320bc7967cbe2696bf49d6773fe3c89ba10bcf8ee9c33be165f14086828f6195bad742fbe75fee9c0995827c455c777950df583ff8f13c21338 HEAD_REF master ) @@ -13,7 +13,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME visit_struct) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-visit_struct) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/visit-struct/vcpkg.json b/ports/visit-struct/vcpkg.json index 5287e8ecdbcb0a..dd9880a4a7dcef 100644 --- a/ports/visit-struct/vcpkg.json +++ b/ports/visit-struct/vcpkg.json @@ -1,8 +1,8 @@ { "name": "visit-struct", - "version-string": "1.0", - "port-version": 3, + "version": "1.1.0", "description": "A header-only library providing structure visitors for C++11 and C++14", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/vk-bootstrap/portfile.cmake b/ports/vk-bootstrap/portfile.cmake index c7e041abd3fdb2..fee8029a976af3 100644 --- a/ports/vk-bootstrap/portfile.cmake +++ b/ports/vk-bootstrap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO charles-lunarg/vk-bootstrap - REF 142986cdb767037118b687387b097ff6b3e7fe7d - SHA512 1dc32f09f4548ffaf71d39d5200d60a9bd58971327039f2adb4327fdb885f984bbd91409d28dbfc24e5fdac8c241824e141a2558cddc1b86b84cf2376e7d7567 + REF "v${VERSION}" + SHA512 357ce69b080c6abcef7764652f5ab5e5fc744a9d0308bf457787f27c3c14a911480a7f9caf304ee92c33519bfbc977fb320fa3ef4a329716d0bd1b03135dd98e HEAD_REF master ) diff --git a/ports/vk-bootstrap/vcpkg.json b/ports/vk-bootstrap/vcpkg.json index f0f717701315e2..9b4db0ed7c3e6d 100644 --- a/ports/vk-bootstrap/vcpkg.json +++ b/ports/vk-bootstrap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vk-bootstrap", - "version": "0.5", - "port-version": 1, + "version": "0.7", "description": "Vulkan bootstraping library", "homepage": "https://github.com/charles-lunarg/vk-bootstrap", "license": "MIT", diff --git a/ports/vkfft/portfile.cmake b/ports/vkfft/portfile.cmake index 23c2a86d721467..ab9283298efd88 100644 --- a/ports/vkfft/portfile.cmake +++ b/ports/vkfft/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DTolm/VkFFT - REF fc981ecc022ae7932d4d906bed3cf9def592ddf5 #v1.2.17 - SHA512 c2ffae4885fe75778743f4165475026a43ab2ad2df2e02774a2750ad77ad8ceb3c6ff22a5cec56af3913af46eeb48bc09d2e119a54d893daa13af1fd768d9a9f + REF e1c58868a9581725dd595975daf780da0a37dad1 #v1.2.31 + SHA512 b113f0117336ef2f6a285166cb4d68ea372e0dbb46025b7fcbae30f4f5147ad0fb1f7abfd91e1a73e2b4d72446c16ac0e90efc467785e035f176e81d95979706 HEAD_REF master ) diff --git a/ports/vkfft/vcpkg.json b/ports/vkfft/vcpkg.json index 8e656038c1396c..6c4076fe482a15 100644 --- a/ports/vkfft/vcpkg.json +++ b/ports/vkfft/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vkfft", - "version": "1.2.17", + "version": "1.2.31", "description": "Vulkan/CUDA/HIP/OpenCL/Level Zero Fast Fourier Transform library", "homepage": "https://github.com/DTolm/VkFFT", "license": "MIT" diff --git a/ports/vlfeat/vcpkg.json b/ports/vlfeat/vcpkg.json index 66f89f953797d7..c76d319117be19 100644 --- a/ports/vlfeat/vcpkg.json +++ b/ports/vlfeat/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vlfeat", - "version-string": "2020-07-10", - "port-version": 2, + "version-date": "2020-07-10", + "port-version": 3, "description": "An open library of computer vision algorithms", "homepage": "https://www.vlfeat.org", "dependencies": [ diff --git a/ports/vs-yasm/vcpkg.json b/ports/vs-yasm/vcpkg.json index 830838cc7bde85..3a9192b8c74d3d 100644 --- a/ports/vs-yasm/vcpkg.json +++ b/ports/vs-yasm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vs-yasm", - "version-string": "0.5.0", - "port-version": 1, + "version": "0.5.0", + "port-version": 2, "description": "Provides Visual Studio integration for the YASM assembler.", "homepage": "https://github.com/ShiftMediaProject/VSYASM", "supports": "windows & !arm" diff --git a/ports/vsg/devendor-glslang.patch b/ports/vsg/devendor-glslang.patch new file mode 100644 index 00000000000000..356d4c4041a4d8 --- /dev/null +++ b/ports/vsg/devendor-glslang.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61da709f..472bc6af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,9 +37,11 @@ find_package(Vulkan ${Vulkan_MIN_VERSION} REQUIRED) + + find_package(Threads REQUIRED) + ++find_package(glslang CONFIG REQUIRED) ++ + # Enable/disable shader compilation support that pulls in glslang + set(VSG_SUPPORTS_ShaderCompiler 1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." ) +-if (VSG_SUPPORTS_ShaderCompiler) ++if (FALSE) + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/glslang/build_vars.cmake) + + if (Git_FOUND) +diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt +index 4154312f..49d63b97 100644 +--- a/src/vsg/CMakeLists.txt ++++ b/src/vsg/CMakeLists.txt +@@ -226,7 +226,7 @@ set(SOURCES + utils/LoadPagedLOD.cpp + ) + +-if (${VSG_SUPPORTS_ShaderCompiler}) ++if (FALSE) + + # include glslang source code directly into the VulkanScenegraph library build. + include(../glslang/build_vars.cmake) +@@ -236,6 +236,14 @@ endif() + set(LIBRARIES PUBLIC + Vulkan::Vulkan + Threads::Threads ++ glslang::glslang ++ glslang::OSDependent ++ glslang::MachineIndependent ++ glslang::GenericCodeGen ++ glslang::glslang-default-resource-limits ++ glslang::OGLCompiler ++ glslang::SPVRemapper ++ glslang::SPIRV + ) + + # Check for std::atomic +@@ -364,9 +372,6 @@ target_include_directories(vsg + PUBLIC + $ + $ +- PRIVATE +- $ +- $ + ) + + target_link_libraries(vsg ${LIBRARIES}) +diff --git a/src/vsg/utils/ShaderCompiler.cpp b/src/vsg/utils/ShaderCompiler.cpp +index 71a7f09f..803f26a1 100644 +--- a/src/vsg/utils/ShaderCompiler.cpp ++++ b/src/vsg/utils/ShaderCompiler.cpp +@@ -20,7 +20,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI + #include + + #if VSG_SUPPORTS_ShaderCompiler +-# include ++# include + # include + # include + #endif diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake new file mode 100644 index 00000000000000..5efaaff6af1958 --- /dev/null +++ b/ports/vsg/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vsg-dev/VulkanSceneGraph + REF "v${VERSION}" + SHA512 da5c9448da6bd2bd6edcb82ed1ac67aded9c3fd957fb7d3c78bb741d8993a5e90b134433237a63bf1a6eb23b30a1e6b4ea2115416f8d32464bd04925d8dbcd34 + HEAD_REF master + PATCHES devendor-glslang.patch +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json new file mode 100644 index 00000000000000..dd3b617dc1b1e7 --- /dev/null +++ b/ports/vsg/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "vsg", + "version": "1.0.5", + "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", + "homepage": "http://www.vulkanscenegraph.org/", + "license": "MIT", + "dependencies": [ + "glslang", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan" + ] +} diff --git a/ports/vtk-m/omp.patch b/ports/vtk-m/omp.patch new file mode 100644 index 00000000000000..062799b220a792 --- /dev/null +++ b/ports/vtk-m/omp.patch @@ -0,0 +1,26 @@ +diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake +index e9ac039..c745604 100644 +--- a/CMake/VTKmDeviceAdapters.cmake ++++ b/CMake/VTKmDeviceAdapters.cmake +@@ -59,20 +59,14 @@ if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) + find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) + + add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) ++ target_link_libraries(vtkm::openmp INTERFACE OpenMP::OpenMP_CXX) + if(OpenMP_CXX_FLAGS) +- set_property(TARGET vtkm::openmp +- APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$:${OpenMP_CXX_FLAGS}>) +- + if(VTKm_ENABLE_CUDA) + string(REPLACE ";" "," openmp_cuda_flags "-Xcompiler=${OpenMP_CXX_FLAGS}") + set_property(TARGET vtkm::openmp + APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$:${openmp_cuda_flags}>) + endif() + endif() +- if(OpenMP_CXX_LIBRARIES) +- set_target_properties(vtkm::openmp PROPERTIES +- INTERFACE_LINK_LIBRARIES "${OpenMP_CXX_LIBRARIES}") +- endif() + endif() + + if(VTKm_ENABLE_CUDA) diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake index 17bb5ee981de35..31f9c5c13ff4a9 100644 --- a/ports/vtk-m/portfile.cmake +++ b/ports/vtk-m/portfile.cmake @@ -42,7 +42,10 @@ vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" REPO vtk/vtk-m REF 902fdac6fafb6358ce88f8747d55e2c0715241f1 # v1.9.0 Upgrading will most likly brake the VTK build SHA512 f83872495ed3dbcea372776c4439a7d224568d144ff602c188fae120026778b1bee681c9e9535cc693e870cbc08ca9896af2bc954935c289f6b9a24f2471a50b - FILE_DISAMBIGUATOR 1) + FILE_DISAMBIGUATOR 1 + PATCHES + omp.patch +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json index a1d97fecde6243..b50aa164bc957d 100644 --- a/ports/vtk-m/vcpkg.json +++ b/ports/vtk-m/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk-m", "version": "1.9.0", - "port-version": 1, + "port-version": 2, "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.", "homepage": "https://gitlab.kitware.com/vtk/vtk-m/", "license": null, diff --git a/ports/vtk/missing-include-fixes.patch b/ports/vtk/missing-include-fixes.patch new file mode 100644 index 00000000000000..e6f49cab9ef2d3 --- /dev/null +++ b/ports/vtk/missing-include-fixes.patch @@ -0,0 +1,40 @@ +diff --git a/IO/Image/vtkSEPReader.cxx b/IO/Image/vtkSEPReader.cxx +index 2b15bc249e..cec84d1712 100644 +--- a/IO/Image/vtkSEPReader.cxx ++++ b/IO/Image/vtkSEPReader.cxx +@@ -34,7 +34,6 @@ + #include + + #include +-#include + + namespace details + { +diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h +index 83d127a41e..bdb33a258b 100644 +--- a/IO/Image/vtkSEPReader.h ++++ b/IO/Image/vtkSEPReader.h +@@ -25,8 +25,9 @@ + #include "vtkImageAlgorithm.h" + #include "vtkNew.h" // for ivars + +-#include // for std::array +-#include // for std::string ++#include // for std::array ++#include // for std::uint8_t ++#include // for std::string + + namespace details + { +diff --git a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +index 6267684218..cf19b83af4 100644 +--- a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp ++++ b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +@@ -31,6 +31,7 @@ + + /*! @cond Doxygen_Suppress */ + ++#include + #include + #include + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 1f1013529947fc..72eeb48307cce7 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -40,6 +40,7 @@ vcpkg_from_github( iotr.patch ${STRING_PATCH} 9690.diff + missing-include-fixes.patch ) # ============================================================================= diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index edc09943105b91..26f1cab5ab99e4 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.2.0-pv5.11.0", - "port-version": 6, + "port-version": 7, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index 81cc869c4b400d..3d312fb191d3a8 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -1,16 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers - REF d732b2de303ce505169011d438178191136bfb00 - SHA512 425d393dec95902af46f182b3d8d5d279efefddc9cbce05c2b3e4f1706fa05ff74db0a3db2adc370bf6ac25c152c66d9a96feaac8a427acdc46b1d27e69c2608 - HEAD_REF v1.3.243 + REF bae9700cd9425541a0f6029957f005e5ad3ef660 + SHA512 b1a51cb868563bf044c65cab8411547b8a08ea21998f01e5be53027217ddd18ff6907d78490c08e3f14865c53436ddf092811726ae3df23a29f8edd614bdb95b + HEAD_REF v1.3.250 ) set(VCPKG_BUILD_TYPE release) # header-only port -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/vulkan-headers/usage b/ports/vulkan-headers/usage new file mode 100644 index 00000000000000..5b461a6d41572e --- /dev/null +++ b/ports/vulkan-headers/usage @@ -0,0 +1,4 @@ +Vulkan-Headers provides official find_package support: + + find_package(VulkanHeaders CONFIG) + target_link_libraries(main PRIVATE Vulkan::Headers) diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index ca77a5e22a34b3..002040ad37382f 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version": "1.3.243", + "version": "1.3.250", "port-version": 2, "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers", diff --git a/ports/vulkan/CMakeLists.txt b/ports/vulkan/CMakeLists.txt new file mode 100644 index 00000000000000..faf48f7423f666 --- /dev/null +++ b/ports/vulkan/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.25) + +project(FIND_VULKAN LANGUAGES C) + +set(CMAKE_FIND_DEBUG_MODE ON) + +find_package(Vulkan ${VCPKG_VULKAN_VERSION}) + +set(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/vulkan-result.cmake" CACHE FILEPATH "") +configure_file("vulkan-result.cmake.in" "${OUTFILE}" @ONLY ESCAPE_QUOTES) diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake index 9f1154b677308a..6dc9e17b48bf0a 100644 --- a/ports/vulkan/portfile.cmake +++ b/ports/vulkan/portfile.cmake @@ -1,44 +1,36 @@ -# Due to the complexity involved, this package doesn't install the Vulkan SDK. -# It instead verifies that Vulkan is installed. -# Other packages can depend on this package to declare a dependency on Vulkan. -message(STATUS "Querying VULKAN_SDK Enviroment variable") -file(TO_CMAKE_PATH "$ENV{VULKAN_SDK}" VULKAN_DIR) -set(VULKAN_INCLUDE "${VULKAN_DIR}/include/vulkan/") -set(VULKAN_ERROR_DL "Before continuing, please download and install Vulkan from:\n https://vulkan.lunarg.com/sdk/home\nIf you have already downloaded it, make sure the VULKAN_SDK environment variable is set to vulkan's installation root.") +# This package just verifies that the Vulkan SDK is installed. +set(VCPKG_BUILD_TYPE release) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -if(NOT DEFINED ENV{VULKAN_SDK}) - message(FATAL_ERROR "Could not find Vulkan SDK. ${VULKAN_ERROR_DL}") +if(DEFINED ENV{VULKAN_SDK}) + message(STATUS "VULKAN_SDK environment variable: $ENV{VULKAN_SDK}") endif() -message(STATUS "Searching " ${VULKAN_INCLUDE} " for vulkan.h") -if(NOT EXISTS "${VULKAN_INCLUDE}/vulkan.h") - message(FATAL_ERROR "Could not find vulkan.h. ${VULKAN_ERROR_DL}") -endif() -message(STATUS "Found vulkan.h") - -# Check if the user left the version in the installation directory e.g. c:/vulkanSDK/1.1.82.1/ -if(VULKAN_DIR MATCHES "(([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+))") - set(VULKAN_VERSION "${CMAKE_MATCH_1}") - set(VULKAN_MAJOR "${CMAKE_MATCH_2}") - set(VULKAN_MINOR "${CMAKE_MATCH_3}") - set(VULKAN_PATCH "${CMAKE_MATCH_4}") - message(STATUS "Found Vulkan SDK version ${VULKAN_VERSION}") - - set(VULKAN_REQUIRED_VERSION "1.1.82.1") - if (VULKAN_MAJOR LESS 1 OR VULKAN_MINOR LESS 1 OR VULKAN_PATCH LESS 82) - message(FATAL_ERROR "Vulkan ${VULKAN_VERSION} but ${VULKAN_REQUIRED_VERSION} is required. Please download and install a more recent version from:" - "\n https://vulkan.lunarg.com/sdk/home\n") - endif() -endif() +set(vulkan_result_file "${CURRENT_BUILDTREES_DIR}/vulkan-${TARGET_TRIPLET}.cmake.log") +vcpkg_cmake_configure( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" + OPTIONS + "-DVCPKG_VULKAN_VERSION=${VERSION}" + OPTIONS_RELEASE + "-DOUTFILE=${vulkan_result_file}" +) -if (EXISTS ${VULKAN_DIR}/../LICENSE.txt) - configure_file(${VULKAN_DIR}/../LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) -elseif(EXISTS ${VULKAN_DIR}/LICENSE.txt) - configure_file(${VULKAN_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) +include("${vulkan_result_file}") +if(DETECTED_Vulkan_FOUND) + message(STATUS "Found Vulkan SDK ${DETECTED_Vulkan_VERSION} (${DETECTED_Vulkan_LIBRARIES})") else() - configure_file(${CURRENT_PORT_DIR}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan/copyright COPYONLY) + set(message "The Vulkan SDK wasn't found. ") + if(VCPKG_TARGET_IS_WINDOWS) + string(APPEND message "Refer to Getting Started with the Windows Vulkan SDK: https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html") + elseif(VCPKG_TARGET_IS_OSX) + string(APPEND message "Refer to Getting Started with the MacOS Vulkan SDK: https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html") + elseif(VCPKG_TARGET_IS_LINUX) + string(APPEND message "Refer to Getting Started with the Linux Vulkan SDK: https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html") + endif() + message(FATAL_ERROR "${message}") endif() -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +find_file(vulkan_license NAMES LICENSE.txt PATHS ${DETECTED_Vulkan_INCLUDE_DIRS} "${CURRENT_PORT_DIR}" PATH_SUFFIXES "..") +vcpkg_install_copyright(FILE_LIST "${vulkan_license}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/vulkan/usage b/ports/vulkan/usage index 62130b840a8f50..e2df7fcf0a9ca5 100644 --- a/ports/vulkan/usage +++ b/ports/vulkan/usage @@ -1,9 +1,8 @@ -The package vulkan does not provide cmake or visual studio integration directly. -However, it can still easily be used. +vulkan is compatible with built-in CMake targets: - Visual Studio: - Include $(VULKAN_SDK)/include to your include path. - - CMake: + # https://cmake.org/cmake/help/latest/module/FindVulkan.html find_package(Vulkan REQUIRED) target_link_libraries(main PRIVATE Vulkan::Vulkan) + +The vulkan package does not provide direct Visual Studio integration. +For manual integration, add $(VULKAN_SDK)/include to your include path. diff --git a/ports/vulkan/vcpkg.json b/ports/vulkan/vcpkg.json index 96bd75075f5826..d44d80e84126c1 100644 --- a/ports/vulkan/vcpkg.json +++ b/ports/vulkan/vcpkg.json @@ -1,8 +1,14 @@ { "name": "vulkan", "version": "1.1.82.1", - "port-version": 5, - "description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices.", + "port-version": 6, + "description": "A stub package that ensures that the Vulkan SDK is installed.", "license": null, - "supports": "!uwp & !xbox" + "supports": "!uwp & !xbox", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/vulkan/vulkan-result.cmake.in b/ports/vulkan/vulkan-result.cmake.in new file mode 100644 index 00000000000000..daed34203677a2 --- /dev/null +++ b/ports/vulkan/vulkan-result.cmake.in @@ -0,0 +1,4 @@ +set(DETECTED_Vulkan_FOUND "@Vulkan_FOUND@") +set(DETECTED_Vulkan_VERSION "@Vulkan_VERSION@") +set(DETECTED_Vulkan_INCLUDE_DIRS "@Vulkan_INCLUDE_DIRS@") +set(DETECTED_Vulkan_LIBRARIES "@Vulkan_LIBRARIES@") diff --git a/ports/wangle/fix_dependency.patch b/ports/wangle/fix_dependency.patch index 6b80a68f8d993c..f44d39fabc9d72 100644 --- a/ports/wangle/fix_dependency.patch +++ b/ports/wangle/fix_dependency.patch @@ -1,17 +1,26 @@ diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt -index 8df7c76..f605f25 100644 +index 85ae066..766d3d3 100644 --- a/wangle/CMakeLists.txt +++ b/wangle/CMakeLists.txt -@@ -62,7 +62,7 @@ find_package(folly CONFIG REQUIRED) +@@ -64,18 +64,23 @@ set(CMAKE_INSTALL_DIR lib/cmake/wangle CACHE STRING + find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) - find_package(fmt CONFIG REQUIRED) +-find_package(fmt CONFIG REQUIRED) find_package(OpenSSL REQUIRED) -find_package(Glog REQUIRED) +-find_package(gflags CONFIG QUIET) +find_package(glog CONFIG REQUIRED) - find_package(gflags CONFIG QUIET) ++find_package(gflags CONFIG REQUIRED) ++find_package(Boost REQUIRED ++ COMPONENTS ++ filesystem ++ thread ++) ++ if (gflags_FOUND) message(STATUS "Found gflags from package config") -@@ -70,8 +70,8 @@ if (gflags_FOUND) + message(STATUS "gflags_CONFIG=${gflags_CONFIG}") else() find_package(Gflags REQUIRED) endif() @@ -22,35 +31,49 @@ index 8df7c76..f605f25 100644 find_package(Threads REQUIRED) if (UNIX AND NOT APPLE) find_package(Librt) -@@ -153,24 +153,23 @@ target_include_directories( - PUBLIC - $ - $ -+ PRIVATE - ${FIZZ_INCLUDE_DIR} - ${FOLLY_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} -- ${OPENSSL_INCLUDE_DIR} -- ${GLOG_INCLUDE_DIRS} - ${GFLAGS_INCLUDE_DIRS} -- ${LIBEVENT_INCLUDE_DIR} -- ${DOUBLE_CONVERSION_INCLUDE_DIRS} +@@ -166,6 +171,14 @@ target_include_directories( + ${LIBEVENT_INCLUDE_DIR} + ${DOUBLE_CONVERSION_INCLUDE_DIR} ) ++set(Boost_LIBRARIES Boost::boost Boost::filesystem Boost::thread ) ++set(FOLLY_LIBRARIES Folly::folly) ++set(FIZZ_LIBRARIES fizz::fizz) ++set(GLOG_LIBRARIES glog::glog) ++set(GFLAGS_LIBRARIES gflags::gflags) ++set(LIBEVENT_LIB libevent::core libevent::extra) ++set(DOUBLE_CONVERSION_LIBRARIES double-conversion::double-conversion) ++ target_link_libraries(wangle PUBLIC ${FOLLY_LIBRARIES} ${FIZZ_LIBRARIES} - ${Boost_LIBRARIES} -- ${OPENSSL_LIBRARIES} -- ${GLOG_LIBRARIES} -+ OpenSSL::SSL -+ OpenSSL::Crypto -+ glog::glog - ${GFLAGS_LIBRARIES} -- ${LIBEVENT_LIB} -- ${DOUBLE_CONVERSION_LIBRARIES} -+ libevent::core -+ libevent::extra -+ double-conversion::double-conversion - ${CMAKE_DL_LIBS} - ${LIBRT_LIBRARIES} - Threads::Threads) +diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in +index e0fd0dc..5f6cf14 100644 +--- a/wangle/cmake/wangle-config.cmake.in ++++ b/wangle/cmake/wangle-config.cmake.in +@@ -15,13 +15,19 @@ set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") + set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle") + + include(CMakeFindDependencyMacro) +-find_dependency(folly REQUIRED) +-find_dependency(fizz REQUIRED) +-find_dependency(glog REQUIRED) +-find_dependency(Threads REQUIRED) +-find_dependency(Libevent REQUIRED) +-find_dependency(OpenSSL REQUIRED) +-find_dependency(double-conversion REQUIRED) ++find_dependency(folly CONFIG) ++find_dependency(fizz CONFIG) ++find_dependency(gflags CONFIG) ++find_dependency(glog CONFIG) ++find_dependency(Threads) ++find_dependency(Libevent CONFIG) ++find_dependency(OpenSSL) ++find_dependency(double-conversion CONFIG) ++find_dependency(Boost ++ COMPONENTS ++ filesystem ++ thread ++) + + if (NOT TARGET wangle::wangle) + include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake") diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index bf8313befecfdd..378dfb90f23725 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -3,14 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2022.03.21.00 - SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e + REF "v${VERSION}" + SHA512 aa87614f9630fd325e848bef38c520b85a57eaf0e3dd5cb3421a0bb55322fbdf9c22b153436d703eb30ac9f8c4d02bfb71b9313acd16c412609216eb0ca16109 HEAD_REF master PATCHES fix-config-cmake.patch fix_dependency.patch ) +file(REMOVE + "${SOURCE_PATH}/wangle/cmake/FindDoubleConversion.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake" +) + + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/wangle" OPTIONS diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index fb51f4338a1ea7..46109a2a82b0ed 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2022.03.21.00", + "version-string": "2023.05.15.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", @@ -13,6 +13,7 @@ "double-conversion", "fizz", "folly", + "gflags", "glog", "libevent", "openssl", diff --git a/ports/wasmedge/fmt-10.patch b/ports/wasmedge/fmt-10.patch new file mode 100644 index 00000000000000..87577c5ddc8463 --- /dev/null +++ b/ports/wasmedge/fmt-10.patch @@ -0,0 +1,36 @@ +diff --git a/include/common/enum_errcode.hpp b/include/common/enum_errcode.hpp +index bda7d9e2..c075ed74 100644 +--- a/include/common/enum_errcode.hpp ++++ b/include/common/enum_errcode.hpp +@@ -131,4 +131,8 @@ static inline constexpr const auto ErrCodeStr = []() constexpr { + } + (); + ++inline uint32_t format_as(ErrCode code) { ++ return code.getCode(); ++} ++ + } // namespace WasmEdge +diff --git a/thirdparty/wasi/api.hpp b/thirdparty/wasi/api.hpp +index 97d37c83..53fadf1d 100644 +--- a/thirdparty/wasi/api.hpp ++++ b/thirdparty/wasi/api.hpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + using const_uint8_t_ptr = uint32_t; + using uint8_t_ptr = uint32_t; +@@ -562,6 +563,10 @@ enum __wasi_errno_t : uint16_t { + static_assert(sizeof(__wasi_errno_t) == 2, "witx calculated size"); + static_assert(alignof(__wasi_errno_t) == 2, "witx calculated align"); + ++inline uint16_t format_as(__wasi_errno_t error) { ++ return fmt::underlying(error); ++} ++ + /** + * File descriptor rights, determining which actions may be performed. + */ diff --git a/ports/wasmedge/portfile.cmake b/ports/wasmedge/portfile.cmake index b685638a2d7f24..aca46a8ce324ea 100644 --- a/ports/wasmedge/portfile.cmake +++ b/ports/wasmedge/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO WasmEdge/WasmEdge - REF 0.12.0-alpha.1 - SHA512 4218ecb6fba34b4ae94fc8c63b7da03c37f9dd2e404a9a6008be972a799b981929ada0ef213d8fababa25d10e27b777df66d22e1e61c92ff8e60b5e1caf97562 + REF "${VERSION}" + SHA512 040eabea8ad7885b95fb3bdb97687e63412c027d853da0b37cc15b8b7e51c02f10286281c57d03a71d6d5a7bf7d4a5e627e31d6fd5ba560b80da675d1f1edbad HEAD_REF master + PATCHES + fmt-10.patch ) set(WASMEDGE_CMAKE_OPTIONS "") @@ -62,6 +64,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/wasmedge/vcpkg.json b/ports/wasmedge/vcpkg.json index 09b98d65b9f594..7a42c9c36eb4cb 100644 --- a/ports/wasmedge/vcpkg.json +++ b/ports/wasmedge/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wasmedge", - "version-semver": "0.12.0-alpha.1", + "version": "0.12.1", + "port-version": 1, "description": "WasmEdge is a high-performance WebAssembly runtime for edge computing.", "homepage": "https://WasmEdge.org", "license": "Apache-2.0", diff --git a/ports/wcslib/portfile.cmake b/ports/wcslib/portfile.cmake new file mode 100644 index 00000000000000..009f449d2cac1c --- /dev/null +++ b/ports/wcslib/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_download_distfile(archive + URLS "https://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-7.12.tar.bz2" + FILENAME "wcslib-7.12.tar.bz2" + SHA512 7f38f725992d3c4bd3c1b908d494ac361c17f6b60f091d987fda596211423bb7396b3a5e2f1f6dd6215835016d302083472a7ad0822f17cdfe230c8f556b3e23 +) + +vcpkg_extract_source_archive( + src + ARCHIVE "${archive}" +) + +vcpkg_configure_make( + SOURCE_PATH ${src} + COPY_SOURCE + OPTIONS + --disable-flex + --disable-fortran + --without-pgplot + --without-cfitsio) + +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${src}/COPYING") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/wcslib/usage b/ports/wcslib/usage new file mode 100644 index 00000000000000..00db7980589a79 --- /dev/null +++ b/ports/wcslib/usage @@ -0,0 +1,6 @@ +wcslib can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(wcslib REQUIRED IMPORTED_TARGET wcslib) + target_include_directories(main PRIVATE PkgConfig::wcslib) + target_link_libraries(main PRIVATE PkgConfig::wcslib) diff --git a/ports/wcslib/vcpkg.json b/ports/wcslib/vcpkg.json new file mode 100644 index 00000000000000..cbcfa896ed4779 --- /dev/null +++ b/ports/wcslib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wcslib", + "version": "7.12", + "description": "World Coordinate System (WCS) (Library)", + "homepage": "https://www.atnf.csiro.au/people/mcalabre/WCS/", + "supports": "!windows" +} diff --git a/ports/webview2/portfile.cmake b/ports/webview2/portfile.cmake index d2b215616f9441..6a47ad7581f1e7 100644 --- a/ports/webview2/portfile.cmake +++ b/ports/webview2/portfile.cmake @@ -10,10 +10,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF "${VERSION}" + SOURCE_BASE "${VERSION}" NO_REMOVE_ONE_LEVEL ) diff --git a/ports/webview2/vcpkg.json b/ports/webview2/vcpkg.json index 8a03278735f767..34a407b0e0b92e 100644 --- a/ports/webview2/vcpkg.json +++ b/ports/webview2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "webview2", "version": "1.0.1210.39", + "port-version": 1, "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge", "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", diff --git a/ports/wepoll/vcpkg.json b/ports/wepoll/vcpkg.json index 23b11269f13f89..53bb601095491d 100644 --- a/ports/wepoll/vcpkg.json +++ b/ports/wepoll/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wepoll", - "version-string": "1.5.8", - "port-version": 2, + "version": "1.5.8", + "port-version": 3, "description": "Fast epoll for windows", "homepage": "https://github.com/piscisaureus/wepoll", "supports": "windows", diff --git a/ports/wg21-sg14/vcpkg.json b/ports/wg21-sg14/vcpkg.json index 4999f444bd8d7d..92bd9dde0c666d 100644 --- a/ports/wg21-sg14/vcpkg.json +++ b/ports/wg21-sg14/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wg21-sg14", - "version-string": "2019-08-13", - "port-version": 1, + "version-date": "2019-08-13", + "port-version": 2, "description": "A library for Study Group 14 of Working Group 21 (C++)", "homepage": "https://github.com/WG21-SG14/SG14" } diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index 266e0d867ffdd5..dd870770976cf1 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/wil - REF d0849dca2c466bdce38a32a7e4265b193b8fb0f9 - SHA512 9dd4eeae55c04f97da63e0b63f7e66b550726e547f52906a10ab7c92fa4b97ff000e170ac23f9eac846a04112764b86785abb96de82557672665742a8b4ba29c + REF 9db6276dce851dc2b6807fc81bffbec2e27acd0b + SHA512 da26905b2665e952c06a42f1b56e7cb6e335cccb592d7dac5e59a11bbf2b10e5d532649383d2feb2313432c9be5068a2cd57b368a309f65899cbff61e866fc10 HEAD_REF master ) diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json index fd8b8b1c30ebf2..f6fc102d611afc 100644 --- a/ports/wil/vcpkg.json +++ b/ports/wil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wil", - "version-date": "2023-02-02", + "version-date": "2023-04-11", "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", "homepage": "https://github.com/microsoft/wil", "license": "MIT", diff --git a/ports/winpcap/Packet.vcxproj b/ports/winpcap/Packet.vcxproj.in similarity index 100% rename from ports/winpcap/Packet.vcxproj rename to ports/winpcap/Packet.vcxproj.in diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index aebe6997f94ca2..602fc28ab5a141 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -28,10 +28,10 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch.in" "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" @ONLY) configure_file("${CMAKE_CURRENT_LIST_DIR}/wpcap.patch.in" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" @ONLY) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${WINPCAP_VERSION} + SOURCE_BASE ${WINPCAP_VERSION} PATCHES "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" @@ -56,7 +56,7 @@ vcpkg_execute_required_process( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CURRENT_PORT_DIR}/Packet.vcxproj" DESTINATION "${SOURCE_PATH}/packetNtx/Dll/Project/") + configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY) endif() vcpkg_build_msbuild( @@ -84,7 +84,7 @@ vcpkg_execute_required_process( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CURRENT_PORT_DIR}/wpcap.vcxproj" DESTINATION "${SOURCE_PATH}/wpcap/PRJ/") + configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY) endif() vcpkg_build_msbuild( @@ -168,5 +168,4 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files. -") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.") diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index be838b77b2ba62..215c76b1306184 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 8, + "port-version": 10, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", "homepage": "https://www.winpcap.org", "supports": "windows" diff --git a/ports/winpcap/wpcap.vcxproj b/ports/winpcap/wpcap.vcxproj.in similarity index 100% rename from ports/winpcap/wpcap.vcxproj rename to ports/winpcap/wpcap.vcxproj.in diff --git a/ports/winsparkle/portfile.cmake b/ports/winsparkle/portfile.cmake index 1c86809a6e9466..2291c583deb488 100644 --- a/ports/winsparkle/portfile.cmake +++ b/ports/winsparkle/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 c2cf29e1880534c170110f8e5a966939aecc9a9e05afc87868400074f1492fcac949b61e2ce4636eadd2f127caad3660e0f763476e9523aad3834d673f6edd77 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/winsparkle/vcpkg.json b/ports/winsparkle/vcpkg.json index b2055e91ac8a21..16a5766e4809ec 100644 --- a/ports/winsparkle/vcpkg.json +++ b/ports/winsparkle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "winsparkle", "version": "0.7.0", - "port-version": 1, + "port-version": 2, "description": "WinSparkle is an easy-to-use software update library for Windows developers.", "homepage": "https://winsparkle.org", "license": "MIT", diff --git a/ports/wmipp/portfile.cmake b/ports/wmipp/portfile.cmake new file mode 100644 index 00000000000000..202e47bbfa92a6 --- /dev/null +++ b/ports/wmipp/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sonodima/wmipp + REF "v${VERSION}" + SHA512 3cfa7bacc1e03077503fa04e636106ce5bfc66a3fce25e52033433c2328a62229fdf7baad4a0116459fb0c299839ea02507fe8da43c853b9dd8bcfcb3d2301d3 + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/include/wmipp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/wmipp/vcpkg.json b/ports/wmipp/vcpkg.json new file mode 100644 index 00000000000000..981421e15c4608 --- /dev/null +++ b/ports/wmipp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "wmipp", + "version": "1.2.0", + "description": "Streamlined Windows Management Instrumentation (WMI) integration for seamless C++ development", + "homepage": "https://github.com/sonodima/wmipp", + "license": "MIT", + "supports": "windows & !uwp" +} diff --git a/ports/wordnet/vcpkg.json b/ports/wordnet/vcpkg.json index 68fa0a5c090d43..47aa7b137e0fb4 100644 --- a/ports/wordnet/vcpkg.json +++ b/ports/wordnet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wordnet", - "version-string": "3.0", - "port-version": 2, + "version": "3.0", + "port-version": 3, "description": "WordNet is a large lexical database of English", "dependencies": [ { diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake index 3b7c9a6790cafc..f7a291feea9287 100644 --- a/ports/x-plane/portfile.cmake +++ b/ports/x-plane/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 23a1efc893fdb838ce90307ac2e1bf592b03880e9c7bf7aac51cf0d358816931b56a3d603e266f3c9041620190c689dc4d3b28b288bc39cf6e653db6f2125395 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} ) diff --git a/ports/x-plane/vcpkg.json b/ports/x-plane/vcpkg.json index 6402bd4b52b7f1..156986edd84b9a 100644 --- a/ports/x-plane/vcpkg.json +++ b/ports/x-plane/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x-plane", "version": "3.0.3", - "port-version": 1, + "port-version": 2, "description": "The X-Plane Plugin SDK", "homepage": "https://developer.x-plane.com/sdk/", "supports": "!(x86 | arm | wasm32)" diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 40b9c607f4d2cf..5125496ea037ca 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -81,7 +81,7 @@ if("chroma-format-all" IN_LIST FEATURES) vcpkg_list(APPEND OPTIONS --chroma-format=all) endif() -if("disable-gpl" IN_LIST FEATURES) +if(NOT "gpl" IN_LIST FEATURES) vcpkg_list(APPEND OPTIONS --disable-gpl) endif() diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 4bef123d8d0d18..c7a9c187324f0f 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x264", "version": "0.164.3095", - "port-version": 3, + "port-version": 4, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://www.videolan.org/developers/x264.html", "license": "GPL-2.0-or-later", @@ -28,14 +28,15 @@ { "name": "x264", "features": [ - "asm" + "asm", + "gpl" ], "platform": "x86 | x64 | (arm & !windows) | arm64" } ] }, - "disable-gpl": { - "description": "Disable GPL-only features" + "gpl": { + "description": "Allow use of GPL code, the resulting libs and binaries will be under GPL" }, "tool": { "description": "Build the command line tool", diff --git a/ports/xapian/configure.diff b/ports/xapian/configure.diff new file mode 100644 index 00000000000000..9c2ce041af6b6b --- /dev/null +++ b/ports/xapian/configure.diff @@ -0,0 +1,23 @@ +diff --git a/configure.ac b/configure.ac +index ca5b7b2..b059402 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -870,6 +870,7 @@ case $enable_backend_chert$enable_backend_glass in + dnl + dnl Similarly for uuid support. + ++ if false; then + dnl Check for zlib.h. + AC_CHECK_HEADERS([zlib.h], [], [ + AC_MSG_ERROR([zlib.h not found - required for chert and glass (you may need to install the zlib1g-dev or zlib-devel package)]) +@@ -879,6 +880,10 @@ case $enable_backend_chert$enable_backend_glass in + AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [ + AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll - required for chert and glass (you may need to install the zlib1g-dev or zlib-devel package)]) + ]) ++ fi ++ PKG_CHECK_MODULES([ZLIB], [zlib], [],[AC_MSG_ERROR([zlib library not found])]) ++ CFLAGS="$LIBS $ZLIB_CFLAGS" ++ LIBS="$ZLIB_LIBS $LIBS" + + dnl Find a way to generate UUIDs. + diff --git a/ports/xapian/msvc-no-debug.diff b/ports/xapian/msvc-no-debug.diff new file mode 100644 index 00000000000000..1d41a3201a292b --- /dev/null +++ b/ports/xapian/msvc-no-debug.diff @@ -0,0 +1,13 @@ +diff --git a/include/xapian/version_h.cc b/include/xapian/version_h.cc +index b36ae4d..c61e31a 100644 +--- a/include/xapian/version_h.cc ++++ b/include/xapian/version_h.cc +@@ -75,7 +75,7 @@ const char * dummy[] = { + "#endif", + "#endif", + "", +-#elif defined _MSC_VER ++#elif 0 + // When building the library with MSVC, generate preprocessor code to check + // that the same setting of _DEBUG is used for building applications as was + // used for building the library. diff --git a/ports/xapian/portfile.cmake b/ports/xapian/portfile.cmake index bd41b1b97f4ae1..2d432e81dfc0e9 100644 --- a/ports/xapian/portfile.cmake +++ b/ports/xapian/portfile.cmake @@ -1,31 +1,31 @@ vcpkg_download_distfile(ARCHIVE - URLS https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz - FILENAME xapian-core-1.4.21.tar.xz - SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a + URLS "https://oligarchy.co.uk/xapian/${VERSION}/xapian-core-${VERSION}.tar.xz" + FILENAME "xapian-core-${VERSION}.tar.xz" + SHA512 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES + configure.diff + msvc-no-debug.diff ) -if(WIN32) - vcpkg_replace_string("${SOURCE_PATH}/configure.ac" "z zlib zdll" "z zlib zdll zlibd") - - # xapian does not support debug lib on Windows - # if use `set(VCPKG_BUILD_TYPE release)` ，the vcpkg post check can not passed， - # it will throw exception "Mismatching number of debug and release binaries. Found 0 for debug but 1 for release." - # that means the `set(VCPKG_BUILD_TYPE release)` can not be used in the WIN32 environment. - if(VCPKG_BUILD_TYPE STREQUAL "release") - set(OPTIONS "CXXFLAGS=-EHsc") - endif() +set(OPTIONS "") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS + ac_cv_have_decl___popcnt=no + ac_cv_have_decl___popcnt64=no + ) endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG USE_WRAPPERS - OPTIONS ${OPTIONS} + OPTIONS + ${OPTIONS} ) vcpkg_install_make() @@ -33,7 +33,7 @@ vcpkg_install_make() vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xapian) -if (NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..") if(NOT VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../../debug") @@ -41,4 +41,4 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/xapian/vcpkg.json b/ports/xapian/vcpkg.json index d185f263b95d0b..42071590a0b225 100644 --- a/ports/xapian/vcpkg.json +++ b/ports/xapian/vcpkg.json @@ -1,11 +1,11 @@ { "name": "xapian", - "version": "1.4.21", + "version": "1.4.22", "port-version": 1, "description": "Xapian is an Open Source Search Engine Library, released under the GPL v2+. It's written in C++, with bindings to allow use from Perl, Python 2, Python 3, PHP 5, PHP 7, Java, Tcl, C#, Ruby, Lua, Erlang, Node.js and R (so far!)", - "homepage": "https://github.com/xapian/xapian", + "homepage": "https://xapian.org/", "license": "GPL-2.0-or-later", - "supports": "!(windows & arm) & !uwp", + "supports": "(!arm | arm64) & !uwp", "dependencies": [ { "name": "vcpkg-cmake-config", diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index fd08f1af96161a..1fb5618dfbd1b9 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF v6.60 - SHA512 83dba532c7aaa618d61f2d345caeb0ca0b1c3e4946b758095410f269ba954d1870325ed05aa7a1f8aab0b5a2961ecd878980ab835f3db3078a969d2d951aa7e9 + REF v6.69 + SHA512 c202e5c3688c4dc8cd26d4371c511ffc0fd0885c4d31a6a5fa955c39ae6fcc98f5f0ac2b88c087e10b71b24a91c0e7f082683cd6be67c29a19170723d966a585 HEAD_REF master ) diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index 8244ab284bc26d..2e919bb187b03e 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xbyak", - "version": "6.60", + "version": "6.69", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", "license": "BSD-3-Clause", diff --git a/ports/xeus/vcpkg.json b/ports/xeus/vcpkg.json index 89f8f67ad2a069..35562d0fd2c155 100644 --- a/ports/xeus/vcpkg.json +++ b/ports/xeus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xeus", "version": "0.24.3", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of the Jupyter kernel protocol", "homepage": "https://github.com/jupyter-xeus/xeus", "license": "BSD-3-Clause", @@ -9,7 +9,7 @@ "cppzmq", { "name": "libuuid", - "platform": "linux" + "platform": "!windows & !osx" }, "nlohmann-json", "openssl", diff --git a/ports/xframe/vcpkg.json b/ports/xframe/vcpkg.json index bf21d3323116a0..f6c4e73c4d0b46 100644 --- a/ports/xframe/vcpkg.json +++ b/ports/xframe/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xframe", - "version-string": "0.3.0", - "port-version": 2, + "version": "0.3.0", + "port-version": 3, "description": "xframe is a dataframe for C++, based on xtensor and xtl.", "homepage": "https://github.com/xtensor-stack/xframe", "dependencies": [ diff --git a/ports/xlsxio/export-targets.patch b/ports/xlsxio/export-targets.patch deleted file mode 100644 index 112473771de0ea..00000000000000 --- a/ports/xlsxio/export-targets.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05c7ee5..28a0206 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -87,7 +87,8 @@ INCLUDE_DIRECTORIES(${ANYZIP_INCLUDE_DIRS}) - INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS}) - - # build definitions --SET(ALLTARGETS) -+SET(ALLTARGETS_LIB) -+SET(ALLTARGETS_EXE) - SET(LINKTYPES) - IF(BUILD_STATIC) - LIST(APPEND LINKTYPES "STATIC") -@@ -106,7 +107,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - ENDIF() - TARGET_INCLUDE_DIRECTORIES(xlsxio_read_${LINKTYPE} PRIVATE lib) - TARGET_LINK_LIBRARIES(xlsxio_read_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPAT_LIBRARIES}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_read_${LINKTYPE}) -+ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_read_${LINKTYPE}) - - ADD_LIBRARY(xlsxio_write_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c) - SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF};BUILD_XLSXIO_${LINKTYPE}") -@@ -115,7 +116,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_write.def") - ENDIF() - TARGET_LINK_LIBRARIES(xlsxio_write_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_write_${LINKTYPE}) -+ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_write_${LINKTYPE}) - - IF(WITH_WIDE) - ADD_LIBRARY(xlsxio_readw_${LINKTYPE} ${LINKTYPE} lib/xlsxio_read.c lib/xlsxio_read_sharedstrings.c) -@@ -127,7 +128,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - ENDIF() - TARGET_INCLUDE_DIRECTORIES(xlsxio_readw_${LINKTYPE} PRIVATE lib) - TARGET_LINK_LIBRARIES(xlsxio_readw_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPATW_LIBRARIES}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_readw_${LINKTYPE}) -+ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_readw_${LINKTYPE}) - - #ADD_LIBRARY(xlsxio_writew_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c) - #SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES DEFINE_SYMBOL "BUILD_XLSXIO_DLL") -@@ -137,7 +138,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - # SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_writew.def") - #ENDIF() - #TARGET_LINK_LIBRARIES(xlsxio_writew_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB}) -- #SET(ALLTARGETS ${ALLTARGETS} xlsxio_writew_${LINKTYPE}) -+ #SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_writew_${LINKTYPE}) - ENDIF() - - SET(EXELINKTYPE ${LINKTYPE}) -@@ -148,35 +149,35 @@ ENDFOREACH() - IF(BUILD_TOOLS) - ADD_EXECUTABLE(xlsxio_xlsx2csv src/xlsxio_xlsx2csv.c) - TARGET_LINK_LIBRARIES(xlsxio_xlsx2csv xlsxio_read_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_xlsx2csv) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_xlsx2csv) - - ADD_EXECUTABLE(xlsxio_csv2xlsx src/xlsxio_csv2xlsx.c) - TARGET_LINK_LIBRARIES(xlsxio_csv2xlsx xlsxio_write_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_csv2xlsx) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_csv2xlsx) - ENDIF() - - IF(BUILD_EXAMPLES) - ADD_EXECUTABLE(example_xlsxio_write_getversion examples/example_xlsxio_write_getversion.c) - TARGET_LINK_LIBRARIES(example_xlsxio_write_getversion xlsxio_write_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write_getversion) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write_getversion) - - ADD_EXECUTABLE(example_xlsxio_write examples/example_xlsxio_write.c) - TARGET_LINK_LIBRARIES(example_xlsxio_write xlsxio_write_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write) - - ADD_EXECUTABLE(example_xlsxio_read examples/example_xlsxio_read.c) - TARGET_LINK_LIBRARIES(example_xlsxio_read xlsxio_read_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read) - - ADD_EXECUTABLE(example_xlsxio_read_advanced examples/example_xlsxio_read_advanced.c) - TARGET_LINK_LIBRARIES(example_xlsxio_read_advanced xlsxio_read_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read_advanced) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read_advanced) - - IF(WITH_WIDE) - ADD_EXECUTABLE(example_xlsxio_readw examples/example_xlsxio_read.c) - SET_TARGET_PROPERTIES(example_xlsxio_readw PROPERTIES COMPILE_DEFINITIONS "XML_UNICODE") - TARGET_LINK_LIBRARIES(example_xlsxio_readw xlsxio_readw_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_readw) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_readw) - ENDIF() - ENDIF() - -@@ -200,7 +201,43 @@ IF(BUILD_DOCUMENTATION) - ENDIF() - - # installation specifications --INSTALL(TARGETS ${ALLTARGETS} -+INSTALL(TARGETS ${ALLTARGETS_LIB} -+ EXPORT xlsxioTargets -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin -+) -+INSTALL(EXPORT xlsxioTargets -+ NAMESPACE xlsxio:: -+ DESTINATION cmake -+) -+FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" -+[[INCLUDE(CMakeFindDependencyMacro) -+IF (@WITH_LIBZIP@) -+ FIND_DEPENDENCY(LibZip) -+ELSE() -+ FIND_DEPENDENCY(minizip CONFIG) -+ENDIF() -+IF (@EXPAT_DIR@) -+ FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR}) -+ FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) -+ELSE() -+ FIND_DEPENDENCY(EXPAT) -+ENDIF() -+ -+IF(@WITH_WIDE@) -+ IF(@EXPAT_DIR@) -+ FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw libexpatw NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) -+ ELSE() -+ FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw) -+ ENDIF() -+ENDIF() -+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/xlsxioTargets.cmake") -+]]) -+CONFIGURE_FILE("${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" @ONLY) -+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" DESTINATION cmake) -+ -+INSTALL(TARGETS ${ALLTARGETS_EXE} - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin diff --git a/ports/xlsxio/fix-dependencies.patch b/ports/xlsxio/fix-dependencies.patch index 7a02d8f9de7635..70b2cdfa58dbef 100644 --- a/ports/xlsxio/fix-dependencies.patch +++ b/ports/xlsxio/fix-dependencies.patch @@ -1,16 +1,41 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 490ee5c..05c7ee5 100644 +index 7e86706..f2bdc36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -49,9 +49,8 @@ IF(WITH_LIBZIP) - SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES}) - SET(ANYZIP_DEF USE_LIBZIP) +@@ -57,7 +57,9 @@ ELSEIF(WITH_MINIZIP_NG) + SET(ANYZIP_LIBRARIES minizip${MINIZIP_NG_SUFFIX}) + SET(ANYZIP_DEF USE_MINIZIP;USE_MINIZIP_NG) ELSE() - FIND_PACKAGE(Minizip REQUIRED) -- SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) -- SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) -+ FIND_PACKAGE(minizip CONFIG REQUIRED) -+ SET(ANYZIP_LIBRARIES minizip::minizip) ++ FIND_PACKAGE(Minizip NAMES unofficial-minizip REQUIRED) ++ SET(MINIZIP_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") ++ SET(MINIZIP_LIBRARIES unofficial::minizip::minizip) + SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) + SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) SET(ANYZIP_DEF USE_MINIZIP) +@@ -68,7 +70,8 @@ IF(EXPAT_DIR) + FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR}) + FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) + ELSE() +- FIND_PACKAGE(EXPAT REQUIRED) ++ FIND_PACKAGE(EXPAT NAMES expat REQUIRED) ++ SET(EXPAT_LIBRARIES expat::expat) + ENDIF() + # dependancy: expatw (if wide library was requested) + IF(WITH_WIDE) +@@ -225,13 +228,13 @@ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" + IF (@WITH_LIBZIP@) + FIND_DEPENDENCY(LibZip) + ELSE() +- FIND_DEPENDENCY(minizip CONFIG) ++ FIND_DEPENDENCY(unofficial-minizip CONFIG) + ENDIF() + IF (@EXPAT_DIR@) + FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR}) + FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) + ELSE() +- FIND_DEPENDENCY(EXPAT) ++ FIND_DEPENDENCY(expat CONFIG) ENDIF() - # dependancy: expat + + IF(@WITH_WIDE@) diff --git a/ports/xlsxio/portfile.cmake b/ports/xlsxio/portfile.cmake index 7d7915e9c361c4..ad0230c1b4eab5 100644 --- a/ports/xlsxio/portfile.cmake +++ b/ports/xlsxio/portfile.cmake @@ -1,29 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brechtsanders/xlsxio - REF e3acace39e5fb153f5ce3500a4952c2bf93175bd - SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea + REF "${VERSION}" + SHA512 67b9a4e275446f3ca08e91d31f05236855e761c06ed84ea3aea8c25a7cd6729191f6c95b9efe07392775a75e2713e7ec2c6d216b8d310e7b46bee531cccba8be HEAD_REF master PATCHES fix-dependencies.patch - export-targets.patch # https://github.com/brechtsanders/xlsxio/pull/105 ) file(REMOVE "${SOURCE_PATH}/CMake/FindMinizip.cmake") -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - libzip WITH_LIBZIP -) - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} + -DCMAKE_POLICY_DEFAULT_CMP0012=NEW -DBUILD_SHARED=${BUILD_SHARED} -DBUILD_STATIC=${BUILD_STATIC} -DWITH_WIDE=OFF @@ -41,4 +34,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/xlsxio/vcpkg.json b/ports/xlsxio/vcpkg.json index 376964779ed258..56522fdc432f60 100644 --- a/ports/xlsxio/vcpkg.json +++ b/ports/xlsxio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xlsxio", - "version-date": "2021-03-24", - "port-version": 1, + "version": "0.2.34", "description": "Cross-platform C library for reading values from and writing values to .xlsx files", "homepage": "https://github.com/brechtsanders/xlsxio", "license": "MIT", diff --git a/ports/xpack/portfile.cmake b/ports/xpack/portfile.cmake index 8fb9bf86dc088f..723f6eebcb2012 100644 --- a/ports/xpack/portfile.cmake +++ b/ports/xpack/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xyz347/xpack - REF 137467c05badd88b8569d161f27afb498ea4ff9a - SHA512 349ff9fb9ca74bd1401d8f0f121b263e40c021fde57a500d31eb14eeba8f3d3e8d7f6f629fc696d3052095d311700aa42b7b3a0a19c61787246e6680ea27928e + REF f7985ea64426d09f9c3d65558e905b7773f9de2e + SHA512 db4793536648084868c6645306d89026e7fefddc9875dcacb6e44abf7513ff1ce690f41681a35503ba6ad0ab5510ca80418065216a1c2d8f40df6114c1eee2ab HEAD_REF master ) diff --git a/ports/xpack/vcpkg.json b/ports/xpack/vcpkg.json index bc5ab5e069b4c0..34c3036a10d060 100644 --- a/ports/xpack/vcpkg.json +++ b/ports/xpack/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xpack", - "version-date": "2023-02-06", + "version": "1.0.5", "description": "Convert C++ struct from/to json/xml", "homepage": "https://github.com/xyz347/xpack", "license": "Apache-2.0", diff --git a/ports/xproperty/vcpkg.json b/ports/xproperty/vcpkg.json index 137b9c071f0ae2..14c2b3cde38054 100644 --- a/ports/xproperty/vcpkg.json +++ b/ports/xproperty/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xproperty", - "version-string": "0.8.1", - "port-version": 2, + "version": "0.8.1", + "port-version": 3, "description": "Traitlets-like C++ properties and implementation of the observer pattern", "dependencies": [ { diff --git a/ports/xqilla/portfile.cmake b/ports/xqilla/portfile.cmake index c02aa27533d005..480e331e2be885 100644 --- a/ports/xqilla/portfile.cmake +++ b/ports/xqilla/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 f744ff883675887494780d24ecdc94afa394d3795d1544b1c598016b3f936c340ad7cd84529ac12962e3c5ce2f1be928a0cd4f9b9eb70e6645a38b0728cb1994 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES "fix-compare.patch" ) diff --git a/ports/xqilla/vcpkg.json b/ports/xqilla/vcpkg.json index 5206797d1f4e91..3c0ec55090ab18 100644 --- a/ports/xqilla/vcpkg.json +++ b/ports/xqilla/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xqilla", "version": "2.3.4", - "port-version": 1, + "port-version": 2, "description": "XQuery and XPath 2 library", "homepage": "http://xqilla.sourceforge.net/HomePage", "license": "Apache-2.0", diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index cc72510dacb38b..521152764059f6 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xsimd - REF 9.0.1 - SHA512 ed56287f608ccdf5bc5d5fc2918e313e7c4cecdd9ef2c9993a72ea900d9ff662c57ac5326c7a809eb11505c6f39d4599f3f161b97b6e03c65783b824b8d700d2 + REF "${VERSION}" + SHA512 bd7a363bbebc9196954c8c87271f14f05ca177569fcf080dac91be06ad2801c43fccbb385afd700b80d58c83d77f26ba199a7105672e4a1e55c517d15dd6e8e3 HEAD_REF master ) @@ -28,4 +28,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/xsimd/vcpkg.json b/ports/xsimd/vcpkg.json index 898f22f99b1c4a..3f91ddc618956d 100644 --- a/ports/xsimd/vcpkg.json +++ b/ports/xsimd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xsimd", - "version": "9.0.1", + "version": "10.0.0", "description": "Modern, portable C++ wrappers for SIMD intrinsics", "homepage": "https://github.com/xtensor-stack/xsimd", "license": "BSD-3-Clause", diff --git a/ports/xtensor-fftw/vcpkg.json b/ports/xtensor-fftw/vcpkg.json index 4edda09245b8cd..2356600f88befb 100644 --- a/ports/xtensor-fftw/vcpkg.json +++ b/ports/xtensor-fftw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xtensor-fftw", - "version-string": "2019-11-30", - "port-version": 3, + "version-date": "2019-11-30", + "port-version": 4, "description": "FFTW bindings for the xtensor C++14 multi-dimensional array library", "homepage": "https://github.com/xtensor-stack/xtensor-fftw", "dependencies": [ diff --git a/ports/xtensor/fix-find-tbb-and-install-destination.patch b/ports/xtensor/fix-find-tbb-and-install-destination.patch new file mode 100644 index 00000000000000..51ac35e1e90e33 --- /dev/null +++ b/ports/xtensor/fix-find-tbb-and-install-destination.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7535649..5c93655 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,8 +75,8 @@ if(XTENSOR_USE_XSIMD) + endif() + + if(XTENSOR_USE_TBB) +- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") +- find_package(TBB REQUIRED) ++ #set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") ++ find_package(TBB CONFIG REQUIRED) + message(STATUS "Found intel TBB: ${TBB_INCLUDE_DIRS}") + endif() + +@@ -261,7 +261,7 @@ export(EXPORT ${PROJECT_NAME}-targets + install(FILES ${XTENSOR_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor) + +-set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE ++set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE + STRING "install path for xtensorConfig.cmake") + + configure_package_config_file(${PROJECT_NAME}Config.cmake.in +@@ -288,7 +288,7 @@ configure_file(${PROJECT_NAME}.pc.in + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" + @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + + # Write single include + # ==================== diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index 2cd7a14dfb4989..77f102032ff6fe 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor - REF 0.24.3 - SHA512 3519541ce659d800dca386cdbb4c7aa5331e5297779239230cbfb78b22c541af22a98aae30a9e8604ee855378fa8e67be720dab1e0005135575d9738e64797c8 + REF "${VERSION}" + SHA512 6284fb5de5d61c87a8599baad86b6c8c95d06d3753698a3a49efe9a87c291965e4a2439c84abf0722ce97ca7e48c5fdb0b64141f1bc8de7a7d06b7de9ec06cb6 HEAD_REF master + PATCHES + fix-find-tbb-and-install-destination.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -34,4 +36,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/xtensor/vcpkg.json b/ports/xtensor/vcpkg.json index 4185f4cc93ee88..91edd794842934 100644 --- a/ports/xtensor/vcpkg.json +++ b/ports/xtensor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xtensor", - "version": "0.24.3", + "version": "0.24.6", "description": "C++ tensors with broadcasting and lazy computing", "homepage": "https://github.com/xtensor-stack/xtensor", "license": "BSD-3-Clause", diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake index 92805da5739413..2c131853159261 100644 --- a/ports/xtl/portfile.cmake +++ b/ports/xtl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtl - REF e0f00666d90086bb245ae73abb6123d0e2c1b30b # 0.7.2 - SHA512 d7a552dc4e43a3270a56c57fde8fdc48a108909d4fa1e3fdd7ab12b178b3e271ed4d89aac9fd184e2739ddacfb3b5cb248538ed50a0ba56e740875c0faf5aa62 + REF "${VERSION}" + SHA512 fb447334f68f255d7d28c9202eee2cec70d007c1031f3756a6acd0cc019c0d95ed1d12ec63f2e9fb3df184f9ec305e6a3c808bb88c1e3eb922916ad059d2e856 HEAD_REF master PATCHES fix-fixup-cmake.patch @@ -25,4 +25,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/xtl/vcpkg.json b/ports/xtl/vcpkg.json index 852ce3427b8568..29d3dadc0d541d 100644 --- a/ports/xtl/vcpkg.json +++ b/ports/xtl/vcpkg.json @@ -1,9 +1,9 @@ { "name": "xtl", - "version": "0.7.2", - "port-version": 1, + "version": "0.7.5", "description": "The x template library", "homepage": "https://github.com/xtensor-stack/xtl", + "license": "BSD-3-Clause", "dependencies": [ "nlohmann-json", { diff --git a/ports/xxhash/fix_xxhsum1_path.patch b/ports/xxhash/fix_xxhsum1_path.patch new file mode 100644 index 00000000000000..d378f32e33477c --- /dev/null +++ b/ports/xxhash/fix_xxhsum1_path.patch @@ -0,0 +1,13 @@ +diff --git a/cmake_unofficial/CMakeLists.txt b/cmake_unofficial/CMakeLists.txt +index d5456b0..aed0db5 100644 +--- a/cmake_unofficial/CMakeLists.txt ++++ b/cmake_unofficial/CMakeLists.txt +@@ -122,7 +122,7 @@ if(NOT XXHASH_BUNDLED_MODE) + install(TARGETS xxhsum + EXPORT xxHashTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") +- install(FILES "${XXHASH_DIR}/xxhsum.1" ++ install(FILES "${XXHASH_DIR}/cli/xxhsum.1" + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") + endif(XXHASH_BUILD_XXHSUM) + diff --git a/ports/xxhash/portfile.cmake b/ports/xxhash/portfile.cmake index 03f988e82f596f..3907bc76d6f608 100644 --- a/ports/xxhash/portfile.cmake +++ b/ports/xxhash/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v0.8.1 SHA512 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193 HEAD_REF dev + PATCHES + fix_xxhsum1_path.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/xxhash/vcpkg.json b/ports/xxhash/vcpkg.json index 22b45b81b00d42..ed742673ad81c9 100644 --- a/ports/xxhash/vcpkg.json +++ b/ports/xxhash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xxhash", "version": "0.8.1", - "port-version": 1, + "port-version": 2, "description": "Extremely fast hash algorithm", "homepage": "https://github.com/Cyan4973/xxHash", "dependencies": [ diff --git a/ports/yajl/vcpkg.json b/ports/yajl/vcpkg.json index d031be7cea78fa..03c8bca942b80c 100644 --- a/ports/yajl/vcpkg.json +++ b/ports/yajl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "yajl", - "version-string": "2.1.0", - "port-version": 3, + "version": "2.1.0", + "port-version": 4, "description": "Yet Another JSON Library", "homepage": "https://github.com/lloyd/yajl", "license": "ISC", diff --git a/ports/yara/CMakeLists.txt b/ports/yara/CMakeLists.txt index a6d3b7d877511d..ed3f28a7172233 100644 --- a/ports/yara/CMakeLists.txt +++ b/ports/yara/CMakeLists.txt @@ -133,7 +133,7 @@ endif() if(DOTNET_MODULE) list(APPEND libyara_definitions -DDOTNET_MODULE) - list(APPEND libyara_sources libyara/modules/dotnet/dotnet.c) + list(APPEND libyara_sources libyara/modules/dotnet/dotnet.c libyara/simple_str.c) endif() add_library(libyara ${libyara_sources}) diff --git a/ports/yara/vcpkg.json b/ports/yara/vcpkg.json index 582d17f9710a3c..094a0e512b4cae 100644 --- a/ports/yara/vcpkg.json +++ b/ports/yara/vcpkg.json @@ -1,6 +1,7 @@ { "name": "yara", "version": "4.3.0", + "port-version": 1, "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", "license": "BSD-3-Clause", diff --git a/ports/yomm2/fix_find_boost.patch b/ports/yomm2/fix_find_boost.patch index f5b167083f57a4..17fd1bb30b26a5 100644 --- a/ports/yomm2/fix_find_boost.patch +++ b/ports/yomm2/fix_find_boost.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b7b88b1..02297e7 100644 +index 7e8a282..f550c2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ project(YOMM2 VERSION 1.0) +@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # Find Boost dependency list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") include(find_or_download_package) @@ -12,7 +12,7 @@ index b7b88b1..02297e7 100644 if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -index 7272504..9f8b2ae 100644 +index 7272504..6423a17 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in @@ -1,7 +1,7 @@ diff --git a/ports/yomm2/fix_uwp_osx.patch b/ports/yomm2/fix_uwp_osx.patch deleted file mode 100644 index 34ee35c8fc264a..00000000000000 --- a/ports/yomm2/fix_uwp_osx.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f16eb6..a46c8b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,14 +15,15 @@ find_package(Boost) - message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}") - - if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -save-temps") - endif() - endif() - - if(MSVC) -- set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS /EHsc") -+ set(CMAKE_CXX_FLAGS "/std:c++17 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS /EHsc") -+else() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") - endif() - - add_subdirectory(src) diff --git a/ports/yomm2/portfile.cmake b/ports/yomm2/portfile.cmake index 889af616727680..34ff379cf9917c 100644 --- a/ports/yomm2/portfile.cmake +++ b/ports/yomm2/portfile.cmake @@ -2,10 +2,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jll63/yomm2 - REF v1.1.2 - SHA512 f45c3f3d267dedaa3c76f9dab1a75be01941e3715e71b30b878be49157a5ba97f2188c9e635272be3ca396019b161bb21a30199ca504c94a18673685f5dbf06d + REF "v${VERSION}" + SHA512 456422f829293339d1d29eda8a00ad1bf5a2b7adcf0eb3727729b25208e1e67bff8187e21d49b64817ebb3a2274cef5504e22d612b1c68de20c8fe458daa81ba HEAD_REF master - PATCHES "fix_find_boost.patch" "fix_uwp_osx.patch" + PATCHES "fix_find_boost.patch" ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/yomm2/vcpkg.json b/ports/yomm2/vcpkg.json index 57cc1c6a1be89d..12eea2b7e74e0e 100644 --- a/ports/yomm2/vcpkg.json +++ b/ports/yomm2/vcpkg.json @@ -1,9 +1,9 @@ { "name": "yomm2", - "version-string": "1.1.2", - "port-version": 1, + "version": "1.3.1", "description": "YOMM2 is an implementation of open multi-methods.", "homepage": "https://github.com/jll63/yomm2", + "license": "BSL-1.0", "dependencies": [ "boost-dynamic-bitset", "boost-integer", diff --git a/ports/z85/vcpkg.json b/ports/z85/vcpkg.json index 66f96178accb29..2bf093296039c4 100644 --- a/ports/z85/vcpkg.json +++ b/ports/z85/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z85", - "version-string": "1.0", - "port-version": 1, + "version": "1.0", + "port-version": 2, "description": "Z85 is a binary-to-text encoding library. It implements ZeroMQ Base-85 Encoding Algorithm and provides custom padding." } diff --git a/ports/zeroc-ice/md5i_fix.patch b/ports/zeroc-ice/md5i_fix.patch deleted file mode 100644 index 0e45588d07f5fb..00000000000000 --- a/ports/zeroc-ice/md5i_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp -index 66f4de545b..271352d1ea 100644 ---- a/cpp/src/Slice/MD5I.cpp -+++ b/cpp/src/Slice/MD5I.cpp -@@ -52,6 +52,7 @@ - */ - - #include -+#include - #include - - #ifdef __GNUC__ -@@ -172,7 +173,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) - * On little-endian machines, we can process properly aligned - * data without copying it. - */ -- if (!((data - (const md5_byte_t *)0) & 3)) { -+ if (!((reinterpret_cast(data)) & 3)) { - /* data are properly aligned */ - X = (const md5_word_t *)data; - } else { diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake index 22c60df29dbf23..e0fe436b45066c 100644 --- a/ports/zeroc-ice/portfile.cmake +++ b/ports/zeroc-ice/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeroc-ice/ice - REF v3.7.7 - SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee - PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch no-werror.patch + REF "v${VERSION}" + SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5 + PATCHES mcppd_fix.patch no-werror.patch ) set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) diff --git a/ports/zeroc-ice/prepare_for_build.cmake b/ports/zeroc-ice/prepare_for_build.cmake index df3e93003d0efa..e49303c99f830a 100644 --- a/ports/zeroc-ice/prepare_for_build.cmake +++ b/ports/zeroc-ice/prepare_for_build.cmake @@ -8,6 +8,7 @@ function(prepare_for_build ICE_SOURCE_DIR) message("-- Modifying hardcoded 'RuntimeLibrary' directives in .vcxproj files") set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src") file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj") + foreach(PROJ_FILE ${PROJ_FILES}) file(READ ${PROJ_FILE} PROJ_FILE_CONTENT) STRING(REGEX @@ -50,15 +51,16 @@ function(prepare_for_build ICE_SOURCE_DIR) ) endforeach() + set(ICE_BUILDER_VERSION "5.0.9") set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages") - set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.5.0.7") + set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.${ICE_BUILDER_VERSION}") if(NOT EXISTS "${ICE_BUILDER_DEST_DIRECTORY}") message("-- Making Ice Builder for MSBuild available") vcpkg_download_distfile( ICE_BUILDER_MSBUILD_ARCHIVE - URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.7.nupkg - FILENAME zeroc.icebuilder.msbuild.5.0.7.zip - SHA512 d4afed8a3c67daf2e1cde09e7747ec9f088fa1354069bb7c7782c1089ea0f4e50b669f45a88502ad341dbccafbc1394d74fe764479f25bf4be1d3f70e66cb174 + URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.9.nupkg + FILENAME "zeroc.icebuilder.msbuild.${ICE_BUILDER_VERSION}.zip" + SHA512 E65620F3B667A48B28EC770443296BB0B8058168197DB3AE877A36531FFC6CE7E9289C7FE37DFAD751877FBDBA03C55E37122931BBF001EA6F1906DFEEBACFCB ) vcpkg_extract_source_archive( diff --git a/ports/zeroc-ice/slice2swift.patch b/ports/zeroc-ice/slice2swift.patch deleted file mode 100644 index 6c45cb82db7240..00000000000000 --- a/ports/zeroc-ice/slice2swift.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp -index 404dee7670..01e144de90 100644 ---- a/cpp/src/slice2swift/SwiftUtil.cpp -+++ b/cpp/src/slice2swift/SwiftUtil.cpp -@@ -1523,7 +1523,7 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, - const DataMemberList& baseMembers, - const DataMemberList& allMembers, - const ContainedPtr& p, -- bool local, -+ bool /*local*/, - bool rootClass, - const StringPairList& extraParams) - { -@@ -1531,11 +1531,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, - { - out << sp; - out << nl; -- int typeCtx = TypeContextInParam; -- if(local) -- { -- typeCtx |= TypeContextLocal; -- } - out << "public init" << spar; - for(DataMemberList::const_iterator i = allMembers.begin(); i != allMembers.end(); ++i) - { diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json index 9cec3ca768a431..3d71a0a2deca36 100644 --- a/ports/zeroc-ice/vcpkg.json +++ b/ports/zeroc-ice/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zeroc-ice", - "version": "3.7.7", - "port-version": 4, + "version": "3.7.9", "maintainers": "Benjamin Oldenburg ", "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", "homepage": "https://github.com/zeroc-ice/ice", @@ -18,12 +17,18 @@ }, "zlib" ], + "default-features": [ + "glacier2lib", + "icegridlib", + "icestormlib" + ], "features": { "glacier2lib": { "description": "Glacier2 libraries" }, "glacier2router": { "description": "Glacier2Router", + "supports": "!(windows & static)", "dependencies": [ { "name": "zeroc-ice", @@ -35,13 +40,16 @@ ] }, "iceboxlib": { - "description": "IceBox libraries and runtime" + "description": "IceBox libraries and runtime", + "supports": "!(windows & static)" }, "iceboxtools": { - "description": "IceBox tools" + "description": "IceBox tools", + "supports": "!(windows & static)" }, "icebridge": { "description": "IceBridge", + "supports": "!(windows & static)", "dependencies": [ { "name": "zeroc-ice", @@ -78,6 +86,7 @@ }, "icegridtools": { "description": "IceGrid tools", + "supports": "!(windows & static)", "dependencies": [ "expat", { @@ -105,6 +114,7 @@ }, "icestormtools": { "description": "IceStorm tools", + "supports": "!(windows & static)", "dependencies": [ "lmdb", { diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 891449d991f23b..4c8cf77ba16c11 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -34,7 +34,8 @@ vcpkg_cmake_configure( -DWITH_PERF_TOOL=OFF -DWITH_DOCS=OFF -DWITH_NSS=OFF - -DCMAKE_FIND_PACKAGE_REQUIRE_GnuTLS=ON + -DWITH_LIBBSD=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_GnuTLS=ON -DWITH_LIBSODIUM_STATIC=${BUILD_STATIC} ${FEATURE_OPTIONS} ${PLATFORM_OPTIONS} diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index 70e2c48c233ba8..a82a4f5424da42 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zeromq", "version-date": "2023-01-31", - "port-version": 1, + "port-version": 4, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", "license": "LGPL-3.0-only", diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 4b9f595a1d1095..9059e587a64fe9 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -1,10 +1,10 @@ -set(ZLIB_FULL_VERSION 2.0.6) +set(ZLIB_FULL_VERSION 2.0.7) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng REF "${ZLIB_FULL_VERSION}" - SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 + SHA512 1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988 HEAD_REF develop ) @@ -24,6 +24,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" ) -file(INSTALL "${SOURCE_PATH}/LICENSE.md" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright -) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index c36f24e4f51cff..0bb10ad0a2235a 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zlib-ng", - "version": "2.0.6", - "port-version": 1, + "version": "2.0.7", "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/ports/zookeeper/portfile.cmake b/ports/zookeeper/portfile.cmake index ff67f075062423..2ee2ac12418481 100644 --- a/ports/zookeeper/portfile.cmake +++ b/ports/zookeeper/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES cmake.patch diff --git a/ports/zookeeper/vcpkg.json b/ports/zookeeper/vcpkg.json index eee539a28d92e1..48fe25b77bc173 100644 --- a/ports/zookeeper/vcpkg.json +++ b/ports/zookeeper/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zookeeper", "version": "3.5.6", + "port-version": 1, "description": "ZooKeeper C bindings", "homepage": "https://github.com/apache/zookeeper", "license": "BSD-3-Clause", diff --git a/ports/zpp-bits/portfile.cmake b/ports/zpp-bits/portfile.cmake index a0064d1d6fe7a2..df75a3bf93f486 100644 --- a/ports/zpp-bits/portfile.cmake +++ b/ports/zpp-bits/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eyalz800/zpp_bits - REF v4.4.13 - SHA512 26298d4485b364ac19a2d5375842052bc21f6f0c6fd355bd41078fc41885a8d26c5386a5cd6169044a4e476bd7b7540832f520ca75c06791e8e30dffb018b557 + REF "v${VERSION}" + SHA512 55757e4a02b680b8eae9e72073bd5612ba7e167bb82c40e89a3e27e3be520b1cd6db11dbb89bfaa4b046ba5b0dab11e02f481cbf93faebc96afc34ab49cd737a HEAD_REF master ) file(INSTALL "${SOURCE_PATH}/zpp_bits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/zpp-bits/vcpkg.json b/ports/zpp-bits/vcpkg.json index ed5ec15e407a41..8c8ab51d079776 100644 --- a/ports/zpp-bits/vcpkg.json +++ b/ports/zpp-bits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zpp-bits", - "version": "4.4.13", + "version": "4.4.17", "description": "A lightweight C++20 serialization and RPC library", "homepage": "https://github.com/eyalz800/zpp_bits", "license": "MIT" diff --git a/ports/zserge-webview/portfile.cmake b/ports/zserge-webview/portfile.cmake index 9bd482b8b2efd3..2caa4c403ed538 100644 --- a/ports/zserge-webview/portfile.cmake +++ b/ports/zserge-webview/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webview/webview - REF 2ee04ccd0530e3928a872f5d508c114403803e61 #commit-2022-09-07 - SHA512 c784635a0c0948d91fea12643b04f0125e0be64d34aeddafbd0240aa977e867fa74efaf4e5dea7fe207bc0d1461b544f483d6228bf92dade7dc0d5e2c5a585a6 + REF 8387ff8945fc010e7c4203c021943ce4ca12a276 #commit-2023-04-15 + SHA512 def8d4d5322546a0d3a767f76a6024c0c09e0da184445836f9c1887ab5bdfa1276fb8f2ed65b1b366c237cb22e935b1c6dd99151417c652cd3c5881255494f69 HEAD_REF master ) diff --git a/ports/zserge-webview/vcpkg.json b/ports/zserge-webview/vcpkg.json index f7b41f31464104..4088f23f1c0abe 100644 --- a/ports/zserge-webview/vcpkg.json +++ b/ports/zserge-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zserge-webview", - "version-date": "2022-09-07", + "version-date": "2023-04-15", "description": "Tiny cross-platform webview library for C/C++/Golang.", "homepage": "https://github.com/webview/webview", "license": "MIT" diff --git a/ports/zstd/emscripten.patch b/ports/zstd/emscripten.patch deleted file mode 100644 index b7ee7a2f779e23..00000000000000 --- a/ports/zstd/emscripten.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake -index 0265349..1807d6e 100644 ---- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake -+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake -@@ -54,7 +54,9 @@ macro(ADD_ZSTD_COMPILATION_FLAGS) - endif () - # Add noexecstack flags - # LDFLAGS -+ if(NOT EMSCRIPTEN) - EnableCompilerFlag("-z noexecstack" false false true) -+ endif() - # CFLAGS & CXXFLAGS - EnableCompilerFlag("-Qunused-arguments" true true false) - EnableCompilerFlag("-Wa,--noexecstack" true true false) diff --git a/ports/zstd/fix-emscripten-and-clang-cl.patch b/ports/zstd/fix-emscripten-and-clang-cl.patch new file mode 100644 index 00000000000000..c8dae329e49084 --- /dev/null +++ b/ports/zstd/fix-emscripten-and-clang-cl.patch @@ -0,0 +1,31 @@ +diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake +index 0265349..4a50a67 100644 +--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake ++++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake +@@ -54,10 +54,22 @@ macro(ADD_ZSTD_COMPILATION_FLAGS) + endif () + # Add noexecstack flags + # LDFLAGS +- EnableCompilerFlag("-z noexecstack" false false true) +- # CFLAGS & CXXFLAGS +- EnableCompilerFlag("-Qunused-arguments" true true false) +- EnableCompilerFlag("-Wa,--noexecstack" true true false) ++ if(MSVC) ++ # UNICODE SUPPORT ++ EnableCompilerFlag("/D_UNICODE" true true false) ++ EnableCompilerFlag("/DUNICODE" true true false) ++ # Enable asserts in Debug mode ++ if (CMAKE_BUILD_TYPE MATCHES "Debug") ++ EnableCompilerFlag("/DDEBUGLEVEL=1" true true false) ++ endif () ++ else() ++ if(NOT EMSCRIPTEN) ++ EnableCompilerFlag("-z noexecstack" false false true) ++ endif() ++ # CFLAGS & CXXFLAGS ++ EnableCompilerFlag("-Qunused-arguments" true true false) ++ EnableCompilerFlag("-Wa,--noexecstack" true true false) ++ endif() + elseif (MSVC) # Add specific compilation flags for Windows Visual + + set(ACTIVATE_MULTITHREADED_COMPILATION "ON" CACHE BOOL "activate multi-threaded compilation (/MP flag)") diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 53446dca9a6c98..932d13054daf34 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -2,11 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd REF "v${VERSION}" - SHA512 b6f64850ceb6cfed831fff3c43508d2a72338862a96dd9430b1d3ebbfcee40201c8b6dcf8b6b603e252bb96f3f283c9cb07da7f24414187f5f1fea3b51e01863 + SHA512 356994e0d8188ce97590bf86b602eb50cbcb2f951594afb9c2d6e03cc68f966862505afc4a50e76efd55e4cfb11dbc9b15c7837b7827a961a1311ef72cd23505 HEAD_REF dev PATCHES no-static-suffix.patch - emscripten.patch + fix-emscripten-and-clang-cl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index 26277dc44fe639..9f974f739c91b7 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zstd", - "version": "1.5.4", - "port-version": 1, + "version": "1.5.5", "description": "Zstandard - Fast real-time compression algorithm", "homepage": "https://facebook.github.io/zstd/", "license": "BSD-3-Clause OR GPL-2.0-only", diff --git a/ports/zyre/vcpkg.json b/ports/zyre/vcpkg.json index fac1e8bc5902e2..0e5cb090e5c18e 100644 --- a/ports/zyre/vcpkg.json +++ b/ports/zyre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zyre", - "version-string": "2019-07-07", - "port-version": 4, + "version-date": "2019-07-07", + "port-version": 5, "description": "An open-source framework for proximity-based peer-to-peer applications", "homepage": "https://github.com/zeromq/zyre", "dependencies": [ diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile new file mode 100644 index 00000000000000..36cb3fd551e8e9 --- /dev/null +++ b/scripts/azure-pipelines/android/Dockerfile @@ -0,0 +1,55 @@ +FROM ubuntu:20.04 +ENV DEBIAN_FRONTEND noninteractive + +RUN \ + apt-get update && \ + apt-get -y upgrade && \ + apt-get -y --no-install-recommends install git g++ wget curl zip vim \ + pkg-config tar cmake unzip ca-certificates + +# Download Android NDK +RUN \ + wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip && \ + unzip android-ndk-r25c-linux.zip && \ + rm -rf android-ndk-r25c-linux.zip + +ENV ANDROID_NDK_HOME /android-ndk-r25c + +# Download Powershell +RUN \ + wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb && \ + dpkg -i packages-microsoft-prod.deb && \ + rm -f packages-microsoft-prod.deb && \ + apt-get -y install software-properties-common && \ + apt-get update && \ + add-apt-repository universe && \ + apt-get -y install powershell + +RUN \ + apt-get -y --no-install-recommends install autoconf nasm bison python2 \ + flex build-essential libtool libtool-bin gettext automake autoconf-archive + +# python related +RUN \ + apt-get -y --no-install-recommends install python3-setuptools python3-pip python3-venv + +# freeglut +RUN \ + apt-get -y --no-install-recommends install libxi-dev libgl1-mesa-dev \ + libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev + +# glfw3 +RUN \ + apt-get -y --no-install-recommends install libxinerama-dev libxcursor-dev + +# required by qt5-base +RUN \ + apt-get -y --no-install-recommends install libxext-dev libxfixes-dev libxrender-dev \ + libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev \ + libxkbcommon-dev libxcb-keysyms1-dev \ + libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \ + libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ + libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev \ + libxcb-cursor-dev libxkbcommon-x11-dev + +WORKDIR /vcpkg \ No newline at end of file diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml new file mode 100644 index 00000000000000..0fe17316f4d9ee --- /dev/null +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -0,0 +1,136 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: triplet + type: string + - name: jobName + type: string + - name: poolName + type: string + - name: dockerImage + type: string + - name: tripletPattern + displayName: 'Enable the triplets which contain this substring' + type: string + default: '' + +jobs: +- job: ${{ parameters.jobName }} + condition: and(succeeded(), contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}')) + pool: + name: ${{ parameters.poolName }} + workspace: + clean: resources + timeoutInMinutes: 1440 # 1 day + cancelTimeoutInMinutes: 1 + variables: + - name: WORKING_ROOT + value: /mnt/vcpkg-ci + - name: VCPKG_DOWNLOADS + value: /mnt/vcpkg-ci/downloads + - group: vcpkg-asset-caching-credentials + - name: X_VCPKG_ASSET_SOURCES + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" + - group: vcpkg-binary-caching-credentials + - name: X_VCPKG_BINARY_SOURCE_STUB + value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" + + steps: + # Note: /mnt is the Azure machines' temporary disk. + - bash: | + curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash + az login --identity + az acr login --name AndContainerRegistry + displayName: 'Set up managed identity' + - bash: | + sudo mkdir /home/agent -m=777 + sudo chown `id -u` /home/agent + sudo mkdir ${{ variables.WORKING_ROOT }} -m=777 + sudo rm -rf ${{ variables.WORKING_ROOT }}/failure-logs + sudo mkdir ${{ variables.WORKING_ROOT }}/failure-logs -m=777 + sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777 + exit 0 + displayName: 'Create working directories' + - bash: | + docker run --rm \ + --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \ + ${{ parameters.dockerImage }} \ + ./bootstrap-vcpkg.sh + displayName: 'Bootstrap vcpkg' + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - bash: | + docker run --rm \ + --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \ + ${{ parameters.dockerImage }} \ + ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') + - bash: | + CONTAINERS=$(docker ps -a -q) + if [ -n "$CONTAINERS" ]; then + docker rm -f $CONTAINERS + fi + displayName: 'Stop and remove all docker containers' + - bash: | + docker pull ${{ parameters.dockerImage }} + displayName: 'Pull Docker Container' + - task: Bash@3 + inputs: + targetType: inline + script: | + USER=$(id --user) + docker run --init -i \ + -a stderr \ + -a stdout \ + --user $USER \ + --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \ + --mount type=bind,source=$(WORKING_ROOT)/failure-logs,target=/vcpkg/failure-logs \ + --mount type=bind,source=/mnt/vcpkg-ci,target=/mnt/vcpkg-ci \ + --env X_VCPKG_ASSET_SOURCES="x-azurl,$(root-url-ea),$(sas-ea),readwrite" \ + ${{ parameters.dockerImage }} \ + pwsh \ + -File /vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 \ + -Triplet ${{ parameters.triplet }} \ + -BuildReason $(Build.Reason) \ + -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" \ + -WorkingRoot ${{ variables.WORKING_ROOT }} \ + -IsLinuxHost + failOnStderr: true + displayName: '*** Test Modified Ports' + - bash: | + CONTAINERS=$(docker ps -a -q) + if [ -n "$CONTAINERS" ]; then + docker rm -f $CONTAINERS + fi + displayName: 'Stop and remove all docker containers' + condition: always() + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}' + inputs: + PathtoPublish: '$(WORKING_ROOT)/failure-logs' + ArtifactName: 'failure logs for ${{ parameters.triplet }}' + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') + - bash: | + python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/ + displayName: 'Build a file list for all packages' + condition: always() + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: file lists for ${{ parameters.triplet }}' + condition: always() + inputs: + PathtoPublish: scripts/list_files + ArtifactName: 'file lists for ${{ parameters.triplet }}' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: ${{ parameters.triplet }} + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: ${{ parameters.triplet }} \ No newline at end of file diff --git a/scripts/azure-pipelines/android/create-docker-image.ps1 b/scripts/azure-pipelines/android/create-docker-image.ps1 new file mode 100644 index 00000000000000..b80bec8452aa86 --- /dev/null +++ b/scripts/azure-pipelines/android/create-docker-image.ps1 @@ -0,0 +1,32 @@ +# Create Docker image for Android + +$Location = 'eastasia' +$Date = (Get-Date -Format 'yyyy-MM-dd') +$ResourceGroupName = "And-Registry" +$ContainerRegistryName = "AndContainerRegistry" +$ErrorActionPreference = 'Stop' + +Get-AzResourceGroup -Name $ResourceGroupName -ErrorVariable error -ErrorAction SilentlyContinue +if ($error) { + New-AzResourceGroup -Name $ResourceGroupName -Location $Location + New-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name $ContainerRegistryName -EnableAdminUser -Sku Basic +} + +$registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name $ContainerRegistryName +Connect-AzContainerRegistry -Name $registry.Name + +$imageName = "vcpkg-android" +docker build . -t $imageName + +$remote = [string]::Format('andcontainerregistry.azurecr.io/{0}:{1}', $imageName, $Date) +docker tag $imageName $remote + +docker push $remote + +#removes from local environment +docker rmi --force $remote $imageName + +# pulls and runs ... +docker logout + +Write-Host "Remote: $remote" diff --git a/scripts/azure-pipelines/android/create-image.ps1 b/scripts/azure-pipelines/android/create-image.ps1 new file mode 100644 index 00000000000000..08b264c635ad70 --- /dev/null +++ b/scripts/azure-pipelines/android/create-image.ps1 @@ -0,0 +1 @@ +& "$PSScriptRoot/../linux/create-image.ps1" -Prefix "And-" -ProvisionScript "$PSScriptRoot/provision-image.sh" \ No newline at end of file diff --git a/scripts/azure-pipelines/android/create-vmss.ps1 b/scripts/azure-pipelines/android/create-vmss.ps1 new file mode 100644 index 00000000000000..d5ca2654f3f132 --- /dev/null +++ b/scripts/azure-pipelines/android/create-vmss.ps1 @@ -0,0 +1,6 @@ +[CmdLetBinding()] +Param( + [parameter(Mandatory=$true)] + [string]$ImageName +) +& "$PSScriptRoot/../linux/create-vmss.ps1" -ImageName $ImageName -Prefix "PrAnd-" -AddAndroidContainerRegistryPermissions diff --git a/scripts/azure-pipelines/android/provision-image.sh b/scripts/azure-pipelines/android/provision-image.sh new file mode 100644 index 00000000000000..286ce4b7461983 --- /dev/null +++ b/scripts/azure-pipelines/android/provision-image.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# +# This script is to set up the machine for the Docker host. + +export DEBIAN_FRONTEND=noninteractive + +## Docker +apt-get -y --no-install-recommends install ca-certificates gnupg lsb-release +mkdir -p /etc/apt/keyrings +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg +echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null +apt-get update +apt-get -y --no-install-recommends install docker-ce docker-ce-cli \ No newline at end of file diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 7c40eadd07d2e2..7ebeb3c9edf0fa 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,9 +2,11 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2023-03-15' - linux-pool: 'PrLin-2023-03-15' + android-pool: 'PrAnd-2023-05-09' + linux-pool: 'PrLin-2023-05-09' + windows-pool: 'PrWin-2023-05-09' osx-pool: 'PrOsx-2022-02-04' + linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20' parameters: - name: vcpkgToolSha @@ -84,3 +86,30 @@ jobs: poolName: $(linux-pool) vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} + +- template: android/azure-pipelines.yml + parameters: + triplet: arm-neon-android + jobName: arm_neon_android + poolName: $(android-pool) + dockerImage: $(linux-docker-image) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + tripletPattern: ${{ parameters.tripletPattern }} + +- template: android/azure-pipelines.yml + parameters: + triplet: x64-android + jobName: x64_android + poolName: $(android-pool) + dockerImage: $(linux-docker-image) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + tripletPattern: ${{ parameters.tripletPattern }} + +- template: android/azure-pipelines.yml + parameters: + triplet: arm64-android + jobName: arm64_android + poolName: $(android-pool) + dockerImage: $(linux-docker-image) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + tripletPattern: ${{ parameters.tripletPattern }} \ No newline at end of file diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 2b50cf3b6f9915..9383299d7ff987 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -16,7 +16,7 @@ parameters: jobs: - job: x64_linux - condition: contains('^x64-linux$', '${{ parameters.tripletPattern }}') + condition: and(succeeded(), contains('^x64-linux$', '${{ parameters.tripletPattern }}')) pool: name: ${{ parameters.poolName }} workspace: @@ -54,7 +54,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -IsLinuxHost' pwsh: true - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for x64-linux' diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index 932d25aecde22b..7873dbdaaa6407 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -15,8 +15,15 @@ or are running from Azure Cloud Shell. This script assumes you have installed the OpenSSH Client optional Windows component. #> +[CmdLetBinding()] +Param( + [parameter(Mandatory=$false)] + [string]$Prefix = "Lin-", + [parameter(Mandatory=$false)] + [string]$ProvisionScript +) + $Location = 'eastasia' -$Prefix = 'Lin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D8a_v4' $ProtoVMName = 'PROTOTYPE' @@ -126,11 +133,14 @@ Write-Progress ` -Status 'Running provisioning script provision-image.sh in VM' ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) +if($ProvisionScript.Length -eq 0) { + $ProvisionScript = "$PSScriptRoot\provision-image.sh" +} $ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` -ResourceGroupName $ResourceGroupName ` -VMName $ProtoVMName ` -CommandId 'RunShellScript' ` - -ScriptPath "$PSScriptRoot\provision-image.sh" + -ScriptPath $ProvisionScript Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)" diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 54ed2142bb9e99..a4217fe811c500 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -25,11 +25,13 @@ The name of the image to deploy into the scale set. [CmdLetBinding()] Param( [parameter(Mandatory=$true)] - [string]$ImageName + [string]$ImageName, + [parameter(Mandatory=$false)] + [string]$Prefix = "PrLin-", + [switch]$AddAndroidContainerRegistryPermissions ) $Location = 'eastasia' -$Prefix = 'PrLin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D32a_v4' $LiveVMPrefix = 'BUILD' @@ -64,7 +66,8 @@ $Vmss = New-AzVmssConfig ` -UpgradePolicyMode Manual ` -EvictionPolicy Delete ` -Priority Spot ` - -MaxPrice -1 + -MaxPrice -1 ` + -IdentityType SystemAssigned $NicName = $ResourceGroupName + 'NIC' New-AzNetworkInterface ` @@ -102,11 +105,23 @@ $Vmss = Set-AzVmssBootDiagnostic ` -VirtualMachineScaleSet $Vmss ` -Enabled $true -New-AzVmss ` +$VmssCreated = New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` -VirtualMachineScaleSet $Vmss +if ($AddAndroidContainerRegistryPermissions) { + $spID = $VmssCreated.Identity.PrincipalId + + $acrGroup = "And-Registry" + $acrName = "AndContainerRegistry" + + $resourceID = (Get-AzContainerRegistry -ResourceGroupName $acrGroup -Name $acrName).Id + + # needs admin privileges + New-AzRoleAssignment -ObjectId $spID -Scope $resourceID -RoleDefinitionName AcrPull +} + Write-Host "Location: $Location" Write-Host "Resource group name: $ResourceGroupName" Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 332144e56f67eb..1e9aff0862b4a4 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -16,7 +16,7 @@ parameters: jobs: - job: x64_osx - condition: contains('^x64-osx$', '${{ parameters.tripletPattern }}') + condition: and(succeeded(), contains('^x64-osx$', '${{ parameters.tripletPattern }}')) pool: name: ${{ parameters.poolName }} workspace: diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md new file mode 100644 index 00000000000000..9b1adcbadf752d --- /dev/null +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -0,0 +1,21 @@ +## First time machine setup: +* [ ] Install Azure PowerShell: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps + +## Each Patch Tuesday: +* [ ] Check for depends:vm-update PRs and make relevant changes if possible. +* [ ] Check for Service 360 alerts about vulnerable software we are installing in the VMs and + update that. (Most often PowerShell needs to be updated to the current 7.2.x release) +* [ ] Run android/create-image.ps1 +* [ ] Run linux/create-image.ps1 +* [ ] Run windows/create-image.ps1 +* [ ] Run android/create-vmss.ps1 +* [ ] Run linux/create-vmss.ps1 +* [ ] Run windows/create-vmss.ps1 +* [ ] Create new pools for all 3 of these in Azure DevOps: https://dev.azure.com/vcpkg/public/_settings/agentqueues + * Android: 4 agents + * Linux: 4 agents + * Windows: 22 agents +* [ ] Update azure-pipelines.yml to point to the new pools. +* [ ] Submit PR with those changes. +* [ ] Submit a full CI rebuild with those changes: https://dev.azure.com/vcpkg/public/_build?definitionId=29 + refs/pull/NUMBER/head diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 55a05aef3220d6..e51bf08a55f5f9 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -53,7 +53,8 @@ Param( $BinarySourceStub = $null, [String]$BuildReason = $null, [switch]$NoParentHashes = $false, - [switch]$PassingIsPassing = $false + [switch]$PassingIsPassing = $false, + [switch]$IsLinuxHost = $false ) if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { @@ -104,7 +105,7 @@ if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { $cachingArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") } -if ($Triplet -eq 'x64-linux') { +if ($IsLinuxHost) { $env:HOME = '/home/agent' $executableExtension = [string]::Empty } @@ -136,6 +137,8 @@ if ($LASTEXITCODE -ne 0) $parentHashes = @() if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) { + $headBaseline = Get-Content "$PSScriptRoot/../ci.baseline.txt" -Raw + # Prefetch tools for better output foreach ($tool in @('cmake', 'ninja', 'git')) { & "./vcpkg$executableExtension" fetch $tool @@ -145,17 +148,25 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) } } - Write-Host "Determining parent hashes using HEAD~1" - $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' - $parentHashes = @("--parent-hashes=$parentHashesFile") + Write-Host "Comparing with HEAD~1" & git revert -n -m 1 HEAD | Out-Null - # The vcpkg.cmake toolchain file is not part of ABI hashing, - # but changes must trigger at least some testing. - Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" - Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" - & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" - - Write-Host "Running CI using parent hashes" + $parentBaseline = Get-Content "$PSScriptRoot/../ci.baseline.txt" -Raw + if ($parentBaseline -eq $headBaseline) + { + Write-Host "CI baseline unchanged, determining parent hashes" + $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' + $parentHashes = @("--parent-hashes=$parentHashesFile") + # The vcpkg.cmake toolchain file is not part of ABI hashing, + # but changes must trigger at least some testing. + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" + & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" + } + else + { + Write-Host "CI baseline was modified, not using parent hashes" + } + Write-Host "Running CI for HEAD" & git reset --hard HEAD } diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 3caf700ef6294e..e99758c7380d8c 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -22,7 +22,7 @@ parameters: jobs: - job: ${{ parameters.jobName }} - condition: contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}') + condition: and(succeeded(), contains('^${{ parameters.triplet }}$', '${{ parameters.tripletPattern }}')) pool: name: ${{ parameters.poolName }} workspace: diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 75970784f132f7..17c23f168d4a4d 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.3/PowerShell-7.3.3-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.4/PowerShell-7.3.4-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index e92f32be6a782c..b901fd963bf203 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.81.0", + $version = "1.82.0", $portsDir = $null ) @@ -22,14 +22,9 @@ else { } # Clear this array when moving to a new boost version -$defaultPortVersion = 2 +$defaultPortVersion = 1 $portVersions = @{ #e.g. "boost-asio" = 1; - "boost" = 3; - "boost-build" = 3; - "boost-locale" = 3; - "boost-modular-build-helper" = 4; - "boost-vcpkg-helpers" = 3; } function Get-PortVersion { diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 7bf80bfc2ac94e..5a360e047b3ef7 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 = '2023-03-29' +$versionDate = '2023-04-07' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.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 f5c24634235dc0..4960766360b605 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -95,7 +95,9 @@ ARCH="$(uname -m)" if [ -e /etc/alpine-release ]; then vcpkgUseSystem="ON" - vcpkgUseMuslC="ON" + if [ "$ARCH" = "x86_64" ]; then + vcpkgUseMuslC="ON" + fi fi if [ "$UNAME" = "OpenBSD" ]; then @@ -126,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-03-29" +vcpkgToolReleaseTag="2023-04-07" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="f83ec768200c6ece26555aba8d25c17063fed27ef7744f42eaa7772fa55a0f6187a2a4bae6fa4a72a23f6bb8590e056b13d4215e340d4e3d42de030b9e36a721" + vcpkgToolReleaseSha="2a2805aa251a9523311c813e9e68896f18805fed4ace301c603f4afac3940b27d4ef1d3b4572c8f93ce4d13ac613720275b9e21e39cc5d19115d2fc849bfe2bb" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="f81ccaffe8ba2e775277312296581c5cb37f5f659f09cf3c99c07346ff1e73e9e4ac42aeed31e0db408b49ab0114bc947db5e26c4f24a57b13a6ad0c12d0b423" + vcpkgToolReleaseSha="d8dc48e6dc866f4ebe3919c0bf1377769d6c6f1ad2dab7fc09da9b26f7dac3ab3b06affb585ece7ba72e2fdeacdc77b8df31ad08cff49e4c060b7647fc1cc22a" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="4fea1d3f36a1895b5535da9595871f80900c58aac288ffb7939290f13d268ee82ba8e358675e2f191ab6564536a809de42b3819fec300b0195a8d8e8513d0051" + vcpkgToolReleaseSha="f26aaf5f503b9fd0a8b206230df19af966390d7087a9f3342f24c2d5e73f1f1bd81cba2695a89c87015ec822bd41bf836c2a9ef9f0e11acc61d6d9593aa8fae9" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="3c80824f31775aac981d13dd5e4aab8565f4ec9b45440cd8d9b2b76d4131071fbcc7170979475f436a355c7f079d41d6b140ec84465c7ff4fac9ca26d20d0a30" + vcpkgToolReleaseSha="89dc32154e22f6a51fa18a8ea22c16263533546469f73cdb4ee168ab7c68ebc2b2a93177284dc03ecf2d2ca438f9fd583def48844788942e98ea45027e8ec2fa" fi # Do the download or build. diff --git a/scripts/buildsystems/msbuild/vcpkg.props b/scripts/buildsystems/msbuild/vcpkg.props index 0f0b6e3b353c33..36bccc55abf4c2 100644 --- a/scripts/buildsystems/msbuild/vcpkg.props +++ b/scripts/buildsystems/msbuild/vcpkg.props @@ -32,7 +32,7 @@ true - false + false true diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 15496ce45a5f11..739495fb7ef069 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -56,12 +56,13 @@ if(VCPKG_PREFER_SYSTEM_LIBS) endif() # Manifest options and settings +set(Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE "${VCPKG_MANIFEST_DIR}") if(NOT DEFINED VCPKG_MANIFEST_DIR) if(EXISTS "${CMAKE_SOURCE_DIR}/vcpkg.json") - set(VCPKG_MANIFEST_DIR "${CMAKE_SOURCE_DIR}") + set(Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE "${CMAKE_SOURCE_DIR}") endif() endif() -set(VCPKG_MANIFEST_DIR "${VCPKG_MANIFEST_DIR}" +set(VCPKG_MANIFEST_DIR "${Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE}" CACHE PATH "The path to the vcpkg manifest directory." FORCE) if(DEFINED VCPKG_MANIFEST_DIR AND NOT VCPKG_MANIFEST_DIR STREQUAL "") @@ -392,16 +393,16 @@ if(NOT Z_VCPKG_ROOT_DIR) endif() if(DEFINED VCPKG_INSTALLED_DIR) - # do nothing + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${VCPKG_INSTALLED_DIR}") elseif(DEFINED _VCPKG_INSTALLED_DIR) - set(VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}") + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${_VCPKG_INSTALLED_DIR}") elseif(VCPKG_MANIFEST_MODE) - set(VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed") + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${CMAKE_BINARY_DIR}/vcpkg_installed") else() - set(VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed") + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${Z_VCPKG_ROOT_DIR}/installed") endif() -set(VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" +set(VCPKG_INSTALLED_DIR "${Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE}" CACHE PATH "The directory which contains the installed libraries for each triplet" FORCE) set(_VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3c5f669bbad744..7d7f71aa5e796c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -21,8 +21,11 @@ ## ## ## CI tested triplets: +## arm64-android ## arm64-windows +## arm-neon-android ## arm-uwp +## x64-android ## x64-linux ## x64-osx ## x64-uwp @@ -34,21 +37,65 @@ # Add new items alphabetically +7zip:arm-neon-android=fail +7zip:arm64-android=fail +ace:arm-neon-android=fail +ace:arm64-android=fail +ace:x64-android=fail +ace:x64-windows-static-md=fail +allegro5:arm-neon-android=fail +allegro5:arm64-android=fail +allegro5:x64-android=fail +ampl-asl:x64-android=fail +apr:arm-neon-android=fail +apr:arm64-android=fail +apr:x64-android=fail +apsi:arm-neon-android=fail +apsi:x64-android=fail # Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed arrayfire:x64-linux=fail # Fails with "fatal error LNK1322: cannot avoid potential ARM hazard" even with /Gy allegro5:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail +assimp:arm-neon-android=fail +avro-c:arm-neon-android=fail +avro-c:arm64-android=fail +avro-c:x64-android=fail +avro-cpp:arm-neon-android=fail +avro-cpp:arm64-android=fail +avro-cpp:x64-android=fail +azure-identity-cpp:arm-neon-android=fail +azure-identity-cpp:arm64-android=fail +azure-identity-cpp:x64-android=fail +backward-cpp:arm-neon-android=fail +backward-cpp:arm64-android=fail +backward-cpp:x64-android=fail +bde:x64-android=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail +bento4:arm-neon-android=fail +berkeleydb:arm-neon-android=fail +berkeleydb:arm64-android=fail +berkeleydb:x64-android=fail +binlog:arm-neon-android=fail bitserializer:arm64-osx=fail +blitz:x64-android=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail +boinc:arm-neon-android=fail +boinc:arm64-android=fail +boinc:x64-android=fail +bond:arm-neon-android=fail +bond:arm64-android=fail +bond:x64-android=fail # Conflicts with openssl +boringssl:arm-neon-android=skip +boringssl:arm64-android=skip boringssl:arm64-windows=skip boringssl:arm-uwp=skip +boringssl:x64-android=skip boringssl:x64-linux=skip boringssl:x64-osx=skip boringssl:arm64-osx=skip @@ -61,11 +108,25 @@ bond:arm-uwp=fail bond:x64-osx=fail bond:arm64-osx=fail bond:x64-uwp=fail +botan:arm-neon-android=fail +botan:arm64-android=fail +botan:x64-android=fail +brpc:x64-android=fail +buck-yeh-bux:x64-android=fail +c4core:arm-neon-android=fail +c4core:arm64-android=fail +c4core:x64-android=fail +c89stringutils:arm-neon-android=fail +c89stringutils:arm64-android=fail +c89stringutils:x64-android=fail +caf:arm-neon-android=fail caf:arm-uwp=fail +caf:arm64-android=fail +caf:x64-android=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail - +cairo:x64-android=fail # file conflict with dbg-macro c-dbg-macro:x86-windows=skip c-dbg-macro:x64-windows=skip @@ -80,8 +141,11 @@ c-dbg-macro:x64-linux=skip casclib:arm-uwp=fail casclib:x64-uwp=fail +catch-classic:arm-neon-android=skip +catch-classic:arm64-android=skip catch-classic:arm64-windows = skip catch-classic:arm-uwp = skip +catch-classic:x64-android=skip catch-classic:x64-linux = skip catch-classic:x64-osx = skip catch-classic:arm64-osx = skip @@ -107,14 +171,20 @@ charls:x64-windows-static=skip charls:x64-windows-static-md=skip charls:x86-windows=skip # chartdir does not offer stable download URLs +chartdir:arm-neon-android=fail +chartdir:arm64-android=fail chartdir:arm64-windows=skip chartdir:arm-uwp=skip +chartdir:x64-android=fail chartdir:x64-uwp=skip chartdir:x64-windows-static=skip chartdir:x86-windows=skip chartdir:x64-windows=skip chartdir:x64-windows-static-md=skip chartdir:x64-osx=skip +chipmunk:arm-neon-android=fail +chipmunk:arm64-android=fail +chipmunk:x64-android=fail # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI # broken on Windows because it does not yet support VS2022 @@ -131,7 +201,30 @@ civetweb:arm64-windows = skip civetweb:arm-uwp = skip civetweb:x64-uwp = skip clamav:arm64-windows=fail + +# clapack is replaced by lapack-reference on the platforms lapack-reference supports +clapack:x64-linux=skip +clapack:x64-osx=skip +clapack:arm64-osx=skip +clapack:x64-windows-static=skip +clapack:x64-windows-static-md=skip +clapack:x64-windows=skip +clapack:x86-windows=skip +lapack-reference:arm64-windows=skip +lapack-reference:arm-uwp=skip +lapack-reference:x64-uwp=skip + +clblas:arm-neon-android=fail +clblas:arm64-android=fail +clblas:x64-android=fail +clblast:arm-neon-android=fail +clblast:arm64-android=fail +clblast:x64-android=fail +clockutils:arm-neon-android=fail +clockutils:arm64-android=fail +clockutils:x64-android=fail clockutils:x64-linux=fail +clrng:arm-neon-android=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip @@ -141,6 +234,9 @@ cmcstl2:x64-windows = skip cmcstl2:x64-windows-static = skip cmcstl2:x64-windows-static-md=skip cmcstl2:x86-windows = skip +cnats:arm-neon-android=fail +cnats:arm64-android=fail +cnats:x64-android=fail coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail @@ -152,20 +248,42 @@ colmap:x64-windows=fail colmap:x64-windows-static=fail colmap:x64-windows-static-md=fail +concurrencpp:arm-neon-android=fail +concurrencpp:arm64-android=fail +concurrencpp:x64-android=fail concurrencpp:x64-linux=fail concurrencpp:x64-osx=fail +constexpr-contracts:arm-neon-android=fail +constexpr-contracts:arm64-android=fail +constexpr-contracts:x64-android=fail constexpr-contracts:x64-linux=fail -coolprop:arm-uwp=fail -coolprop:x64-uwp=fail +coroutine:arm-neon-android=fail coroutine:arm-uwp=fail +coroutine:arm64-android=fail +coroutine:x64-android=fail coroutine:x64-linux=fail coroutine:x64-uwp=fail +cpp-ipc:arm-neon-android=fail +cpp-ipc:arm64-android=fail +cpp-ipc:x64-android=fail +cppcms:arm-neon-android=fail +cppcms:arm64-android=fail +cppcms:x64-android=fail +cppgraphqlgen:arm-neon-android=fail +cppgraphqlgen:arm64-android=fail +cppgraphqlgen:x64-android=fail +cppmicroservices:arm-neon-android=fail +cppmicroservices:arm64-android=fail cppmicroservices:arm64-windows=fail cppmicroservices:arm-uwp=fail +cppmicroservices:x64-android=fail cppmicroservices:x64-uwp=fail cpp-netlib:arm-uwp=fail cpp-netlib:x64-uwp=fail # Requires full C++20 support, currently absent from CI for these triplets. +cppslippi:arm-neon-android=fail +cppslippi:arm64-android=fail +cppslippi:x64-android=fail cppslippi:x64-linux=fail cppslippi:x64-osx=fail cppcoro:x64-linux=fail @@ -174,8 +292,28 @@ cppcoro:x64-uwp=fail # The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. # This is known to work on x64-linux as of gcc 10.3.0. cppgraphqlgen:x64-linux=fail +cpptoml:arm-neon-android=fail +cpptoml:arm64-android=fail +cpptoml:x64-android=fail +cpputest:arm-neon-android=fail crashpad:arm-uwp=fail +crashpad:x64-linux=fail +cserialport:arm-neon-android=fail +cserialport:arm64-android=fail +cserialport:x64-android=fail +cubeb:arm-neon-android=fail +cubeb:arm64-android=fail +cubeb:x64-android=fail cuda:x64-osx=fail +czmq:arm-neon-android=fail +czmq:arm64-android=fail +czmq:x64-android=fail +darknet:arm-neon-android=fail +darknet:arm64-android=fail +darknet:x64-android=fail +dbg-macro:arm-neon-android=fail +dbg-macro:arm64-android=fail +dbg-macro:x64-android=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip dbghelp:arm64-windows=skip @@ -186,7 +324,15 @@ dbghelp:x64-windows-static=skip dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip +dcmtk:arm-neon-android=fail +dcmtk:arm64-android=fail +dcmtk:x64-android=fail dcmtk:x64-uwp=fail +# VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the +# upstream build script of this port. +# See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 +dimcli:x64-windows-static-md=fail +dimcli:x64-windows-static=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip @@ -197,33 +343,58 @@ discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail # requires g++11 discordcoreapi:x64-linux=fail +discount:x64-android=fail dlib:arm-uwp=fail dlib:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail +drogon:arm-neon-android=fail +drogon:arm64-android=fail +drogon:x64-android=fail # requires python@2 from brew, but that no longer exists # python2 EOL yay! +duktape:arm-neon-android=fail +duktape:arm64-android=fail +duktape:x64-android=fail duktape:x64-osx=skip duktape:arm64-osx=skip eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail -ebml:arm-uwp=fail -ebml:x64-uwp=fail +eathread:x64-android=fail +elfio:arm-neon-android=fail +elfio:arm64-android=fail +elfio:x64-android=fail # Checks for gnu extension so only works with gcc. +elfutils:arm-neon-android=fail +elfutils:arm64-android=fail +elfutils:x64-android=fail elfutils:x64-osx=fail elfutils:arm64-osx=fail epsilon:arm-uwp=fail epsilon:x64-uwp=fail +evpp:arm-neon-android=fail +evpp:arm64-android=fail +evpp:x64-android=fail faiss:arm64-windows=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail fastrtps:x64-windows-static-md=fail +fdk-aac:arm-neon-android=fail +fdk-aac:arm64-android=fail +fdk-aac:x64-android=fail flashlight-cpu:x64-linux=fail flashlight-cuda:x64-linux=fail + +flint:arm-neon-android=fail +flint:arm64-android=fail +flint:x64-android=fail +fltk:arm-neon-android=fail +fltk:arm64-android=fail +fltk:x64-android=fail # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because # fluidlite has no dependencies and thus is less likely to be broken by another package. fluidlite:arm-uwp=skip @@ -236,33 +407,68 @@ fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip +fmem:arm-neon-android=fail +fmem:arm64-android=fail +fmem:x64-android=fail fmi4cpp:arm-uwp=fail fmi4cpp:x64-uwp=fail +folly:arm64-android=fail +folly:x64-android=fail fontconfig:x64-uwp=fail fontconfig:arm-uwp=fail +foonathan-memory:arm-neon-android=fail +foonathan-memory:arm64-android=fail foonathan-memory:arm64-windows=fail foonathan-memory:arm-uwp=fail +foonathan-memory:x64-android=fail foonathan-memory:x64-uwp=fail +freeglut:arm-neon-android=fail freeglut:arm-uwp=fail +freeglut:arm64-android=fail +freeglut:x64-android=fail freeglut:x64-uwp=fail freeglut:x64-osx=fail # Needs /bigobj +freeopcua:arm-neon-android=fail +freeopcua:arm64-android=fail freeopcua:arm64-windows=fail +freeopcua:x64-android=fail +freerdp:x64-android=fail +fruit:arm-neon-android=fail +fruit:arm64-android=fail +fruit:x64-android=fail +ftgl:arm-neon-android=fail +ftgl:arm64-android=fail +ftgl:x64-android=fail ftgl:x64-uwp=fail ftgl:arm-uwp=fail - +fuzzylite:arm-neon-android=fail +fuzzylite:arm64-android=fail +fuzzylite:x64-android=fail +g3log:arm-neon-android=fail +g3log:arm64-android=fail +g3log:x64-android=fail +gainput:arm-neon-android=fail +gainput:arm64-android=fail +gainput:x64-android=fail +gamenetworkingsockets:arm-neon-android=fail +gamenetworkingsockets:arm64-android=fail +gamenetworkingsockets:x64-android=fail # VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 # gazebo is broken due it depend on old ports that already in the new versions. # There is an open PR that try to fix that. gazebo:x64-windows=fail gazebo:x64-linux=fail gazebo:x86-windows=fail - -# gsoap does not offer stable public source downloads -gsoap:x64-windows = skip -gsoap:x86-windows = skip -gsoap:x64-windows-static = skip -gsoap:x64-windows-static-md = skip +gdk-pixbuf:arm-neon-android=fail +gdk-pixbuf:arm64-android=fail +gdk-pixbuf:x64-android=fail +gemmlowp:arm-neon-android=fail +gemmlowp:arm64-android=fail +gemmlowp:x64-android=fail +gherkin-c:arm-neon-android=fail +gherkin-c:arm64-android=fail +gherkin-c:x64-android=fail # Port geotrans source ftp://ftp.nga.mil server # extremely slow may take several hours to download @@ -284,8 +490,16 @@ gherkin-c:x64-windows = skip gherkin-c:x64-windows-static = skip gherkin-c:x64-windows-static-md = skip gherkin-c:x86-windows = skip -glew:arm64-windows=fail +gl3w:arm-neon-android=fail +gl3w:arm64-android=fail +gl3w:x64-android=fail +glew:arm-neon-android=fail +glew:arm64-android=fail +glew:x64-android=fail +glfw3:arm-neon-android=fail glfw3:arm-uwp=fail +glfw3:arm64-android=fail +glfw3:x64-android=fail glfw3:x64-uwp=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail @@ -299,19 +513,47 @@ gmmlib:x64-windows=fail gmmlib:x86-windows=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail +gperftools:arm-uwp=fail gperftools:arm64-windows=fail +gperftools:x64-android=fail gperftools:x64-uwp=fail -gperftools:arm-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail # graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251 -graphicsmagick:x86-windows=fail -graphicsmagick:x64-windows=fail -graphicsmagick:x64-windows-static=fail +graphicsmagick:arm-neon-android=fail +graphicsmagick:arm64-android=fail +graphicsmagick:x64-android=fail graphicsmagick:x64-windows-static-md=fail +graphicsmagick:x64-windows-static=fail +graphicsmagick:x64-windows=fail +graphicsmagick:x86-windows=fail +graphqlparser:arm-neon-android=fail +graphqlparser:arm64-android=fail graphqlparser:arm64-osx=fail # python2 required +graphqlparser:x64-android=fail + +# gsoap does not offer stable public source downloads +gsoap:x64-android=fail +gsoap:x64-windows = skip +gsoap:x86-windows = skip +gsoap:x64-windows-static = skip +gsoap:x64-windows-static-md = skip + +gstreamer:arm-neon-android=fail +gstreamer:arm64-android=fail +gstreamer:x64-android=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail +gts:arm-neon-android=fail +gts:arm64-android=fail +gts:x64-android=fail +gul14:arm-neon-android=fail +gul14:arm64-android=fail +gul14:x64-android=fail +# see ignition skips below +gz-tools2:arm-neon-android=fail +gz-tools2:x64-android=fail +gz-tools2:arm64-android=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail @@ -324,49 +566,115 @@ healpix:x64-uwp=fail healpix:arm64-windows=fail healpix:arm-uwp=fail healpix:x64-osx=fail +hexl:x64-android=fail +highs:arm-neon-android=fail +highs:arm64-android=fail +highs:x64-android=fail hpx:x64-windows-static=fail hpx:arm64-windows=fail +hwloc:arm-neon-android=fail +hwloc:arm64-android=fail +hwloc:x64-android=fail +hyperscan:x64-android=fail idevicerestore:x64-linux=fail idevicerestore:x64-osx=fail ignition-common1:x64-linux=fail +ignition-msgs1:arm-neon-android=fail +ignition-msgs1:arm64-android=fail ignition-msgs1:arm64-windows=fail ignition-msgs1:arm-uwp=fail +ignition-msgs1:x64-android=fail ignition-msgs1:x64-uwp=fail ignition-msgs5:arm64-windows=fail ignition-msgs5:arm-uwp=fail +ignition-msgs5:x64-android=fail ignition-msgs5:x64-uwp=fail ignition-msgs5:x64-osx=skip # Conflicts with libjpeg-turbo, mozjpeg -ijg-libjpeg:arm64-windows = skip +ignition-msgs6:x64-android=fail +ignition-tools:arm-neon-android=fail +ignition-tools:arm64-android=fail +ignition-tools:x64-android=fail +ijg-libjpeg:arm-neon-android=fail ijg-libjpeg:arm-uwp = skip +ijg-libjpeg:arm64-android=fail +ijg-libjpeg:arm64-osx = skip +ijg-libjpeg:arm64-windows = skip +ijg-libjpeg:x64-android=fail ijg-libjpeg:x64-linux = skip ijg-libjpeg:x64-osx = skip -ijg-libjpeg:arm64-osx = skip ijg-libjpeg:x64-uwp = skip ijg-libjpeg:x64-windows = skip ijg-libjpeg:x64-windows-static = skip +ijg-libjpeg:x64-windows-static-md=fail ijg-libjpeg:x86-windows = skip +infoware:x64-android=fail +intelrdfpmathlib:arm-neon-android=fail +intelrdfpmathlib:arm64-android=fail +intelrdfpmathlib:x64-android=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail +irrlicht:x64-android=fail irrlicht:x64-uwp=fail +isal:x64-android=fail ismrmrd:x86-windows=fail +jaeger-client-cpp:arm-neon-android=fail +jaeger-client-cpp:x64-android=fail +jemalloc:arm-neon-android=fail +jemalloc:arm64-android=fail jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail +jemalloc:x64-android=fail jemalloc:x64-uwp=fail +jinja2cpplight:arm-neon-android=fail jinja2cpplight:arm-uwp=fail +jinja2cpplight:arm64-android=fail +jinja2cpplight:x64-android=fail jinja2cpplight:x64-uwp=fail +json-schema-validator:arm-neon-android=fail +json-schema-validator:arm64-android=fail kfr:arm64-windows=fail +kfr:x64-android=fail kfr:x64-uwp=fail kfr:arm-uwp=fail kfr:x64-linux=fail +lastools:arm-neon-android=fail +lastools:arm64-android=fail +lastools:x64-android=fail lcm:x64-windows-static=fail lcm:x64-windows-static-md=fail +lcm:arm-neon-android=fail +lcm:arm64-android=fail +lcm:x64-android=fail leptonica:x64-uwp=fail leptonica:arm-uwp=fail leveldb:arm-uwp=fail leveldb:x64-uwp=fail libaiff:x64-linux=fail libarchive:arm-uwp=fail +libbson:arm-neon-android=fail +libbson:arm64-android=fail +libbson:x64-android=fail +libcanberra:arm-neon-android=fail +libcanberra:arm64-android=fail +libcanberra:x64-android=fail +libcerf:x64-windows-static-md=fail +libcpplocate:arm-neon-android=fail +libcpplocate:arm64-android=fail +libcpplocate:x64-android=fail +libcrafter:arm-neon-android=fail +libcrafter:arm64-android=fail +libcrafter:x64-android=fail +libepoxy:arm-neon-android=fail +libepoxy:arm64-android=fail +libepoxy:x64-android=fail +libgit2:arm-neon-android=fail +libgit2:arm64-android=fail +libgit2:x64-android=fail +libgo:x64-android=fail +libgpg-error:arm-neon-android=fail +libgpg-error:arm64-android=fail +libgpg-error:x64-android=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail @@ -388,22 +696,40 @@ libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail +libgpod:arm-neon-android=fail +libgpod:arm64-android=fail +libgpod:x64-android=fail libgxps:x64-windows-static=fail libgxps:x64-windows-static-md=fail +libhdfs3:arm-neon-android=fail +libhdfs3:arm64-android=fail +libhdfs3:x64-android=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail libhdfs3:arm64-osx=fail +libidn2:arm-neon-android=fail +libidn2:arm64-android=fail +libidn2:x64-android=fail libirecovery:x64-windows-static-md=fail # 120 min build time for libjxl arm-uwp-rel, reason unknown libjxl:arm-uwp=skip liblemon:arm-uwp=fail liblemon:x64-uwp=fail +liblo:arm-neon-android=fail liblo:arm-uwp=fail +liblo:arm64-android=fail +liblo:x64-android=fail liblo:x64-uwp=fail +liblsl:arm-neon-android=fail +liblsl:arm64-android=fail +liblsl:x64-android=fail libmagic:x64-uwp=fail libmagic:arm-uwp=fail +libmariadb:arm-neon-android=fail +libmariadb:arm64-android=fail libmariadb:arm64-windows = skip libmariadb:arm-uwp = skip +libmariadb:x64-android=fail libmariadb:x64-linux = skip libmariadb:x64-osx = skip libmariadb:arm64-osx = skip @@ -412,8 +738,11 @@ libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) +libmesh:arm-neon-android=skip +libmesh:arm64-android=skip libmesh:arm64-windows=skip libmesh:arm-uwp=skip +libmesh:x64-android=skip libmesh:x64-uwp=skip libmesh:x64-windows=skip libmesh:x64-windows-static=skip @@ -425,18 +754,38 @@ libmesh:x64-linux=skip # Build fails since PIC is not enabled and some configuration tests do not work properly on UWP libmicrodns:arm-uwp=fail libmicrodns:x64-uwp=fail +libmicrohttpd:x64-windows-static-md=fail +libmikmod:arm-neon-android=fail +libmikmod:arm64-android=fail +libmikmod:x64-android=fail libmodman:x64-windows-static=fail libmodplug:arm-uwp=fail libmodplug:x64-uwp=fail +libmpeg2:arm-neon-android=fail libmpeg2:arm-uwp=fail +libmpeg2:arm64-android=fail +libmpeg2:x64-android=fail libmpeg2:x64-linux=fail libmpeg2:x64-osx=fail libmpeg2:x64-uwp=fail +libmysql:arm-neon-android=fail +libmysql:arm64-android=fail +libmysql:x64-android=fail libmysql:x86-windows=fail libmysql:arm64-windows=fail +libopensp:arm-neon-android=fail +libopensp:arm64-android=fail +libopensp:x64-android=fail libopusenc:arm-uwp=fail libopusenc:x64-uwp=fail +libosip2:arm-neon-android=fail +libosip2:arm64-android=fail +libosip2:x64-android=fail libosip2:x64-windows-static-md=fail +libp7client:x64-android=fail +libphonenumber:arm-neon-android=fail +libphonenumber:arm64-android=fail +libphonenumber:x64-android=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip libpng-apng:x64-linux = skip @@ -447,7 +796,10 @@ libpng-apng:x64-windows-static = skip libpng-apng:x64-windows-static-md=skip libpng-apng:x86-windows = skip # The developer of libqcow does not offer stable release archives +libqcow:arm-neon-android=skip libqcow:arm-uwp=skip +libqcow:arm64-android=skip +libqcow:x64-android=skip libqcow:x64-uwp=skip libqcow:x64-windows-static=skip libqcow:x64-windows-static-md=skip @@ -473,13 +825,23 @@ libspatialite:arm-uwp=fail libspatialite:x64-uwp=fail libssh:arm-uwp=fail libssh:x64-uwp=fail +libtar:arm-neon-android=fail +libtar:arm64-android=fail +libtcod:arm-neon-android=fail +libtcod:arm64-android=fail +libtcod:x64-android=fail +libtins:arm-neon-android=fail libtins:arm-uwp=fail +libtins:arm64-android=fail +libtins:x64-android=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm-uwp=fail +libusb:arm-neon-android=fail libusb:arm-uwp=fail +libusb:arm64-android=fail +libusb:x64-android=fail libusb:x64-uwp=fail -libusb:arm64-windows=fail libusb-win32:arm-uwp=fail libusb-win32:x64-linux=fail libusb-win32:x64-osx=fail @@ -497,6 +859,10 @@ libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip libvmdk:arm64-osx=skip +libvpx:arm-neon-android=fail +libwandio:arm-neon-android=fail +libwandio:arm64-android=fail +libwandio:x64-android=fail libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail @@ -507,26 +873,46 @@ libwandio:arm-uwp=fail libxaw:x64-windows-static=skip # clang-cl ICEd libxt:arm64-windows=fail +libzen:arm-neon-android=fail licensepp:arm-uwp=fail licensepp:x64-uwp=fail linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail +linenoise-ng:x64-windows-static-md=fail +live555:arm-neon-android=fail live555:arm-uwp=fail +live555:arm64-android=fail +live555:x64-android=fail live555:x64-osx=fail live555:arm64-osx=fail live555:x64-uwp=fail # fails due to an outdated gcc version llfio:x64-linux=fail +llgl:arm-neon-android=fail +llgl:arm64-android=fail +llgl:x64-android=fail +llvm:arm-neon-android=fail +llvm:arm64-android=fail +llvm:x64-android=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cxx:arm-uwp=fail log4cxx:x64-uwp=fail +loguru:arm-neon-android=fail +loguru:arm64-android=fail +loguru:x64-android=fail luajit:arm64-windows=fail luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail lzfse:arm-uwp=fail +magnum:arm-neon-android=fail +magnum:arm64-android=fail magnum:arm64-windows=skip +magnum:x64-android=fail +mchehab-zbar:arm-neon-android=fail +mchehab-zbar:arm64-android=fail +mchehab-zbar:x64-android=fail mecab:arm64-windows = skip mecab:arm-uwp = skip mecab:x64-linux = skip @@ -535,15 +921,27 @@ mecab:x64-windows = skip mecab:x64-windows-static = skip mecab:x64-windows-static-md=skip mecab:x86-windows = skip +memorymodule:arm-neon-android=fail +memorymodule:arm64-android=fail +memorymodule:x64-android=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail mfl:x64-linux=fail # requires a c++20 compiler +mfx-dispatch:arm-neon-android=fail +mfx-dispatch:arm64-android=fail +mfx-dispatch:x64-android=fail milerius-sfml-imgui:x64-windows-static=fail +mimalloc:arm-neon-android=fail +mimalloc:arm64-android=fail +mimalloc:x64-android=fail +minifb:arm-neon-android=fail +minifb:arm64-android=fail +minifb:x64-android=fail +minio-cpp:arm-neon-android=fail +miniply:arm-neon-android=fail miniupnpc:arm-uwp=fail miniupnpc:x64-uwp=fail -minizip:arm-uwp=fail -minizip:x64-uwp=fail # Conflicts with signalrclient microsoft-signalr:arm64-windows=skip microsoft-signalr:arm-uwp=skip @@ -557,6 +955,29 @@ microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail +monkeys-audio:arm-neon-android=fail +monkeys-audio:arm64-android=fail +monkeys-audio:x64-android=fail +moos-core:arm-neon-android=fail +moos-core:arm64-android=fail +moos-core:x64-android=fail +mozjpeg:arm-neon-android=fail +mozjpeg:arm64-android=fail +mozjpeg:x64-android=fail +mp-units:arm-neon-android=fail +mp-units:arm64-android=fail +mp-units:x64-android=fail +mp3lame:arm-neon-android=fail +mp3lame:arm64-android=fail +mp3lame:x64-android=fail +mpir:x64-android=fail +# these ports require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines +ms-gdkx:x64-windows=fail +ms-gdkx:x64-windows-static=fail +ms-gdkx:x64-windows-static-md=fail +ms-gltf:arm-neon-android=fail +ms-gltf:arm64-android=fail +ms-gltf:x64-android=fail ms-quic:arm-uwp=fail ms-quic:arm64-windows=fail ms-quic:x64-uwp=fail @@ -599,8 +1020,15 @@ msmpi:x64-osx=fail msmpi:x64-uwp=fail munit:arm-uwp=fail munit:arm64-windows=fail +munit:x64-android=fail munit:x64-uwp=fail +mysql-connector-cpp:arm-neon-android=fail +mysql-connector-cpp:arm64-android=fail +mysql-connector-cpp:x64-android=fail +nana:arm-neon-android=fail nana:arm-uwp=fail +nana:arm64-android=fail +nana:x64-android=fail nana:x64-linux=fail nana:x64-osx=fail nana:x64-uwp=fail @@ -609,11 +1037,17 @@ nanodbc:x64-uwp=fail nanodbc:x64-linux=skip nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail -nettle:arm-uwp=fail -nettle:arm64-windows=fail +netcdf-cxx4:x64-windows-static-md=fail +ngspice:x64-android=fail ngspice:x64-windows-static=fail +nmap:arm-neon-android=fail +nmap:arm64-android=fail +nmap:x64-android=fail nng:arm-uwp=fail nng:x64-uwp=fail +nrf-ble-driver:arm-neon-android=fail +nrf-ble-driver:arm64-android=fail +nrf-ble-driver:x64-android=fail numactl:arm64-windows=fail numactl:arm-uwp=fail numactl:x64-osx=fail @@ -622,9 +1056,8 @@ numactl:x64-windows=fail numactl:x64-windows-static=fail numactl:x64-windows-static-md=fail numactl:x86-windows=fail -ocilib:arm-uwp=fail -ocilib:arm64-windows=fail -ocilib:x64-uwp=fail +nvtt:x64-android=fail +oatpp-libressl:x64-android=fail ocilib:x64-windows-static-md=fail octomap:arm-uwp=fail octomap:x64-uwp=fail @@ -633,6 +1066,7 @@ ode:arm-uwp=fail ode:x64-uwp=fail offscale-libetcd-cpp:arm-uwp=fail offscale-libetcd-cpp:x64-uwp=fail +ogdf:arm64-android=fail ogre:arm64-osx=fail # Conflicts with ogre ogre-next:arm64-windows = skip @@ -645,6 +1079,7 @@ ogre-next:x64-windows = skip ogre-next:x64-windows-static = skip ogre-next:x64-windows-static-md=skip ogre-next:x86-windows = skip +ois:x64-android=fail # ompl is vulnerable to some form of race in its dependent ports, and adding 'ode' as a dependency # does not resolve the issue # src/ompl/CMakeFiles/ompl.dir/extensions/ode/src/OpenDEStateValidityChecker.cpp.o @@ -654,20 +1089,34 @@ ogre-next:x86-windows = skip # /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_filesystem.a # /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_system.a -lpthread && : # /usr/bin/ld: cannot find -lode +ompl:arm-neon-android=fail +ompl:arm64-android=fail +ompl:x64-android=fail ompl:x64-osx=fail ompl:arm64-osx=fail ompl:x64-linux=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected +omplapp:arm64-android=fail +omplapp:x64-android=fail +onednn:x64-android=fail +open62541:x64-windows-static-md=fail +openblas:arm-neon-android=fail +openblas:arm64-android=fail +openblas:x64-android=fail opencc:arm64-windows=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. opencc:arm-uwp=fail +opencc:x64-android=fail opencc:x64-uwp=fail opencl:arm-uwp=fail opencl:x64-uwp=fail opencsg:arm-uwp=fail opencsg:x64-uwp=fail +opencv2:arm-neon-android=fail +opencv2:arm64-android=fail opencv2:arm64-windows = skip opencv2:arm-uwp = skip +opencv2:x64-android=fail opencv2:x64-linux = skip opencv2:x64-osx = skip opencv2:x64-uwp = skip @@ -686,12 +1135,27 @@ opencv3:x64-windows-static-md = skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail +openfbx:arm-neon-android=fail +openimageio:arm-neon-android=fail +openimageio:arm64-android=fail +openimageio:x64-android=fail +openldap:arm-neon-android=fail +openldap:arm64-android=fail +openldap:x64-android=fail openmama:x64-windows-static-md=fail openmesh:arm64-windows=fail openmesh:arm-uwp=fail openmesh:x64-uwp=fail -openscap:x64-windows-static=fail +openmpi:arm-neon-android=fail +openmpi:arm64-android=fail +openmpi:x64-android=fail +openscap:arm-neon-android=fail +openscap:arm64-android=fail +openscap:x64-android=fail openscap:x64-osx=fail +openscap:x64-windows-static-md=fail +openscap:x64-windows-static=fail +opensubdiv:x64-android=fail # osx needs bison 3.4 installed openturns:x64-osx=fail # https://github.com/AcademySoftwareFoundation/openvdb/issues/1362 @@ -714,17 +1178,34 @@ optional-bare:x64-windows = skip optional-bare:x64-windows-static = skip optional-bare:x64-windows-static-md=skip optional-bare:x86-windows = skip +optional-lite:arm-neon-android=fail +optional-lite:arm64-android=fail +optional-lite:x64-android=fail opusfile:arm-uwp=fail opusfile:x64-uwp=fail +orc:arm-neon-android=fail +orc:arm64-android=fail +orc:x64-android=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail +pcl:arm-neon-android=fail +pcl:arm64-android=fail +pcl:x64-android=fail +pfring:arm-neon-android=fail +pfring:arm64-android=fail +pfring:x64-android=fail pfring:x64-osx=fail pfring:arm64-osx=fail # pfring on Linux currently fails because its build scripts enable warnings as # errors, and warnings trigger with the Linux kernel headers in the Azure images. pfring:x64-linux=fail +pixman:arm-neon-android=fail +pixman:arm64-android=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail +plib:arm-neon-android=fail +plib:arm64-android=fail +plib:x64-android=fail plibsys:arm-uwp=fail plibsys:x64-uwp=fail plplot:arm64-windows=fail @@ -732,22 +1213,38 @@ plplot:arm-uwp=fail plplot:x64-uwp=fail pmdk:arm-uwp=fail pmdk:arm64-windows=fail +pmdk:x64-android=fail pmdk:x64-linux=fail pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail pmdk:x86-windows=fail +polyhook2:x64-android=fail popsift:x64-windows-static-md=fail popsift:x64-linux=fail # segfaults :( portable-snippets:arm-uwp=fail +ptex:arm-neon-android=fail +ptex:arm64-android=fail +ptex:x64-android=fail +python2:arm-neon-android=fail +python2:arm64-android=fail +python2:x64-android=fail +python3:arm-neon-android=fail +python3:arm64-android=fail +python3:x64-android=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail +qpid-proton:arm-neon-android=fail qpid-proton:arm-uwp=fail +qpid-proton:arm64-android=fail +qpid-proton:x64-android=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail +qt5-base:arm-neon-android=fail +qt5-base:arm64-android=fail qt5-base:arm64-windows=fail - +qt5-base:x64-android=fail # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip @@ -773,11 +1270,19 @@ qt5-webengine:x86-windows=skip # Missing system libraries qt5-x11extras:x64-osx=fail qt5-x11extras:arm64-osx=fail +quickfix:arm-neon-android=fail +quickfix:arm64-android=fail qwt:arm64-osx=fail qwt-qt6:x64-osx=fail +rabit:arm-neon-android=fail +rabit:arm64-android=fail rabit:arm64-osx=fail +rabit:x64-android=fail +range-v3-vs2015:arm-neon-android=fail +range-v3-vs2015:arm64-android=fail range-v3-vs2015:arm64-windows = skip range-v3-vs2015:arm-uwp = skip +range-v3-vs2015:x64-android=fail range-v3-vs2015:x64-linux = skip range-v3-vs2015:x64-osx = skip range-v3-vs2015:arm64-osx = skip @@ -786,6 +1291,9 @@ range-v3-vs2015:x64-windows = skip range-v3-vs2015:x64-windows-static = skip range-v3-vs2015:x64-windows-static-md=skip range-v3-vs2015:x86-windows = skip +range-v3:arm-neon-android=fail +range-v3:arm64-android=fail +range-v3:x64-android=fail rapidstring:arm64-windows=fail rapidstring:arm-uwp=fail rapidstring:x64-linux=fail @@ -807,14 +1315,25 @@ rbdl-orb:arm-uwp=skip rbdl-orb:arm64-windows=skip rbdl-orb:x64-linux=skip rbdl-orb:x64-osx=skip +rbdl:arm-neon-android=fail +rbdl:arm64-android=fail +rbdl:x64-android=fail readline:arm-uwp=fail readline:x64-uwp=fail realsense2:arm64-windows=fail realsense2:arm-uwp=fail realsense2:x64-uwp=fail +replxx:arm-neon-android=fail replxx:arm-uwp=fail +replxx:arm64-android=fail +replxx:x64-android=fail replxx:x64-uwp=fail +rest-rpc:arm-neon-android=fail +rest-rpc:arm64-android=fail +rest-rpc:x64-android=fail +restbed:arm-neon-android=fail restbed:arm-uwp=fail +restbed:arm64-android=fail restbed:x64-uwp=fail # file conflicts with msgpack rest-rpc:x86-windows=skip @@ -828,6 +1347,7 @@ rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rest-rpc:arm64-osx=skip rhash:arm64-windows=fail +rocksdb:arm-neon-android=fail rocksdb:arm-uwp=fail rocksdb:x64-uwp=fail rpclib:arm64-windows=fail @@ -848,6 +1368,9 @@ rsasynccpp:x64-linux=fail rsasynccpp:x64-osx=fail # Requires g++10 but CI compiler only has g++9 rsm-binary-io:x64-linux=fail +rsm-bsa:arm-neon-android=fail +rsm-bsa:arm64-android=fail +rsm-bsa:x64-android=fail # Requires g++10 but CI compiler only has g++9 rsm-bsa:x64-linux=fail rtlsdr:x64-uwp=fail @@ -856,8 +1379,17 @@ rtlsdr:arm-uwp=fail rtlsdr:x64-linux=fail rtlsdr:x64-osx=fail +rttr:arm-neon-android=fail +rttr:arm64-android=fail +rttr:x64-android=fail +scintilla:arm-neon-android=fail +scintilla:arm64-android=fail +scintilla:x64-android=fail +sciter:arm-neon-android=fail +sciter:arm64-android=fail sciter:arm64-windows=skip sciter:arm-uwp=skip +sciter:x64-android=fail sciter:x64-linux=skip sciter:x64-osx=skip sciter:arm64-osx=skip @@ -876,11 +1408,22 @@ sdformat6:x64-windows-static-md=fail sdformat9:arm-uwp=fail sdformat9:x64-uwp=fail sdformat9:x64-windows-static-md=fail +sdl1:arm-neon-android=fail +sdl1:arm64-android=fail +sdl1:x64-android=fail sdl2-net:arm-uwp=fail sdl2-net:x64-uwp=fail +sentencepiece:arm-neon-android=fail +sentencepiece:arm64-android=fail +sentencepiece:x64-android=fail +sentencepiece:x64-windows-static-md=fail septag-sx:arm64-windows=fail septag-sx:arm-uwp=fail +septag-sx:x64-android=fail septag-sx:x64-uwp=fail +sfml:arm-neon-android=fail +sfml:arm64-android=fail +sfml:x64-android=fail shiva:x64-windows-static=fail shiva:x64-windows-static-md=fail shiva-sfml:x64-linux=fail @@ -896,25 +1439,66 @@ shogun:x64-windows = skip shogun:x64-windows-static = skip shogun:x64-windows-static-md=skip shogun:x86-windows = skip +signalrclient:arm-neon-android=fail +signalrclient:arm64-android=fail +signalrclient:x64-android=fail signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail simbody:arm64-windows=fail +simd:arm-neon-android=fail +simd:arm64-android=fail +simd:x64-android=fail +sjpeg:arm-neon-android=fail +sjpeg:arm64-android=fail +sjpeg:x64-android=fail +skia:arm-neon-android=fail +skia:arm64-android=fail +skia:x64-android=fail +sleef:arm-neon-android=fail +sleef:arm64-android=fail +sleef:x64-android=fail sleef:x86-windows=fail +sleepy-discord:arm-neon-android=fail +sleepy-discord:arm64-android=fail +slikenet:arm-neon-android=fail slikenet:arm-uwp=fail +slikenet:arm64-android=fail +slikenet:x64-android=fail slikenet:x64-uwp=fail +smpeg2:arm-neon-android=fail +smpeg2:arm64-android=fail +smpeg2:x64-android=fail smpeg2:x64-linux=fail sockpp:arm-uwp=fail sockpp:x64-uwp=fail +soem:arm-neon-android=fail +soem:arm64-android=fail +soem:x64-android=fail +soil2:arm-neon-android=fail soil2:arm-uwp=fail +soil2:arm64-android=fail +soil2:x64-android=fail soil2:x64-uwp=fail +soil:arm-neon-android=fail +soil:arm64-android=fail +soil:x64-android=fail +solid3:arm64-android=fail soqt:arm64-windows=fail soqt:arm-uwp=fail soqt:x64-uwp=fail soundtouch:arm-uwp=fail soundtouch:x64-uwp=fail +spaceland:arm64-android=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail +spaceland:x64-android=fail spaceland:x64-uwp=fail +spatialite-tools:arm-neon-android=fail +spatialite-tools:arm64-android=fail +spatialite-tools:x64-android=fail +spdk-isal:arm-neon-android=fail +spdk-isal:arm64-android=fail +spdk-isal:x64-android=fail spdk:x64-linux=fail spdk-dpdk:arm64-windows=fail spdk-dpdk:arm-uwp=fail @@ -934,8 +1518,18 @@ spdk-ipsec:x64-windows-static-md=fail spdk-ipsec:x86-windows=fail # Conflict with isal, and "internal" dep of spdk:x64-linux=fail spdk-isal:x64-linux=skip +spscqueue:arm-neon-android=fail +spscqueue:arm64-android=fail +spscqueue:x64-android=fail +status-code:arm-neon-android=fail +status-code:arm64-android=fail +status-code:x64-android=fail stormlib:arm-uwp=fail stormlib:x64-uwp=fail +stx:arm-neon-android=fail +stx:arm64-android=fail +stx:x64-android=fail +stxxl:arm-neon-android=fail stxxl:arm-uwp=fail stxxl:x64-uwp=fail # upstream issue https://github.com/stxxl/stxxl/issues/99 @@ -944,40 +1538,75 @@ stxxl:x64-windows=skip stxxl:x64-windows-static=skip stxxl:x64-windows-static-md=skip symengine:arm-uwp=fail +symengine:x64-windows-static-md=fail systemc:arm64-windows=fail systemc:arm-uwp=fail systemc:x64-uwp=fail +szip:arm-neon-android=fail +szip:arm64-android=fail +szip:x64-android=fail +tcl:arm-neon-android=fail tcl:arm-uwp=fail +tcl:arm64-android=fail tcl:arm64-windows=fail +tcl:x64-android=fail tcl:x64-uwp=fail +teemo:x64-android=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail # tensorflow does not support VS2022 -tensorflow:x64-windows=fail -tensorflow:x64-windows-static=fail +tensorflow:x64-android=fail tensorflow:x64-windows-static-md=fail -tensorflow-cc:x64-windows=fail -tensorflow-cc:x64-windows-static=fail +tensorflow:x64-windows-static=fail +tensorflow:x64-windows=fail +tensorflow-cc:x64-android=fail tensorflow-cc:x64-windows-static-md=fail +tensorflow-cc:x64-windows-static=fail +tensorflow-cc:x64-windows=fail +tesseract:arm-neon-android=fail +tesseract:arm64-android=fail +tesseract:x64-android=fail +thorvg:arm-neon-android=fail +thorvg:arm64-android=fail +thorvg:x64-android=fail tidy-html5:arm-uwp=fail tidy-html5:x64-uwp=fail tinkerforge:arm-uwp=fail tinkerforge:x64-uwp=fail tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail +tinycthread:arm-neon-android=fail +tinycthread:arm64-android=fail +tinycthread:x64-android=fail +tlx:arm-neon-android=fail +tlx:arm64-android=fail +tlx:x64-android=fail +tmxlite:arm-neon-android=fail +tmxlite:arm64-android=fail +tmxlite:x64-android=fail +torch-th:arm-neon-android=fail +torch-th:arm64-android=fail torch-th:arm64-windows=fail torch-th:arm-uwp=fail +torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail treehopper:x64-windows-static=fail treehopper:x64-linux=fail -unicorn-lib:arm-uwp=fail -unicorn-lib:x64-uwp=fail +turbobase64:arm-neon-android=fail +tvision:arm-neon-android=fail +tvision:arm64-android=fail +tvision:x64-android=fail +unicorn:x64-windows-static-md=fail +unittest-cpp:arm-neon-android=fail +unittest-cpp:arm64-android=fail unittest-cpp:arm64-windows=fail unittest-cpp:arm-uwp=fail +unittest-cpp:x64-android=fail unittest-cpp:x64-uwp=fail +usbmuxd:x64-windows-static-md=fail # USD has set official policy that they will not update to be compatible with TBB in the near term (https://github.com/PixarAnimationStudios/USD/issues/1600) usd:arm64-windows=skip usd:arm-uwp=skip @@ -990,14 +1619,29 @@ usd:x64-osx=skip usd:x86-windows=skip uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail -v8:arm64-windows=fail +# the version of v8 we have in the repo doesn't support VS2022 v8:arm-uwp=fail +v8:arm64-windows=fail +v8:x64-android=fail v8:x64-osx=fail v8:x64-uwp=fail +v8:x64-windows-static-md=fail +v8:x64-windows-static=fail +v8:x64-windows=fail +v8:x86-windows=fail vectorclass:arm64-windows=fail vectorclass:arm-uwp=fail +vowpal-wabbit:arm-neon-android=fail +vowpal-wabbit:arm64-android=fail +vowpal-wabbit:x64-android=fail +vtk-m:arm-neon-android=fail +vtk-m:arm64-android=fail +vtk-m:x64-android=fail +vulkan:arm-neon-android=fail +vulkan:arm64-android=fail vulkan:arm64-windows=fail vulkan:arm-uwp=fail +vulkan:x64-android=fail vulkan:x64-linux=fail vulkan:x64-osx=fail vulkan:arm64-osx=fail @@ -1008,8 +1652,11 @@ vulkan:x64-windows-static-md=fail vulkan:x86-windows=fail # Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) # conflicts with qt5-location +vxl:arm-neon-android=skip +vxl:arm64-android=skip vxl:arm64-windows = skip vxl:arm-uwp = skip +vxl:x64-android=fail vxl:x64-linux = skip vxl:x64-osx = skip vxl:x64-uwp = skip @@ -1017,6 +1664,11 @@ vxl:x64-windows = skip vxl:x64-windows-static = skip vxl:x64-windows-static-md=skip vxl:x86-windows = skip +wasmedge:arm-neon-android=fail +wasmedge:arm64-android=fail +wasmedge:x64-android=fail +wavpack:arm-neon-android=fail +wavpack:x64-android=fail winpcap:arm64-windows = skip winpcap:arm-uwp = skip winpcap:x64-uwp = skip @@ -1025,17 +1677,37 @@ winpcap:x64-windows-static = skip winpcap:x64-windows-static-md=skip winpcap:x86-windows = skip winsock2:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 +wordnet:arm-neon-android=fail +wordnet:arm64-android=fail +wordnet:x64-android=fail +workflow:arm-neon-android=fail +workflow:arm-uwp=fail +workflow:arm64-android=fail +workflow:x64-android=fail +workflow:x64-uwp=fail +wpilib:arm-neon-android=fail +wpilib:arm64-android=fail wpilib:arm64-windows=fail +wpilib:x64-android=fail wpilib:x64-osx=fail wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 +x264:arm-neon-android=fail +x264:arm64-android=fail +x265:arm-neon-android=fail +x265:arm64-android=fail x265:arm64-windows=fail x265:arm-uwp=fail +x265:x64-android=fail x265:x64-uwp=fail -xalan-c:x64-windows-static=fail -xalan-c:arm64-windows=fail # No xorg-macros available on osx +xbitmaps:arm-neon-android=fail +xbitmaps:arm64-android=fail +xbitmaps:x64-android=fail xbitmaps:x64-osx=skip +xerces-c:arm-neon-android=fail xerces-c:arm-uwp=fail +xerces-c:arm64-android=fail +xerces-c:x64-android=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail @@ -1043,57 +1715,15 @@ yara:arm-uwp=fail yara:x64-uwp=fail z3:arm-uwp=fail z3:x64-uwp=fail - -# clapack is replaced by lapack-reference on the platforms lapack-reference supports -clapack:x64-linux=skip -clapack:x64-osx=skip -clapack:arm64-osx=skip -clapack:x64-windows-static=skip -clapack:x64-windows-static-md=skip -clapack:x64-windows=skip -clapack:x86-windows=skip -lapack-reference:arm64-windows=skip -lapack-reference:arm-uwp=skip -lapack-reference:x64-uwp=skip - -# failures for x64-windows-static-md -ace:x64-windows-static-md=fail -ijg-libjpeg:x64-windows-static-md=fail -libcerf:x64-windows-static-md=fail -libmicrohttpd:x64-windows-static-md=fail -linenoise-ng:x64-windows-static-md=fail -netcdf-cxx4:x64-windows-static-md=fail -open62541:x64-windows-static-md=fail -openscap:x64-windows-static-md=fail -sentencepiece:x64-windows-static-md=fail -symengine:x64-windows-static-md=fail -unicorn:x64-windows-static-md=fail - -# these ports require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines -ms-gdkx:x64-windows=fail -ms-gdkx:x64-windows-static=fail -ms-gdkx:x64-windows-static-md=fail - -# the version of v8 we have in the repo doesn't support VS2022 -v8:x86-windows=fail -v8:x64-windows=fail -v8:x64-windows-static=fail -v8:x64-windows-static-md=fail - -zyre:x64-windows-static-md=fail -usbmuxd:x64-windows-static-md=fail -workflow:x64-uwp=fail -workflow:arm-uwp=fail - -# VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the -# upstream build script of this port. -# See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 -dimcli:x64-windows-static-md=fail -dimcli:x64-windows-static=fail - -zeroc-ice:x86-windows=fail +zeroc-ice:arm-neon-android=fail +zeroc-ice:arm64-android=fail +zeroc-ice:x64-android=fail zeroc-ice:x64-windows=fail -zeroc-ice:x64-windows-static-md=fail +zeroc-ice:x86-windows=fail +ztd-text:arm-neon-android=fail +ztd-text:arm64-android=fail +ztd-text:x64-android=fail +zyre:x64-windows-static-md=fail # Ports which needs to pass in CI cmake:x64-windows=pass diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 67441df14b5499..736d463238b802 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -1,45 +1,49 @@ -# Mirror list from https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys -# Sourceforge is not used because it does not keep older package versions +# Full mirror list: https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys set(Z_VCPKG_ACQUIRE_MSYS_MIRRORS - "https://www2.futureware.at/~nickoe/msys2-mirror/" + # Alternative primary + "https://repo.msys2.org/" + # Tier 1 "https://mirror.yandex.ru/mirrors/msys2/" "https://mirrors.tuna.tsinghua.edu.cn/msys2/" "https://mirrors.ustc.edu.cn/msys2/" - "https://mirror.bit.edu.cn/msys2/" "https://mirror.selfnet.de/msys2/" - "https://mirrors.sjtug.sjtu.edu.cn/msys2/" ) +# Downloads the given package function(z_vcpkg_acquire_msys_download_package out_archive) cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "URL;SHA512;FILENAME" "") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_download_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") endif() - set(all_urls "${arg_URL}") - + string(REPLACE "https://repo.msys2.org/" "https://mirror.msys2.org/" all_urls "${arg_URL}") foreach(mirror IN LISTS Z_VCPKG_ACQUIRE_MSYS_MIRRORS) - string(REPLACE "https://repo.msys2.org/" "${mirror}" mirror_url "${arg_URL}") + string(REPLACE "https://mirror.msys2.org/" "${mirror}" mirror_url "${arg_URL}") list(APPEND all_urls "${mirror_url}") endforeach() vcpkg_download_distfile(msys_archive URLS ${all_urls} SHA512 "${arg_SHA512}" - FILENAME "msys-${arg_FILENAME}" + FILENAME "${arg_FILENAME}" QUIET ) set("${out_archive}" "${msys_archive}" PARENT_SCOPE) endfunction() -# writes to the following variables in parent scope: -# - Z_VCPKG_MSYS_ARCHIVES -# - Z_VCPKG_MSYS_TOTAL_HASH -# - Z_VCPKG_MSYS_PACKAGES -# - Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE +# Declares a package +# Writes to the following cache variables: +# - Z_VCPKG_MSYS_PACKAGES_AVAILABLE +# - Z_VCPKG_MSYS_${arg_NAME}_URL +# - Z_VCPKG_MSYS_${arg_NAME}_SHA512 +# - Z_VCPKG_MSYS_${arg_NAME}_FILENAME +# - Z_VCPKG_MSYS_${arg_NAME}_DEPS # - Z_VCPKG_MSYS_${arg_NAME}_PATCHES +# - Z_VCPKG_MSYS_${arg_NAME}_DIRECT +# - Z_VCPKG_MSYS_${arg_NAME}_PROVIDES +# - Z_VCPKG_MSYS_${alias}_PROVIDED_BY function(z_vcpkg_acquire_msys_declare_package) - cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS;PATCHES") + cmake_parse_arguments(PARSE_ARGV 0 arg "DIRECT" "NAME;URL;SHA512" "DEPS;PATCHES;PROVIDES") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") @@ -50,37 +54,104 @@ function(z_vcpkg_acquire_msys_declare_package) endif() endforeach() - if(NOT arg_URL MATCHES [[^https://repo\.msys2\.org/.*/(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$]]) - message(FATAL_ERROR "internal error: regex does not match supplied URL to vcpkg_acquire_msys: ${arg_URL}") + if(arg_DIRECT) + if(NOT arg_NAME) + message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package requires argument: NAME") + endif() + get_filename_component(filename "${arg_URL}" NAME) + else() + if(NOT arg_URL MATCHES [[^https://mirror\.msys2\.org/.*/(([^/]*)-[^-/]+-[^-/]+-[^-/]+\.pkg\.tar\.(xz|zst))$]]) + message(FATAL_ERROR "internal error: regex does not match supplied URL to vcpkg_acquire_msys: ${arg_URL}") + endif() + set(filename "msys2-${CMAKE_MATCH_1}") + if(NOT DEFINED arg_NAME) + set(arg_NAME "${CMAKE_MATCH_2}") + endif() + if(Z_VCPKG_MSYS_${arg_NAME}_DIRECT) + return() + endif() + if(arg_NAME IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE) + message(FATAL_ERROR "Redeclaration of package '${arg_NAME}'") + endif() endif() - set(filename "${CMAKE_MATCH_1}") - if(NOT DEFINED arg_NAME) - set(arg_NAME "${CMAKE_MATCH_2}") + list(APPEND Z_VCPKG_MSYS_PACKAGES_AVAILABLE "${arg_NAME}") + set(Z_VCPKG_MSYS_PACKAGES_AVAILABLE "${Z_VCPKG_MSYS_PACKAGES_AVAILABLE}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_URL "${arg_URL}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_SHA512 "${arg_SHA512}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_FILENAME "${filename}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_DEPS "${arg_DEPS}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_PATCHES "${arg_PATCHES}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_DIRECT "${arg_DIRECT}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_PROVIDES "${arg_PROVIDES}" CACHE INTERNAL "") + foreach(name IN LISTS arg_PROVIDES) + set(Z_VCPKG_MSYS_${name}_PROVIDED_BY "${arg_NAME}" CACHE INTERNAL "") + endforeach() +endfunction() + +# Collects all required packages to satisfy the given input set +# Writes to the following cache variables: +# - Z_VCPKG_MSYS__ARCHIVE +function(z_vcpkg_acquire_msys_download_packages) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "OUT_UNKNOWN;OUT_RESOLVED" "PACKAGES") + set(backlog "${arg_PACKAGES}") + list(REMOVE_DUPLICATES backlog) + + list(FILTER arg_PACKAGES EXCLUDE REGEX "^mingw64") + if(NOT arg_PACKAGES STREQUAL "" AND NOT "msys2-runtime" IN_LIST arg_PACKAGES) + list(APPEND backlog "msys2-runtime") endif() - if("${arg_NAME}" IN_LIST Z_VCPKG_MSYS_PACKAGES OR arg_Z_ALL_PACKAGES) - list(REMOVE_ITEM Z_VCPKG_MSYS_PACKAGES "${arg_NAME}") - list(APPEND Z_VCPKG_MSYS_PACKAGES ${arg_DEPS}) - set(Z_VCPKG_MSYS_PACKAGES "${Z_VCPKG_MSYS_PACKAGES}" PARENT_SCOPE) + set(unknown "") + set(resolved "") + set(need_msys_runtime 0) + while(NOT backlog STREQUAL "") + list(POP_FRONT backlog name) + if(DEFINED Z_VCPKG_MSYS_${name}_PROVIDED_BY AND NOT name IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE) + set(name "${Z_VCPKG_MSYS_${name}_PROVIDED_BY}") + if(name IN_LIST resolved) + continue() + endif() + endif() + if(NOT name IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE) + list(APPEND unknown "${name}") + continue() + endif() + list(APPEND resolved "${name}") + list(REMOVE_ITEM Z_VCPKG_MSYS_${name}_DEPS ${resolved} ${backlog}) + list(APPEND backlog ${Z_VCPKG_MSYS_${name}_DEPS}) z_vcpkg_acquire_msys_download_package(archive - URL "${arg_URL}" - SHA512 "${arg_SHA512}" - FILENAME "${filename}" + URL "${Z_VCPKG_MSYS_${name}_URL}" + SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}" + FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}" ) + set(Z_VCPKG_MSYS_${name}_ARCHIVE "${archive}" CACHE INTERNAL "") + endwhile() + if(DEFINED arg_OUT_UNKNOWN) + set("${arg_OUT_UNKNOWN}" "${unknown}" PARENT_SCOPE) + endif() + if(DEFINED arg_OUT_RESOLVED) + set("${arg_OUT_RESOLVED}" "${resolved}" PARENT_SCOPE) + endif() +endfunction() - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${arg_NAME}") - set(Z_VCPKG_MSYS_ARCHIVES "${Z_VCPKG_MSYS_ARCHIVES}" PARENT_SCOPE) - set(Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE "${archive}" PARENT_SCOPE) - set(Z_VCPKG_MSYS_${arg_NAME}_PATCHES "${arg_PATCHES}" PARENT_SCOPE) - string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${arg_SHA512}") - foreach(patch IN LISTS arg_PATCHES) +# Returns a stable collection of hashes, regardless of package order +function(z_vcpkg_acquire_msys_collect_hashes out_hash) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "" "PACKAGES") + list(SORT arg_PACKAGES) + set(result "") + foreach(name IN LISTS arg_PACKAGES) + if(NOT DEFINED Z_VCPKG_MSYS_${name}_SHA512) + message(FATAL_ERROR "SHA512 unknown for '${name}'.") + endif() + string(APPEND result "${Z_VCPKG_MSYS_${name}_SHA512}") + foreach(patch IN LISTS Z_VCPKG_MSYS_${name}_PATCHES) file(SHA512 "${patch}" patch_sha) - string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${patch_sha}") + string(APPEND result "${patch_sha}") endforeach() - set(Z_VCPKG_MSYS_TOTAL_HASH "${Z_VCPKG_MSYS_TOTAL_HASH}" PARENT_SCOPE) - endif() + endforeach() + set(${out_hash} "${result}" PARENT_SCOPE) endfunction() function(vcpkg_acquire_msys out_msys_root) @@ -94,13 +165,12 @@ function(vcpkg_acquire_msys out_msys_root) message(WARNING "vcpkg_acquire_msys was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - set(Z_VCPKG_MSYS_TOTAL_HASH "") - set(Z_VCPKG_MSYS_ARCHIVES "") - - set(Z_VCPKG_MSYS_PACKAGES "${arg_PACKAGES}") - - if(NOT arg_NO_DEFAULT_PACKAGES) - list(APPEND Z_VCPKG_MSYS_PACKAGES bash coreutils sed grep gawk gzip diffutils make pkg-config) + z_vcpkg_acquire_msys_declare_all_packages() + set(requested "${arg_PACKAGES}") + if(arg_Z_ALL_PACKAGES) + set(requested "${Z_VCPKG_MSYS_PACKAGES_AVAILABLE}") + elseif(NOT arg_NO_DEFAULT_PACKAGES) + list(APPEND requested bash coreutils file gawk grep gzip diffutils make pkgconf sed) endif() if(DEFINED arg_DIRECT_PACKAGES AND NOT arg_DIRECT_PACKAGES STREQUAL "") @@ -113,421 +183,456 @@ function(vcpkg_acquire_msys out_msys_root) message(FATAL_ERROR "vcpkg_acquire_msys(... DIRECT_PACKAGES ...) requires exactly pairs of URL/SHA512") endif() + set(direct_packages "") # direct_packages_last > direct_packages_number - 1 > 0 - 1 >= 0, so this is fine foreach(index RANGE "${direct_packages_last}") math(EXPR url_index "${index} * 2") math(EXPR sha512_index "${url_index} + 1") list(GET arg_DIRECT_PACKAGES "${url_index}" url) list(GET arg_DIRECT_PACKAGES "${sha512_index}" sha512) - get_filename_component(filename "${url}" NAME) - z_vcpkg_acquire_msys_download_package(archive + if(NOT filename MATCHES "^(.*)-[^-]+-[^-]+-[^-]+\.pkg\.tar\..*$") + message(FATAL_ERROR "Cannot determine package name for '${filename}'") + endif() + set(pkg_name "${CMAKE_MATCH_1}") + z_vcpkg_acquire_msys_declare_package( + NAME "${pkg_name}" URL "${url}" SHA512 "${sha512}" - FILENAME "${filename}" + DIRECT ) - string(REGEX MATCH "^(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$" pkg_name "${filename}") - set(pkg_name "${CMAKE_MATCH_2}") - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${pkg_name}") - set(Z_VCPKG_MSYS_${pkg_name}_ARCHIVE "${archive}") - string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${sha512}") + list(APPEND direct_packages "${pkg_name}") endforeach() + list(INSERT requested 0 ${direct_packages}) + endif() + + z_vcpkg_acquire_msys_download_packages( + PACKAGES ${requested} + OUT_RESOLVED resolved + OUT_UNKNOWN unknown + ) + if(NOT unknown STREQUAL "") + message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${requested}): ${unknown} +This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") endif() + set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "${resolved}" CACHE INTERNAL "Export for CI") - # To add new entries, use https://packages.msys2.org/package/$PACKAGE?repo=msys + z_vcpkg_acquire_msys_collect_hashes(hashes PACKAGES ${resolved}) + string(SHA512 total_hash "${hashes}") + string(SUBSTRING "${total_hash}" 0 16 total_hash) + set(path_to_root "${DOWNLOADS}/tools/msys2/${total_hash}") + + if(NOT EXISTS "${path_to_root}") + file(REMOVE_RECURSE "${path_to_root}.tmp") + file(MAKE_DIRECTORY "${path_to_root}.tmp/tmp") + foreach(name IN LISTS resolved) + file(ARCHIVE_EXTRACT + INPUT "${Z_VCPKG_MSYS_${name}_ARCHIVE}" + DESTINATION "${path_to_root}.tmp" + ) + if(Z_VCPKG_MSYS_${name}_PATCHES) + z_vcpkg_apply_patches( + SOURCE_PATH "${path_to_root}.tmp" + PATCHES ${Z_VCPKG_MSYS_${name}_PATCHES} + ) + endif() + endforeach() + file(RENAME "${path_to_root}.tmp" "${path_to_root}") + endif() + # Due to skipping the regular MSYS2 installer, + # some config files need to be established explicitly. + if(NOT EXISTS "${path_to_root}/etc/fstab") + # This fstab entry removes the cygdrive prefix from paths. + file(WRITE "${path_to_root}/etc/fstab" "none / cygdrive binary,posix=0,noacl,user 0 0") + endif() + message(STATUS "Using msys root at ${path_to_root}") + set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE) +endfunction() + + +macro(z_vcpkg_acquire_msys_declare_all_packages) + set(Z_VCPKG_MSYS_PACKAGES_AVAILABLE "" CACHE INTERNAL "") + + # The following list can be updated via test port vcpkg-ci-msys2[update-all]. + # Upstream binary package information is available via + # https://packages.msys2.org/search?t=binpkg&q= + + # msys subsystem z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz" - SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9 - DEPS libbz2 + URL "https://mirror.msys2.org/msys/x86_64/autoconf-wrapper-20221207-1-any.pkg.tar.zst" + SHA512 601ceb483ddf49d744ed7e365317d64777752e35010a1087082452afd42d8d29fc5331cb3fa4654eb09eec85416c8c5b70fed91a45acfaa667f06f80e6d42f30 + PROVIDES autoconf + DEPS autoconf2.71 bash sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" - SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e + URL "https://mirror.msys2.org/msys/x86_64/autoconf2.71-2.71-1-any.pkg.tar.zst" + SHA512 bf725b7d4440764fb21061c066b765193801a03c7ded03cf19ae85aee87ea54059c4283e56877e4e2a54cfec9ef65874160c2cb76de0d08f2550c6032f07c36e + DEPS awk bash diffutils m4 perl sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz" - SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c + URL "https://mirror.msys2.org/msys/x86_64/autoconf-archive-2022.09.03-1-any.pkg.tar.zst" + SHA512 d8567215c405632cd9ce232982c79aa1e8c063d13aac7c64a0ba84901c26710f0254ab72ab9ab464a9ec3fb7163ed60cb950b1f0509880f3378066b073a83d80 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gzip-1.11-1-x86_64.pkg.tar.zst" - SHA512 bcd9d7839aef5f2b73c4d39b51838e62626c201c808d512806ba0a1619aee83c7deddb0d499fd93f9815fe351d7ab656c31c9dc7ee1171d77ad6d598e04dfcbe - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/automake-wrapper-20221207-1-any.pkg.tar.zst" + SHA512 22a65f75d1f19788cab93ecf70cb653fcedf67c18285ccbd2bb74ed1303dae8b09e9cfff40e8733920e75d8c4754d59481fa0c5b07d0c28803809448b011f45f + PROVIDES automake + DEPS automake1.16 bash gawk ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/texinfo-6.8-3-x86_64.pkg.tar.zst" - SHA512 5cc16d3b3c3b9859fe61233fa27f2146526e2b4d6e626814d283b35bfd77bc15eb4ffaec00bde6c10df93466d9155a06854a7ecf2e0d9af746dd56c4d88d192e + URL "https://mirror.msys2.org/msys/x86_64/automake1.16-1.16.5-1-any.pkg.tar.zst" + SHA512 62c9dfe28d6f1d60310f49319723862d29fc1a49f7be82513a4bf1e2187ecd4023086faf9914ddb6701c7c1e066ac852c0209db2c058f3865910035372a4840a DEPS bash perl + PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch" ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bash-5.1.008-1-x86_64.pkg.tar.zst" - SHA512 a2ab8c958615134dc666254baca8cb13ed773036954e458de74ffb3bfe661bb33149082d38b677024da451755098a9201ab7dd435ced6e7f6b4e94c3ae368daf - DEPS msys2-runtime - ) - z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-3-any.pkg.tar.zst" - SHA512 f639deac9b2191c2096584cf374103bbb1e9d2476dd0ebec94b1e80da59be25b88e362ac5280487a89f0bb0ed57f99b66e314f36b7de9cda03c0974806a3a4e2 - DEPS m4 perl + URL "https://mirror.msys2.org/msys/x86_64/bash-5.2.015-1-x86_64.pkg.tar.zst" + SHA512 2a1e35ccabe023332454cc58f6b9d8c4fdf9fb823f4c8a99127fcf69ab6f7aca35a3d7ea0f4f97378c4f696ef397f48bd30c2379f41d8b5dffd2de0d6177e612 + PROVIDES sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-archive-2019.01.06-1-any.pkg.tar.xz" - SHA512 77540d3d3644d94a52ade1f5db27b7b4b5910bbcd6995195d511378ca6d394a1dd8d606d57161c744699e6c63c5e55dfe6e8664d032cc8c650af9fdbb2db08b0 - DEPS m4 perl + URL "https://mirror.msys2.org/msys/x86_64/binutils-2.40-1-x86_64.pkg.tar.zst" + SHA512 d7f00f93b54fd77102cc2e535303902d0958664eeacf09865a92e572a5bdca11e0782b7b89eb6412c3340a02fc581cbfeb074a5be1b75537422a2b28ed0e6773 + DEPS libiconv libintl zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/diffutils-3.8-2-x86_64.pkg.tar.zst" - SHA512 ee74e457c417d6978b3185f2fb8e15c9c30ecfc316c2474d69c978e7eb2282a3bd050d68dbf43d694cb5ab6f159b0e7ca319d01f8192071d82a224dde87d69b5 - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/bzip2-1.0.8-4-x86_64.pkg.tar.zst" + SHA512 1d2ce42c6775c0cb0fe9c2863c975fd076579131d0a5bce907355315f357df4ee66869c9c58325f5b698f3aba2413b2823deda86dd27fdb6e2e5e5d4de045259 + DEPS libbz2 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/binutils-2.37-5-x86_64.pkg.tar.zst" - SHA512 32129cf97b53d5f6d87b42f17643e9dfc2e41b9ab4e4dfdc10e69725a9349bb25e57e0937e7504798cae91f7a88e0f4f5814e9f6a021bb68779d023176d2f311 - DEPS libiconv libintl + URL "https://mirror.msys2.org/msys/x86_64/coreutils-8.32-5-x86_64.pkg.tar.zst" + SHA512 63f99348e654440458f26e9f52ae3289759a5a03428cf2fcf5ac7b47fdf7bf7f51d08e3346f074a21102bee6fa0aeaf88b8ebeba1e1f02a45c8f98f69c8db59c + DEPS libiconv libintl gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.7-3-x86_64.pkg.tar.zst" - SHA512 a202ddaefa93d8a4b15431dc514e3a6200c47275c5a0027c09cc32b28bc079b1b9a93d5ef65adafdc9aba5f76a42f3303b1492106ddf72e67f1801ebfe6d02cc - DEPS grep sed coreutils file findutils + URL "https://mirror.msys2.org/msys/x86_64/diffutils-3.9-1-x86_64.pkg.tar.zst" + SHA512 5858c7cfa84b2f79b8e61a34901f43af441cf6e792f534532aeafced4cee470241e72d117cffa5136ffa6ad1b04e2a4e0963080df1b380e9b2657dc7dd9bd193 + DEPS libiconv libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/file-5.41-2-x86_64.pkg.tar.zst" - SHA512 124c3983608879362acea7d487bf23690f371b3cfe0355385f0e643263b2a5568abe5cebda92ef9bc534e81f850138f589e75982f36a53f509676056d71de642 - DEPS gcc-libs zlib libbz2 + URL "https://mirror.msys2.org/msys/x86_64/file-5.44-5-x86_64.pkg.tar.zst" + SHA512 68d1df9eb548af935b4f3e7f32d0bb3599bf6d59219e229a0501e531b78c6fbecba620c8854f504b44acc48c9bacc4c2420975c598a396ae7f6ae56c742ab6d2 + DEPS gcc-libs libbz2 liblzma libzstd zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" - SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/findutils-4.9.0-3-x86_64.pkg.tar.zst" + SHA512 1538733929ecc11bc7c19797577e4cd59cc88499b375e3c2ea4a8ed4d66a1a02f4468ff916046c76195ba92f4c591d0e351371768117a423595d2e43b3321aad + DEPS libintl libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-3-x86_64.pkg.tar.zst" - SHA512 9d03e8fc5677dd1386454bd27a683667e829ad5b1b87fc0879027920b2e79b25a2d773ab2556cd29844b18dd25b26fef5a57bf89e35ca318e39443dcaf0ca3ba - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/gawk-5.2.1-2-x86_64.pkg.tar.zst" + SHA512 0d056ae2bd906badc4e8ac362bd848800ec0fbe53137c74eb20667b86fa18c7fc0da291c5baec129a8fdfba31216d8500d827475b8ad0e8bcbfb2a0e46ddb95e + PROVIDES awk + DEPS libintl libreadline mpfr sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" - SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/gcc-libs-11.3.0-3-x86_64.pkg.tar.zst" # 05-Jul-2022 + SHA512 eb8dccfa7939f3cb86a585a71d3083dda814bb38ee8484446147533a355520862989716b5ff3e483741496c594314367759646153cb6a4fedc0b44a87373a3fc ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-2-x86_64.pkg.tar.zst" - SHA512 0719e8d3683711453ff77496cad11583e877ea52806e5ea3f470444705705db20a8a9fe99987166b02c6bd240c06c7d86faa979a7bc5536c9c804d800b60b7be - DEPS libiconv libintl gmp + URL "https://mirror.msys2.org/msys/x86_64/gettext-0.21-2-x86_64.pkg.tar.zst" + SHA512 2f6b95686e6c9cabfdac22994cbd6402dc22da71ab9582205874e7967452be65a25bf73b8994cce679ef43b26a29dec25eb3f233f7126d8c4b2f5ddd28588bd4 + DEPS libasprintf libgettextpo libintl ) + # This package shouldn't be a here z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/grep-3.0-2-x86_64.pkg.tar.xz" - SHA512 c784d5f8a929ae251f2ffaccf7ab0b3936ae9f012041e8f074826dd6077ad0a859abba19feade1e71b3289cc640626dfe827afe91c272b38a1808f228f2fdd00 - DEPS libiconv libintl libpcre + URL "https://mirror.msys2.org/msys/x86_64/gettext-devel-0.21-2-x86_64.pkg.tar.zst" + SHA512 c8852c4c8cf7810434dab18c7a002e59c2248de93b575097a30a31f4e7f41719855c0f3cf55356173576aab03119139f71dce758df1421b3f23c1ca3520e4261 + DEPS gettext # libiconv-devel ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/sed-4.8-2-x86_64.pkg.tar.zst" - SHA512 8391be777239e0bfc19dc477995ee581ea9dbb1ba34fc27f57ba9d858e7489ac9b7200479d405712b43fa88434dd597be71d161fa8c05606e7ef991711bfc4c1 - DEPS libintl + URL "https://mirror.msys2.org/msys/x86_64/gmp-6.2.1-2-x86_64.pkg.tar.zst" + SHA512 b2df273243ba08ed2b1117d2b4826900706859c51c1c39ca6e47df2b44b006b2512f7db801738fdbb9411594bc8bc67d308cf205f7fa1aab179863844218e513 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libpcre-8.45-1-x86_64.pkg.tar.zst" - SHA512 b10a69380c44ea35367f310a7400eae26beacf347ddbb5da650b54924b80ffd791f12a9d70923567e5081e3c7098f042e47bcff1328d95b0b27ce63bcd762e88 - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/grep-1~3.0-6-x86_64.pkg.tar.zst" + SHA512 79b4c652082db04c2ca8a46ed43a86d74c47112932802b7c463469d2b73e731003adb1daf06b08cf75dc1087f0e2cdfa6fec0e8386ada47714b4cff8a2d841e1 + DEPS libiconv libintl libpcre sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst" - SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/gzip-1.12-2-x86_64.pkg.tar.zst" + SHA512 107754050a4b0f8633d680fc05aae443ff7326f67517f0542ce2d81b8a1eea204a0006e8dcf3de42abb3be3494b7107c30aba9a4d3d03981e9cacdc9a32ea854 + DEPS bash ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-4-any.pkg.tar.zst" - SHA512 175940ebccb490c25d2c431dd025f24a7d0c930a7ee8cb81a44a4989c1d07f4b5a8134e1d05a7a1b206f8e19a2308ee198b1295e31b2e139f5d9c1c077252c94 - DEPS gawk + URL "https://mirror.msys2.org/msys/x86_64/libasprintf-0.21-2-x86_64.pkg.tar.zst" + SHA512 e583ae8a6611f11ce56bdd8c0e420854d253070072776c78358ee052260fb3c7b1a7a53eed5e3f1e555e883fa489bb6154679ffe91c88e0390596805b1799d71 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-2-x86_64.pkg.tar.zst" - SHA512 d4b00e2b53ce99ddd3ee8e41c41add5ab36d26a54107acf7f5a5bf4a0033d72465cdab86f5b2eb8b7aca2cb5027a3e35cb194794c3bf563c0075ca3dbcad6987 - DEPS libintl libreadline mpfr + URL "https://mirror.msys2.org/msys/x86_64/libbz2-1.0.8-4-x86_64.pkg.tar.zst" + SHA512 5a7be6d04e55e6fb1dc0770a8c020ca24a317807c8c8a4813146cd5d559c12a6c61040797b062e441645bc2257b390e12dd6df42519e56278a1fe849fe76a1c4 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst" - SHA512 d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072 - DEPS gmp gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/libcrypt-2.1-4-x86_64.pkg.tar.zst" + SHA512 8bd56a777326dc8793df8bc7bc837bbfd9fb888d678fbfded8c37449fcc85aa3e318b5a249f773aa38ef4e12d8c58f080dce7db9c322b649702bdba292708ebc + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.1-1-x86_64.pkg.tar.zst" - SHA512 c5c8009ef069d05c2209b69c8e87094b09aac4b5c3dfdbea474d8262e55d286b400f1360c6a9778fd5eb87fb76a6463c21188286a1a1919ad79153eae3c44b0f + URL "https://mirror.msys2.org/msys/x86_64/libgettextpo-0.21-2-x86_64.pkg.tar.zst" + SHA512 e5736e2d5b8a7f0df02bab3a4c0e09f5a83069f4ff5554fa176f832b455fe836210686428172a34951db7f4ce6f20ec5428440af06d481fcaa90d632aac4afd2 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. - SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba - DEPS liblzma libiconv gettext + URL "https://mirror.msys2.org/msys/x86_64/libiconv-1.17-1-x86_64.pkg.tar.zst" + SHA512 e8fc6338d499ccf3a143b3dbdb91838697de76e1c9582bb44b0f80c1d2da5dcfe8102b7512efa798c5409ba9258f4014eb4eccd24a9a46d89631c06afc615678 + DEPS gcc-libs libintl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz" - SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad + URL "https://mirror.msys2.org/msys/x86_64/libintl-0.21-2-x86_64.pkg.tar.zst" + SHA512 fd066ea0fa9bc67fe3bcb09ba4d9dd4524611840bb3179e521fa3049dc88ba5e49851cc04cb76d8f0394c4ec1a6bf45c3f6ce6231dc5b0d3eb1f91d983b7f93b + DEPS gcc-libs libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libreadline-8.1.001-1-x86_64.pkg.tar.zst" - SHA512 4104eb0c18b8c06ab3bd4ba6420e3464df8293bec673c88da49e2f74cf1d583c922e9ead5691271fe593d424f92d1fd8668a3002174d756993d5b18337459bab - DEPS ncurses + URL "https://mirror.msys2.org/msys/x86_64/liblzma-5.4.1-1-x86_64.pkg.tar.zst" + SHA512 298a49e0c26587899e37c894f61c9e9c4702548bcc181610fc8408b773097cc3e042b5ae24a4e01ee0b592b68c8f24152f9dcc298b7d1860ffa6562c2513274d + # This package installs only a DLL. No extra deps. + DEPS # gettext libiconv sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-2-x86_64.pkg.tar.zst" - SHA512 4bf744a21ab2030ea9d65eb4d824ec5bed4532b7a489859e5e19bba11b5ba9be08613de48acb38baacfd2a7295722e4d858d7c577565f1999d2583defbbb58f2 - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/libpcre-8.45-3-x86_64.pkg.tar.zst" + SHA512 566a2723f5b078a586d80c077f9267afb7badf3640386640a098d76ef9142797e7fa8acef5e638b962d9479206fb443c924750eec00a26bccdc39fb49094963f + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-3-any.pkg.tar.zst" - SHA512 77a195a9fe8680bee55c04b8ecc0e9ee43e2d89607c745098dfac4687f4f853885cabbb005202d70e9a9cdf9facf6849cc47c6b2f25573b5af8201696d926c72 - DEPS perl - PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch" + URL "https://mirror.msys2.org/msys/x86_64/libreadline-8.2.001-3-x86_64.pkg.tar.zst" + SHA512 fe8fa6c0d9fd81eab945855b83b9ee8ae224159b3c5eb550424645f2a611e82fd92744093cbcd560a2e2717a142b0dbb3f3cbb627bf41a309483241d3340a9c3 + DEPS ncurses ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst" - SHA512 ad21734c05bc7faa809bc4ba761fb41a3b448d31794d1fd3d430cf4afe05ae991aabece4ec9a25718c01cc323d507bf97530533f0a20aabc18a7a2ccc0ae02b1 - DEPS libcrypt + URL "https://mirror.msys2.org/msys/x86_64/libtool-2.4.7-3-x86_64.pkg.tar.zst" + SHA512 a202ddaefa93d8a4b15431dc514e3a6200c47275c5a0027c09cc32b28bc079b1b9a93d5ef65adafdc9aba5f76a42f3303b1492106ddf72e67f1801ebfe6d02cc + DEPS sh tar + # extra deps which are really needed + awk findutils grep sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-3-x86_64.pkg.tar.zst" - SHA512 15cee333a82b55ff6072b7be30bf1c33c926d8ac21a0a91bc4cbf655b6f547bc29496df5fa288eb47ca2f88af2a4696f9b718394437b65dd06e3d6669ca0c2e5 + URL "https://mirror.msys2.org/msys/x86_64/libzstd-1.5.4-1-x86_64.pkg.tar.zst" + SHA512 5aed6a9b2e40759144878f1b5f888f221016fe3fb23ba04f17d515ca51b78c592f79747d90fcc096c735d74cccfeb22c19f2154dfa49d14bedc6c306f0c07759 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-4-x86_64.pkg.tar.zst" - SHA512 9f72c81d8095ca1c341998bc80788f7ce125770ec4252f1eb6445b9cba74db5614caf9a6cc7c0fcc2ac18d4a0f972c49b9f245c3c9c8e588126be6c72a8c1818 - DEPS libiconv + URL "https://mirror.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst" + SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c + DEPS bash gcc-libs libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/make-4.3-3-x86_64.pkg.tar.zst" - SHA512 1d991bfc2f076c8288023c7dd71c65470ad852e0744870368a4ab56644f88c7f6bbeca89dbeb7ac8b2719340cfec737a8bceae49569bbe4e75b6b8ffdcfe76f1 - DEPS libintl msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/make-4.4.1-1-x86_64.pkg.tar.zst" + SHA512 7e1c95b976d949db4b74c444e0d1495bbee26649aa82eadf34076dba3c1223d4e7b901e07935ba73dceda67f0a0cf25dd99fe3eed5300a5163fdaab14ca8d9fc + DEPS libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.21-1-x86_64.pkg.tar.zst" - SHA512 44444064b9860dbd3cb886812fb20ee97ab04a65616cca497be69c592d5507e7bc66bfe8dbd060a4df9c5d9bb44cb0f231584d65cb04351146d54d15852227af - DEPS gettext + URL "https://mirror.msys2.org/msys/x86_64/mpfr-4.2.0-2-x86_64.pkg.tar.zst" + SHA512 a294154a0c48bbf6673e87f5f38eda9f8a0c99f8300a795c14cd2ec4ae18b39b158b2e76ca1cda51fa76575bd70339cb3b24c4ccf8f265f0e59515f5e457b040 + DEPS gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-0.21-1-x86_64.pkg.tar.zst" - SHA512 6ef5f4094c4a174550a898cac4f60215d22de09f7e5f72bdb297d18a6f027e6122b4a519aa8d5781f9b0201dcae14ad7910b181b1499d6d8bbeb5a35b3a08581 - DEPS libintl libgettextpo libasprintf tar + URL "https://mirror.msys2.org/msys/x86_64/msys2-runtime-3.4.6-1-x86_64.pkg.tar.zst" + SHA512 fbdcf2572d242b14ef3b39f29a6119ee58705bad651c9da48ffd11e80637e8d767d20ed5d562f67d92eecd01f7fc3bc351af9d4f84fb9b321d2a9aff858b3619 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/tar-1.34-2-x86_64.pkg.tar.zst" - SHA512 127a971f5c087500ec4858697205b36ae76dba82307f1bcaaa44e746337d85d97360e46e55ef7fecbfa2a4af428ee26d804fa7d7c2b8ce6de1b86328dd14ef2d - DEPS libiconv libintl + URL "https://mirror.msys2.org/msys/x86_64/ncurses-6.4-1-x86_64.pkg.tar.zst" + SHA512 48093633b6506f4217fbe37b43d4e128874a01e5e56f817de38112e5a5b8d3ee4f77e99fb3cd63b55616e3ae84edbc49ac78d90968a24c25dfa368103d208897 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.21-1-x86_64.pkg.tar.zst" - SHA512 bb217639deadb36734bafb8db5217e654d00b93a3ef366116cc6c9b8b8951abef9a7e9b04be3fae09074cf68576f18575a0d09f3d2f344985606c1449a17222e - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/patch-2.7.6-2-x86_64.pkg.tar.zst" + SHA512 eb484156e6e93da061645437859531f7b04abe6fef9973027343302f088a8681d413d87c5635a10b61ddc4a3e4d537af1de7552b3a13106639e451b95831ec91 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.21-1-x86_64.pkg.tar.zst" - SHA512 62dde7bfcfea75ea9adb463807d7c128019ffeec0fb23e73bc39f760e45483c61f4f29e89cdbfab1e317d520c83fe3b65306fbd7258fe11ea951612dbee479fe - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/perl-5.36.0-1-x86_64.pkg.tar.zst" + SHA512 fa83a0451b949155bdba53d71d51381d99e4a28dc0f872c53912c8646a5e1858495b8dcfdb0c235975e41de57bc2464eb1e71ffeab96a25c4aa5327cdaa03414 + DEPS coreutils libcrypt sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/findutils-4.8.0-1-x86_64.pkg.tar.zst" - SHA512 74f8750636becefd3675c89957dfb8a244d2db6fec80bf352998edfef93f66d0e2a37d7f2869a79dd197acf2057ccd6aefd12c58e94154765896a432831ab49c - DEPS libintl libiconv + URL "https://mirror.msys2.org/msys/x86_64/pkgconf-1.9.4-1-x86_64.pkg.tar.zst" + SHA512 0a5f0d69eec591a00d1aee985458dd855100184ec845b076d8f22ca51ba106964b8cf5b0061df288cdd611aa6a6e5fcb98eafded1c46536a0d17253240966f15 + PROVIDES pkg-config ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libintl-0.21-1-x86_64.pkg.tar.zst" - SHA512 be0242eed25793e86e0560868f76cf06a358ffc0b2beb357e776d6c7819e545ac90f9358b17a85aa598584babe3ab4bb4544e360a28f5cec965f314178b930d1 - DEPS libiconv + URL "https://mirror.msys2.org/msys/x86_64/sed-4.9-1-x86_64.pkg.tar.zst" + SHA512 8006a83f0cc6417e3f23ffd15d0cbca2cd332f2d2690232a872ae59795ac63e8919eb361111b78f6f2675c843758cc4782d816ca472fe841f7be8a42c36e8237 + DEPS libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libiconv-1.16-2-x86_64.pkg.tar.zst" - SHA512 3ab569eca9887ef85e7dd5dbca3143d8a60f7103f370a7ecc979a58a56b0c8dcf1f54ac3df4495bc306bd44bf36ee285aaebbb221c4eebfc912cf47d347d45fc - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/tar-1.34-3-x86_64.pkg.tar.zst" + SHA512 19e063393ef0f7eb18df2755798985e78a171f9aa4a747490a357b108d02a9a6a76cae514dd58da0e48a7dd66857dc251be30535677d9fa02e1640bc165cc004 + DEPS libiconv libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gcc-libs-11.2.0-3-x86_64.pkg.tar.zst" - SHA512 be7bb61d1b87eafbb91cf9d0fee3270b9d5e2420c403ea394967941195d52ae248ce4ffde20af41a05310527a920269018f49487be617211a5e340486babd0f8 - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/texinfo-7.0.2-1-x86_64.pkg.tar.zst" + SHA512 f3fc972bb4f738d3a6a736285ee2574262989fdb7bec0f4a260abb1bbfeb94f3fb3795986ba121cf623a96c60eccea2ff67906275acd466c640eae2fe18a2158 + DEPS perl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.4.6-1-x86_64.pkg.tar.zst" - SHA512 fbdcf2572d242b14ef3b39f29a6119ee58705bad651c9da48ffd11e80637e8d767d20ed5d562f67d92eecd01f7fc3bc351af9d4f84fb9b321d2a9aff858b3619 + URL "https://mirror.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz" + SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9 + DEPS bash libbz2 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst" + URL "https://mirror.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst" SHA512 5323fd6635093adf67c24889f469e1ca8ac969188c7f087244a43b3afa0bf8f14579bd87d9d7beb16a7cd61a5ca1108515a46b331868b4817b35cebcb4eba1d1 + DEPS sh ) - z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.20.3-1-any.pkg.tar.zst" - SHA512 ce73d4270942f61963e8307f6bec945d14e3774455684842b8fde836b19a4e9cbf8efd0663ffb28ad872493db70fa3a4e14bd0b248c2067199f4fee94e80e77e - DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python + URL "https://mirror.msys2.org/msys/x86_64/xz-5.4.1-1-x86_64.pkg.tar.zst" + SHA512 5a04e8c244c05926da4bcc63f4fdc731b508c37396629c33e98833c7b6e10c0784b1b0de72f6f11f7f2bdab5ac8eafe2e1613081efd0f973b558200c6ccb6d90 + DEPS libiconv libintl liblzma ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.19-1-any.pkg.tar.zst" - SHA512 0d18a93d7804d6469b8566cf4ad3a7efbdf8a4a4b05d191b23a30e107586423c6338b9f4a5ea2cc93052e6c0336dc82a43c26189c410263a6e705e6f3ebe261a - DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread + URL "https://mirror.msys2.org/msys/x86_64/zlib-1.2.13-1-x86_64.pkg.tar.zst" + SHA512 8dc7525091cf94b1c0646fd21a336cd984385e7e163f925b1f3f786c8be8b884f6cb9b68f55fdb932104c0eb4c8e270fc8df2ec4742404d2dcd0ad9c3e29e7e8 + DEPS gcc-libs ) + + # mingw64 subsystem z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" - SHA512 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst" + SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.9-2-any.pkg.tar.zst" - SHA512 8a45b28b2b0471718bd1ab096958872b18ae3b25f06c30718c54d1edaf04214397330a51776f3e4eee556ac47d9e3aa5e1b211c5df0cf6be3046a6f3a79cfa7d - DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20230311-1-any.pkg.tar.zst" + SHA512 f7526ad35bccc5edba3fcf1354a85eacbd61dba5780b1bc65c7e8795ecb252432004af809052bb0ba981b1dea174c40e2d3f20655d8e2b29be95ad54d2aa5782 + DEPS mingw-w64-x86_64-p11-kit ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst" - SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2 - DEPS mingw-w64-x86_64-gcc-libs + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-expat-2.5.0-1-any.pkg.tar.zst" + SHA512 b49ec84750387af5b73a78d654673d62cf0e2cb2b59b4d25acb7eca3830018f7a2aefe600d67d843417cfbdd97db81ecfd49a8811e312f53b42c21fb106b230d ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst" - SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-12.2.0-10-any.pkg.tar.zst" + SHA512 0fbe2b01a22c327affcf1581b33912494731ac32c58cc94df740604f6f5a284f89f13508f977f4e15a1345c81e3e8ada3ff5c55bff0a907631d27ed7c0f74677 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.3-3-any.pkg.tar.zst" - SHA512 888c155d878651dc31c9a01455ab689d7b644cec759521b69b8399c20b6ddc77c90f3ee4ddeed8857084335335b4b30e182d826fb5b78719b704f13a1dfdbd54 - DEPS mingw-w64-x86_64-libsystre + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-12.2.0-10-any.pkg.tar.zst" + SHA512 94b001fa5a2cba5a5fc4b27887cf1dfc930a67dd03a889247b15d51f11280af01c509fe63b7412ec36b549a5a302e1f4d98a13685d1d10068e7d12a4446777a4 + PROVIDES mingw-w64-x86_64-libssp mingw-w64-x86_64-omp + DEPS mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz" - SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8 - DEPS mingw-w64-x86_64-libtre + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-0.21.1-1-any.pkg.tar.zst" + SHA512 9002289afe530706912eb5b8feffe1d7adb23e01d6b79516ff5deef2faec1577b31890dda15426cc4cc2f30b5f12e55166a4bad492db533234b44cc89fe81117 + DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv ) z_vcpkg_acquire_msys_declare_package( - NAME "mingw-w64-x86_64-libtre" - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz" - SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.2.1-5-any.pkg.tar.zst" + SHA512 7d884ef1186bd6942f7a7ace28963aae679bb6c6c77c05f186323c44b11894b80f53203a6fad55a0ae112fec41b4e1a624e67021e5f2f529a7fedf35c2755245 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.m-1-any.pkg.tar.zst" - SHA512 9471b0e5b01453f6ee5c92be6e259446c6b5be45d1da8985a4735b3e54c835d9b86286b2af126546419bf968df096442bd4f60f30efa1a901316e3c02b98525f - DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libffi-3.4.4-1-any.pkg.tar.zst" + SHA512 ec88a0e0cb9b3ff3879d3fd952d3ad52f0d86a42669eddaeca47778ab0d5213abdea7d480a23aa3870e08d6b93b9c4988855e368474be7186e9719456baae5df ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20210119-1-any.pkg.tar.zst" - SHA512 5590ca116d73572eb336ad73ea5df9da34286d8ff8f6b162b38564d0057aa23b74a30858153013324516af26671046addd6bcade221e94e7b8ed5e8f886e1c58 - DEPS mingw-w64-x86_64-p11-kit + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst" + SHA512 57221118a6ed975ddde322e0d34487d4752c18c62c6184e9ed77ca14fe0a3a78a78aefe628cda3285294a5564d87cd057c56f4864b12fa8580d68b8e8a805e16 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.24.1-1-any.pkg.tar.zst" - SHA512 6437919cd61c8b1a59b346bbd93d960adb7f11206e8c0010311d71d0fe9aa03f950ecf08f19a5555b27f481cc0d61b88650b165ae9336ac1a1a0a9be553239b9 - DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz" + SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8 + PROVIDES mingw-w64-x86_64-libgnurx + DEPS mingw-w64-x86_64-libtre ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.18.0-1-any.pkg.tar.zst" - SHA512 2584a6e0bc2b7d145f026487951b8690e3d8e79f475a7b77f95fc27ca9a9f1887fe9303e340ba2635353c4a6f6a2f10a907dd8778e54be7506a15459f616d4a4 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtasn1-4.19.0-1-any.pkg.tar.zst" + SHA512 761a7c316914d7f98ec6489fb4c06d227e5956d50f2e233ad9be119cfd6301f6b7e4f872316c0bae3913268c1aa9b224b172ab94130489fbd5d7269ff9064cfb DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.37.2-1-any.pkg.tar.zst" - SHA512 0f83f10b0c8f4699a6b84deb6986fcd471cb80b995561ad793e827f9dd66110d555744918ed91982aec8d9743f6064726dd5eba3e695aa9ab5381ea4f8e76dbe - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz" + SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d + PROVIDES mingw-w64-x86_64-libtre + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.1.001-1-any.pkg.tar.zst" - SHA512 b38aef9216ea2ba7edd82ce57a48dbc913b9bdcb44b96b9800342fe097d706ba39c9d5ba08d793d2c3388722479258bb05388ae09d74a1edcaaf9002e9d71853 - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst" + SHA512 e79bb2c93f4c9426c5a5400cd0d3a871c39c56db7068d45b208778fce19a9adb18229ee826397ee2fe8e68df0c554281490315687b3f50b48d6c7f2a6a68ec4b + PROVIDES mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" - SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-1-any.pkg.tar.zst" + SHA512 57b86866e2439baa21f296ecb5bdfd624a155dbd260ffe157165e2f8b20bc6fbd5cc446d25dee61e9ed8c28aca941e6f478be3c2d70393f160ed5fd8438e9683 + DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-mpfr + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst" + SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.11.1-2-any.pkg.tar.zst" - SHA512 15fd4e085fabe2281f33c8f36f4b1b0be132e5b100f6d4eaf54688842791aa2cf4e6d38a855f74f42be3f86c52e20044518f5843f8e9ca13c54a6ea4adb973a8 - DEPS mingw-w64-x86_64-tcl + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0-1-any.pkg.tar.zst" + SHA512 5c8edf4f5ab59afa51cbf1c5ae209583feebaea576e7e3abb59d7e448fe13e143993e6f35117c26ccc221bc6efc44568119c2e25d469c726a592a026b2498d92 + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.11-5-any.pkg.tar.zst" - SHA512 9db75ff47260ea3652d1abf60cd44649d0e8cbe5c4d26c316b99a6edb08252fb87ed017c856f151da99bcaa0bd90c0bebae28234035b008c5bd6508511639852 - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20230211-1-any.pkg.tar.zst" + SHA512 3a86a851805646939dadd9dc4756fea45ffdbd89dec32f8452513d6aa491760861850eec68efb6a48b8b99953d7904547c6d55ff4fd67f20fd2641591781b53c + DEPS mingw-w64-x86_64-libsystre ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xz-5.2.5-2-any.pkg.tar.zst" - SHA512 94fcf8b9f9fbc2cfdb2ed53dbe72797806aa3399c4dcfea9c6204702c4504eb4d4204000accd965fcd0680d994bf947eae308bc576e629bbaa3a4cefda3aea52 - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openblas-0.3.21-7-any.pkg.tar.zst" + SHA512 e1e49f477cb44f00b5f8760f9c25bd24746844fd076ca0c490b882cfe31204ae100692387e83de22cd89093c102ae751b99bca9dd2d328aaf5de0e401a531e8a + PROVIDES mingw-w64-x86_64-OpenBLAS + DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-omp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst" - SHA512 38daa0edd1a2c1efdd56baeb6805d10501a57e0c8ab98942e4a16f8b021908dac315513ea85f5278adf300bce3052a44a3f8b473adb0d5d3656aa4a48fe61081 - DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.1.0-1-any.pkg.tar.zst" + SHA512 f146d0f2b31b767422c767f4ea39312cbe90eac86e8b248e24d28595069e6cc450351280dd5b837e27ffdd743fb7eb4880360a658f0d2b3709b8a170be3e37d2 + #DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" - SHA512 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 - DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-p11-kit-0.24.1-5-any.pkg.tar.zst" + SHA512 cbdecf7bf56ce64605a77b3c700c30322f7b0fbc8efbe2cb7007ae4108815ef96530a57db5631c788b41f1d20fbcad202de92066871bb76c78ea27ea07c848e0 + DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" - SHA512 f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 - DEPS mingw-w64-x86_64-mpfr + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.10.10-1-any.pkg.tar.zst" + SHA512 be778ecfd0d4a0f186f0628dab8959596c83b1f1cfaf8554fef63e3b9fd6c5506fa30cf84ad16bbb1eed6793b1f62a5770eff71fa53de6304c0c63d3bb164b00 + PROVIDES mingw-w64-x86_64-python3 mingw-w64-x86_64-python3.10 + DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-3-any.pkg.tar.zst" - SHA512 be8ad04e53804f18cfeec5b9cba1877af1516762de60891e115826fcfe95166751a68e24cdf351a021294e3189c31ce3c2db0ebf9c1d4d4ab6fea1468f73ced5 - DEPS mingw-w64-x86_64-gmp + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.24.2-1-any.pkg.tar.zst" + SHA512 0c651815fc7d553430c577d350f460f74b731951125bf44cdbf148c705cb45801c032b98b53315cf98fbf57be3c8f5b598a148f0fbf93dd55079361e05445e7e + PROVIDES mingw-w64-x86_64-python3-numpy + DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" - SHA512 d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-readline-8.2.001-6-any.pkg.tar.zst" + SHA512 7b09a854b2225732b8452f6df7ebb378463066da3801ea29372c52ff68b2f6be5ccf8adf3d7d15a75e6fb3d471c5ade7bd4b9fc9599116d269c00bd9adde566e + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.4.4-1-any.pkg.tar.zst" - SHA512 479e6591d06eee2686591d7232a60d4092540deb40cf0c2c418de861b1da6b21fb4be82e603dd4a3b88f5a1b1d21cdb4f016780dda8131e32be5c3dec85dfc4d + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.41.1-1-any.pkg.tar.zst" + SHA512 efa7ddcb9326bf25abcac35db36d461fb0817d40f5a6ffc1b412b627df5030a1494b0c87d2f0d0231bc962362d213e6c8eaad7cf057e88f51a0cdd8d2377d327 + PROVIDES mingw-w64-x86_64-sqlite mingw-w64-x86_64-sqlite-analyzer + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-4-any.pkg.tar.zst" - SHA512 1d7be396ef132289be0c33792c4e81dea6cb7b1eafa249fb3e8abc0b393d14e5114905c0c0262b6a7aed8f196ae4d7a10fbafd342b08ec76c9196921332747b5 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" + SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 + DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" - SHA512 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.12-1-any.pkg.tar.zst" + SHA512 145e4a1e3093da20cd6755ca8d2b04f7ace87e3ac952d3593880d57f6719a4767ca315543a4f82ee5cb37cff311ff29c446b36484568f65fb6d0c58706763b9b + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst" - SHA512 f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tk-8.6.12-1-any.pkg.tar.zst" + SHA512 d3eb26a0fa4986ba4f6c77baf48d6fa9d623500f0b72aac9a385ff3c242dc8842eb80b563490995c162869fe3366e8b89d65561b4810b6b661ebbff2161428bf + DEPS mingw-w64-x86_64-tcl ) z_vcpkg_acquire_msys_declare_package( - NAME "mingw-w64-x86_64-libwinpthread" - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - SHA512 a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.1-1-any.pkg.tar.zst" + SHA512 93e01ebade4de60f06f4485f083accd9c9e212d2fa2de63acca6d7d31f009a4fb89720da23101018fd74b99415e1fb661cc3f3a7ba4be3cea49dadd768826f33 + DEPS mingw-w64-x86_64-gettext ) - - if(NOT Z_VCPKG_MSYS_PACKAGES STREQUAL "") - message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${arg_PACKAGES}): ${packages} -This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") - endif() - - string(SHA512 total_hash "${Z_VCPKG_MSYS_TOTAL_HASH}") - string(SUBSTRING "${total_hash}" 0 16 total_hash) - set(path_to_root "${DOWNLOADS}/tools/msys2/${total_hash}") - if(NOT EXISTS "${path_to_root}") - file(REMOVE_RECURSE "${path_to_root}.tmp") - file(MAKE_DIRECTORY "${path_to_root}.tmp/tmp") - set(index 0) - foreach(archive IN LISTS Z_VCPKG_MSYS_ARCHIVES) - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${archive}_ARCHIVE}" - LOGNAME "msys-${TARGET_TRIPLET}-${index}" - WORKING_DIRECTORY "${path_to_root}.tmp" - ) - math(EXPR index "${index} + 1") - if(Z_VCPKG_MSYS_${archive}_PATCHES) - z_vcpkg_apply_patches( - SOURCE_PATH "${path_to_root}.tmp" - PATCHES ${Z_VCPKG_MSYS_${archive}_PATCHES} - ) - endif() - endforeach() - file(RENAME "${path_to_root}.tmp" "${path_to_root}") - endif() - # Due to skipping the regular MSYS2 installer, - # some config files need to be established explicitly. - if(NOT EXISTS "${path_to_root}/etc/fstab") - # This fstab entry removes the cygdrive prefix from paths. - file(WRITE "${path_to_root}/etc/fstab" "none / cygdrive binary,posix=0,noacl,user 0 0") - endif() - message(STATUS "Using msys root at ${path_to_root}") - set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE) -endfunction() + z_vcpkg_acquire_msys_declare_package( + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.13-3-any.pkg.tar.zst" + SHA512 c07bea5fcc78016da74756612827b662b5dd4901d27f3a3390acc3c39b767806f48b09bd231140a40e3cd7aba76e5d869ed18278c720277e55f831f0c7809d54 + ) +endmacro() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index c28fb4795e744b..3ff67423655bb5 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -35,24 +35,28 @@ macro(z_vcpkg_determine_autotools_target_cpu out_var) endif() endmacro() +macro(z_vcpkg_set_arch_mac out_var value) + # Better match the arch behavior of config.guess + # See: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + if("${value}" MATCHES "^(ARM|arm)64$") + set(${out_var} "aarch64") + else() + set(${out_var} "${value}") + endif() +endmacro() + macro(z_vcpkg_determine_autotools_host_arch_mac out_var) - set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + z_vcpkg_set_arch_mac(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") endmacro() macro(z_vcpkg_determine_autotools_target_arch_mac out_var) list(LENGTH VCPKG_OSX_ARCHITECTURES osx_archs_num) if(osx_archs_num EQUAL 0) - set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + z_vcpkg_set_arch_mac(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") elseif(osx_archs_num GREATER_EQUAL 2) set(${out_var} "universal") else() - # Better match the arch behavior of config.guess - # See: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - if(VCPKG_OSX_ARCHITECTURES MATCHES "^(ARM|arm)64$") - set(${out_var} "aarch64") - else() - set(${out_var} "${VCPKG_OSX_ARCHITECTURES}") - endif() + z_vcpkg_set_arch_mac(${out_var} "${VCPKG_OSX_ARCHITECTURES}") endif() unset(osx_archs_num) endmacro() @@ -220,7 +224,7 @@ function(vcpkg_configure_make) # Establish a bash environment as expected by autotools. if(CMAKE_HOST_WIN32) - list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4 which) + list(APPEND msys_require_packages autoconf-wrapper automake-wrapper binutils libtool make pkgconf which) vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) set(base_cmd "${MSYS_ROOT}/usr/bin/bash.exe" --noprofile --norc --debug) vcpkg_list(SET add_to_env) diff --git a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake new file mode 100644 index 00000000000000..7d95d008621e65 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake @@ -0,0 +1,5 @@ +set(program_name 7z) +set(paths_to_search "${DOWNLOADS}/tools/7z/Files/7-Zip") +set(download_urls "https://7-zip.org/a/7z1900.msi") +set(download_filename "7z1900.msi") +set(download_sha512 f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067) diff --git a/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake b/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake new file mode 100644 index 00000000000000..5241f21eec5eb3 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake @@ -0,0 +1,6 @@ +set(program_name aria2c) +set(program_version 1.35.0) +set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1") +set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip") +set(download_filename "aria2-${program_version}-win-32bit-build1.zip") +set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) diff --git a/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake b/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake new file mode 100644 index 00000000000000..f3521f0e9491e3 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake @@ -0,0 +1,23 @@ +set(program_name bazel) +set(program_version 4.2.2) +set(rename_binary_to "bazel") +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + set(tool_subdirectory "${program_version}-linux") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") + set(download_filename "bazel-${tool_subdirectory}-x86_64") + set(raw_executable ON) + set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9) +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + set(tool_subdirectory "${program_version}-darwin") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") + set(download_filename "bazel-${tool_subdirectory}-x86_64") + set(raw_executable ON) + set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275) +else() + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip") + set(download_filename "bazel-${tool_subdirectory}-x86_64.zip") + set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake b/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake new file mode 100644 index 00000000000000..fae680bf137706 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake @@ -0,0 +1,20 @@ +if(CMAKE_HOST_WIN32) + # This download shall be the same as in vcpkg_find_acquire_program(FLEX).cmake + set(program_version 2.5.25) + set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip") + set(download_filename "win_flex_bison-${program_version}.zip") + set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e) + set(tool_subdirectory "${program_version}") + set(program_name win_bison) + set(paths_to_search "${DOWNLOADS}/tools/win_flex/${program_version}") + if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4") + file(REMOVE_RECURSE "${paths_to_search}") + endif() +else() + set(program_name bison) + set(apt_package_name bison) + set(brew_package_name bison) + if (APPLE) + set(paths_to_search /usr/local/opt/bison/bin) + endif() +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(CLANG).cmake b/scripts/cmake/vcpkg_find_acquire_program(CLANG).cmake new file mode 100644 index 00000000000000..0826c875126b7c --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(CLANG).cmake @@ -0,0 +1,31 @@ +set(program_name clang) +set(tool_subdirectory "clang-15.0.6") +set(program_version 15.0.6) +if(CMAKE_HOST_WIN32) + set(paths_to_search + # Support LLVM in Visual Studio 2019 + "$ENV{LLVMInstallDir}/x64/bin" + "$ENV{LLVMInstallDir}/bin" + "$ENV{VCINSTALLDIR}/Tools/Llvm/x64/bin" + "$ENV{VCINSTALLDIR}/Tools/Llvm/bin" + "${DOWNLOADS}/tools/${tool_subdirectory}-windows/bin" + "${DOWNLOADS}/tools/clang/${tool_subdirectory}/bin") + + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") + else() + set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}") + endif() + + if(host_arch MATCHES "64") + set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe") + set(download_filename "LLVM-${program_version}-win64.7z.exe") + set(download_sha512 2dd6f3eea106f2b905e6658ea5ea12856d17285adbfba055edc2d6b6389c4c2f7aa001df5cb0d8fb84fa7fa47d5035a7fddf276523b472dd55f150ae25938768) + else() + set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe") + set(download_filename "LLVM-${program_version}-win32.7z.exe") + set(download_sha512 90225D650EADB0E590A9912B479B46A575D41A19EB5F2DA03C4DC8B032DC0790222F0E3706DFE2A35C0E7747941972AC26CB47D3EB13730DB76168931F37E5F1) + endif() +endif() +set(brew_package_name "llvm") +set(apt_package_name "clang") diff --git a/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake b/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake new file mode 100644 index 00000000000000..3efc1b73a9bb1c --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake @@ -0,0 +1,6 @@ +set(program_name dark) +set(tool_subdirectory "wix311-binaries") +set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}") +set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip") +set(download_filename "wix311-binaries.zip") +set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) diff --git a/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake b/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake new file mode 100644 index 00000000000000..fa1f19d36ce747 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake @@ -0,0 +1,11 @@ +set(program_name doxygen) +set(program_version 1.9.1) +vcpkg_list(SET sourceforge_args + REPO doxygen + REF "rel-${program_version}" + FILENAME "doxygen-${program_version}.windows.bin.zip" + SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b + NO_REMOVE_ONE_LEVEL + WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" + ) +set(tool_subdirectory c3eeb6b9fa-76d69c6db5) diff --git a/scripts/cmake/vcpkg_find_acquire_program(FLEX).cmake b/scripts/cmake/vcpkg_find_acquire_program(FLEX).cmake new file mode 100644 index 00000000000000..b686c7fd754c14 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(FLEX).cmake @@ -0,0 +1,17 @@ +if(CMAKE_HOST_WIN32) + # This download shall be the same as in vcpkg_find_acquire_program(BISON).cmake + set(program_version 2.5.25) + set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip") + set(download_filename "win_flex_bison-${program_version}.zip") + set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e) + set(tool_subdirectory "${program_version}") + set(program_name win_flex) + set(paths_to_search "${DOWNLOADS}/tools/win_flex/${program_version}") + if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4") + file(REMOVE_RECURSE "${paths_to_search}") + endif() +else() + set(program_name flex) + set(apt_package_name flex) + set(brew_package_name flex) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(GASPREPROCESSOR).cmake b/scripts/cmake/vcpkg_find_acquire_program(GASPREPROCESSOR).cmake new file mode 100644 index 00000000000000..b2008644709431 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(GASPREPROCESSOR).cmake @@ -0,0 +1,11 @@ +set(raw_executable true) +set(program_name gas-preprocessor) +set(interpreter PERL) +set(search_names "gas-preprocessor.pl") +set(paths_to_search "${DOWNLOADS}/tools/gas-preprocessor/${tool_subdirectory}") +set(rename_binary_to "gas-preprocessor.pl") +set(commit_id 9309c67acb535ca6248f092e96131d8eb07eefc1) +set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/${commit_id}/gas-preprocessor.pl") +string(SUBSTRING ${commit_id} 0 8 tool_subdirectory) +set(download_filename "gas-preprocessor-${tool_subdirectory}.pl") +set(download_sha512 b4749cf8aa758e3f28d4b21803422a5c2588f5fc48cfd317564606b374f8d739c636067cf7a4956d7365d63b055bc6e7626c304857e6c9013d6b4a0db9d8ad4f) diff --git a/scripts/cmake/vcpkg_find_acquire_program(GIT).cmake b/scripts/cmake/vcpkg_find_acquire_program(GIT).cmake new file mode 100644 index 00000000000000..dc6f708de5d2a0 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(GIT).cmake @@ -0,0 +1,15 @@ +set(program_name git) +if(CMAKE_HOST_WIN32) + set(base_version 2.32.0) + set(program_version 2.32.0.2) + set(tool_subdirectory "git-${program_version}-2-windows") + set(download_urls "https://github.com/git-for-windows/git/releases/download/v${base_version}.windows.2/PortableGit-${program_version}-32-bit.7z.exe") + set(download_filename "PortableGit-${program_version}-32-bit.7z.exe") + set(download_sha512 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348) + set(paths_to_search + "${DOWNLOADS}/tools/${tool_subdirectory}/mingw32/bin" + "${DOWNLOADS}/tools/git/${tool_subdirectory}/mingw32/bin") +else() + set(brew_package_name "git") + set(apt_package_name "git") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(GN).cmake b/scripts/cmake/vcpkg_find_acquire_program(GN).cmake new file mode 100644 index 00000000000000..473ecd826c2e11 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(GN).cmake @@ -0,0 +1,47 @@ +set(program_name gn) +set(rename_binary_to "gn") +if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/gn") +else() # Old behavior + message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues") + set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + if(HOST_ARCH STREQUAL "aarch64") + set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") + set(gn_platform "linux-arm64") + set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") + else() + set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") + set(gn_platform "linux-amd64") + set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") + endif() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + if(HOST_ARCH STREQUAL "arm64") + set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") + set(gn_platform "mac-arm64") + set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") + else() + set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") + set(gn_platform "mac-amd64") + set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") + endif() + else() + if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + else() # AMD64 + set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") + set(gn_platform "windows-amd64") + set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") + endif() + endif() +endif() +set(tool_subdirectory "${program_version}") +set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") +set(download_filename "gn-${gn_platform}.zip") diff --git a/scripts/cmake/vcpkg_find_acquire_program(GO).cmake b/scripts/cmake/vcpkg_find_acquire_program(GO).cmake new file mode 100644 index 00000000000000..db7f84478b4e63 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(GO).cmake @@ -0,0 +1,8 @@ +set(program_name go) +set(tool_subdirectory 1.16.6.windows-386) +set(paths_to_search ${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin) +set(brew_package_name "go") +set(apt_package_name "golang-go") +set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip") +set(download_filename "go${tool_subdirectory}.zip") +set(download_sha512 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8) diff --git a/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake b/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake new file mode 100644 index 00000000000000..d10a1c435d5bb0 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake @@ -0,0 +1,6 @@ +set(program_name gperf) +set(program_version 3.0.1) +set(paths_to_search "${DOWNLOADS}/tools/gperf/bin") +set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download") +set(download_filename "gperf-${program_version}-bin.zip") +set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9) diff --git a/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake b/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake new file mode 100644 index 00000000000000..244bc569e8f91f --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake @@ -0,0 +1,9 @@ +set(program_name jom) +set(tool_subdirectory "jom-1.1.3") +set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}") +set(download_urls + "https://download.qt.io/official_releases/jom/jom_1_1_3.zip" + "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" +) +set(download_filename "jom_1_1_3.zip") +set(download_sha512 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33) diff --git a/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake b/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake new file mode 100644 index 00000000000000..4bb05a0911f541 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake @@ -0,0 +1,19 @@ +set(program_name meson) +set(search_names meson meson.py) +set(interpreter PYTHON3) +set(apt_package_name "meson") +set(brew_package_name "meson") +set(version_command --version) +set(extra_search_args EXACT_VERSION_MATCH) +if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") +else() # Old behavior + set(program_version 0.58.1) + set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) + set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") + set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") + set(download_filename "meson-${ref}.tar.gz") + set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) + set(supported_on_unix ON) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake b/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake new file mode 100644 index 00000000000000..be59e4dfa3dc85 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake @@ -0,0 +1,8 @@ +set(program_name nasm) +set(program_version 2.16.01) +set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}") +set(brew_package_name "nasm") +set(apt_package_name "nasm") +set(download_urls "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip") +set(download_filename "nasm-${program_version}-win64.zip") +set(download_sha512 ce4d02f530dc3376b4513f219bbcec128ee5bebd8a5c332599b48d8071f803d1538d7258fec7c2e9b4d725b8d7314cea2696289d0493017eb13bfe70e5cb5062) diff --git a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake new file mode 100644 index 00000000000000..b94b29f4618d9b --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake @@ -0,0 +1,30 @@ +set(program_name ninja) +set(program_version 1.10.2) +set(supported_on_unix ON) +set(version_command --version) +if(CMAKE_HOST_WIN32) + set(download_filename "ninja-win-${program_version}.zip") + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") + set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(download_filename "ninja-mac-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") + set(tool_subdirectory "${program_version}-osx") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") + set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") + set(supported_on_unix OFF) +else() + execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + if(HOST_ARCH MATCHES "x86_64|amd64|AMD64") + set(download_filename "ninja-linux-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") + set(tool_subdirectory "${program_version}-linux") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") + set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + else() + set(version_command "") # somewhat hacky way to skip version check and use system binary + endif() +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake b/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake new file mode 100644 index 00000000000000..d7f1bd9b01de81 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake @@ -0,0 +1,9 @@ +set(program_name nuget) +set(tool_subdirectory "5.11.0") +set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows") +set(brew_package_name "nuget") +set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") +set(rename_binary_to "nuget.exe") +set(download_filename "nuget.5.11.0.exe") +set(raw_executable ON) +set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) diff --git a/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake b/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake new file mode 100644 index 00000000000000..1827bfa973f3fe --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake @@ -0,0 +1,20 @@ +set(program_name patchelf) +set(program_version 0.14.5) +set(supported_on_unix ON) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) + if(HOST_ARCH STREQUAL "aarch64") + set(patchelf_platform "aarch64") + set(download_sha512 "3B5EB4405FAB1D5202728AA390DD9F059CD7AFD582BAD9C50383CAD605127BC77DFCE3F2F26E9714F6BD5CCFFD49D3973BA2F061D2E2931B6E1BD0C263B99E75") + elseif(HOST_ARCH STREQUAL "armv7l") + set(patchelf_platform "armv7l") + set(download_sha512 "30160d750784f5e8805bffe96ca80b40ed10441549e10f47b61e0d21b32979e01865cd770f1de9162988d4daabc6984dcdb7438f67bcd5eee76ad5f01b00276d") + else() + set(patchelf_platform "x86_64") + set(download_sha512 "5E983A25B3F3F3B8582D1DE6C7DE30812E8D6E58E96F711F33A2634D3FB1F2370531DA179927AA401328319F92465E6F76274A6F994D1DC54C74B98E704D0D29") + endif() + set(download_filename "${program_name}-${program_version}-${patchelf_platform}.tar.gz") + set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}") + set(tool_subdirectory "${program_version}-${patchelf_platform}-linux") + set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_platform}-linux/bin") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake b/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake new file mode 100644 index 00000000000000..a2ba283d46d3a7 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake @@ -0,0 +1,11 @@ +set(program_name perl) +set(program_version 5.32.1.1) +set(tool_subdirectory ${program_version}) +set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin) +set(brew_package_name "perl") +set(apt_package_name "perl") +set(download_urls + "https://strawberryperl.com/download/${program_version}/strawberry-perl-${program_version}-32bit.zip" +) +set(download_filename "strawberry-perl-${program_version}-32bit.zip") +set(download_sha512 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9) diff --git a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake new file mode 100644 index 00000000000000..0ba1a611d90448 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake @@ -0,0 +1,39 @@ +set(program_name pkg-config) +if(DEFINED ENV{PKG_CONFIG}) + debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}") + set(PKGCONFIG "$ENV{PKG_CONFIG}" CACHE INTERNAL "") + set(PKGCONFIG "${PKGCONFIG}" PARENT_SCOPE) + return() +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir} + set(supported_on_unix ON) + set(rename_binary_to "pkg-config") + set(program_version 0.29.2.1) + set(raw_executable ON) + set(download_filename "pkg-config.openbsd") + set(tool_subdirectory "openbsd") + set(download_urls "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config") + set(download_sha512 b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b) + set(version_command --version) +elseif(CMAKE_HOST_WIN32) + if(NOT EXISTS "${PKGCONFIG}") + set(VERSION 0.29.2-3) + set(program_version git-9.0.0.6373.5be8fcd83-1) + vcpkg_acquire_msys( + PKGCONFIG_ROOT + NO_DEFAULT_PACKAGES + DIRECT_PACKAGES + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" + 0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst" + c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 + ) + endif() + set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") + set("${program}" "${${program}}" PARENT_SCOPE) + return() +else() + set(brew_package_name pkg-config) + set(apt_package_name pkg-config) + set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(PYTHON2).cmake b/scripts/cmake/vcpkg_find_acquire_program(PYTHON2).cmake new file mode 100644 index 00000000000000..7e7905b175df18 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(PYTHON2).cmake @@ -0,0 +1,27 @@ +if(CMAKE_HOST_WIN32) + set(program_name python) + set(program_version 2.7.18) + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + else() # Old behavior + 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}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") + endif() +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + # macOS includes Python 2.7 built-in as `python` + set(program_name python) + set(brew_package_name "python2") +else() + set(program_name python2) + set(apt_package_name "python") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake new file mode 100644 index 00000000000000..063839f7ffa9b0 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake @@ -0,0 +1,21 @@ +if(CMAKE_HOST_WIN32) + set(program_name python) + set(program_version 3.10.7) + 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 a69445906a909ce5f2554c544fe4251a8ab9c5028b531975b8c78fa8e98295b2bf06e1840f346a3c0edf485a7792c40c9d318bffd36b9c7829ac72b7cf8697bc) + 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 29b47f8073b54c092a2c8b39b09ab392f757a8c09149e8d2de043907fffb250b5f6801175e16fedb4fae7b6555822acdc57d81d13c2fea95ef0f6ed717f86cb9) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") + vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) +else() + set(program_name python3) + set(brew_package_name "python") + set(apt_package_name "python3") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake b/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake new file mode 100644 index 00000000000000..e6c948d5d989f5 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake @@ -0,0 +1,6 @@ +set(program_name "ruby") +set(program_version 2.7.4-1) +set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin") +set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z") +set(download_filename "rubyinstaller-${program_version}-x86.7z") +set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) diff --git a/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake b/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake new file mode 100644 index 00000000000000..0ced68ce2f2a43 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake @@ -0,0 +1,8 @@ +set(program_name scons) +set(program_version 4.1.0) +set(tool_subdirectory "${program_version}") +set(interpreter PYTHON2) +set(search_names "scons.py") +set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download") +set(download_filename "scons-local-${program_version}.zip") +set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) diff --git a/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake new file mode 100644 index 00000000000000..5fe019c096d4c2 --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake @@ -0,0 +1,16 @@ +set(program_version 4.0.2) +set(program_name swig) +if(CMAKE_HOST_WIN32) + vcpkg_list(SET sourceforge_args + REPO swig/swigwin + REF "swigwin-${program_version}" + FILENAME "swigwin-${program_version}.zip" + SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d + NO_REMOVE_ONE_LEVEL + WORKING_DIRECTORY "${DOWNLOADS}/tools/swig" + ) + set(tool_subdirectory "b8f105f9b9-f0518bc3b7/swigwin-${program_version}") +else() + set(apt_package_name "swig") + set(brew_package_name "swig") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake b/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake new file mode 100644 index 00000000000000..e676ceabea0ebb --- /dev/null +++ b/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake @@ -0,0 +1,10 @@ +set(program_name yasm) +set(program_version 1.3.0.6.g1962) +set(tool_subdirectory 1.3.0.6) +set(brew_package_name "yasm") +set(apt_package_name "yasm") +set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe") +set(download_filename "yasm-${program_version}.exe") +set(rename_binary_to "yasm.exe") +set(raw_executable ON) +set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index a18077356895fc..32825d86ca92f4 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -113,463 +113,9 @@ function(vcpkg_find_acquire_program program) set(brew_package_name "") set(apt_package_name "") - if(program STREQUAL "PERL") - set(program_name perl) - set(program_version 5.32.1.1) - set(tool_subdirectory ${program_version}) - set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin) - set(brew_package_name "perl") - set(apt_package_name "perl") - set(download_urls - "https://strawberryperl.com/download/${program_version}/strawberry-perl-${program_version}-32bit.zip" - ) - set(download_filename "strawberry-perl-${program_version}-32bit.zip") - set(download_sha512 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9) - elseif(program STREQUAL "NASM") - set(program_name nasm) - set(program_version 2.16.01) - set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}") - set(brew_package_name "nasm") - set(apt_package_name "nasm") - set(download_urls "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip") - set(download_filename "nasm-${program_version}-win64.zip") - set(download_sha512 ce4d02f530dc3376b4513f219bbcec128ee5bebd8a5c332599b48d8071f803d1538d7258fec7c2e9b4d725b8d7314cea2696289d0493017eb13bfe70e5cb5062) - elseif(program STREQUAL "YASM") - set(program_name yasm) - set(program_version 1.3.0.6.g1962) - set(tool_subdirectory 1.3.0.6) - set(brew_package_name "yasm") - set(apt_package_name "yasm") - set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe") - set(download_filename "yasm-${program_version}.exe") - set(rename_binary_to "yasm.exe") - set(raw_executable ON) - set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) - elseif(program STREQUAL "GIT") - set(program_name git) - if(CMAKE_HOST_WIN32) - set(base_version 2.32.0) - set(program_version 2.32.0.2) - set(tool_subdirectory "git-${program_version}-2-windows") - set(download_urls "https://github.com/git-for-windows/git/releases/download/v${base_version}.windows.2/PortableGit-${program_version}-32-bit.7z.exe") - set(download_filename "PortableGit-${program_version}-32-bit.7z.exe") - set(download_sha512 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348) - set(paths_to_search - "${DOWNLOADS}/tools/${tool_subdirectory}/mingw32/bin" - "${DOWNLOADS}/tools/git/${tool_subdirectory}/mingw32/bin") - else() - set(brew_package_name "git") - set(apt_package_name "git") - endif() - elseif(program STREQUAL "GN") - set(program_name gn) - set(rename_binary_to "gn") - if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt") - file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/gn/version.txt" program_version) - set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/gn") - else() # Old behavior - message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues") - set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(supported_on_unix ON) - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) - if(HOST_ARCH STREQUAL "aarch64") - set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") - set(gn_platform "linux-arm64") - set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B") - else() - set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC") - set(gn_platform "linux-amd64") - set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") - endif() - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(supported_on_unix ON) - EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) - if(HOST_ARCH STREQUAL "arm64") - set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") - set(gn_platform "mac-arm64") - set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8") - else() - set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC") - set(gn_platform "mac-amd64") - set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") - endif() - else() - if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") - set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") - set(gn_platform "windows-amd64") - set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") - else() # AMD64 - set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") - set(gn_platform "windows-amd64") - set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") - endif() - endif() - endif() - set(tool_subdirectory "${program_version}") - set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") - set(download_filename "gn-${gn_platform}.zip") - elseif(program STREQUAL "GO") - set(program_name go) - set(tool_subdirectory 1.16.6.windows-386) - set(paths_to_search ${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin) - set(brew_package_name "go") - set(apt_package_name "golang-go") - set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip") - set(download_filename "go${tool_subdirectory}.zip") - set(download_sha512 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8) - elseif(program STREQUAL "PYTHON3") - if(CMAKE_HOST_WIN32) - set(program_name python) - set(program_version 3.10.7) - 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 a69445906a909ce5f2554c544fe4251a8ab9c5028b531975b8c78fa8e98295b2bf06e1840f346a3c0edf485a7792c40c9d318bffd36b9c7829ac72b7cf8697bc) - 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 29b47f8073b54c092a2c8b39b09ab392f757a8c09149e8d2de043907fffb250b5f6801175e16fedb4fae7b6555822acdc57d81d13c2fea95ef0f6ed717f86cb9) - endif() - set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") - vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) - else() - set(program_name python3) - set(brew_package_name "python") - set(apt_package_name "python3") - endif() - elseif(program STREQUAL "PYTHON2") - if(CMAKE_HOST_WIN32) - set(program_name python) - set(program_version 2.7.18) - if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") - include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") - else() # Old behavior - 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}.msi") - set(download_filename "python-${program_version}.msi") - set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) - else() - set(tool_subdirectory "python-${program_version}-x64") - set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") - set(download_filename "python-${program_version}.amd64.msi") - set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) - endif() - set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") - endif() - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - # macOS includes Python 2.7 built-in as `python` - set(program_name python) - set(brew_package_name "python2") - else() - set(program_name python2) - set(apt_package_name "python") - endif() - elseif(program STREQUAL "RUBY") - set(program_name "ruby") - set(program_version 2.7.4-1) - set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin") - set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z") - set(download_filename "rubyinstaller-${program_version}-x86.7z") - set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) - elseif(program STREQUAL "JOM") - set(program_name jom) - set(tool_subdirectory "jom-1.1.3") - set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}") - set(download_urls - "https://download.qt.io/official_releases/jom/jom_1_1_3.zip" - "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" - ) - set(download_filename "jom_1_1_3.zip") - set(download_sha512 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33) - elseif(program STREQUAL "7Z") - set(program_name 7z) - set(paths_to_search "${DOWNLOADS}/tools/7z/Files/7-Zip") - set(download_urls "https://7-zip.org/a/7z1900.msi") - set(download_filename "7z1900.msi") - set(download_sha512 f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067) - elseif(program STREQUAL "NINJA") - set(program_name ninja) - set(program_version 1.10.2) - set(supported_on_unix ON) - set(version_command --version) - if(CMAKE_HOST_WIN32) - set(download_filename "ninja-win-${program_version}.zip") - set(tool_subdirectory "${program_version}-windows") - set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") - set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(download_filename "ninja-mac-${program_version}.zip") - set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") - set(tool_subdirectory "${program_version}-osx") - set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") - set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") - set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") - set(supported_on_unix OFF) - else() - execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) - if(HOST_ARCH MATCHES "x86_64|amd64|AMD64") - set(download_filename "ninja-linux-${program_version}.zip") - set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") - set(tool_subdirectory "${program_version}-linux") - set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") - set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) - else() - set(version_command "") # somewhat hacky way to skip version check and use system binary - endif() - endif() - elseif(program STREQUAL "NUGET") - set(program_name nuget) - set(tool_subdirectory "5.11.0") - set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows") - set(brew_package_name "nuget") - set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") - set(rename_binary_to "nuget.exe") - set(download_filename "nuget.5.11.0.exe") - set(raw_executable ON) - set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) - elseif(program STREQUAL "MESON") # Should always be found! - set(program_name meson) - set(search_names meson meson.py) - set(interpreter PYTHON3) - set(apt_package_name "meson") - set(brew_package_name "meson") - set(version_command --version) - set(extra_search_args EXACT_VERSION_MATCH) - if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") - file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) - set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") - else() # Old behavior - set(program_version 0.58.1) - set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) - set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") - set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") - set(download_filename "meson-${ref}.tar.gz") - set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) - set(supported_on_unix ON) - endif() - elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON") - if(CMAKE_HOST_WIN32) - set(program_version 2.5.25) - set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip") - set(download_filename "win_flex_bison-${program_version}.zip") - set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e) - set(tool_subdirectory "${program_version}") - if(program STREQUAL "FLEX") - set(program_name win_flex) - else() - set(program_name win_bison) - endif() - set(paths_to_search ${DOWNLOADS}/tools/win_flex/${program_version}) - if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4") - file(REMOVE_RECURSE "${paths_to_search}") - endif() - elseif(program STREQUAL "FLEX") - set(program_name flex) - set(apt_package_name flex) - set(brew_package_name flex) - else() - set(program_name bison) - set(apt_package_name bison) - set(brew_package_name bison) - if (APPLE) - set(paths_to_search /usr/local/opt/bison/bin) - endif() - endif() - elseif(program STREQUAL "CLANG") - set(program_name clang) - set(tool_subdirectory "clang-15.0.6") - set(program_version 15.0.6) - if(CMAKE_HOST_WIN32) - set(paths_to_search - # Support LLVM in Visual Studio 2019 - "$ENV{LLVMInstallDir}/x64/bin" - "$ENV{LLVMInstallDir}/bin" - "$ENV{VCINSTALLDIR}/Tools/Llvm/x64/bin" - "$ENV{VCINSTALLDIR}/Tools/Llvm/bin" - "${DOWNLOADS}/tools/${tool_subdirectory}-windows/bin" - "${DOWNLOADS}/tools/clang/${tool_subdirectory}/bin") - - if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) - set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") - else() - set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}") - endif() - - if(host_arch MATCHES "64") - set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe") - set(download_filename "LLVM-${program_version}-win64.7z.exe") - set(download_sha512 2dd6f3eea106f2b905e6658ea5ea12856d17285adbfba055edc2d6b6389c4c2f7aa001df5cb0d8fb84fa7fa47d5035a7fddf276523b472dd55f150ae25938768) - else() - set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe") - set(download_filename "LLVM-${program_version}-win32.7z.exe") - set(download_sha512 90225D650EADB0E590A9912B479B46A575D41A19EB5F2DA03C4DC8B032DC0790222F0E3706DFE2A35C0E7747941972AC26CB47D3EB13730DB76168931F37E5F1) - endif() - endif() - set(brew_package_name "llvm") - set(apt_package_name "clang") - elseif(program STREQUAL "GPERF") - set(program_name gperf) - set(program_version 3.0.1) - set(paths_to_search "${DOWNLOADS}/tools/gperf/bin") - set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download") - set(download_filename "gperf-${program_version}-bin.zip") - set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9) - elseif(program STREQUAL "GASPREPROCESSOR") - set(raw_executable true) - set(program_name gas-preprocessor) - set(interpreter PERL) - set(search_names "gas-preprocessor.pl") - set(paths_to_search "${DOWNLOADS}/tools/gas-preprocessor/${tool_subdirectory}") - set(rename_binary_to "gas-preprocessor.pl") - set(commit_id 9309c67acb535ca6248f092e96131d8eb07eefc1) - set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/${commit_id}/gas-preprocessor.pl") - string(SUBSTRING ${commit_id} 0 8 tool_subdirectory) - set(download_filename "gas-preprocessor-${tool_subdirectory}.pl") - set(download_sha512 b4749cf8aa758e3f28d4b21803422a5c2588f5fc48cfd317564606b374f8d739c636067cf7a4956d7365d63b055bc6e7626c304857e6c9013d6b4a0db9d8ad4f) - elseif(program STREQUAL "DARK") - set(program_name dark) - set(tool_subdirectory "wix311-binaries") - set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}") - set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip") - set(download_filename "wix311-binaries.zip") - set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) - elseif(program STREQUAL "SCONS") - set(program_name scons) - set(program_version 4.1.0) - set(tool_subdirectory "${program_version}") - set(interpreter PYTHON2) - set(search_names "scons.py") - set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download") - set(download_filename "scons-local-${program_version}.zip") - set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) - elseif(program STREQUAL "SWIG") - set(program_version 4.0.2) - set(program_name swig) - if(CMAKE_HOST_WIN32) - vcpkg_list(SET sourceforge_args - REPO swig/swigwin - REF "swigwin-${program_version}" - FILENAME "swigwin-${program_version}.zip" - SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/swig" - ) - set(tool_subdirectory "b8f105f9b9-f0518bc3b7/swigwin-${program_version}") - else() - set(apt_package_name "swig") - set(brew_package_name "swig") - endif() - - elseif(program STREQUAL "DOXYGEN") - set(program_name doxygen) - set(program_version 1.9.1) - vcpkg_list(SET sourceforge_args - REPO doxygen - REF "rel-${program_version}" - FILENAME "doxygen-${program_version}.windows.bin.zip" - SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" - ) - set(tool_subdirectory c3eeb6b9fa-76d69c6db5) - elseif(program STREQUAL "BAZEL") - set(program_name bazel) - set(program_version 4.2.2) - set(rename_binary_to "bazel") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(supported_on_unix ON) - set(tool_subdirectory "${program_version}-linux") - set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") - set(download_filename "bazel-${tool_subdirectory}-x86_64") - set(raw_executable ON) - set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(supported_on_unix ON) - set(tool_subdirectory "${program_version}-darwin") - set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") - set(download_filename "bazel-${tool_subdirectory}-x86_64") - set(raw_executable ON) - set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275) - else() - set(tool_subdirectory "${program_version}-windows") - set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip") - set(download_filename "bazel-${tool_subdirectory}-x86_64.zip") - set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d) - endif() - elseif(program STREQUAL "ARIA2") - set(program_name aria2c) - set(program_version 1.35.0) - set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1") - set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip") - set(download_filename "aria2-${program_version}-win-32bit-build1.zip") - set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) - elseif(program STREQUAL "PKGCONFIG") - set(program_name pkg-config) - if(DEFINED ENV{PKG_CONFIG}) - debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}") - set(PKGCONFIG "$ENV{PKG_CONFIG}" CACHE INTERNAL "") - set(PKGCONFIG "${PKGCONFIG}" PARENT_SCOPE) - return() - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") - # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir} - set(supported_on_unix ON) - set(rename_binary_to "pkg-config") - set(program_version 0.29.2.1) - set(raw_executable ON) - set(download_filename "pkg-config.openbsd") - set(tool_subdirectory "openbsd") - set(download_urls "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config") - set(download_sha512 b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b) - set(version_command --version) - elseif(CMAKE_HOST_WIN32) - if(NOT EXISTS "${PKGCONFIG}") - set(VERSION 0.29.2-3) - set(program_version git-9.0.0.6373.5be8fcd83-1) - vcpkg_acquire_msys( - PKGCONFIG_ROOT - NO_DEFAULT_PACKAGES - DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" - 0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst" - c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 - ) - endif() - set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") - set("${program}" "${${program}}" PARENT_SCOPE) - return() - else() - set(brew_package_name pkg-config) - set(apt_package_name pkg-config) - set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin") - endif() - elseif(program STREQUAL "PATCHELF") - set(program_name patchelf) - set(program_version 0.14.5) - set(supported_on_unix ON) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) - if(HOST_ARCH STREQUAL "aarch64") - set(patchelf_platform "aarch64") - set(download_sha512 "3B5EB4405FAB1D5202728AA390DD9F059CD7AFD582BAD9C50383CAD605127BC77DFCE3F2F26E9714F6BD5CCFFD49D3973BA2F061D2E2931B6E1BD0C263B99E75") - elseif(HOST_ARCH STREQUAL "armv7l") - set(patchelf_platform "armv7l") - set(download_sha512 "30160d750784f5e8805bffe96ca80b40ed10441549e10f47b61e0d21b32979e01865cd770f1de9162988d4daabc6984dcdb7438f67bcd5eee76ad5f01b00276d") - else() - set(patchelf_platform "x86_64") - set(download_sha512 "5E983A25B3F3F3B8582D1DE6C7DE30812E8D6E58E96F711F33A2634D3FB1F2370531DA179927AA401328319F92465E6F76274A6F994D1DC54C74B98E704D0D29") - endif() - set(download_filename "${program_name}-${program_version}-${patchelf_platform}.tar.gz") - set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}") - set(tool_subdirectory "${program_version}-${patchelf_platform}-linux") - set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_platform}-linux/bin") - endif() - set(version_command --version) + set(program_information "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/vcpkg_find_acquire_program(${program}).cmake") + if(program MATCHES "^[A-Z0-9]+\$" AND EXISTS "${program_information}") + include("${program_information}") else() message(FATAL_ERROR "unknown tool ${program} -- unable to acquire.") endif() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index c9bb4eda089954..ac0b64e6eb45d5 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -129,18 +129,18 @@ if(CMD STREQUAL "BUILD") include("${CMAKE_TRIPLET_FILE}") - if (DEFINED VCPKG_PORT_CONFIGS) - foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS) - include("${VCPKG_PORT_CONFIG}") - endforeach() - endif() - set(HOST_TRIPLET "${_HOST_TRIPLET}") set(CURRENT_HOST_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}" CACHE PATH "Location to install final packages for the host") set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") + if (DEFINED VCPKG_PORT_CONFIGS) + foreach(VCPKG_PORT_CONFIG IN LISTS VCPKG_PORT_CONFIGS) + include("${VCPKG_PORT_CONFIG}") + endforeach() + endif() + set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt") file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}") diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 91b62753b4cd62..2737f91b7ca588 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -13,7 +13,6 @@ # VCPKG_TOOLCHAIN = ON OFF # TRIPLET_SYSTEM_ARCH = arm x86 x64 # BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} # DEBUG_CONFIG = "Debug Static" "Debug Dll" # RELEASE_CONFIG = "Release Static"" "Release DLL" # VCPKG_TARGET_IS_WINDOWS diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index fc8fde3f53883c..ce2a69ec702345 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -79,7 +79,7 @@ }, { "$package": "Intl", - "name": "gettext" + "name": "gettext-libintl" }, { "$package": "GIF", diff --git a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake new file mode 100644 index 00000000000000..222727ca95ffd7 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake @@ -0,0 +1,336 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(msys_repo_url "https://mirror.msys2.org/msys/x86_64") +set(mingw64_repo_url "https://mirror.msys2.org/mingw/mingw64") +set(mingw32_repo_url "https://mirror.msys2.org/mingw/mingw32") + +# Ignore these updates (e.g. for known problems) +vcpkg_list(SET ignored_packages + https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20211016-3-any.pkg.tar.zst +) + +# Ignore these dependencies (e.g. interactive or effectively optional) +vcpkg_list(SET ignored_dependencies + autoconf2.13 autoconf2.69 + automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 + db + gdbm + info + less + libiconv-devel + libltdl + mingw-w64-x86_64-tzdata +) + +# Ignore these provides (e.g. effectively optional) +vcpkg_list(SET ignored_provides + gnome-common + perl-Archive-Tar perl-Attribute-Handlers perl-AutoLoader perl-CPAN-Meta-Requirements perl-CPAN-Meta-YAML perl-CPAN-Meta perl-CPAN perl-Carp perl-Compress-Raw-Bzip2 perl-Compress-Raw-Zlib perl-Config-Perl-V perl-DB_File perl-Data-Dumper perl-Devel-PPPort perl-Devel-SelfStubber perl-Digest-MD5 perl-Digest-SHA perl-Digest perl-Dumpvalue perl-Encode perl-Env perl-Exporter perl-ExtUtils-CBuilder perl-ExtUtils-Constant perl-ExtUtils-Install perl-ExtUtils-MakeMaker perl-ExtUtils-Manifest perl-ExtUtils-PL2Bat perl-ExtUtils-ParseXS perl-File-Fetch perl-File-Path perl-File-Temp perl-Filter-Simple perl-Filter-Util-Call perl-FindBin perl-Getopt-Long perl-HTTP-Tiny perl-I18N-Collate perl-I18N-LangTags perl-IO-Compress perl-IO-Socket-IP perl-IO-Zlib perl-IO perl-IPC-Cmd perl-IPC-SysV perl-JSON-PP perl-Locale-Maketext-Simple perl-Locale-Maketext perl-MIME-Base64 perl-Math-BigInt-FastCalc perl-Math-BigInt perl-Math-BigRat perl-Math-Complex perl-Memoize perl-Module-CoreList perl-Module-Load-Conditional perl-Module-Load perl-Module-Loaded perl-Module-Metadata perl-NEXT perl-Net-Ping perl-Params-Check perl-PathTools perl-Perl-OSType perl-PerlIO-via-QuotedPrint perl-Pod-Checker perl-Pod-Escapes perl-Pod-Perldoc perl-Pod-Simple perl-Pod-Usage perl-Safe perl-Scalar-List-Utils perl-Search-Dict perl-SelfLoader perl-Socket perl-Storable perl-Sys-Syslog perl-Term-ANSIColor perl-Term-Cap perl-Term-Complete perl-Term-ReadLine perl-Test-Harness perl-Test-Simple perl-Test perl-Text-Abbrev perl-Text-Balanced perl-Text-ParseWords perl-Text-Tabs perl-Thread-Queue perl-Thread-Semaphore perl-Tie-File perl-Tie-RefHash perl-Time-HiRes perl-Time-Local perl-Time-Piece perl-Unicode-Collate perl-Unicode-Normalize perl-Win32 perl-Win32API-File perl-XSLoader perl-autodie perl-autouse perl-base perl-bignum perl-constant perl-encoding-warnings perl-experimental perl-if perl-lib perl-libnet perl-parent perl-perlfaq perl-podlators perl-threads-shared perl-threads perl-version +) + + +string(TIMESTAMP now "%s" UTC) + +function(age_in_days out_var timestamp) + set(age "") + if(timestamp) + math(EXPR age "(${now} - ${timestamp}) / 3600 / 24") + endif() + set(${out_var} "${age}" PARENT_SCOPE) +endfunction() + +function(pretty_age out_var age_in_days) + if(age_in_days STREQUAL "") + set(${out_var} "(timestamp unknown)" PARENT_SCOPE) + else() + set(${out_var} "(${age_in_days} days ago)" PARENT_SCOPE) + endif() +endfunction() + +function(get_vcpkg_builddate out_var name) + if(NOT DEFINED Z_VCPKG_MSYS_${name}_ARCHIVE) + z_vcpkg_acquire_msys_download_package(Z_VCPKG_MSYS_${name}_ARCHIVE + URL "${Z_VCPKG_MSYS_${name}_URL}" + SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}" + FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}" + ) + set(Z_VCPKG_MSYS_${name}_ARCHIVE "${Z_VCPKG_MSYS_${name}_ARCHIVE}" PARENT_SCOPE) + endif() + set(pkginfo_dir "${CURRENT_BUILDTREES_DIR}/vcpkg") + file(REMOVE_RECURSE "${pkginfo_dir}/${name}.txt" "${pkginfo_dir}/_tmp") + file(MAKE_DIRECTORY "${pkginfo_dir}/_tmp") + execute_process( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${name}_ARCHIVE}" .PKGINFO + WORKING_DIRECTORY "${pkginfo_dir}/_tmp" + ) + file(RENAME "${pkginfo_dir}/_tmp/.PKGINFO" "${pkginfo_dir}/${name}.txt") + file(STRINGS "${pkginfo_dir}/${name}.txt" builddate REGEX "builddate = [0-9]+") + string(REPLACE "builddate = " "" builddate "${builddate}") + set(${out_var} "${builddate}" PARENT_SCOPE) +endfunction() + +function(get_vcpkg_provides out_var name) + if(NOT DEFINED Z_VCPKG_MSYS_${name}_ARCHIVE) + z_vcpkg_acquire_msys_download_package(Z_VCPKG_MSYS_${name}_ARCHIVE + URL "${Z_VCPKG_MSYS_${name}_URL}" + SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}" + FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}" + ) + set(Z_VCPKG_MSYS_${name}_ARCHIVE "${Z_VCPKG_MSYS_${name}_ARCHIVE}" PARENT_SCOPE) + endif() + set(pkginfo_dir "${CURRENT_BUILDTREES_DIR}/vcpkg") + file(REMOVE_RECURSE "${pkginfo_dir}/${name}.txt" "${pkginfo_dir}/_tmp") + file(MAKE_DIRECTORY "${pkginfo_dir}/_tmp") + execute_process( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${name}_ARCHIVE}" .PKGINFO + WORKING_DIRECTORY "${pkginfo_dir}/_tmp" + ) + file(RENAME "${pkginfo_dir}/_tmp/.PKGINFO" "${pkginfo_dir}/${name}.txt") + file(STRINGS "${pkginfo_dir}/${name}.txt" provides REGEX "provides = .+") + string(REPLACE "provides = " "" provides "${provides}") + set(${out_var} "${provides}" PARENT_SCOPE) +endfunction() + +function(update_vcpkg_download script_file name new_url) + message(STATUS "- Updating vcpkg...") + if(NOT new_url MATCHES [[^https://mirror\.msys2\.org/.*/(([^/]*)-[^-/]+-[^-/]+-[^-/]+\.pkg\.tar\.(xz|zst))$]]) + message(FATAL_ERROR "Supplied URL does not match the expected pattern: ${arg_URL}") + endif() + set(filename "msys2-${CMAKE_MATCH_1}") + vcpkg_download_distfile(archive + URLS "${new_url}" + FILENAME "${filename}" + SKIP_SHA512 + ) + execute_process( + COMMAND "${CMAKE_COMMAND}" -E sha512sum "${archive}" + OUTPUT_VARIABLE sha512 + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(REGEX REPLACE " .*" "" sha512 "${sha512}") + vcpkg_replace_string("${SCRIPTS}/cmake/${script_file}" "${Z_VCPKG_MSYS_${name}_URL}" "${new_url}") + vcpkg_replace_string("${SCRIPTS}/cmake/${script_file}" "${Z_VCPKG_MSYS_${name}_SHA512}" "${sha512}") +endfunction() + +function(pretty_dependencies out_var list_name) + foreach(dependency IN LISTS ignored_dependencies) + list(TRANSFORM ${list_name} REPLACE "^${dependency}\$" "(${dependency})") + endforeach() + list(JOIN ${list_name} " " list_string) + set(${out_var} "${list_string}" PARENT_SCOPE) +endfunction() + +function(analyze_package_list list_var script) + message(STATUS "*** Analyzing packages in '${script}'") + vcpkg_list(SET critical) # Packages which can be upgraded and are fairly old in vcpkg + vcpkg_list(SET mismatched_deps) # Packages which have vcpkg deps different from msys2 deps + vcpkg_list(SET missing) # Packages used in (new) deps but not declared + vcpkg_list(SET upgradable) # Packages which can be upgrade but are fairly fresh in vcpkg + vcpkg_list(SET vanished) # Packages which vanished from the msys2 database + + # Preload details from direct packages + foreach(name IN LISTS ${list_var}) + if(NOT Z_VCPKG_MSYS_${name}_DIRECT) + continue() + endif() + get_vcpkg_provides(vcpkg_provides "${name}") + set(Z_VCPKG_MSYS_${name}_PROVIDES "${vcpkg_provides}") + foreach(provided IN LISTS vcpkg_provides) + set(Z_VCPKG_MSYS_${provided}_PROVIDED_BY "${name}") + endforeach() + endforeach() + + # msys2.org removes packages 1.75 years after it was removed from the active database, + # cf. https://www.msys2.org/docs/faq/#how-long-are-old-packages-kept-on-repomsys2org + # We don't know the date of that replacement, and mirrors might use a shorter time. + # But we can compare the build date of the package currently downloaded by vcpkg + # and the build date of the package in the msys2 database. + # If this time span exceeds 'max_age', an update is marked as critical. + set(max_age 365) # days + math(EXPR minimum_builddate "${now} - 6 * 30 * 24 * 3600") + foreach(name IN LISTS ${list_var}) + if(Z_VCPKG_MSYS_${name}_DIRECT) + message(STATUS "${name} (DIRECT)") + elseif("DIRECT_ONLY" IN_LIST ARGN) + continue() + else() + message(STATUS "${name}") + endif() + set(vcpkg_url "${Z_VCPKG_MSYS_${name}_URL}") + set(vcpkg_deps "${Z_VCPKG_MSYS_${name}_DEPS}") + set(vcpkg_provides "${Z_VCPKG_MSYS_${name}_PROVIDES}") + + set(repo "msys") + if(name MATCHES "^mingw-w64-x86_64") + set(repo "mingw64") + elseif(name MATCHES "^mingw-w64-i686") + set(repo "mingw32") + endif() + + file(GLOB files "${${repo}_repo_files}/${name}-*/desc") + set(found 0) + foreach(file IN LISTS files) + # Find the package + file(STRINGS "${file}" desc) + if(NOT desc MATCHES "%NAME%;${name};") + continue() + elseif(NOT desc MATCHES "%FILENAME%;([^;]+)") + continue() + endif() + set(found 1) + set(current_url "${${repo}_repo_url}/${CMAKE_MATCH_1}") + # Check the URL + if(NOT vcpkg_url STREQUAL current_url AND NOT current_url IN_LIST ignored_packages) + get_vcpkg_builddate(vcpkg_builddate "${name}") + age_in_days(vcpkg_age "${vcpkg_builddate}") + pretty_age(vcpkg_age_pretty "${vcpkg_age}") + set(current_age "") + if(desc MATCHES "%BUILDDATE%;([0-9]+)") + age_in_days(current_age "${CMAKE_MATCH_1}") + endif() + pretty_age(current_age_string "${current_age}") + message(STATUS "- vcpkg: ${vcpkg_url} ${vcpkg_age_pretty}") + message(STATUS "+ msys2: ${current_url} ${current_age_string}") + + set(age_diff "0") + if(NOT vcpkg_age STREQUAL "" AND NOT current_age STREQUAL "") + math(EXPR age_diff "${current_age} - ${vcpkg_age}") + endif() + if(age_diff GREATER max_age) + if("update-all" IN_LIST FEATURES) + update_vcpkg_download("${script}" "${name}" "${current_url}") + else() + vcpkg_list(APPEND critical "${name}") + endif() + elseif(NOT vcpkg_url STREQUAL current_url) + if("update-all" IN_LIST FEATURES) + update_vcpkg_download("${script}" "${name}" "${current_url}") + else() + vcpkg_list(APPEND upgradable "${name}") + endif() + endif() + endif() + # Check the dependencies + if(desc MATCHES "%DEPENDS%;([^%]*)" OR vcpkg_deps) + list(JOIN CMAKE_MATCH_1 " " current_deps) + separate_arguments(current_deps UNIX_COMMAND "${current_deps}") + list(TRANSFORM current_deps REPLACE "[<=>].*" "") + list(SORT current_deps) + list(SORT vcpkg_deps) + pretty_dependencies(current_deps_string current_deps) + if(Z_VCPKG_MSYS_${name}_DIRECT AND NOT current_deps STREQUAL "") + message(STATUS "* msys2 dependencies: ${current_deps_string}") + elseif(NOT vcpkg_deps STREQUAL current_deps) + pretty_dependencies(vcpkg_deps_string vcpkg_deps) + message(STATUS "- vcpkg dependencies: ${vcpkg_deps_string}") + message(STATUS "+ msys2 dependencies: ${current_deps_string}") + list(REMOVE_ITEM current_deps ${ignored_dependencies}) + if(NOT vcpkg_deps STREQUAL current_deps) + vcpkg_list(APPEND mismatched_deps "${name}") + endif() + list(REMOVE_ITEM current_deps ${known_packages} ${${list_var}} ${ignored_dependencies}) + set(missing_deps "") + foreach(dep IN LISTS current_deps) + if(NOT DEFINED Z_VCPKG_MSYS_${dep}_PROVIDED_BY) + list(APPEND missing_deps "${dep}") + endif() + endforeach() + if(missing_deps) + list(JOIN missing_deps " " missing_deps_string) + message(STATUS "! unknown dependencies: ${missing_deps_string}") + vcpkg_list(APPEND missing ${missing_deps}) + endif() + endif() + endif() + # Check the "provides" + if(desc MATCHES "%PROVIDES%;([^%]*)" OR vcpkg_provides) + list(JOIN CMAKE_MATCH_1 " " current_provides) + separate_arguments(current_provides UNIX_COMMAND "${current_provides}") + list(TRANSFORM current_provides REPLACE "[<=>].*" "") + list(REMOVE_ITEM current_provides ${ignored_provides}) + list(JOIN vcpkg_provides " " vcpkg_provides_string) + if(NOT vcpkg_provides STREQUAL current_provides) + list(JOIN vcpkg_provides " " vcpkg_provides_string) + list(JOIN current_provides " " current_provides_string) + message(STATUS "- vcpkg provides: ${vcpkg_provides_string}") + message(STATUS "+ msys2 provides: ${current_provides_string}") + elseif(NOT vcpkg_provides STREQUAL "") + message(STATUS "* provides: ${vcpkg_provides_string}") + endif() + endif() + endforeach() + if(NOT found) + vcpkg_list(APPEND vanished "${name}") + get_vcpkg_builddate(vcpkg_builddate "${name}") + age_in_days(vcpkg_age "${vcpkg_builddate}") + pretty_age(vcpkg_age_pretty "${vcpkg_age}") + message(STATUS "- vcpkg: ${vcpkg_url} ${vcpkg_age_pretty}") + message(STATUS "! msys2: no match for ${name}") + + age_in_days(current_age "${now}") + set(age_diff "0") + if(NOT vcpkg_age STREQUAL "" AND NOT current_age STREQUAL "") + math(EXPR age_diff "${current_age} - ${vcpkg_age}") + endif() + if(age_diff GREATER max_age) + vcpkg_list(APPEND critical "${name}") + endif() + endif() + endforeach() + + if(mismatched_deps) + list(JOIN mismatched_deps " " mismatched_deps) + message(WARNING "The following msys2 packages have changed dependencies: ${mismatched_deps}") + endif() + if(missing) + list(SORT missing) + list(REMOVE_DUPLICATES missing) + list(JOIN missing " " missing) + message(WARNING "The following msys2 packages would be needed to update all dependencies: ${missing}") + endif() + if(upgradable) + list(JOIN upgradable " " upgradable) + message(WARNING "The following msys2 packages could be updated: ${upgradable}") + endif() + if(critical) + list(JOIN critical " " critical) + message(SEND_ERROR "The following msys2 packages were build more than 6 months ago and should be updated: ${critical}") + endif() + if(vanished) + list(JOIN vanished " " vanished) + message(SEND_ERROR "The following msys2 packages are no longer in the database: ${vanished}") + endif() + message(STATUS "*** Analyzing packages in '${script}' done") +endfunction() + +message(STATUS "*** Downloading current msys2 package lists") +string(TIMESTAMP stamp "%Y-%m-%d" UTC) +foreach(repo IN ITEMS msys mingw32 mingw64) + string(REPLACE "/" "-" local_file "msys2-${stamp}-${repo}.files") + set(archive "${DOWNLOADS}/${local_file}") + vcpkg_download_distfile(repo_files_archive + URLS "${${repo}_repo_url}/${repo}.files" + FILENAME "${local_file}" + SKIP_SHA512 + ) + vcpkg_extract_source_archive(repo_files + ARCHIVE "${repo_files_archive}" + NO_REMOVE_ONE_LEVEL + ) + set(${repo}_repo_files "${repo_files}") +endforeach() +message(STATUS "*** Downloading current msys2 package lists done") + +set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") +vcpkg_acquire_msys(msys_root Z_ALL_PACKAGES) +analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_acquire_msys.cmake") +set(known_packages "${Z_VCPKG_MSYS_PACKAGES_RESOLVED}") + +set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") +vcpkg_find_acquire_program(PKGCONFIG) +analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_acquire_program(PKGCONFIG).cmake" DIRECT_ONLY) + +set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") +include("${SCRIPTS}/cmake/vcpkg_find_fortran.cmake") +vcpkg_find_fortran(FORTRAN) +analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_fortran.cmake" DIRECT_ONLY) diff --git a/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json b/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json new file mode 100644 index 00000000000000..039d3df819996a --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "vcpkg-ci-msys2", + "version": "1", + "description": "Test vcpkg msys2 freshness", + "license": "MIT", + "supports": "(windows | mingw) & native", + "features": { + "update-all": { + "description": "Update all outdated packages in vcpkg_acquire_msys.cmake" + } + } +} diff --git a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake index 88a4856c5f5e1c..0316fc2b69b27d 100644 --- a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake +++ b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake @@ -1,21 +1,62 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -if(CMAKE_HOST_WIN32) - foreach(PROG GO JOM NASM PERL YASM GIT PYTHON3 PYTHON2 RUBY 7Z NUGET FLEX BISON GPERF GASPREPROCESSOR DARK SCONS SWIG DOXYGEN ARIA2 PKGCONFIG) - vcpkg_find_acquire_program(${PROG}) - foreach(SUBPROG IN LISTS ${PROG}) - if(NOT EXISTS "${SUBPROG}") - message(FATAL_ERROR "Program ${SUBPROG} did not exist.") - endif() - endforeach() - endforeach() -endif() - -foreach(PROG GN NINJA MESON BAZEL) - vcpkg_find_acquire_program(${PROG}) - foreach(SUBPROG IN LISTS ${PROG}) - if(NOT EXISTS "${SUBPROG}") - message(FATAL_ERROR "Program ${SUBPROG} did not exist.") - endif() - endforeach() -endforeach() +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# For each vcpkg_find_acquire_program(NAME).cmake script, +# there must be a literal call to vcpkg_find_acquire_program(NAME).cmake + +set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON2 PYTHON3 YASM) +vcpkg_find_acquire_program(BAZEL) +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(GIT) +vcpkg_find_acquire_program(GN) +vcpkg_find_acquire_program(NINJA) +vcpkg_find_acquire_program(PERL) +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(PYTHON3) +vcpkg_find_acquire_program(YASM) + +if(NOT VCPKG_TARGET_IS_OSX) + # System python too old (3.9; meson needs 3.10) + list(APPEND variables MESON) + vcpkg_find_acquire_program(MESON) +endif() + +if(VCPKG_HOST_IS_LINUX) + list(APPEND variables PATCHELF) + vcpkg_find_acquire_program(PATCHELF) +endif() + +if(VCPKG_HOST_IS_WINDOWS) + list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET RUBY SCONS SWIG) + vcpkg_find_acquire_program(7Z) + vcpkg_find_acquire_program(ARIA2) + vcpkg_find_acquire_program(CLANG) + vcpkg_find_acquire_program(DARK) + vcpkg_find_acquire_program(DOXYGEN) + vcpkg_find_acquire_program(GASPREPROCESSOR) + vcpkg_find_acquire_program(GO) + vcpkg_find_acquire_program(GPERF) + vcpkg_find_acquire_program(JOM) + vcpkg_find_acquire_program(NASM) + vcpkg_find_acquire_program(NUGET) + vcpkg_find_acquire_program(RUBY) + vcpkg_find_acquire_program(SCONS) + vcpkg_find_acquire_program(SWIG) +endif() + +set(missing "") +foreach(variable IN LISTS variables) + list(POP_BACK "${variable}" program) + if(NOT EXISTS "${program}") + list(APPEND missing "${variable}: ${program}") + endif() + list(POP_FRONT "${variable}" interpreter) + if(interpreter AND NOT EXISTS "${interpreter}") + list(APPEND missing "${variable} (interpreter): ${interpreter}") + endif() +endforeach() +if(missing) + list(JOIN missing "\n " missing) + message(FATAL_ERROR "The following programs do not exist:\n ${missing}") +endif() diff --git a/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json index 987003b4cf0d3c..fb9166ef5b82c8 100644 --- a/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json +++ b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json @@ -3,5 +3,5 @@ "version-string": "0", "port-version": 1, "description": "Test port to exercise vcpkg_find_acquire_program", - "supports": "windows" + "supports": "native" } diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index fb4e66cd6b04ac..4eff3206bd17c6 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -9,25 +9,6 @@ else() endif() set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") -if (VCPKG_TARGET_TRIPLET MATCHES "arm64-android") - set(ANDROID_ABI arm64-v8a CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "armv6-android") - set(ANDROID_ABI armeabi CACHE STRING "") - set(ANDROID_ARM_MODE arm CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-neon-android") - set(ANDROID_ABI armeabi-v7a CACHE STRING "") - set(ANDROID_ARM_NEON ON CACHE BOOL "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-android") - set(ANDROID_ABI armeabi-v7a CACHE STRING "") - set(ANDROID_ARM_NEON OFF CACHE BOOL "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "x64-android") - set(ANDROID_ABI x86_64 CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "x86-android") - set(ANDROID_ABI x86 CACHE STRING "") -else() - message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}") -endif() - if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(ANDROID_STL c++_shared CACHE STRING "") else() diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 4656108782b8d1..8820bfbde46a3f 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -27,6 +27,10 @@ endif() get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) + if(NOT (DEFINED VCPKG_MSVC_CXX_WINRT_EXTENSIONS)) + set(VCPKG_MSVC_CXX_WINRT_EXTENSIONS ON) + endif() + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") elseif(VCPKG_CRT_LINKAGE STREQUAL "static") @@ -41,14 +45,22 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CHARSET_FLAG) endif() + set(MP_BUILD_FLAG "") + if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe")) + set(MP_BUILD_FLAG "/MP") + endif() + set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; - set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + set(_vcpkg_common_flags "/nologo /Z7 ${MP_BUILD_FLAG} /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD set(_vcpkg_winmd_flag "") - file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) - set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") - # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars - #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + if(VCPKG_MSVC_CXX_WINRT_EXTENSIONS) + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) + set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") + # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars + #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + endif() set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "") set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "") @@ -67,10 +79,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG - if(CMAKE_GENERATOR MATCHES "Ninja") - set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection + if(VCPKG_MSVC_CXX_WINRT_EXTENSIONS) + set(additional_dll_flags "/WINMD:NO") + if(CMAKE_GENERATOR MATCHES "Ninja") + set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection + endif() endif() - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_dll_flags} /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index 03a142bab35aea..7f4886815433b5 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -51,8 +51,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CHARSET_FLAG) endif() - set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "") - set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "") + set(MP_BUILD_FLAG "") + if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe")) + set(MP_BUILD_FLAG "/MP") + endif() + + set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc ${MP_BUILD_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} ${MP_BUILD_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64ec") string(APPEND CMAKE_CXX_FLAGS " /arm64EC /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC") diff --git a/scripts/toolchains/xbox.cmake b/scripts/toolchains/xbox.cmake index f79d7b3434676a..f96c8586ccb9eb 100644 --- a/scripts/toolchains/xbox.cmake +++ b/scripts/toolchains/xbox.cmake @@ -24,6 +24,7 @@ endif() if (DEFINED ENV{GRDKLatest}) cmake_path(SET _vcpkg_grdk "$ENV{GRDKLatest}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_grdk}/gameKit/Include") include_directories(BEFORE SYSTEM "${_vcpkg_grdk}/gameKit/Include") cmake_path(CONVERT "${_vcpkg_grdk}/gameKit/Include" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE) @@ -36,12 +37,14 @@ if (DEFINED ENV{GXDKLatest}) cmake_path(SET _vcpkg_gxdk "$ENV{GXDKLatest}") if(XBOX_CONSOLE_TARGET STREQUAL "scarlett") + list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/Scarlett") include_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/Scarlett") cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Include;${_vcpkg_gxdk}/gameKit/Include/Scarlett" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE) link_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Lib/amd64" "${_vcpkg_gxdk}/gameKit/Include/Lib/amd64/Scarlett") cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Lib/amd64;${_vcpkg_gxdk}/gameKit/Include/Lib/amd64/Scarlett" TO_NATIVE_PATH_LIST _vcpkg_lib NORMALIZE) elseif(XBOX_CONSOLE_TARGET STREQUAL "xboxone") + list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/XboxOne") include_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/XboxOne") cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Include;${_vcpkg_gxdk}/gameKit/Include/XboxOne" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE) @@ -64,8 +67,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(_vcpkg_core_libs onecore_apiset.lib) set(_vcpkg_default_lib onecore_apiset.lib) + set(MP_BUILD_FLAG "") + if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe")) + set(MP_BUILD_FLAG "/MP") + endif() + set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_GAMES /D_WIN32_WINNT=0x0A00 /D_ATL_NO_DEFAULT_LIBS /D__WRL_NO_DEFAULT_LIB__ /D__WRL_CLASSIC_COM_STRICT__ /D_UITHREADCTXT_SUPPORT=0 /D_CRT_USE_WINAPI_PARTITION_APP") - set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc /utf-8") + set(_vcpkg_common_flags "/nologo /Z7 ${MP_BUILD_FLAG} /GS /Gd /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc /utf-8") # Add the Microsoft GDK if present if (DEFINED _vcpkg_grdk) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 32778c73379c27..831c9be01c2f1c 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -194,11 +194,11 @@ ninja-freebsd-1.8.2.zip - 7.2.8 + 7.2.11 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.8/PowerShell-7.2.8-win-x86.zip - b91ad901837099b34f689ae654b238a1171141adce8be6fc52f48373a7e79117072e84ab38e427c1ac66647dd86a19f1c6c6cba2b8e365d656c65c8447069c72 - PowerShell-7.2.8-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.2.11/PowerShell-7.2.11-win-x86.zip + e9581122101ad161ad628a6feb63e61d3ef8f064a3f325465e8a1a4a6cfc1affbc9bf63146efae0aa65ff9ea5c93018af2c413dc0940f0d162edef805659ec84 + PowerShell-7.2.11-win-x86.zip 16.15.1 diff --git a/triplets/community/arm-android.cmake b/triplets/community/arm-android.cmake index feb8f186b799aa..1376baede203bb 100644 --- a/triplets/community/arm-android.cmake +++ b/triplets/community/arm-android.cmake @@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") +set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=OFF) diff --git a/triplets/community/arm-neon-android.cmake b/triplets/community/arm-neon-android.cmake index feb8f186b799aa..a26d9aa3e5c338 100644 --- a/triplets/community/arm-neon-android.cmake +++ b/triplets/community/arm-neon-android.cmake @@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_MAKE_BUILD_TRIPLET "--host=armv7a-linux-androideabi") +set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON) diff --git a/triplets/community/arm64-android.cmake b/triplets/community/arm64-android.cmake index 46ad5f166aeb48..784f0d39c64a57 100644 --- a/triplets/community/arm64-android.cmake +++ b/triplets/community/arm64-android.cmake @@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-linux-android") +set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=arm64-v8a) diff --git a/triplets/community/armv6-android.cmake b/triplets/community/armv6-android.cmake index 29ba5655ae3154..7e6015cc929d3c 100644 --- a/triplets/community/armv6-android.cmake +++ b/triplets/community/armv6-android.cmake @@ -2,3 +2,4 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) +set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=armeabi -DANDROID_ARM_MODE=arm) diff --git a/triplets/community/x64-android.cmake b/triplets/community/x64-android.cmake index 7ef27c2b80873b..28404f4ed7bc29 100644 --- a/triplets/community/x64-android.cmake +++ b/triplets/community/x64-android.cmake @@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-linux-android") +set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86_64) diff --git a/triplets/community/x86-android.cmake b/triplets/community/x86-android.cmake index f909598cb3fc95..ef668467a266c9 100644 --- a/triplets/community/x86-android.cmake +++ b/triplets/community/x86-android.cmake @@ -3,3 +3,4 @@ set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_MAKE_BUILD_TRIPLET "--host=i686-linux-android") +set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DANDROID_ABI=x86) diff --git a/versions/3-/3fd.json b/versions/3-/3fd.json index a4398c8dfd18cc..22d519d54db3d2 100644 --- a/versions/3-/3fd.json +++ b/versions/3-/3fd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bfff492ed0b9ee3f31bb7593443572bc0fcf2d4", + "version": "2.6.3", + "port-version": 3 + }, { "git-tree": "3b52e6aff44ca4e11335754570701f692ea14184", "version": "2.6.3", diff --git a/versions/a-/absent.json b/versions/a-/absent.json index e6148197f4b4e0..8cc30040fe6edd 100644 --- a/versions/a-/absent.json +++ b/versions/a-/absent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84a42adaeabc3fb5db1b9f8c4bb6c4155db57d17", + "version": "0.3.1", + "port-version": 3 + }, { "git-tree": "4245977c7070822c223161421a31aa6fe5042017", "version-string": "0.3.1", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 845a7ece6da375..6f62b3cab5fa46 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "df4ee7b5111a86e0bc99f45b39447bff68d102bd", + "version": "7.1.0", + "port-version": 1 + }, + { + "git-tree": "9a2a1876f2f625494b16da42b27ace343255d691", + "version": "7.1.0", + "port-version": 0 + }, { "git-tree": "25ea14090fceba8ae684e0c6ab047a719250ef56", "version": "7.0.11", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 54b58b9bbeb818..27d32b9f1f4ef3 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "75c1e838f461bba7a78802919b2ec16bdbfd154e", + "version-semver": "3.9.5", + "port-version": 13 + }, + { + "git-tree": "d8cbff606d12daa3bf08a8fa623c2d524f1e05e5", + "version-semver": "3.9.5", + "port-version": 12 + }, + { + "git-tree": "8674469ca3e9968a8473861000056e09a190ced4", + "version-semver": "3.9.5", + "port-version": 11 + }, { "git-tree": "2cf2310a238e646e62043be2f553332d8bd4c171", "version-semver": "3.9.5", diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json new file mode 100644 index 00000000000000..26721671950682 --- /dev/null +++ b/versions/a-/ada-url.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "184ab96a9e448d759aafb20f540502f43b5fc7f9", + "version": "2.4.2", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aklomp-base64.json b/versions/a-/aklomp-base64.json index 880e564956b348..0a1712393e4b8a 100644 --- a/versions/a-/aklomp-base64.json +++ b/versions/a-/aklomp-base64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4785f09421c2636709249ad7a555c7420b9bcfe8", + "version-date": "2023-01-06", + "port-version": 1 + }, { "git-tree": "f73a4f50ab2a515962e939dad478916a5f44842f", "version-date": "2023-01-06", diff --git a/versions/a-/alac-decoder.json b/versions/a-/alac-decoder.json index 8e444511f7032e..b64eae86d72208 100644 --- a/versions/a-/alac-decoder.json +++ b/versions/a-/alac-decoder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2812ce639bc0f6f2c8fbb93f348d721b1c2df14d", + "version": "0.2", + "port-version": 7 + }, { "git-tree": "4b02da71863a4f88b910c23f05909e2cbb9ab9cc", "version-string": "0.2", diff --git a/versions/a-/alac.json b/versions/a-/alac.json index 043bc9fe16854c..8f8917b57d2be0 100644 --- a/versions/a-/alac.json +++ b/versions/a-/alac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88a9f4cee49d77de933447fad12491899c59ab70", + "version": "2017-11-03-c38887c5", + "port-version": 4 + }, { "git-tree": "71902d13114760bafba205b06f2c7e0ff65a4974", "version-string": "2017-11-03-c38887c5", diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index 8bebb133f7dc2e..dc67d45f6531b8 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cb4b9d32a6098f48e3d0a75ddd7eaae7a7df085", + "version": "1.8.5", + "port-version": 0 + }, { "git-tree": "16bef528ef38e7426a333739878188d9ca909bc5", "version": "1.8.3", diff --git a/versions/a-/aliyun-oss-c-sdk.json b/versions/a-/aliyun-oss-c-sdk.json index 195a46f4c53f2e..622883aac827ef 100644 --- a/versions/a-/aliyun-oss-c-sdk.json +++ b/versions/a-/aliyun-oss-c-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a6710098ecdb98956fdde32c883a45e2abae333", + "version": "3.10.0", + "port-version": 3 + }, { "git-tree": "a05ad4fd2bde4c19dccdbfd66c18130e5bed7902", "version-string": "3.10.0", diff --git a/versions/a-/alsa.json b/versions/a-/alsa.json index 6e0f989a1ad577..6b89ccc12d5dea 100644 --- a/versions/a-/alsa.json +++ b/versions/a-/alsa.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "18d67806b319dea0e3c2e9c921a1864901af1d22", + "version": "1.2.8", + "port-version": 1 + }, + { + "git-tree": "1e4f79a1681c6c40c4b500bf4c8c5d3746916bab", + "version": "1.2.8", + "port-version": 0 + }, { "git-tree": "658bd201adf1ade8dcfceacc5678f4b790a799c8", "version": "1.2.6.1", diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json index 237a7fd9f83b75..85d72391e18fea 100644 --- a/versions/a-/amqpcpp.json +++ b/versions/a-/amqpcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0661ec390526889afac4ba693c92ab00a4937c", + "version": "4.3.23", + "port-version": 0 + }, { "git-tree": "cdf5751364452365ad13aeecc8a74bc6ab15076a", "version": "4.3.19", diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index 332aa8c269cdaa..d6c134f048ae5f 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5c1bc126371829227e923c11f029a539a234a483", + "version": "2.36.1", + "port-version": 1 + }, + { + "git-tree": "e90e0fe54ab8038226b849471fba169157753c19", + "version": "2.36.1", + "port-version": 0 + }, + { + "git-tree": "579a4c31ad7d7972339105a9c043a3658af5705d", + "version": "2.36.0", + "port-version": 1 + }, { "git-tree": "e82bacd16784a617c44319de8e23d0557f72095f", "version": "2.36.0", diff --git a/versions/a-/angle.json b/versions/a-/angle.json index f5f1544a2e0789..2a5e5e0ff28357 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "784aa16c1dacc9aedb49de3bd1393bb6ef6b853d", + "version-string": "chromium_5414", + "port-version": 2 + }, { "git-tree": "b9840e4a2d643b94dc27bf1adc2803f16501cadd", "version-string": "chromium_5414", diff --git a/versions/a-/annoy.json b/versions/a-/annoy.json index 3d64f3ebbe0742..d04a679e8287f3 100644 --- a/versions/a-/annoy.json +++ b/versions/a-/annoy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fbb9d06a1f5a44af0146faddb75f1fb74a0842d", + "version": "1.17.2", + "port-version": 0 + }, { "git-tree": "fb0fa777748e35b69b4d3206cccc7ba770d12ee4", "version-date": "2023-02-25", diff --git a/versions/a-/argagg.json b/versions/a-/argagg.json index 930e71e80f9bc3..40e5d2cd7e611f 100644 --- a/versions/a-/argagg.json +++ b/versions/a-/argagg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a90b715c9fa23c9e723c4fac3725a73c9007d5b", + "version": "0.4.6", + "port-version": 3 + }, { "git-tree": "89a9b4bc7d3ecb518a5a78d3ce9731cf974df7f8", "version-string": "0.4.6", diff --git a/versions/a-/argon2.json b/versions/a-/argon2.json index c13b5d1183f577..31a947fda440b6 100644 --- a/versions/a-/argon2.json +++ b/versions/a-/argon2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08a4ee53f1f5330c8f911dff530810c762551675", + "version": "20190702", + "port-version": 1 + }, { "git-tree": "3a15f9b44e7ae1ef03f6f92a5552bc85951fd3a1", "version": "20190702", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 797f4ff29052b4..76d7f7f631bb68 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4e29a49e78533ec10e3142ae7ad69fdd12c8d163", + "version": "12.0.0", + "port-version": 1 + }, + { + "git-tree": "881bfaaab349dae46929b36e5b84e7036a009ad3", + "version": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "21fea47a1e9c7bf68e6c088ad5a6b7b6e33c2fcb", + "version": "11.0.0", + "port-version": 0 + }, { "git-tree": "04944a4d39fe590b7fed071475502fa8bcfe5a27", "version": "10.0.1", diff --git a/versions/a-/asiosdk.json b/versions/a-/asiosdk.json index b5f3f1c865e5ba..6c75ac72908be5 100644 --- a/versions/a-/asiosdk.json +++ b/versions/a-/asiosdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a58f240a86a38690339c96b11db0a62fd2388e4f", + "version": "2.3.3", + "port-version": 6 + }, { "git-tree": "75f1c1ef95024543bf7298ba4389eafe67b9f473", "version": "2.3.3", diff --git a/versions/a-/asmjit.json b/versions/a-/asmjit.json index b6222d2404edbf..82ef33035cc2c7 100644 --- a/versions/a-/asmjit.json +++ b/versions/a-/asmjit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e226149f3b22da2162e7d93eacc9f19411401e62", + "version-date": "2023-03-25", + "port-version": 0 + }, + { + "git-tree": "adc2ad6be145c9cbf66d606bddc56267b02e41bf", + "version-date": "2022-11-06", + "port-version": 0 + }, { "git-tree": "f67010904c0f2d7a1d79a647ea928aece3e66750", "version-date": "2021-10-26", diff --git a/versions/a-/asmtk.json b/versions/a-/asmtk.json new file mode 100644 index 00000000000000..79f8b0b77ca05a --- /dev/null +++ b/versions/a-/asmtk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9805dcacbdaa6f23d28fac07d973d22c2d00aec5", + "version-date": "2022-11-06", + "port-version": 0 + } + ] +} diff --git a/versions/a-/asynch.json b/versions/a-/asynch.json index 629b9978a7a1b9..6747c3ea8adf85 100644 --- a/versions/a-/asynch.json +++ b/versions/a-/asynch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4aa950187368ee03bd5ee5739468fc68ea4c9e0c", + "version-date": "2019-09-21", + "port-version": 3 + }, { "git-tree": "e656692601ab76c652a9b09c98bb36ee8723f9c0", "version-string": "2019-09-21", diff --git a/versions/a-/at-spi2-core.json b/versions/a-/at-spi2-core.json index 90206cfee627f9..07921b889b36d3 100644 --- a/versions/a-/at-spi2-core.json +++ b/versions/a-/at-spi2-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "897df7693a8a1addc3a5ab84efabef89e4cef1d8", + "version": "2.44.1", + "port-version": 2 + }, { "git-tree": "72611608fcbd5e1a1b867a88e4810d75ddc94fdf", "version": "2.44.1", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index 18d71ff6f33b94..b2de1cc72c3cfc 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9acaf9d071486528917fa62e0315a65d2c4ed6d", + "version": "2.36.1", + "port-version": 1 + }, { "git-tree": "f0bad5eb22d4affecd3eb08be801a8692b5704c6", "version": "2.36.1", diff --git a/versions/a-/atlmfc.json b/versions/a-/atlmfc.json index 7f6fcbf607d9dc..4de2206ee7c86a 100644 --- a/versions/a-/atlmfc.json +++ b/versions/a-/atlmfc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60bac7802a9cdb32192315262495b647af36b723", + "version": "0", + "port-version": 2 + }, { "git-tree": "509a448c797ddb6cf67ba179b6edff02fee17865", "version-string": "0", diff --git a/versions/a-/aurora.json b/versions/a-/aurora.json index 5fb067e57d13a9..430a249aac8fb6 100644 --- a/versions/a-/aurora.json +++ b/versions/a-/aurora.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05d122ad98c50099a3bdbfd845faf2460df6659a", + "version": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 2 + }, { "git-tree": "a41f2335fd703ebb6a3dbd4eb20260754cff110c", "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", diff --git a/versions/a-/autobahn.json b/versions/a-/autobahn.json index 5aaa23e76ed97a..44a825b555e13d 100644 --- a/versions/a-/autobahn.json +++ b/versions/a-/autobahn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d30e9c65f3f7f62c0020630f26df0f772854996", + "version": "20.8.1", + "port-version": 2 + }, { "git-tree": "2d7687436a474abcf18dd1b5689437218f8f6d36", "version-string": "20.8.1", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 6209820624f767..add7640efdd236 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "785c086e68c5e4d5257587ee6deeae566140b8fe", + "version": "1.11.65", + "port-version": 0 + }, { "git-tree": "495471c4071406ec6929d77a553dc03ebd6df095", "version": "1.11.4", diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index 8acf4b87bb915c..bead8869d3ae86 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fed72b2797511395842d94efefa040e0fd1f65a", + "version-date": "2023-01-18", + "port-version": 1 + }, { "git-tree": "78c535284693d96c19026445e363459b37a4aca9", "version-date": "2023-01-18", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 5c9a1330c89442..e490d58ac577f9 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "307d4685a0813bb00150dfe87aed0b3fbf88c179", + "version-semver": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "43ab8aacc87b3d2644b7845af700baf9320f139f", + "version-semver": "1.8.2", + "port-version": 0 + }, + { + "git-tree": "66add6b6952292833b50c4f3bbcf9ea90d192b38", + "version-semver": "1.8.1", + "port-version": 0 + }, { "git-tree": "a18e2b1efaf5843b0eb5fe27a88c4306d5572970", "version-semver": "1.8.0", diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index 1af34635a3abfa..6c68537e7752ab 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abdd671a9667a8b13e439410503d5bb582189fdc", + "version-semver": "1.5.0", + "port-version": 0 + }, { "git-tree": "07078cbe0cd0059af61369f8794ff5d652eaf506", "version-semver": "1.4.0", diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 98ae085163d060..8df675151fc028 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2a1e6a1a145f9436731cbcc9019f807325298c1", + "version": "1.4.1", + "port-version": 5 + }, { "git-tree": "379c37baf28190bb33ccf1d512c22a21c664e41e", "version": "1.4.1", diff --git a/versions/a-/azure-security-keyvault-administration-cpp.json b/versions/a-/azure-security-keyvault-administration-cpp.json index 4497fa26f05f9a..2a41b8402af184 100644 --- a/versions/a-/azure-security-keyvault-administration-cpp.json +++ b/versions/a-/azure-security-keyvault-administration-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c7bbcafaacfef51314e05b648c3634a3d324916", + "version-semver": "4.0.0-beta.3", + "port-version": 0 + }, { "git-tree": "51aaf65e62ea28b9af84af79e4d655ea13c40ba3", "version-semver": "4.0.0-beta.2", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index b12d34b709e207..d5da42e8d65de5 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": "6f480f2686c90dc9985e9c827ecc2f3c086985f0", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "4f575471af05af66923fe548074d30f1aa0fdc2c", "version-semver": "4.1.0", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index f21e164fed2b2a..0e151e398859f8 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "404efdca4682f39039fe7e76541db56b6cab3e3e", + "version-semver": "4.4.0", + "port-version": 0 + }, { "git-tree": "f4d8db5aff7d24803e3a2605d3bf3051343fb9a0", "version-semver": "4.3.0", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index d985aa4e378d1c..c15689d0f38243 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": "a795e3eddbe6ced53ba732f9793679e78d79d359", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "7b5d805e78f564ff27138c6f005175979b6740c6", "version-semver": "4.1.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index ef5e077ab8ab06..8c8539dcb5d5f1 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13de7bf9db0ab19424dcbf7413c3bf2aa5798653", + "version-semver": "12.3.2", + "port-version": 0 + }, { "git-tree": "934133a1c7576ddd824292411199b9bc8f4629f9", "version-semver": "12.3.1", diff --git a/versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json index 39ab19170ee4ab..ac883c9fcd1d13 100644 --- a/versions/a-/azure-storage-cpp.json +++ b/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbbb3a066c3002438b0a002b334d861f48887ad3", + "version": "7.5.0", + "port-version": 5 + }, { "git-tree": "245884377d005f8265e75b9b6eff339d687de0e9", "version-string": "7.5.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index ae63987d252f4b..90e7f41a82ab9b 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": "9c8ba7dabf8011127712dc95628ca1029b0c92c3", + "version-semver": "12.6.0", + "port-version": 0 + }, { "git-tree": "12acf62b792b5b9b406eea20f8b3b25e30a32eca", "version-semver": "12.5.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 50113d2adf50e7..24ca95ae667855 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": "f264428685ea6f882d9c58a9915c83665d428456", + "version-semver": "12.5.0", + "port-version": 0 + }, { "git-tree": "10d67bcd4301e8b3fa5d89b9f8e6eecd835b276f", "version-semver": "12.4.0", diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 6029dfc21fb14a..eb4e68c8dff608 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12a48f09e61ae946a6858c69e2c40688bdff3980", + "version": "8.2.4", + "port-version": 0 + }, { "git-tree": "f99370553e85e9f6a10878253cdee86883b0ff30", "version": "8.2.2", diff --git a/versions/b-/beast.json b/versions/b-/beast.json index 4b88457c2d3b42..b3232f7dcda185 100644 --- a/versions/b-/beast.json +++ b/versions/b-/beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "608757dbb0f830eedf5b1416fb8a79731dd5240c", + "version": "0", + "port-version": 2 + }, { "git-tree": "eea4815ae315b38373961c8ff9a5be8556857b3f", "version-string": "0", diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index bc7a1610b60ca4..b434fa52ae2982 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66a97129b31a5e70e45a40c767ea96b1e0477a93", + "version": "4.1.1", + "port-version": 0 + }, { "git-tree": "7518e59f9f1e994e3af289b8de87115834dcb758", "version": "3.5.6", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index 61e53ffd237dfc..a398f90189caa2 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faeb0b56e68483860ab8cc468a6c594ac361167f", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "2b8e34d5f083c7c674469078f5e80521e3b77d58", "version-semver": "1.7.1", diff --git a/versions/b-/binlog.json b/versions/b-/binlog.json index f6d3cc586df678..966905acd5e548 100644 --- a/versions/b-/binlog.json +++ b/versions/b-/binlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53449cd8c7572c72137ace92720d632b671f2d17", + "version-date": "2021-04-16", + "port-version": 1 + }, { "git-tree": "eb0ae943fc2b0c1c19ad62308d1f321439967fd4", "version-date": "2021-04-16", diff --git a/versions/b-/binn.json b/versions/b-/binn.json index 9de7af6da4e6e5..8dae08a4363437 100644 --- a/versions/b-/binn.json +++ b/versions/b-/binn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9c0f4de4aef736aa3b11d4cce436973f85e03a6", + "version": "3.0", + "port-version": 3 + }, { "git-tree": "aef73e4b20836cfc1913984d75d560f331b51fc1", "version-string": "3.0", diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json index 1d73c6e3076057..41456f9181b710 100644 --- a/versions/b-/blake3.json +++ b/versions/b-/blake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13ac9cc003839e6730587218103f4912e7886311", + "version": "1.3.3", + "port-version": 1 + }, { "git-tree": "707d127029e3c2e2c2216fba6e36247ce43414b3", "version": "1.3.3", diff --git a/versions/b-/blaze.json b/versions/b-/blaze.json index 2a94caab10d522..be8283c1140505 100644 --- a/versions/b-/blaze.json +++ b/versions/b-/blaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f237bb789d83a4004b263f9544ed3d6668f160f", + "version": "3.8.2", + "port-version": 0 + }, { "git-tree": "6bea7e024ba776f0a7c5462056054529f79aa86d", "version": "3.8.1", diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 0962ef77e7b63f..184f4903f707db 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d6de437ccd239433cc34d21212797c4755a6c8f4", + "version": "0.10", + "port-version": 0 + }, + { + "git-tree": "b29172f6f8dd5479a5123214f403137b0180b61f", + "version-date": "2022-12-31", + "port-version": 3 + }, { "git-tree": "89ccc58cff0cc74468ab31076901e5e74b68c6ba", "version-date": "2022-12-31", diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json new file mode 100644 index 00000000000000..ce4a39c589177c --- /dev/null +++ b/versions/b-/blingfire.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "70822350369b68d60a5640eca1b668e1829c8054", + "version": "0.1.8.1", + "port-version": 1 + }, + { + "git-tree": "8352e7a158da2568b5c67c973b3692681be8b0d6", + "version": "0.1.8.1", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 2b867f4fa95fa3..67664be7c80311 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b0f6f1b59e54a64b321aba20d196531d6e181d2c", + "version": "7.22.2", + "port-version": 0 + }, + { + "git-tree": "0d3f7220d72e02720ad44a15cfc46ebc1a6c26b4", + "version": "7.22.1", + "port-version": 1 + }, + { + "git-tree": "05fdc41be633efa59debd81ec8a95c584972e54b", + "version": "7.22.1", + "port-version": 0 + }, { "git-tree": "634e281c399c5bdd7f47977241fce65e88faa595", "version": "7.22.0", diff --git a/versions/b-/bond.json b/versions/b-/bond.json index be81891dac45ee..4ce5e1675fa552 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ce8875d8de21ca31d61b521c2e84a974e325436", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "96ecc1c6ea2a8fabfbdfd7d0a8535821446af89f", "version": "9.0.3", diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index fad0469e2edea4..68d247ad0c7d02 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d45f601cdc5cfb7a4e6d1ec9fdd8396ece8699e9", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "f201a4318c1e2b666d9e4e335b3724db492f75a5", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "b7046b6940dd0ce710ee59f69eb4ba3d0a43df71", "version": "1.81.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 80efb5595a68cd..84b8dc61aa3aa0 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6a184d48bcf1a89a12f66255625340ce9cbfda92", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "437bf58b244741d6ca3857cccf1b3cc937be2e4b", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "a59b4c65c0a50339334a001172d62f06cd4daea7", "version": "1.81.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index 14ce2984bf32d4..a7026b54cb5dd5 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6dcfc6f69223f8fffff4c82db31be7495f17062d", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "be964fa6b68ed5d5cdcb97aa936a3cae0e1b9059", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "d6134309afc69966529d238e26b5d1efff320341", "version": "1.81.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index 0d5dd02653555c..860bdf62b88366 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "798ddb57d8d3bb7a77e424cd5d60f88cc4e6bee7", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "d24eb2359b8796ce2eef84f44b7315acf19b353c", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "ef6ce48af997915c4ca3789d4d7f9a2bf11a36fe", "version": "1.81.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index f7103a1b50f2f9..e06d45fe934397 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8503faaf38485a913d4daf3efd2076b67bebdc0b", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b26e79e8c3b69fb7111fe82632be1cca86440b65", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7f15966c717d1cdbf9efb62fdf83b39ef043fcff", "version": "1.81.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index da9261fdd062c4..7ddad5a7ee2512 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8f22e5c36ac147808ab3acaa7782f590134ccbd3", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "78b9ee5bb522309c5cfbcba93332aeb5f386f199", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "44564a47bb01772ece30464d74f48603bc247c63", "version": "1.81.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index bbbfb237aefc9e..88e8e5fc60eb46 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f07d2980139502309087821ca9a78a9a43a766ec", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "fb48cd65e86476285b8968bf3d74c949b5c0f8bd", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "024f6e2d8aa74bc6987f101ccd02bbe47dedde8c", "version": "1.81.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 9d42002b4c7525..1b48044392fcf2 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cd60150bd194b26b188ecb47675c1ab7963049d1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "e76da275d1922ac8cfc93970005a446c1dba3c3b", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "10372dc236c7754a077115666833b658c739ab59", "version": "1.81.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index 7ecc932908baae..2a2ed87a5c9e27 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ed19c1a3b7f57d00917b260e35cd662b28c1f6eb", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "d79273e42045876ab4d660b653b45c714ad54651", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "cd00fc6028c5c49704962f17ea74c9e0c0bad930", "version": "1.81.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index 139dc27b16a351..cb290593febfcd 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f6a7a34fa0113b74cf593ce3786dc6ad108d779b", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "5824f6d8e202c8763de70d7aad7855c705f16105", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f771fad1234461dfc02462569dba435c64bfa94e", "version": "1.81.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index db73b2f7739276..89a07f27d5bb8e 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "de17313ae17a0044043195c76fd61a75854d4f0d", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "5fbb607f180c58dc6fa488e089d5e6d645eae75f", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f4ca69ca926a9481dd59582c5fce575685a708eb", "version": "1.81.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index 77a76cb0ab8e19..ca47a2863598e1 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1d9372948d3c0fe1da8965e76ded151513f16a52", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "97f32a43b457e26b8ee223c6c7201c995541d149", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "76811578923b601d64f43e851c91ac540982caa5", "version": "1.81.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index cf6d506da924ce..52c97243e9cf19 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d4a35930b7414144551dc9c2e00b31bcb0ca8b2", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "cf70df3193d092c65a4b3728a5410f59e9de1c9d", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "17ed662b7ab56c9dd93973417f6cedf6f6aeb55d", "version": "1.81.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index 328f4ae9897cd1..fade7a893d1fda 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7d252dc8bb4e187e63ea76041f922a308a5b3705", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "58534b65547e8c89e93ce1ba96016c6bc3ebe186", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "c46d137a8dde5ba4966af64695f479ce54bd37ff", "version": "1.81.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index 579761c5eb8093..07062b2d10b0fc 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6e550f08c345804346e807206cff87fbb07689c1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c9471308173e215c8fb471c891366bf8b8c05a48", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "cf0809f1dc32b08b842bea5df43136c7de0207d7", "version": "1.81.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index e8483b495adcda..7a46d82690daba 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "babfe7cd25186b48ed2ceab45108cf5fd1dfc6e4", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b98dd3e591b0859edcd04280b9b143899a1bb4ce", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "0b08a8a271bb97ed52ccb791286975dbd59a63c9", "version": "1.81.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 21de6ba2baf3b1..c0f9205e3e9cc4 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5af14050c2efc2528e61019b46813fb1fe2025bb", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "694a9116ac59b0fb3f9e72a9608deb94e3168e84", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "6dc8c52f304e2ff5c4ad24da160a98bd01018c3e", "version": "1.81.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index c73d55849256f8..280b034a19d25b 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d6ce60d84f6a1da95496e017153a19ec2a425d63", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "e275a197f98ac8e99c9c602945f31b7c9bf5ff77", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "613c3b5b6833d8ff9e0076dd428dafebacd7ab1e", "version": "1.81.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index 66d746684e9a86..768b8d901e6b24 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c266d37e02d494dcf4c3623bae07775c2a7baa45", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "776d22b1210657b1a1de2f93d7c3310881671cb3", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "9e3997ced53ed93bff12b273be6d8a0adc500960", "version": "1.81.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index de031beee472d6..d473737cccb339 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "af2f41ef14357f44466182d783e8cb218d677b1f", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "ff890d416fce1b2c209ee4df8e773f0d285d0fb4", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f22c9c2d371b0d3bad68760622075512860f5379", "version": "1.81.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 64a05151c98f6e..8f6c918c379a3b 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c5bde693ed8971a4e0ba6e22854386d4054898a8", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "1e889b9b867df555de44167d6b1ffcb8cb050649", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "54f2c7dd6ccb8e6c7d1e64a0042f8126777e8bff", "version": "1.81.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index 026b72993e1914..ef2469f308f0d1 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "54ac399bdf18e9c6ab8c9df4d81df4bd86a547d9", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "66f4954b8b554a045b06e911054e8b83d5bcccce", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "1034bcf6a037a9f630689ea7f993efcac839fe99", "version": "1.81.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 0e8132f8182f91..2d91584f8b6794 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "350b9696e8454d9121ffa7ad1c78d56cd378af58", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "6a382535970a62b1b4100d06187bac8f0010ad6d", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "80f5ddcc31b857b87df6d3dd0c0eba3473338229", "version": "1.81.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index 2c3450f48fcedd..e38760ee427894 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2c9e501f72013d017f7422869c77eb6b20f29f46", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "adf8656d4faf6e9ff1b87681b7d085242fe430e1", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "59da1705a0acc9858789b96442767113c2434241", "version": "1.81.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index d151fde7fbd700..fd041241b444ce 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e99972dc970d3a2229996b240d5dc4362204b6dc", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "644c76f8de63bc034d0214ccbf408889f84d82cc", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "9571b8eb4c9d1952899c01b198cd42c7872e7ece", "version": "1.81.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index dcf8dabc8eba25..bc5ecf3b72ce79 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "54d69671454ab2db9d34730a216a5c5efe7d6f0e", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "fbe8594d66a5ff237bda8ca4d0f5f3ab8853d8b5", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "3982b106a915dfaea9b62c981c0b64dd5b1709c1", "version": "1.81.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index ecf1af125e171d..d1d2528d9cbc4a 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f406b6bfcf32cb14d17d1df5e57a1162a2f2d703", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "dc7d8f36b88e86bd33b77fd98e30efc3df0bbb40", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "a01f204e91421776b3891acbf59eb8ba27be6d7a", "version": "1.81.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index 2230e2bf33bebb..03735baa3f093a 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ee6ae12c7b1d5dc36ced3db516336e96211d239c", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c909b46a21eb931b15bad934a065a7b353b5250a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "bb2505f3d476d390b0c3470ab09b4e62b7b954dd", "version": "1.81.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index bf8a068713c47b..d0861ff5e6299c 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7fb813154ce459ddd8d72dfa8cef59b033be2dad", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "52c774d7851dad25ca80ec7e591ea02741a79acd", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "c0cc6d4bdd6034a5026ca00075e1f2d767dff50b", "version": "1.81.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index 2d4d22a3718214..58967e424374a0 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7146ce31ceb0cdce252cdf556502fbd358eb30d5", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "bfeeb9c8d98a0eca5cdf3886bf0757d89828e4a8", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "12a7379b52e6f64ca68b76844b9c8c40911661d2", "version": "1.81.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index b8c38d7b18012d..94cfc259535cab 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d121b1d895d48eb80ef58fc6627e192365decfab", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "f3ff9fc6d82b63ddd51210f54a338afd739536e0", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "3428af10c812e17dc628b3744aa5ddfefe36279f", "version": "1.81.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json index 18f7212039a8c1..80f4fab3d4d0c1 100644 --- a/versions/b-/boost-describe.json +++ b/versions/b-/boost-describe.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "631c0781e5719b44d906954a57f3a9a42bb37e8a", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c52e0602d54045f5635b7b00215aaae4d7d13cbb", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "261e53ba26d72a19e154f649475a944f868acb86", "version": "1.81.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index 6f2b40b94fd89e..6a927cae824c61 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ea40bd02426af4c5ce99995762c452e3a70b5189", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "174c7c69d063d88df48d2a6adf91a10f247bc90c", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "dc4274ca2fa7e6b2d65316758632a414ec22ad40", "version": "1.81.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index 9b592d8716380a..e63de5e8188b9a 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6cfca57c17b2728555ca512c5912af0787eb067a", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "1afca5053a668148d101174768dffa95e676b9c9", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "363bbf3c6f24f93ed58881c0e4d2feefe7cde15b", "version": "1.81.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index 6706b9fc5086d5..d7505b47ea3b41 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d350f9d70da182a7abddd0cadc649394fb144113", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c274178dc34bcc511ed3bb313c7752be5619a75d", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7c7d49f54faf119739e0c7ed84cc2c392b69efc5", "version": "1.81.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 72f6215e6c4822..a6a9f320133717 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6890ed08d6a7b2c9b54ed6150c2c73570cc512c6", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "4a9b5d84ff2016ea4d8d532a67528f2aed22308a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "8b246e0a762f2dc709580f4d35d41c14e1ec6036", "version": "1.81.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 45b2be6db79b0c..565f5e0866a763 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ef4cfcde16100435562ccebf90edca8cfc4e204c", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "4fcf9d94526da9da3fb012252c729d063f3327eb", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "eae566a04e22f1d282cb55c0afa3d21b9e376208", "version": "1.81.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index 5260e504303dbe..ae91d931d0101c 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "73b5c84611b826d9526898701fac02f83e305c63", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "655088a9e6f77757e30f0fb0375c80e5cb76279f", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "e7a28ac75f376fe846ce57d52d5c3f07f72ce755", "version": "1.81.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index 5c211ab9fa0750..908bbaf71f267c 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9e51e733f0ddb9e287a6ee03bf9cbb1f3f65f081", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c08aaff5a0420e89b7c31aac9fb993c1151a483b", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "291c2d3312f0513c7f75fc088dbf4b21a7a5a3d6", "version": "1.81.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index 49b679476108f0..a09d7d8858a0da 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2145b81bf66231976f183f4f45084b70e4cbdc90", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "1bec69f27d7277ac4a0d6b423a53506bce68419a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "e579a7550fe58a6a6f43de989ffa33a961e278e4", "version": "1.81.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index f2c2a59e32a225..6e17525e997b9c 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "561a41ff688b0ef41aa59abc13345b228ae8831e", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "24fb0ddfb7c99858a59c7ed443777a02e37e68a0", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "ac60a3ecf1ac0d0148ab8f75761dbf8fa2994853", "version": "1.81.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index d82c260d9406e8..02313adb68ec02 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9562adeb23d81f0bfb89adb5c920ead09b302ec5", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "8e1014808cb10f2d5396609b3e5a771db46c14b6", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "873acebaf40c0c9e0483ae74f0c9bb3b3c2e5d7f", "version": "1.81.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index d148734a0bc69a..7064b07122fa1f 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1da109d6c53f82fdac9bdf6efa17af3d47dacb54", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "16f002900e349d02179d662c54e35e4ba95bba4f", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "c88f49eddde9b3bf50a57e13d824400c9a75a7b4", "version": "1.81.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 187a16e474d4d1..10fb77d4c94053 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dce4e73b054f0b611a8d1e0f9efc9dd8cd79071f", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "68d39a15284d4d7eeffdeeee4364b496e262cf39", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "137f9eb9242e4fa1aac35c77497f39b830d74943", "version": "1.81.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index d6f50eee1effce..397f6195aa97d9 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3c428ee1b1238a5fbf337fd549d3b3c3afc17930", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "cd3cfc8c7f87e4f36bfc5ec9e6309349707370fb", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "2d8468f160d82e789c30d2431053324c0885d4de", "version": "1.81.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index 1bc606757b77a6..a499d2e4de21dc 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0c32122b9244e041424874f6657451169ab9522d", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "bda2444dbc209c5096c98f45d83c7185cf5d8c20", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "fb97e9c73403b64b7bf75665dd1077069cf089b6", "version": "1.81.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index 69874503273807..53b9d476055090 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "76191c9a206f916d0bdb9619bdad1499c426741c", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "72bf3411fd298c17563829e75df8c40cea2f9b9b", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "dc16ecf82aed90badcd28666763e8928f8712e4f", "version": "1.81.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 05f847e030f0bf..9574dde6b68cc9 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ccdfbbf147613d95e1a7fe3cbdbb56aa91dd2b86", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "3ea5df9a76efbaa25e8693cced4b310ae9a3bcb9", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "8fa5151d0d17d7fa4d3a9c649ad83e77ea37de72", "version": "1.81.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index de9dd19705baab..af8b6bc8519e6a 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d3c482730f924eeac5f136bf8bd6cc87f8866ecf", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "8f99da9c560fc02f2616387c452bf488df834c96", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "5a97932ba05361ac44593d13f4988f60cb504674", "version": "1.81.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index a4a2d298f7339d..4199a277a2fe62 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e4d430a0ca0203e374d282579904323b025a7e3c", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "2f835213c3acc49e139e652da9a3f3e3585fa195", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "18151e6663e64a1bda78ba949dd5dbf882ae5469", "version": "1.81.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index a47f2141e5fcef..d92c3f82e2d841 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4d522c647f882aae8c81ae652b2a5d23d8422f09", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "038723361793eae30d853d3b03776d5e627fef5c", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "89a6fbc04abf3095e7d74157d2e684c208cd670a", "version": "1.81.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 558527fb473969..95992d91ca3ac6 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "034d09501ee6199f969a158831419ae14853e73c", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "ace4872c79b9dae444e5b0805637cb4167763643", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "26a032a3687e89048236a9ad8ce14514d4653121", "version": "1.81.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index aa24f00a227232..5b6300778ade67 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "366641b5e6528033cc0067bec3847f26d9031edd", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b5667fe6ae81029e94fd3b4617af18b93f06937e", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "91d6246873413ea16a04b2454ac88fbf17448874", "version": "1.81.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index 3bd71f7a57e018..d8dee2ae9fefa3 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "662c6f191b2d2991f86cb15e71c7297d5d9acd02", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "f832ed0aa13f9f03feabb69c40a91d8e31b090c9", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "b5f24a2434567a16b1c40e96f5da71b3f604fc3a", "version": "1.81.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index 32e94c9184e5b1..d62dfe169c6e2e 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "91d333f8870517291000ce2d269485286a4fd9bf", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "0246484074b61bbc8623021e87922ef06ecf84c2", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "cc8a315d67b9f86a015d0f261dd8c15be0f746a4", "version": "1.81.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 0d14f63bcb560b..ffec66bbd869b1 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ed95b549c8719f65d4599fb6a612db94043c033f", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "7b810bfe282f052259b5b6bb4e93bc16491e48d2", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "ae7317b7aa788f978c871b93e027ac7e0f90b287", "version": "1.81.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 3922345b18311f..7e979179feec28 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dc0de1141c5074cd88b9de17d7ea2b39c58b6afc", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "6f3b7d8cd436c4dae51ae807f8a7b04888f06447", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "a2fcc6726c54c13660a87ac4440e91c762041f82", "version": "1.81.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index f0c4691f05c5c4..b4edd28572accb 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d189e52a32b8ef2ca41b5afe112f5a4e6430ec70", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "3e31f7965f783bb5f03cd50a94fbec422cfe7a9a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "00f8cddccbe6c6c6ec78ed9502322ef70c89c9b0", "version": "1.81.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index 6fa582025e8ad7..d0a5801de71acd 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c6ef0a6523433599c5a6e0bebedd4b2caa6b56cf", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "7c4e469b6d426fdbfe13ca7cbddd98caffbc7942", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "cab2fe961140ed73233aa308135f1c97b00dde44", "version": "1.81.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index 1d0de02257504b..b120ce853b05d6 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "21da7534c21a1dfd1ff5833e330837ad8fa26341", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "7b5af6b0a01341944b40737a439c4242a6f44b6a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "51dfeafbde1b365b08a8e802e89057312f92657a", "version": "1.81.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 158bab7869e054..fd0d1050e44147 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9a39f5835d29b23ad73b036797cb4f6f000e83c2", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "3938aa03b3ebf9177ab9f922455ae29bf02c8330", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "d5913a98e3d5443e488ba65ee874214487b7b1aa", "version": "1.81.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index f4c3c4f5475808..ea82aab1643fad 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "06e57442234e51fd436cc31ac285319baaf83e26", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "f5dc624248bbaa34b1614bd5de984c149e127544", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "68a8ec26ae2f81487bfd0ccbff5a707229f996cd", "version": "1.81.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index ca0ef49279f5d7..f23e21270a13af 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5fb8cff5e879195843741626bde8a0cb9955e1aa", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "8258d6ffb06571b088d3d6d1119d8106c3acae42", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "e1823e435f5b0a89baadc0aedbd7b80cd3c8b4ef", "version": "1.81.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index 28838bde5305e6..487fa22d206902 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7a7a8a65879f8262d502979631cd082afdf2d6c6", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "5f935f0fb24747b61dad58b0da1c4a307d0ae125", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "07560825826af31beb117e969084c236ad5daa59", "version": "1.81.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json index 560b682541b4ea..4e1de61433a483 100644 --- a/versions/b-/boost-lambda2.json +++ b/versions/b-/boost-lambda2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5ac3cfaa7a77c860f9ad676a028c0a79976c4e64", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "551076a74a5ed1a80ddac2c5838406b3d23968bc", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "b86a3afd40cb32ccb1b8e6e59df60d471e5d11a1", "version": "1.81.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index 4784ca5fd5c557..b76d3809b1642e 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "43c810b64420088a3446c74e4d54db10f16c271b", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "9cbc39c935546af60a873c21b53c97943e90a85b", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "272d3619c543d063bd0e23ae8f23e8c677f419e9", "version": "1.81.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index d943297193f4eb..35b4155be90d10 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "54b82af182eb01789c463148630e7e897ae3f3b7", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "1784c7d294604acdd3dc3179e7ae1967631f1122", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "677997615028f116ea892e8a0731200a2bd3f306", "version": "1.81.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index 3757c5a9be19dc..723bd7b321997d 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9e386bbe69f3d754f0771134ef2bd349b9e9d381", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c14954836274ffec27319627c787e0b5d34a9db9", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "1658e6ae0eac14c1e10378d6299c59a0c889f01e", "version": "1.81.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index 597d6d0262f293..fc0fc3d9b82682 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d9c9d24ad31946e6bf5bcb2adac9f0124e7534d1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "42049ec2a8514f4a4456399d147f39bae465e2c7", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "c88f686dacd0853cb980f5170fc52e2ee0852033", "version": "1.81.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index 49e93f373360a6..0d15b6bf6db67b 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "084161896f614963e296c5ebd58f23ee613988fb", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "d5a6ea1e9d6a0d73e57526511ab5a7082417fb95", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "3fe452d3e96f55d8c49b289f2f101cb274b275be", "version": "1.81.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index 3c1631f182a0b2..568cf244b95a20 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3c03453e91b6d10cfd41e5113aea15c9070ba310", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "34ff06ba71408f9f2d5dbaa0649a5a6660731c70", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "caf66e1400f40a88d45f8411351c04a15fe764bf", "version": "1.81.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index 084f8f7c23d7df..32c2417f6a1c97 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "418ee0f83e1b41fddeb9d416fc383abf40ebcb03", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "e6a9a74ea009da01f7a815b560dbae631bc4aa23", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "5ccbe9c525ab9f5b69d1f6bcbd318c71384a1e8d", "version": "1.81.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index 327350fa779cd2..307b897ecb8cf5 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "61b0ddfd8a1a5e18f97584b57143de200770bd56", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "588fc3a51b43097feee421ca66c5d436914a1364", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "c380e71e2820131a30349ad89bc1c0240c17c4f2", "version": "1.81.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index ef175bab676617..d5d5e14d115350 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fed3e04ea8531c9c7b141eca201e24a6ae24e420", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "eea7060a597e867d171a778a6cff2e56f364cf78", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "1174474032e8403f7f9acff6c8dd01b5add784c4", "version": "1.81.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 8895e693af637c..aa50616557fcf3 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5c1a238cc20c885e785bc05a36b974deb5e02db7", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "91d3f81ba22427aecb2b551da48e54f684f056a2", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "976b927d38ce533c1c403b80c9e0e23e62737195", "version": "1.81.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index 5d06a0df0cb718..1dc9f33a8603bd 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1ce5f627ac0c30d041b9f2981fd3c11e4b504825", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "bbce4dbf27e6888c1313ac461a97746eda2ccc88", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "603b2620f750f75988513a9c5657685bd6e6e049", "version": "1.81.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index 8d9b1e4d489a36..e8aee0b899ad45 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "80e104d697b7ff7a283c5f7ee83ae25fe1192bd7", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "24bc0a7070d454449f3ee96728d01208d5e8f944", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "4a3070ba5150b33b08d90a7938ec2ba249b5780a", "version": "1.81.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index cb433ebcb73ec0..6045026eeed261 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e922f77680d62cda6668cff0096eb4c34f04f4c1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "989754aa4a5a73a526e65389199751b066bea263", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "dbc4c4053a5bf691a7fe428c8445eeee859680ed", "version": "1.81.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index 43cebf97b5f101..371adce29a8267 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e08d5a2eb5d5edfc5a62469dbaa283cf56570d07", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "a93828eeb5ef739da0d8669fca6f7fbccbfdfc1d", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "1acb02099065a7bdb39a002a990ab8424205d6bf", "version": "1.81.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 655bff126a7693..53a4d6f6e4a355 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "46d34f9c642921c949f7f9122d41f3d679392003", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "f465acb8c11b21def4825b5fbe283df0d265941a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "5e74b1d6cfadd49df6bb58b46d93c07d36d71724", "version": "1.81.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index c4d7786481af47..595f8fe1ed2e52 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "62357ac27e3d8d2eefc9bf42f8bb8ab6e417859d", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "551544b7e67836202f43899772bd9ef1dd223640", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "52a3cf587864ba5ffea5902b57582d0f550d2546", "version": "1.81.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index 09db107f7d5f02..7600b4d06bb9a3 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a5add430816876d69afa4df43bd91f776c8c2f7b", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "92f38ef6bc273bbbfd373bef060315f6cafb34c2", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "354572a93cdd0f2ef64b285ca013d250854359f1", "version": "1.81.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index 741a0ebc5faf80..fd176a752123d1 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7b0e294a0e563b3c9580683dafea094dd3e96849", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "2276ca63882c838c8ab2c9b4888f1264f5c46174", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f12752f8d8f890ae24db6c35d181aa4a9e408082", "version": "1.81.0", diff --git a/versions/b-/boost-mysql.json b/versions/b-/boost-mysql.json new file mode 100644 index 00000000000000..3fdea4b813c6dc --- /dev/null +++ b/versions/b-/boost-mysql.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "93979a186a11766a973ba4d204213cc0237f71d1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "3b07f53eb29e4832821872d4beff53b5c2cf1ff4", + "version": "1.82.0", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 7b69be10d5d193..2b67e528bc5121 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0a33bddbce29068b61dc012e6326446175b79184", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "27a80db62b918cf6940cf344794fe82a09656f94", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7f2c197f872e761742ba027d9379eab35d344231", "version": "1.81.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 229b4eae8afe0b..e8cb259701a06e 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "97842146c6a87912141dd1d4654e1576d12e5cef", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "232cc2c101d565009c9c60968bd2c7eab1891e4d", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "63173b669cafa107010dc0615254f7338fef22da", "version": "1.81.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index a6eb6801f8efa1..cea734d715f041 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ad9209f191bcf6d65e9fae09c5d722ae1b058004", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "ae52c4534ac39a38a782f8f5b076883061f6326e", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "040c449827191e183d02552e8a125f47f95be31b", "version": "1.81.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index ee5b4f3e07bcd8..c9b01b7d813cfa 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "100ff3094e97d23516718679d59d9f86821074b8", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "a6a111b76b0488b4b2c3a889876b9fcdcccdfb67", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "a76d1e59a1f3809b82cfd8f43851e51ecf1c7e15", "version": "1.81.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index 69abf87afc5b36..890540c9e0eedc 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bca5b674d3737aeab820ca2f36e4db187031f296", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "7747ed969228bb72b00135c0e2f9e8be23de8f3d", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "dc4fde7c569c4edd73ef2e764f28cadec09f6c01", "version": "1.81.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index 855d6f96cbed9b..e8813c92217600 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "375d3ead166d0600ebedb713227e05b52b624129", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "481c35c8ce42352acd91bad72bd96528f7eca160", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "0308f77b36482007673cf703034443cf65e55415", "version": "1.81.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index 8ecfb766cd6ec5..23a8f93bd4233d 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6170f4f4b0b7b9105de27ddd1caeb5f92c7feac5", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "a80705ae417e52c0ed302f2192dc26addccdb8b2", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "432a7587942a58d632200ef03b28f5a4fc3fd7bc", "version": "1.81.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 5a97af049df590..299a92a222cb44 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "441d806b60674a7f79367de3675633972151823e", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "aef1c06093c494f9dbd3dff370adf7259342896f", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "e8e3a29f5a07aa3f57e92a281a32d9da85faf155", "version": "1.81.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 9b2d520caf449a..09b55e1d8bbd3d 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cfcda2e56bf879d0c3d09399abb8eddcfd1b2d27", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "fe32678fa216e5b70cec84ebf08eefb55ab1a99e", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "dc96247cd9251f11421495082404e4ef6f1fb074", "version": "1.81.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 57884d8ffd021e..ac3cf514dd040b 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "11d5d87f8e0701ad7c591b83b75d69a27249e8d0", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "8dc25d07f3374565adb6cbec2b66c72e5001f0f7", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "4256eb60f0d91c480186af87acaf8a45bedb4833", "version": "1.81.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index 5b7fe653c45437..9f3a1748fc0853 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c5072bfa0aced94778153484b7b3c9302e0ff0f3", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "a9f865a95d609cf845c7df90a24bd2c4a3e8d3fb", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "0da0dedd618fda4f546705035a6cb04243cf3c08", "version": "1.81.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index c6a5e823ddf00d..779dacb234e909 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0a399a01f9750acf2d7ac62288452f3d4319eb0e", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "4e15663be62c3d1a300c193ca87353ce8055b3cb", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "1f3da20be03fe0e6f6027b6ddf35a3cca1fdcaf5", "version": "1.81.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index d6e76853aa4587..83a5305efd7359 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3a0c5194d7a4d8825efff8d67e0c75cae0b058d7", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "347ee427d1c355f706f0ebe28bdd2b6ade08366e", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "d4f932a1cdc8e5f0230299efcb8817f859937692", "version": "1.81.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index 6ac620a3f28597..c3dc9f9fe644de 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "85819cdd004323b0afe1a361b9e05fdb55ab6838", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "1ca0aa370a73a31b99dbba3853293e00bb984ebf", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "84a76a2f6986793db34bfd413c3ef8aa5e994697", "version": "1.81.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index e1b53c598acb61..67ee23866af1a6 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "54d30d2c4ffbd008fab793649b57a09338d91b32", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "d5bbe25fb9d58954910bf9b99678dda4ca24ef6c", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "087e6fd8563e7c1df08ce40069a117f0e86d457b", "version": "1.81.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index ad1c8972f2826e..56084238e435ef 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c39f818a3734e996eb777117eb8d1492d7b1b26f", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "bccb010e7166f6260c14e7a3ecd45ac896063f5b", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "cc5109dfdf796698dc21eda3f65dccc1dbb2b375", "version": "1.81.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json index 9088639e782e21..9afb98e51867f2 100644 --- a/versions/b-/boost-property-map-parallel.json +++ b/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6906d1d7dc7e80215f7889096b950d7c3b984bc2", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "cbb8b88eaa70e08c2df902783a8a3445998611ca", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "ca3887d48c4227a0b06d09aa6059793b0e61c72d", "version": "1.81.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index 357bfffe935f1c..5e059508f19c59 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2f85d45654b717daeeba34ae150afcdc1df309a2", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "ba64fd3f205f23b2f4b0d38d743f64ef4cff5234", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "575f1a849205d7f80887fedc5d7b0d68c3605807", "version": "1.81.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index b972f4adbd393d..632ca3a52875af 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c183cb16868f5bc299ff89a868eaf6b1a0a2f74a", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "2d28ee4ccdf7228708cdaf57631fda57e304fa6f", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "adf734f102e54d2ed73159ff2fca71f9c7fe9ed0", "version": "1.81.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index 829a51e4a78248..ac9e104233aed0 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1bce55f9406e1c918ef220127ac1608811d04926", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "37a65b0b4d70f7150dba9a026747b916f8994dfd", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "30ebf6222b12dc6f415bf0e8818da3b115d84306", "version": "1.81.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index 6860c3f35605ed..288902b9506493 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fbf9f674a0c21a43d0aa0e1fe4a02cdcef8da616", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "356dc81e710c1a2fdb8b03039bcf9be27ac0e58a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "be4f59a7efd19446541a57794c7bf233f9909af9", "version": "1.81.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index c32ba523fb2876..eba8d28404f86c 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e27c5fc20456f37dc552c8002ada45ede962be4e", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "08b3120f932fa085229ab4aaa68cbd97481663fe", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "3788a31404344b58dc74fa8844b30153e6bc3254", "version": "1.81.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 03463ca4ba0404..a9fc979e796e7a 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "71b16c8f7212d75d5088b97301030044f3d924f8", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "2e613c337ef37aa5201d6e6eaa66d8699ac986c9", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "5b978e84334796ec2cde5251a83c1fff650559f2", "version": "1.81.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 827e14bc65a1d9..1599b6a5b6acf2 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0c97951b0f38d6c9b469b367ac136249e1fa23fd", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c05105528f974ce1a2b709f10f3f8c351e2a3991", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "e757f43e9530224bd993eaf6dde5210936eb055f", "version": "1.81.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index e7f86a7384ded6..8a91166bcfd124 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fc4c6c85df6efb4afe27a53499abdcd17da71a69", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "355c16dc4d5e773a1ed735b6d74234c5540457d0", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "6af5cb1fbc3dc3ed087153266d9f7e6df3c8808b", "version": "1.81.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index 6d099f996d4b5d..40f9e8350b03b1 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cdb2522204e612067abded077c6ec1f783210f10", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c5e609cc2aed611b76c584596105bc25c3df10c6", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "335b163023058d8c0fc1f256e56dbe5ab30f03f0", "version": "1.81.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index cf4c250daf84a5..466be59d105653 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6120e3b8498d9976ad2d49093939c03a032d1609", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "9c516223d2f1e307b951fa1735351ddad9b6fc10", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "230937cbe2644aa72fa3487fa36f8e07bef76e82", "version": "1.81.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 8fd69ec0050c05..21f5a178300f94 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d31af2d45fe496fd2d89b734027e72c92d23f1d1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "3b5d4d8bf6461bad9584cfcd9a5402d3c6fde17d", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "172bf85987f58e14b7471bedff57e03790292538", "version": "1.81.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 6c1fc003a661e7..2431d78577058f 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0e786aeb741e3f8444c7252c33039216a9b74c11", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "d20295b553a82d4772b75b6b2aab8240359ae20b", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "86ae8f2fb46f5d370e92690b0c0cc8b8bb99c561", "version": "1.81.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 22d16b08232357..58faacc5b8e995 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "32c1f14869bea00029a8b45bb94cb63ff70cc85a", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "38b294de8545f98716f165966eb6e93137134975", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "1b2d7071e7f4db8ef844cdf22a9352c4644ba2f8", "version": "1.81.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 0845e1068b7e1a..68c1bda1c49784 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b1b42d850a39f2675bdd583b6138994090f47bb4", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b096b460eacdde8817d706be02e5538158765168", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "35eea20a5dba97412f01658e1334a766089dcc62", "version": "1.81.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index 2c75602009c47f..3e80018ab7ba62 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "62baba852c7f10c46fb042bd70d316e4b0178382", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "612a8c8753bfe3c064186f7ff0596c87ae202b83", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "1ff3e296103d255821323aebc556c4a1e535c69d", "version": "1.81.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 34eb87b205db4d..30018ad99a3e35 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a61a6534966bd4a70b051538a287de38be4345ba", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "5a3d3e5c44e52ffa9640751a4ff611c9a0c2d1a1", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "9658d324de2ff7661eb9b9a94c50c2c32fe61e38", "version": "1.81.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index db164c531cb02b..f4d5c93f760389 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "52a94c57d228888c823e75ffb50c1ada6243d400", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c80dbce839b8b0a842817958af53d490db5d91e3", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "4986baa8d4778863b3374e787098adb5d3ae24df", "version": "1.81.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 411fb9c2305270..4d97546c3444b4 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e3722a0c3169cbadc658d55b9c5042821f38c0ed", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "1c21c7df41e751a8b80af93154fbc5839e52dc8a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f536ce478ead1239c82201c2f6160ea3e6db9d86", "version": "1.81.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 66f6f28f2f7753..453785df6d9565 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e396fb4ba828edc96c7843024fac4c95d0c3dca6", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "ae18b290cc8132b982f7ee9ec59199f86ab199fa", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "39f36093419faf46f0a41d57e2d4acd5c38a0054", "version": "1.81.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index 7e13177f01f4ca..cee37ee47585a6 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "73dbf3ff6a02ae856ea69c4a9c6f32905463ff3a", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "e2dbb2792189ed8380b551cdefc615f72aa58aff", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "38e529d1388ce4dedb22e847324b30aab1f97444", "version": "1.81.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 129efe2198c5e6..538e722991a870 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e6e55a999a301eb62d7c4da853a6aeb296713943", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "3c7509ddc456f0a85962fbb51df4f998c3062999", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "bf5777cf607209edba1236a1cf87721ad896ead5", "version": "1.81.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index 5ee994dcdfe79c..1f4d5b9ff24108 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d6659ace5ff022455382adf6078c00bf015d5170", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "6f767f97f025574cf3a14d6390759ff063c3b7c0", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "b428f9b5942c135a898619782258dd4a4d453c33", "version": "1.81.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index 0b2a774ffcd112..7b9b022d52c3d4 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8a8da16449c627e1e3514b6f0c865423def32aef", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b3df561ef1e62cfb1f2210d12fe99ca3b019d0eb", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "e3d2a9d9eb7bd34df9111f68e506e0645ce343d3", "version": "1.81.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 51ec52bff072e1..423d5236fb8e25 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "48fb125e52a85de87f4ff03475742d79f84b42cb", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b4c52641930b283d8706bdadb3a00f0d4713c304", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "b5bda1dda74953d8b2ecfd6f2a67b3503a47e9ab", "version": "1.81.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index eba26205dafa08..0b5c569a095fe3 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7f9b16012eb50bf79ca3c7193b3a91900342fe1b", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "77df201a3df02a2fa21de18433474671cf2f41c0", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7e47dbce4949b5085b51a15ebb1041c86c7dde88", "version": "1.81.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index 45d131fba3f725..a66610d8b09fce 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "10385bb625d17d57f636154ab2b2ec6d35bb4615", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "73ab1bc58c1a66ca2d230d584b5a3f3277ff7698", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7769fa8b3f14741a465e312f373c670392d88986", "version": "1.81.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index e3ba2f01f1d7d6..259f65b1981a1a 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c51c9fa76f925c5824688c6ca9f451716373b5d5", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "ff4d027351210c3566727fee101f01de90240345", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "24786ddf6fd042eff7e75cbb3573d5ba5401530e", "version": "1.81.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 7d4c6e01678429..ec297fb6ac6fb1 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "df30d3eccc932381af5653911a0708436c1db576", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c86715f4f50f065882791fb8fdee4f42b2533084", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "c3e14b189e9ba8356438d69471038ffe993ba9e6", "version": "1.81.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index cf0b4d7e643d4a..68817f8a63166f 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4a53c730b20cacfbd8e6bbbd8faaeee0720c9fc1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b49b178a2beeaf3b919c3e4535b45abf89de6818", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7deb519f49fe9ca4814c3ee10da9cec1c73428f7", "version": "1.81.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index bae7d1b53772fe..38bd43cb9a8bfc 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cf4ae2c2fc67d7878842950e97e57c28811b1fd5", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "7ceff9b2a8616cf2279c68d70a29abf07ca10e17", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "ac4f1da7b85d3cc5746463d7fafd9d2dfe23e2ca", "version": "1.81.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 35cfed9b09ab43..8660a69fda8344 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c9173d5394c4b31fdf698b156b542c29031d03fe", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "54dbf60f65b0931002de7684e7755ae35d16eea4", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "dbde6147fcec0717164899b0964444188d38be89", "version": "1.81.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index ed636a6d629388..47baaccadffb69 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "abc972b6543f779324d60f5c619a205edda22b2b", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "89ca8e5140e7b6b31db688b4fb4819cf8256570f", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "2db0ac9588dd25a7088c7b5967ebd1e479f235ac", "version": "1.81.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 02fb3c1de47be6..b400c394bf1e83 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d02bcbc9c4ee9a4b27e90ab03010bea7b6c70eb3", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "c2264baedf368a03a865ec3e1236a1e94c996b65", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f43797ae5b94d44803685ae038d0bab71c4a3250", "version": "1.81.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index a51ecb281f80f8..1111766703b50f 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "34773fec432e120d3f2d9dd482461da7c36ef897", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "223d017c75c79909d143515a84ba95360b5e6ba1", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "4bb18781eb0901d50703978cb7f93329af8a0c0d", "version": "1.81.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index d96f8d80991db6..6c688ae82144ba 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ab6e440573d5f3ac964c50b3efc24055500a772f", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "77380a21ac442dd476825ca01d1ace199d1631b7", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7b24cb9fc6e02e419870fc6c10d214c4ae0c0a41", "version": "1.81.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index 1efe7e2646baa0..b65319db8915f6 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "48342bc4e28a5dea5e4e6ccb8cb0333b5feebfeb", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b1652104f4dfa41d11e9238edeefd1330d6d216c", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f9548ffa375198ab22ef334a0d9d0c759d785831", "version": "1.81.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index 54824194a0a62e..f17b69f4dba1ae 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d96807810fa612b038f9268c8df545d421fda1a6", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "3651d7a858bd04f7bf933e71110de4b9a46e3df1", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "4caf44a6883820726e6d25b015769ec375758f81", "version": "1.81.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index 03ec8eb6e8249c..5c873c339eec55 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "60fbfc84c6785572c1385528afb5616429828138", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "b15188b886cec9daf54c334fa401d68b56146138", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "505fb723fea2df6581043bf1d90e0628a025321e", "version": "1.81.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index cb04e0491da1a4..d2f949d34ee7c9 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ee2a3d19df6c91036cb772b4747bc7244307cda1", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "df88891653e7f24ffb101bc34513396b20cb4fc5", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "c37e40c50347d534ab95ba2355c72112821490f6", "version": "1.81.0", diff --git a/versions/b-/boost-url.json b/versions/b-/boost-url.json index baa521d8bbe11a..b9af52cdb0c202 100644 --- a/versions/b-/boost-url.json +++ b/versions/b-/boost-url.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5b6110be396379503f9305de47e76d364019b6c6", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "ab148b1f9a35d70c6e647644207c14b2d1e9c472", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f42a5aeebeb06f6fdb239e0913e2510ba4fab98d", "version": "1.81.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index f52f7869effa23..9eaa1bbee21bb2 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b94486558c58f29bb5165d952196d448719caae5", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "6fc53182947ed5525e426f934b440f22d4f04327", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "88534910a9049a40b8d8752913f69dae3cbec37c", "version": "1.81.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index d91e20f724b0a8..6be7fdbdb9286c 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "718fe77c580850e2dd881ff115ffb0f3d8612774", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "db382885cfe159def0504877ac283b57b7efbf8f", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "e9af468276d059ca478a6d42f3d0b343a749443f", "version": "1.81.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index e831b584039408..ada112156fdbba 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8f71e0d63ff1504559355737dba1f2ef2452d557", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "7b85b37781c02dbccca8b62035a9f40e18df6af3", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "13d77a8e8902136d832ae58e9ae4373366ee2fd4", "version": "1.81.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index e3d74f3f4423fd..e44b21302d76b2 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3acfc977da209b860fd7cf1365180af919be0eeb", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "e5d41ae488efffaadaffffc5a1d0b122e7bb3f2e", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "5c84dc87fee7da432b626fca25612d0a05604eb5", "version": "1.81.0", diff --git a/versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json index acfc8e9ac67333..40860550456a2f 100644 --- a/versions/b-/boost-vcpkg-helpers.json +++ b/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f99477ea8dcfb463d2f0a2cce3c60914c2e5adb4", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "16b00921be68c4108060687df8a4ded18b7f9b29", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "2aa63aed3fe5106f44a56b33d8754d045358f662", "version": "1.81.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index c3f6668d83dd69..f53d7608977f67 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "29976ffbb57716e6bfdf06b84e9958fd890a55c0", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "d31a0367a6f1c2540f682fa1636fab7486cead6a", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "2d02fada2420d5210e54536cbc6b6bc865eec00b", "version": "1.81.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index b79a6ad1cddcff..44c76a461021b1 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "26703fa9be9c0ca33ead77b9430a714bd672a523", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "cf1f8eb1ffd37f2abf4a9c8dc6199db7037c1825", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "f6aef641dfdf7f20ec1dbcd1280a260391b255ee", "version": "1.81.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index c3596f97e8690f..d8d30524bacfb7 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "db66242e796c29abd3622cf41d506bee622b4d10", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "d4a71323289449db56daf93cc840d416a42779b8", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "3a6773e846ce5a089ab2c4648f2b2b150870c7ee", "version": "1.81.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index 9d1e212e873985..3ee52f86ae0d74 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ed6d3e07b8e933869bbe2148898adc5916928405", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "68252d54930bb7e7188b93869d914e49b8fc0177", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "ef345601e061511a9c1ca790d5d3f4c2cbb2ba20", "version": "1.81.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 2472e7a33b868e..b9eb0ef4c1de16 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a1b7fd0e064cb4fc3911bfe16e5b89e46bf3b5bb", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "f21651c6a3bdb74377860287634f40c40c745af7", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "7b50cfbdaf3d3ff461a9523d0378faa789f76ed7", "version": "1.81.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 63b07be3715e80..a91556f6cc457b 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7714a26cfdcdc9633297140c227198fb18f64061", + "version": "1.82.0", + "port-version": 1 + }, + { + "git-tree": "42eb34ebc0c22a3f2babbafb457981ac8a1da6d5", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "afc980d4093ddd9d122b1bba1a894edd549c43a1", "version": "1.81.0", diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 893c242e80b68b..8f279f02c2275b 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01164d48fa5667c3e6885d010cb110b84b6f2e78", + "version-date": "2021-06-23", + "port-version": 4 + }, { "git-tree": "cb83700b7bf53177773421dfb803fb8478e6a72d", "version-date": "2021-06-23", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 5fc78b921df904..9d2996c2a47324 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b9240ee18f12e8acaedf11613aa6bc1d7aad9d5", + "version": "2.19.3", + "port-version": 1 + }, { "git-tree": "1ad976f3e650d7188414a0c2c62ec7290bed64e8", "version": "2.19.3", diff --git a/versions/b-/brigand.json b/versions/b-/brigand.json index d5b9f4b2ff2627..a7c08f1c19d0f3 100644 --- a/versions/b-/brigand.json +++ b/versions/b-/brigand.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b68860ce9e8aac4f7e605535571295ba5be9e2a3", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "a27641e46efb007b46792b7bd803f32437fe4178", "version-string": "1.3.0", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index 0ccb4edefb2641..d652925cf28dc0 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ed9b93bfd6a7031b7d96fa5443873f4c2634a049", + "version": "3.5.0", + "port-version": 0 + }, + { + "git-tree": "e7d60a5fc41c5f4aa283aeb1527a4bc8b55e934c", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "dbe9095cfdb6128d117003b2495f84e50653c220", "version": "3.3.0", diff --git a/versions/b-/butteraugli.json b/versions/b-/butteraugli.json index 81c07708449847..de1ff5fb297ec3 100644 --- a/versions/b-/butteraugli.json +++ b/versions/b-/butteraugli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abd41dd5d42cd344aab7266f0c9d6b9d1ebb8ed1", + "version-date": "2019-05-08", + "port-version": 4 + }, { "git-tree": "4a06f382d1c12d38bd578aca7d4cfe4a94b9e492", "version-string": "2019-05-08", diff --git a/versions/b-/bzip2.json b/versions/b-/bzip2.json index b5fb289ec51645..400bdac108b963 100644 --- a/versions/b-/bzip2.json +++ b/versions/b-/bzip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6165360d15e6de08dff3a5f079d51e69908cc55d", + "version-semver": "1.0.8", + "port-version": 4 + }, { "git-tree": "6ee6ad1d0bf78137f7f77671f393abc83363a710", "version-semver": "1.0.8", diff --git a/versions/baseline.json b/versions/baseline.json index 888ce10ec7f9ce..0035d264ef0907 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2,7 +2,7 @@ "default": { "3fd": { "baseline": "2.6.3", - "port-version": 2 + "port-version": 3 }, "7zip": { "baseline": "22.01", @@ -22,11 +22,11 @@ }, "absent": { "baseline": "0.3.1", - "port-version": 2 + "port-version": 3 }, "ace": { - "baseline": "7.0.11", - "port-version": 2 + "baseline": "7.1.0", + "port-version": 1 }, "acl": { "baseline": "2.3.1", @@ -34,7 +34,11 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 10 + "port-version": 13 + }, + "ada-url": { + "baseline": "2.4.2", + "port-version": 0 }, "ade": { "baseline": "0.1.1f", @@ -56,29 +60,25 @@ "baseline": "1.5.0", "port-version": 1 }, - "akali": { - "baseline": "1.43", - "port-version": 1 - }, "aklomp-base64": { "baseline": "2023-01-06", - "port-version": 0 + "port-version": 1 }, "alac": { "baseline": "2017-11-03-c38887c5", - "port-version": 3 + "port-version": 4 }, "alac-decoder": { "baseline": "0.2", - "port-version": 6 + "port-version": 7 }, "alembic": { - "baseline": "1.8.3", - "port-version": 1 + "baseline": "1.8.5", + "port-version": 0 }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", - "port-version": 2 + "port-version": 3 }, "allegro5": { "baseline": "5.2.6.0", @@ -93,8 +93,8 @@ "port-version": 1 }, "alsa": { - "baseline": "1.2.6.1", - "port-version": 2 + "baseline": "1.2.8", + "port-version": 1 }, "amd-amf": { "baseline": "1.4.29", @@ -109,7 +109,7 @@ "port-version": 4 }, "amqpcpp": { - "baseline": "4.3.19", + "baseline": "4.3.23", "port-version": 0 }, "anax": { @@ -117,15 +117,15 @@ "port-version": 8 }, "angelscript": { - "baseline": "2.36.0", - "port-version": 0 + "baseline": "2.36.1", + "port-version": 1 }, "angle": { "baseline": "chromium_5414", - "port-version": 1 + "port-version": 2 }, "annoy": { - "baseline": "2023-02-25", + "baseline": "1.17.2", "port-version": 0 }, "antlr4": { @@ -174,7 +174,7 @@ }, "argagg": { "baseline": "0.4.6", - "port-version": 2 + "port-version": 3 }, "argh": { "baseline": "1.3.2", @@ -182,7 +182,7 @@ }, "argon2": { "baseline": "20190702", - "port-version": 0 + "port-version": 1 }, "argparse": { "baseline": "2.9", @@ -221,8 +221,8 @@ "port-version": 4 }, "arrow": { - "baseline": "10.0.1", - "port-version": 4 + "baseline": "12.0.0", + "port-version": 1 }, "arsenalgear": { "baseline": "2.1.0", @@ -242,11 +242,15 @@ }, "asiosdk": { "baseline": "2.3.3", - "port-version": 5 + "port-version": 6 }, "asmjit": { - "baseline": "2021-10-26", - "port-version": 1 + "baseline": "2023-03-25", + "port-version": 0 + }, + "asmtk": { + "baseline": "2022-11-06", + "port-version": 0 }, "assimp": { "baseline": "5.2.5", @@ -254,7 +258,7 @@ }, "asynch": { "baseline": "2019-09-21", - "port-version": 2 + "port-version": 3 }, "asyncplusplus": { "baseline": "1.1", @@ -266,7 +270,7 @@ }, "at-spi2-core": { "baseline": "2.44.1", - "port-version": 1 + "port-version": 2 }, "atk": { "baseline": "2.38.0", @@ -274,11 +278,11 @@ }, "atkmm": { "baseline": "2.36.1", - "port-version": 0 + "port-version": 1 }, "atlmfc": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "atomic-queue": { "baseline": "2021-05-03", @@ -298,11 +302,11 @@ }, "aurora": { "baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", - "port-version": 1 + "port-version": 2 }, "autobahn": { "baseline": "20.8.1", - "port-version": 1 + "port-version": 2 }, "autodock-vina": { "baseline": "1.2.3", @@ -377,7 +381,7 @@ "port-version": 1 }, "aws-sdk-cpp": { - "baseline": "1.11.4", + "baseline": "1.11.65", "port-version": 0 }, "azmq": { @@ -386,10 +390,10 @@ }, "azure-c-shared-utility": { "baseline": "2023-01-18", - "port-version": 0 + "port-version": 1 }, "azure-core-cpp": { - "baseline": "1.8.0", + "baseline": "1.9.0", "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { @@ -397,7 +401,7 @@ "port-version": 0 }, "azure-identity-cpp": { - "baseline": "1.4.0", + "baseline": "1.5.0", "port-version": 0 }, "azure-iot-sdk-c": { @@ -406,7 +410,7 @@ }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 4 + "port-version": 5 }, "azure-macro-utils-c": { "baseline": "2022-01-21", @@ -417,19 +421,19 @@ "port-version": 0 }, "azure-security-keyvault-administration-cpp": { - "baseline": "4.0.0-beta.2", + "baseline": "4.0.0-beta.3", "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { - "baseline": "4.1.0", + "baseline": "4.2.0", "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.3.0", + "baseline": "4.4.0", "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.1.0", + "baseline": "4.2.0", "port-version": 0 }, "azure-storage-blobs-cpp": { @@ -437,19 +441,19 @@ "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.3.1", + "baseline": "12.3.2", "port-version": 0 }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 4 + "port-version": 5 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.5.0", + "baseline": "12.6.0", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.4.0", + "baseline": "12.5.0", "port-version": 0 }, "azure-storage-queues-cpp": { @@ -493,19 +497,19 @@ "port-version": 5 }, "bdwgc": { - "baseline": "8.2.2", + "baseline": "8.2.4", "port-version": 0 }, "beast": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "behaviortree-cpp": { - "baseline": "3.5.6", - "port-version": 3 + "baseline": "4.1.1", + "port-version": 0 }, "benchmark": { - "baseline": "1.7.1", + "baseline": "1.8.0", "port-version": 0 }, "bento4": { @@ -546,11 +550,11 @@ }, "binlog": { "baseline": "2021-04-16", - "port-version": 0 + "port-version": 1 }, "binn": { "baseline": "3.0", - "port-version": 2 + "port-version": 3 }, "bitmagic": { "baseline": "7.12.3", @@ -582,19 +586,23 @@ }, "blake3": { "baseline": "1.3.3", - "port-version": 0 + "port-version": 1 }, "blas": { "baseline": "2023-03-25", "port-version": 0 }, "blaze": { - "baseline": "3.8.1", + "baseline": "3.8.2", "port-version": 0 }, "blend2d": { - "baseline": "2022-12-31", - "port-version": 2 + "baseline": "0.10", + "port-version": 0 + }, + "blingfire": { + "baseline": "0.1.8.1", + "port-version": 1 }, "blitz": { "baseline": "2020-03-25", @@ -605,632 +613,636 @@ "port-version": 0 }, "boinc": { - "baseline": "7.22.0", + "baseline": "7.22.2", "port-version": 0 }, "bond": { - "baseline": "9.0.3", - "port-version": 3 + "baseline": "10.0.0", + "port-version": 0 }, "boolinq": { "baseline": "3.0.4", "port-version": 0 }, "boost": { - "baseline": "1.81.0", - "port-version": 3 + "baseline": "1.82.0", + "port-version": 1 }, "boost-accumulators": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-algorithm": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-align": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-any": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-array": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-asio": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-assert": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-assign": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-atomic": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-beast": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-bimap": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-bind": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-build": { - "baseline": "1.81.0", - "port-version": 3 + "baseline": "1.82.0", + "port-version": 1 }, "boost-callable-traits": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-chrono": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-circular-buffer": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-compatibility": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-compute": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-concept-check": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-config": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-container": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-container-hash": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-context": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-contract": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-conversion": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-convert": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-core": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-coroutine": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-coroutine2": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-crc": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-date-time": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-describe": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-detail": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-di": { "baseline": "1.2.0", "port-version": 0 }, "boost-dll": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-dynamic-bitset": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-endian": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-exception": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-fiber": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-filesystem": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-flyweight": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-foreach": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-format": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-function": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-function-types": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-functional": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-fusion": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-geometry": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-gil": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-graph": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-graph-parallel": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-hana": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-heap": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-histogram": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-hof": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-icl": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-integer": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-interprocess": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-interval": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-intrusive": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-io": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-iostreams": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-iterator": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-json": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-lambda": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-lambda2": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-leaf": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-lexical-cast": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-local-function": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-locale": { - "baseline": "1.81.0", - "port-version": 3 + "baseline": "1.82.0", + "port-version": 1 }, "boost-lockfree": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-log": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-logic": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-math": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-metaparse": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-modular-build-helper": { - "baseline": "1.81.0", - "port-version": 5 + "baseline": "1.82.0", + "port-version": 1 }, "boost-move": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-mp11": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-mpi": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-mpl": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-msm": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-multi-array": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-multi-index": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-multiprecision": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 + }, + "boost-mysql": { + "baseline": "1.82.0", + "port-version": 1 }, "boost-nowide": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-numeric-conversion": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-odeint": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-optional": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-outcome": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-parameter": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-parameter-python": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-pfr": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-phoenix": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-poly-collection": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-polygon": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-pool": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-predef": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-preprocessor": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-process": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-program-options": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-property-map": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-property-map-parallel": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-property-tree": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-proto": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-ptr-container": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-python": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-qvm": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-random": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-range": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-ratio": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-rational": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-regex": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-safe-numerics": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-scope-exit": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-serialization": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-signals2": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-smart-ptr": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-sort": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-spirit": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-stacktrace": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-statechart": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-static-assert": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-static-string": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-stl-interfaces": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-system": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-test": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-thread": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-throw-exception": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-timer": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-tokenizer": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-tti": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-tuple": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-type-erasure": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-type-index": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-type-traits": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-typeof": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-ublas": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-uninstall": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-units": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-unordered": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-url": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-utility": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-uuid": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-variant": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-variant2": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-vcpkg-helpers": { - "baseline": "1.81.0", - "port-version": 3 + "baseline": "1.82.0", + "port-version": 1 }, "boost-vmd": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-wave": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-winapi": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-xpressive": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boost-yap": { - "baseline": "1.81.0", - "port-version": 2 + "baseline": "1.82.0", + "port-version": 1 }, "boringssl": { "baseline": "2021-06-23", - "port-version": 3 + "port-version": 4 }, "botan": { "baseline": "2.19.3", - "port-version": 0 + "port-version": 1 }, "box2d": { "baseline": "2.4.1", @@ -1246,7 +1258,7 @@ }, "brigand": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "brotli": { "baseline": "1.0.9", @@ -1265,7 +1277,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "3.3.0", + "baseline": "3.5.0", "port-version": 0 }, "bsio": { @@ -1294,7 +1306,7 @@ }, "butteraugli": { "baseline": "2019-05-08", - "port-version": 3 + "port-version": 4 }, "bxzstr": { "baseline": "1.2.0", @@ -1306,7 +1318,7 @@ }, "bzip2": { "baseline": "1.0.8", - "port-version": 3 + "port-version": 4 }, "c-ares": { "baseline": "1.19.0", @@ -1325,16 +1337,16 @@ "port-version": 1 }, "c9y": { - "baseline": "0.7.0", + "baseline": "0.8.0", "port-version": 0 }, "cachelib": { - "baseline": "2023.02.27.00", + "baseline": "2023.05.08.00", "port-version": 0 }, "caf": { - "baseline": "0.18.6", - "port-version": 1 + "baseline": "0.19.1", + "port-version": 0 }, "caffe2": { "baseline": "0.8.1", @@ -1346,10 +1358,10 @@ }, "cairomm": { "baseline": "1.16.2", - "port-version": 2 + "port-version": 3 }, "calceph": { - "baseline": "3.5.1", + "baseline": "3.5.2", "port-version": 0 }, "camport3": { @@ -1362,7 +1374,7 @@ }, "capstone": { "baseline": "5.0.0-rc2", - "port-version": 1 + "port-version": 2 }, "cargs": { "baseline": "1.0.3", @@ -1382,7 +1394,7 @@ }, "catch-classic": { "baseline": "1.12.2", - "port-version": 1 + "port-version": 2 }, "catch2": { "baseline": "3.3.2", @@ -1398,7 +1410,7 @@ }, "ccfits": { "baseline": "2.5", - "port-version": 9 + "port-version": 11 }, "cctag": { "baseline": "1.0.2", @@ -1406,10 +1418,10 @@ }, "cctz": { "baseline": "2.3", - "port-version": 4 + "port-version": 5 }, "cdt": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "celero": { @@ -1438,7 +1450,7 @@ }, "cgicc": { "baseline": "3.2.19", - "port-version": 6 + "port-version": 7 }, "cgl": { "baseline": "0.60.3", @@ -1458,19 +1470,19 @@ }, "chaiscript": { "baseline": "6.1.0", - "port-version": 2 + "port-version": 3 }, "chakracore": { "baseline": "2022-11-09", "port-version": 3 }, "charls": { - "baseline": "2.4.1", + "baseline": "2.4.2", "port-version": 0 }, "chartdir": { "baseline": "7.0.0", - "port-version": 6 + "port-version": 7 }, "check": { "baseline": "0.15.2", @@ -1478,11 +1490,11 @@ }, "chipmunk": { "baseline": "7.0.3", - "port-version": 3 + "port-version": 4 }, "chmlib": { "baseline": "0.40", - "port-version": 6 + "port-version": 7 }, "chromaprint": { "baseline": "1.5.0", @@ -1496,6 +1508,10 @@ "baseline": "8.0.0", "port-version": 0 }, + "cialloo-rcon": { + "baseline": "1.0.0", + "port-version": 0 + }, "cimg": { "baseline": "2.9.9", "port-version": 0 @@ -1526,7 +1542,7 @@ }, "clara": { "baseline": "1.1.5", - "port-version": 1 + "port-version": 2 }, "clblas": { "baseline": "2.12", @@ -1590,15 +1606,15 @@ }, "cmcstl2": { "baseline": "2019-07-20", - "port-version": 2 + "port-version": 3 }, "cminpack": { "baseline": "1.3.8", - "port-version": 3 + "port-version": 4 }, "cmocka": { "baseline": "2020-08-01", - "port-version": 2 + "port-version": 3 }, "cnats": { "baseline": "3.6.0", @@ -1606,7 +1622,7 @@ }, "cnl": { "baseline": "1.1.7", - "port-version": 2 + "port-version": 3 }, "co": { "baseline": "2.0.3", @@ -1618,7 +1634,7 @@ }, "coin": { "baseline": "4.0.0", - "port-version": 6 + "port-version": 7 }, "coin-or-buildtools": { "baseline": "2023-02-02", @@ -1646,7 +1662,7 @@ }, "collada-dom": { "baseline": "2.5.0", - "port-version": 8 + "port-version": 9 }, "colmap": { "baseline": "2023-03-12", @@ -1694,7 +1710,7 @@ }, "constexpr-contracts": { "baseline": "2020-08-09", - "port-version": 2 + "port-version": 3 }, "continuable": { "baseline": "4.2.0", @@ -1706,7 +1722,7 @@ }, "coolprop": { "baseline": "6.4.3", - "port-version": 1 + "port-version": 3 }, "coroutine": { "baseline": "1.5.0", @@ -1716,13 +1732,17 @@ "baseline": "2020.06", "port-version": 5 }, + "cpp-async": { + "baseline": "1.0.0", + "port-version": 0 + }, "cpp-base64": { "baseline": "V2.rc.08", "port-version": 0 }, "cpp-httplib": { - "baseline": "0.11.3", - "port-version": 1 + "baseline": "0.12.3", + "port-version": 0 }, "cpp-ipc": { "baseline": "1.2.0", @@ -1734,7 +1754,7 @@ }, "cpp-netlib": { "baseline": "0.13.0", - "port-version": 7 + "port-version": 8 }, "cpp-peglib": { "baseline": "1.3.10", @@ -1746,7 +1766,7 @@ }, "cpp-taskflow": { "baseline": "2.6.0", - "port-version": 1 + "port-version": 2 }, "cpp-timsort": { "baseline": "2.1.0", @@ -1773,7 +1793,7 @@ "port-version": 2 }, "cppgraphqlgen": { - "baseline": "4.5.1", + "baseline": "4.5.3", "port-version": 0 }, "cppitertools": { @@ -1781,8 +1801,8 @@ "port-version": 3 }, "cppkafka": { - "baseline": "0.3.1", - "port-version": 5 + "baseline": "0.4.0", + "port-version": 0 }, "cppmicroservices": { "baseline": "3.6.0", @@ -1802,7 +1822,7 @@ }, "cppunit": { "baseline": "1.15.1", - "port-version": 3 + "port-version": 4 }, "cpputest": { "baseline": "2019-9-16", @@ -1818,10 +1838,10 @@ }, "cppzmq": { "baseline": "4.9.0", - "port-version": 0 + "port-version": 1 }, "cpr": { - "baseline": "1.9.3", + "baseline": "1.10.2+3", "port-version": 0 }, "cpu-features": { @@ -1838,11 +1858,11 @@ }, "cr": { "baseline": "2020-04-26", - "port-version": 1 + "port-version": 2 }, "crashpad": { "baseline": "2022-09-05", - "port-version": 3 + "port-version": 4 }, "crashrpt": { "baseline": "1.4.3", @@ -1878,11 +1898,11 @@ }, "cspice": { "baseline": "67", - "port-version": 2 + "port-version": 3 }, "ctbignum": { "baseline": "2019-08-02", - "port-version": 2 + "port-version": 3 }, "ctemplate": { "baseline": "2020-09-14", @@ -1890,7 +1910,7 @@ }, "ctp": { "baseline": "6.6.1_P1_20210406_se", - "port-version": 3 + "port-version": 4 }, "ctpg": { "baseline": "1.3.7", @@ -1921,7 +1941,7 @@ "port-version": 8 }, "curl": { - "baseline": "8.0.1", + "baseline": "8.1.2", "port-version": 0 }, "curlpp": { @@ -1930,7 +1950,7 @@ }, "cute-headers": { "baseline": "2019-09-20", - "port-version": 1 + "port-version": 2 }, "cutelyst2": { "baseline": "2.12.0", @@ -1966,7 +1986,7 @@ }, "darknet": { "baseline": "2022-03-06", - "port-version": 2 + "port-version": 3 }, "darts-clone": { "baseline": "1767ab87cffe", @@ -2005,7 +2025,7 @@ "port-version": 0 }, "dbg-macro": { - "baseline": "2021-11-02", + "baseline": "0.5.0", "port-version": 0 }, "dbghelp": { @@ -2014,7 +2034,7 @@ }, "dbow2": { "baseline": "2019-08-05", - "port-version": 2 + "port-version": 3 }, "dbow3": { "baseline": "1.0.0", @@ -2030,11 +2050,11 @@ }, "debug-assert": { "baseline": "1.3.3", - "port-version": 1 + "port-version": 2 }, "decimal-for-cpp": { "baseline": "1.18", - "port-version": 0 + "port-version": 1 }, "detours": { "baseline": "4.0.1", @@ -2057,56 +2077,56 @@ "port-version": 1 }, "directx-headers": { - "baseline": "1.608.2", - "port-version": 1 + "baseline": "1.610.2", + "port-version": 0 }, "directxmath": { "baseline": "2022-12-12", "port-version": 0 }, "directxmesh": { - "baseline": "2023-03-30", + "baseline": "2023-04-28", "port-version": 0 }, "directxsdk": { "baseline": "jun10", - "port-version": 6 + "port-version": 7 }, "directxtex": { - "baseline": "2023-03-30", - "port-version": 0 + "baseline": "2023-04-28", + "port-version": 1 }, "directxtk": { - "baseline": "2023-03-30", + "baseline": "2023-04-28", "port-version": 0 }, "directxtk12": { - "baseline": "2023-03-30", + "baseline": "2023-04-28", "port-version": 0 }, "dirent": { "baseline": "1.23.2", - "port-version": 1 + "port-version": 2 }, "discord-game-sdk": { - "baseline": "2.5.6", - "port-version": 5 + "baseline": "3.2.1", + "port-version": 0 }, "discord-rpc": { "baseline": "3.4.0", - "port-version": 2 + "port-version": 3 }, "discordcoreapi": { - "baseline": "2023-01-02", + "baseline": "2023-05-30", "port-version": 0 }, "discount": { "baseline": "2.2.6", - "port-version": 2 + "port-version": 3 }, "discreture": { "baseline": "2020-01-29", - "port-version": 2 + "port-version": 3 }, "distorm": { "baseline": "3.5.2b", @@ -2126,7 +2146,7 @@ }, "docopt": { "baseline": "2018-11-01", - "port-version": 2 + "port-version": 3 }, "doctest": { "baseline": "2.4.11", @@ -2134,18 +2154,18 @@ }, "double-conversion": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "dpdk": { "baseline": "22.07", "port-version": 1 }, "dpp": { - "baseline": "10.0.23", - "port-version": 1 + "baseline": "10.0.24", + "port-version": 0 }, "draco": { - "baseline": "1.5.3", + "baseline": "1.5.6", "port-version": 0 }, "drlibs": { @@ -2157,8 +2177,8 @@ "port-version": 0 }, "dstorage": { - "baseline": "1.1.0", - "port-version": 2 + "baseline": "1.2.0", + "port-version": 0 }, "dtl": { "baseline": "1.20", @@ -2174,7 +2194,11 @@ }, "duktape": { "baseline": "2.5.0", - "port-version": 3 + "port-version": 4 + }, + "dumb": { + "baseline": "2.0.3", + "port-version": 0 }, "dv-processing": { "baseline": "1.7.8", @@ -2182,11 +2206,11 @@ }, "dx": { "baseline": "1.0.1", - "port-version": 2 + "port-version": 3 }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 5 + "port-version": 6 }, "dxut": { "baseline": "11.31", @@ -2206,7 +2230,7 @@ }, "easycl": { "baseline": "0.3", - "port-version": 1 + "port-version": 2 }, "easyexif": { "baseline": "2022-10-07", @@ -2214,18 +2238,18 @@ }, "easyhook": { "baseline": "2.7.7097.0", - "port-version": 5 + "port-version": 6 }, "easyloggingpp": { "baseline": "9.97.0", - "port-version": 2 + "port-version": 3 }, "eathread": { "baseline": "1.32.09", - "port-version": 3 + "port-version": 5 }, "ebml": { - "baseline": "1.4.2", + "baseline": "1.4.4", "port-version": 1 }, "ecm": { @@ -2234,14 +2258,14 @@ }, "ecos": { "baseline": "2.0.8", - "port-version": 1 + "port-version": 3 }, "ecsutil": { "baseline": "1.0.7.15", - "port-version": 3 + "port-version": 4 }, "edflib": { - "baseline": "1.21", + "baseline": "1.24", "port-version": 0 }, "edlib": { @@ -2298,7 +2322,7 @@ }, "entityx": { "baseline": "1.3.0", - "port-version": 3 + "port-version": 5 }, "entt": { "baseline": "3.11.1", @@ -2366,7 +2390,7 @@ }, "fadbad": { "baseline": "2.1.0", - "port-version": 1 + "port-version": 2 }, "faiss": { "baseline": "1.7.3", @@ -2389,7 +2413,7 @@ "port-version": 2 }, "fast-float": { - "baseline": "3.11.0", + "baseline": "4.0.0", "port-version": 0 }, "fastcdr": { @@ -2402,10 +2426,10 @@ }, "fastfeat": { "baseline": "391d5e9", - "port-version": 2 + "port-version": 4 }, "fastgltf": { - "baseline": "0.4.0", + "baseline": "0.5.0", "port-version": 0 }, "fastio": { @@ -2414,7 +2438,7 @@ }, "fastlz": { "baseline": "2021-05-10", - "port-version": 0 + "port-version": 2 }, "fastor": { "baseline": "2021-11-22", @@ -2422,19 +2446,19 @@ }, "fastrtps": { "baseline": "2.7.0", - "port-version": 0 + "port-version": 1 }, "fawdlstty-libfv": { "baseline": "0.0.8", "port-version": 0 }, "fbgemm": { - "baseline": "2021-03-18", - "port-version": 4 + "baseline": "0.4.1", + "port-version": 0 }, "fbthrift": { - "baseline": "2022.03.21.00", - "port-version": 2 + "baseline": "2023.05.15.00", + "port-version": 0 }, "fcl": { "baseline": "0.7.0", @@ -2446,7 +2470,7 @@ }, "fdlibm": { "baseline": "5.3", - "port-version": 5 + "port-version": 7 }, "ffmpeg": { "baseline": "5.1.2", @@ -2458,18 +2482,22 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 5 + "port-version": 6 }, "fftwpp": { "baseline": "2019-12-19", "port-version": 2 }, + "fineftp": { + "baseline": "1.3.4", + "port-version": 0 + }, "fixed-string": { "baseline": "0.1.1", "port-version": 0 }, "fizz": { - "baseline": "2022.10.31.00", + "baseline": "2023.05.15.00", "port-version": 0 }, "flann": { @@ -2482,43 +2510,43 @@ }, "flashlight-cpu": { "baseline": "0.3", - "port-version": 3 + "port-version": 5 }, "flashlight-cuda": { "baseline": "0.3", - "port-version": 4 + "port-version": 6 }, "flat": { "baseline": "2022-08-30", "port-version": 0 }, "flatbuffers": { - "baseline": "23.3.3", + "baseline": "23.5.9", "port-version": 0 }, "flecs": { - "baseline": "3.2.0", + "baseline": "3.2.3", "port-version": 0 }, "flint": { "baseline": "2.8.0", - "port-version": 1 + "port-version": 2 }, "fltk": { "baseline": "1.3.8", "port-version": 5 }, "fluidlite": { - "baseline": "2020-08-27", - "port-version": 3 + "baseline": "2023-04-18", + "port-version": 0 }, "fluidsynth": { - "baseline": "2.3.1", + "baseline": "2.3.2", "port-version": 2 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", - "port-version": 1 + "port-version": 3 }, "fmi4cpp": { "baseline": "0.8.0", @@ -2526,15 +2554,15 @@ }, "fmilib": { "baseline": "2.4.1", - "port-version": 1 + "port-version": 2 }, "fmt": { - "baseline": "9.1.0", - "port-version": 1 + "baseline": "10.0.0", + "port-version": 0 }, "folly": { - "baseline": "2022.10.31.00", - "port-version": 4 + "baseline": "2023.05.15.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -2545,8 +2573,8 @@ "port-version": 1 }, "fontconfig": { - "baseline": "2.14.1", - "port-version": 2 + "baseline": "2.14.2", + "port-version": 0 }, "foonathan-lexy": { "baseline": "2022.12.1", @@ -2554,7 +2582,7 @@ }, "foonathan-memory": { "baseline": "2019-07-21", - "port-version": 2 + "port-version": 4 }, "forest": { "baseline": "12.1.0", @@ -2562,7 +2590,7 @@ }, "forge": { "baseline": "1.0.8", - "port-version": 2 + "port-version": 3 }, "foxi": { "baseline": "2021-12-01", @@ -2570,7 +2598,7 @@ }, "fp16": { "baseline": "2021-02-21", - "port-version": 0 + "port-version": 2 }, "fplus": { "baseline": "0.2.18-p0", @@ -2590,7 +2618,7 @@ }, "freeopcua": { "baseline": "20190125", - "port-version": 5 + "port-version": 7 }, "freerdp": { "baseline": "2.9.0", @@ -2606,11 +2634,11 @@ }, "freetype-gl": { "baseline": "2022-01-17", - "port-version": 1 + "port-version": 2 }, "freexl": { "baseline": "1.0.6", - "port-version": 1 + "port-version": 2 }, "fribidi": { "baseline": "1.0.12", @@ -2633,7 +2661,7 @@ "port-version": 1 }, "ftxui": { - "baseline": "4.0.0", + "baseline": "4.1.1", "port-version": 0 }, "function2": { @@ -2642,7 +2670,7 @@ }, "functions-framework-cpp": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 4 }, "fuzzylite": { "baseline": "6.0", @@ -2650,11 +2678,11 @@ }, "fxdiv": { "baseline": "2021-02-21", - "port-version": 0 + "port-version": 2 }, "g2o": { "baseline": "2020-02-07", - "port-version": 2 + "port-version": 4 }, "g3log": { "baseline": "2.3", @@ -2674,15 +2702,15 @@ }, "gamma": { "baseline": "gamma-2018-01-27", - "port-version": 4 + "port-version": 6 }, "gasol": { "baseline": "2018-01-04", - "port-version": 2 + "port-version": 4 }, "gaussianlib": { "baseline": "2019-08-04", - "port-version": 1 + "port-version": 2 }, "gazebo": { "baseline": "2022-01-20", @@ -2693,20 +2721,20 @@ "port-version": 0 }, "gdal": { - "baseline": "3.6.3", - "port-version": 1 + "baseline": "3.7.0", + "port-version": 2 }, "gdcm": { - "baseline": "3.0.12", - "port-version": 1 + "baseline": "3.0.22", + "port-version": 0 }, "gdcm2": { "baseline": "deprecated", "port-version": 1 }, "gdk-pixbuf": { - "baseline": "2.42.9", - "port-version": 5 + "baseline": "2.42.10", + "port-version": 0 }, "gemmlowp": { "baseline": "2021-09-28", @@ -2714,7 +2742,7 @@ }, "genann": { "baseline": "2019-07-10", - "port-version": 1 + "port-version": 3 }, "geogram": { "baseline": "1.8.3", @@ -2725,7 +2753,7 @@ "port-version": 0 }, "geos": { - "baseline": "3.11.1", + "baseline": "3.11.2", "port-version": 0 }, "geotrans": { @@ -2738,23 +2766,27 @@ }, "getopt": { "baseline": "0", - "port-version": 2 + "port-version": 3 }, "getopt-win32": { "baseline": "0.1", "port-version": 7 }, "gettext": { + "baseline": "0.21.1", + "port-version": 1 + }, + "gettext-libintl": { "baseline": "0.21.1", "port-version": 0 }, "gettimeofday": { "baseline": "2017-10-14", - "port-version": 4 + "port-version": 6 }, "gflags": { "baseline": "2.2.2", - "port-version": 5 + "port-version": 7 }, "ghc-filesystem": { "baseline": "1.5.12", @@ -2778,7 +2810,7 @@ }, "gl2ps": { "baseline": "1.4.2", - "port-version": 1 + "port-version": 3 }, "gl3w": { "baseline": "2018-05-31", @@ -2788,13 +2820,17 @@ "baseline": "0.1.36", "port-version": 0 }, + "glaze": { + "baseline": "1.2.3", + "port-version": 0 + }, "glbinding": { "baseline": "3.1.0", "port-version": 4 }, "glew": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 3 }, "glfw3": { "baseline": "3.3.8", @@ -2802,14 +2838,14 @@ }, "gli": { "baseline": "2021-07-06", - "port-version": 0 + "port-version": 2 }, "glib": { - "baseline": "2.76.0", - "port-version": 1 + "baseline": "2.76.2", + "port-version": 0 }, "glibmm": { - "baseline": "2.74.0", + "baseline": "2.76.0", "port-version": 0 }, "glm": { @@ -2818,7 +2854,7 @@ }, "globjects": { "baseline": "1.1.0", - "port-version": 4 + "port-version": 6 }, "glog": { "baseline": "0.6.0", @@ -2826,23 +2862,23 @@ }, "gloo": { "baseline": "20201203", - "port-version": 0 + "port-version": 2 }, "glpk": { "baseline": "5.0", "port-version": 1 }, "glslang": { - "baseline": "12.1.0", + "baseline": "12.2.0", "port-version": 0 }, "glui": { "baseline": "2019-11-30", - "port-version": 1 + "port-version": 3 }, "gmime": { "baseline": "3.2.6", - "port-version": 3 + "port-version": 5 }, "gmmlib": { "baseline": "21.3.2", @@ -2850,7 +2886,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 17 + "port-version": 18 }, "gmsh": { "baseline": "4.9.0", @@ -2858,10 +2894,10 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 1 + "port-version": 3 }, "google-cloud-cpp": { - "baseline": "2.9.0", + "baseline": "2.10.0", "port-version": 0 }, "google-cloud-cpp-common": { @@ -2878,11 +2914,11 @@ }, "gperf": { "baseline": "3.1", - "port-version": 4 + "port-version": 5 }, "gperftools": { "baseline": "2019-09-02", - "port-version": 3 + "port-version": 4 }, "gpgme": { "baseline": "1.18.0", @@ -2902,11 +2938,11 @@ }, "graphene": { "baseline": "1.10.8", - "port-version": 1 + "port-version": 2 }, "graphicsmagick": { "baseline": "1.3.37", - "port-version": 1 + "port-version": 3 }, "graphite2": { "baseline": "1.3.14", @@ -2934,10 +2970,10 @@ }, "gsl": { "baseline": "2.7.1", - "port-version": 1 + "port-version": 3 }, "gsl-lite": { - "baseline": "0.40.0", + "baseline": "0.41.0", "port-version": 0 }, "gsoap": { @@ -2946,30 +2982,30 @@ }, "gst-rtsp-server": { "baseline": "1.20.5", - "port-version": 0 + "port-version": 1 }, "gstreamer": { "baseline": "1.20.5", - "port-version": 3 + "port-version": 8 }, "gtest": { "baseline": "1.13.0", "port-version": 0 }, "gtk": { - "baseline": "4.6.8", - "port-version": 1 + "baseline": "4.10.3", + "port-version": 0 }, "gtk3": { - "baseline": "3.24.34", - "port-version": 2 + "baseline": "3.24.37", + "port-version": 0 }, "gtkmm": { - "baseline": "4.6.0", + "baseline": "4.10.0", "port-version": 0 }, "gtl": { - "baseline": "1.1.5", + "baseline": "1.1.8", "port-version": 0 }, "gts": { @@ -3000,9 +3036,25 @@ "baseline": "0.10.1", "port-version": 6 }, + "gz-cmake3": { + "baseline": "3.0.1", + "port-version": 0 + }, + "gz-math7": { + "baseline": "7.0.2", + "port-version": 1 + }, + "gz-tools2": { + "baseline": "2.0.0", + "port-version": 1 + }, + "gz-utils2": { + "baseline": "2.0.0", + "port-version": 0 + }, "gzip-hpp": { "baseline": "0.1.0", - "port-version": 1 + "port-version": 2 }, "h3": { "baseline": "4.1.0", @@ -3010,11 +3062,11 @@ }, "h5py-lzf": { "baseline": "2019-12-04", - "port-version": 1 + "port-version": 3 }, "halide": { "baseline": "15.0.0", - "port-version": 0 + "port-version": 1 }, "happly": { "baseline": "2021-03-19", @@ -3025,7 +3077,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "7.0.0", + "baseline": "7.2.0", "port-version": 0 }, "hash-library": { @@ -3038,7 +3090,7 @@ }, "hayai": { "baseline": "2019-08-10", - "port-version": 1 + "port-version": 3 }, "hazelcast-cpp-client": { "baseline": "5.2.0", @@ -3050,7 +3102,7 @@ }, "healpix": { "baseline": "1.12.10", - "port-version": 8 + "port-version": 9 }, "hedley": { "baseline": "15", @@ -3069,7 +3121,7 @@ "port-version": 0 }, "hidapi": { - "baseline": "0.13.1", + "baseline": "0.14.0", "port-version": 0 }, "highfive": { @@ -3090,11 +3142,11 @@ }, "hiredis": { "baseline": "1.0.2", - "port-version": 4 + "port-version": 5 }, "hnswlib": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "hps": { "baseline": "2022-01-18", @@ -3106,11 +3158,11 @@ }, "http-parser": { "baseline": "2.9.4", - "port-version": 1 + "port-version": 3 }, "hungarian": { - "baseline": "v0.1.3", - "port-version": 1 + "baseline": "0.1.3", + "port-version": 3 }, "hunspell": { "baseline": "1.7.1", @@ -3121,7 +3173,7 @@ "port-version": 0 }, "hyperscan": { - "baseline": "5.4.0", + "baseline": "5.4.2", "port-version": 0 }, "hypodermic": { @@ -3138,7 +3190,7 @@ }, "icu": { "baseline": "72.1", - "port-version": 3 + "port-version": 5 }, "ideviceinstaller": { "baseline": "1.1.2.23", @@ -3148,13 +3200,17 @@ "baseline": "1.0.12", "port-version": 7 }, + "idyntree": { + "baseline": "9.0.0", + "port-version": 0 + }, "if97": { "baseline": "2.1.3", - "port-version": 0 + "port-version": 1 }, "igloo": { "baseline": "1.1.1", - "port-version": 1 + "port-version": 2 }, "ignition-cmake0": { "baseline": "0.6.2", @@ -3189,8 +3245,8 @@ "port-version": 1 }, "ignition-modularscripts": { - "baseline": "2022-05-11", - "port-version": 1 + "baseline": "2023-05-05", + "port-version": 0 }, "ignition-msgs1": { "baseline": "1.0.0", @@ -3238,7 +3294,7 @@ }, "ijg-libjpeg": { "baseline": "9e", - "port-version": 0 + "port-version": 1 }, "ilmbase": { "baseline": "3", @@ -3258,7 +3314,7 @@ }, "imgui": { "baseline": "1.89.4", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.5", @@ -3277,16 +3333,16 @@ "port-version": 1 }, "indicators": { - "baseline": "2.2", + "baseline": "2.3", "port-version": 0 }, "influxdb-cxx": { - "baseline": "2022-09-02", + "baseline": "0.7.1", "port-version": 0 }, "infoware": { - "baseline": "2021-06-16", - "port-version": 1 + "baseline": "2023-04-12", + "port-version": 0 }, "inih": { "baseline": "56", @@ -3294,7 +3350,7 @@ }, "iniparser": { "baseline": "2020-04-06", - "port-version": 3 + "port-version": 5 }, "inipp": { "baseline": "1.0.12", @@ -3310,23 +3366,23 @@ }, "intel-mkl": { "baseline": "2023.0.0", - "port-version": 0 + "port-version": 1 }, "intelrdfpmathlib": { "baseline": "20U2", - "port-version": 4 + "port-version": 6 }, "io2d": { "baseline": "2020-09-14", - "port-version": 3 + "port-version": 5 }, "irrlicht": { - "baseline": "1.8.4", - "port-version": 13 + "baseline": "1.8.5", + "port-version": 0 }, "irrxml": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "isal": { "baseline": "2.30.0", @@ -3342,7 +3398,7 @@ }, "itpp": { "baseline": "4.3.1", - "port-version": 8 + "port-version": 10 }, "ixwebsocket": { "baseline": "11.4.3", @@ -3362,15 +3418,15 @@ }, "jasper": { "baseline": "4.0.0", - "port-version": 1 + "port-version": 2 }, "jbig2dec": { "baseline": "0.19", - "port-version": 1 + "port-version": 3 }, "jbigkit": { "baseline": "2.1", - "port-version": 5 + "port-version": 7 }, "jemalloc": { "baseline": "5.3.0", @@ -3378,23 +3434,23 @@ }, "jinja2cpplight": { "baseline": "2018-05-08", - "port-version": 1 + "port-version": 3 }, "joltphysics": { - "baseline": "2.0.1", - "port-version": 2 + "baseline": "3.0.1", + "port-version": 0 }, "josuttis-jthread": { "baseline": "2020-07-21", - "port-version": 2 + "port-version": 3 }, "jsmn": { "baseline": "2019-04-27", - "port-version": 1 + "port-version": 2 }, "json-c": { "baseline": "2022-06-26", - "port-version": 2 + "port-version": 3 }, "json-dto": { "baseline": "0.3.1", @@ -3406,18 +3462,18 @@ }, "json-spirit": { "baseline": "4.1.0", - "port-version": 2 + "port-version": 4 }, "json11": { "baseline": "2017-06-20", - "port-version": 4 + "port-version": 6 }, "json5-parser": { "baseline": "1.0.0", - "port-version": 3 + "port-version": 5 }, "jsoncons": { - "baseline": "0.170.0", + "baseline": "0.170.2", "port-version": 0 }, "jsoncpp": { @@ -3425,8 +3481,8 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "0.9.2", + "port-version": 0 }, "jsonnet": { "baseline": "0.18.0", @@ -3454,7 +3510,7 @@ }, "kd-soap": { "baseline": "2.1.1", - "port-version": 0 + "port-version": 1 }, "kdalgorithms": { "baseline": "2023-02-11", @@ -3474,7 +3530,7 @@ }, "kenlm": { "baseline": "20200924", - "port-version": 1 + "port-version": 4 }, "keystone": { "baseline": "0.9.2", @@ -3584,6 +3640,10 @@ "baseline": "5.98.0", "port-version": 0 }, + "kf5parts": { + "baseline": "5.98.0", + "port-version": 0 + }, "kf5plotting": { "baseline": "5.98.0", "port-version": 0 @@ -3641,7 +3701,7 @@ "port-version": 0 }, "kissnet": { - "baseline": "2022-10-18", + "baseline": "2023-02-04", "port-version": 0 }, "klein": { @@ -3657,8 +3717,8 @@ "port-version": 1 }, "ktx": { - "baseline": "4.1.0-rc3", - "port-version": 1 + "baseline": "4.1.0", + "port-version": 0 }, "kubazip": { "baseline": "0.2.4", @@ -3670,23 +3730,23 @@ }, "kuku": { "baseline": "2.1", - "port-version": 1 + "port-version": 3 }, "kvasir-mpl": { "baseline": "2019-08-06", - "port-version": 1 + "port-version": 3 }, "kwsys": { "baseline": "2021-08-06", "port-version": 1 }, "lager": { - "baseline": "2022-02-21", + "baseline": "2023-03-19", "port-version": 0 }, "lapack": { "baseline": "2022-02-22", - "port-version": 0 + "port-version": 2 }, "lapack-reference": { "baseline": "3.11.0", @@ -3718,11 +3778,11 @@ }, "leaf": { "baseline": "0.2.2", - "port-version": 1 + "port-version": 2 }, "lemon": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "lemon-parser-generator": { "baseline": "3.39.3", @@ -3738,7 +3798,7 @@ }, "lest": { "baseline": "1.35.1", - "port-version": 2 + "port-version": 3 }, "leveldb": { "baseline": "1.22", @@ -3746,11 +3806,15 @@ }, "levmar": { "baseline": "2.6", - "port-version": 1 + "port-version": 3 + }, + "lexbor": { + "baseline": "2.2.0", + "port-version": 0 }, "libaaplus": { "baseline": "2.36", - "port-version": 0 + "port-version": 1 }, "libadlmidi": { "baseline": "1.5.1", @@ -3762,7 +3826,7 @@ }, "libaiff": { "baseline": "5.0", - "port-version": 7 + "port-version": 9 }, "libalkimia": { "baseline": "8.1.70", @@ -3777,7 +3841,7 @@ "port-version": 0 }, "libass": { - "baseline": "0.16.0", + "baseline": "0.17.1", "port-version": 0 }, "libassuan": { @@ -3790,7 +3854,7 @@ }, "libavif": { "baseline": "0.11.1", - "port-version": 0 + "port-version": 1 }, "libb2": { "baseline": "0.98.1", @@ -3809,8 +3873,8 @@ "port-version": 0 }, "libcaer": { - "baseline": "2022-07-25", - "port-version": 4 + "baseline": "3.3.15", + "port-version": 0 }, "libcanberra": { "baseline": "0.30", @@ -3822,22 +3886,22 @@ }, "libcds": { "baseline": "2.3.3", - "port-version": 2 + "port-version": 4 }, "libcerf": { "baseline": "1.13", - "port-version": 3 + "port-version": 4 }, "libconfig": { "baseline": "1.7.3", - "port-version": 1 + "port-version": 3 }, "libconfuse": { "baseline": "2019-07-14", - "port-version": 3 + "port-version": 4 }, "libcopp": { - "baseline": "2.1.2", + "baseline": "2.2.0", "port-version": 0 }, "libcorrect": { @@ -3870,7 +3934,7 @@ }, "libdatachannel": { "baseline": "0.18.2", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.13", @@ -3881,8 +3945,8 @@ "port-version": 1 }, "libde265": { - "baseline": "1.0.8", - "port-version": 7 + "baseline": "1.0.11", + "port-version": 1 }, "libdeflate": { "baseline": "1.17", @@ -3890,7 +3954,7 @@ }, "libdisasm": { "baseline": "0.23", - "port-version": 9 + "port-version": 10 }, "libdivide": { "baseline": "5.0", @@ -3918,7 +3982,7 @@ }, "libebur128": { "baseline": "1.2.6", - "port-version": 1 + "port-version": 2 }, "libenvpp": { "baseline": "1.0.0", @@ -3932,6 +3996,14 @@ "baseline": "2.1.12+20230128", "port-version": 0 }, + "libeventheader-decode": { + "baseline": "1.0.0", + "port-version": 0 + }, + "libeventheader-tracepoint": { + "baseline": "1.0.0", + "port-version": 0 + }, "libevhtp": { "baseline": "1.2.18", "port-version": 5 @@ -3974,11 +4046,11 @@ }, "libftdi": { "baseline": "0.20", - "port-version": 4 + "port-version": 5 }, "libftdi1": { "baseline": "1.5", - "port-version": 3 + "port-version": 4 }, "libgcrypt": { "baseline": "1.10.1", @@ -3990,10 +4062,10 @@ }, "libgeotiff": { "baseline": "1.7.1", - "port-version": 2 + "port-version": 3 }, "libgit2": { - "baseline": "1.4.2", + "baseline": "1.6.4", "port-version": 0 }, "libgme": { @@ -4013,8 +4085,8 @@ "port-version": 0 }, "libgpiod": { - "baseline": "1.6.3", - "port-version": 2 + "baseline": "2.0.1", + "port-version": 0 }, "libgpod": { "baseline": "2019-08-29", @@ -4022,19 +4094,19 @@ }, "libgta": { "baseline": "1.0.8", - "port-version": 4 + "port-version": 5 }, "libguarded": { "baseline": "2019-08-27", - "port-version": 2 + "port-version": 3 }, "libgwenhywfar": { "baseline": "5.6.0", - "port-version": 2 + "port-version": 3 }, "libgxps": { "baseline": "0.3.2", - "port-version": 1 + "port-version": 2 }, "libharu": { "baseline": "2.4.3", @@ -4045,7 +4117,7 @@ "port-version": 4 }, "libheif": { - "baseline": "1.15.1", + "baseline": "1.16.1", "port-version": 0 }, "libhsplasma": { @@ -4086,7 +4158,7 @@ }, "libigl": { "baseline": "2.4.0", - "port-version": 2 + "port-version": 4 }, "libilbc": { "baseline": "3.0.4", @@ -4102,7 +4174,7 @@ }, "libjpeg-turbo": { "baseline": "2.1.5.1", - "port-version": 0 + "port-version": 1 }, "libjuice": { "baseline": "1.0.6", @@ -4114,7 +4186,7 @@ }, "libkeyfinder": { "baseline": "2.2.6", - "port-version": 0 + "port-version": 1 }, "libkml": { "baseline": "1.3.0", @@ -4122,19 +4194,19 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 11 + "port-version": 13 }, "liblbfgs": { "baseline": "1.10", "port-version": 2 }, "libleidenalg": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "0.10.0", + "port-version": 0 }, "liblemon": { "baseline": "2019-06-13", - "port-version": 4 + "port-version": 5 }, "liblinear": { "baseline": "243", @@ -4142,19 +4214,19 @@ }, "liblo": { "baseline": "0.31", - "port-version": 3 + "port-version": 4 }, "liblrc": { "baseline": "1.0.0", "port-version": 0 }, "liblsl": { - "baseline": "1.16.1", - "port-version": 1 + "baseline": "1.16.2", + "port-version": 0 }, "liblsquic": { "baseline": "3.1.1", - "port-version": 1 + "port-version": 2 }, "liblzma": { "baseline": "5.4.1", @@ -4162,11 +4234,11 @@ }, "libmad": { "baseline": "0.15.1", - "port-version": 10 + "port-version": 12 }, "libmagic": { "baseline": "5.40", - "port-version": 1 + "port-version": 2 }, "libmariadb": { "baseline": "3.3.1", @@ -4174,11 +4246,11 @@ }, "libmaxminddb": { "baseline": "1.4.3", - "port-version": 2 + "port-version": 3 }, "libmediainfo": { - "baseline": "21.03", - "port-version": 2 + "baseline": "23.4", + "port-version": 0 }, "libmesh": { "baseline": "1.5.0", @@ -4190,7 +4262,7 @@ }, "libmicrohttpd": { "baseline": "0.9.75", - "port-version": 0 + "port-version": 1 }, "libmikmod": { "baseline": "3.3.11.1", @@ -4202,7 +4274,7 @@ }, "libmodman": { "baseline": "2.0.1", - "port-version": 4 + "port-version": 5 }, "libmodplug": { "baseline": "0.8.9.0", @@ -4214,7 +4286,7 @@ }, "libmount": { "baseline": "2.38", - "port-version": 1 + "port-version": 2 }, "libmpeg2": { "baseline": "0.5.1", @@ -4222,7 +4294,7 @@ }, "libmspack": { "baseline": "0.10.1", - "port-version": 5 + "port-version": 6 }, "libmt32emu": { "baseline": "2.7.0", @@ -4233,8 +4305,8 @@ "port-version": 1 }, "libmysql": { - "baseline": "8.0.20", - "port-version": 10 + "baseline": "8.0.32", + "port-version": 4 }, "libnice": { "baseline": "0.1.21", @@ -4242,7 +4314,7 @@ }, "libnice-gst": { "baseline": "0.1.21", - "port-version": 0 + "port-version": 1 }, "libnoise": { "baseline": "1.0.0", @@ -4266,7 +4338,7 @@ }, "libodb-pgsql": { "baseline": "2.4.0", - "port-version": 6 + "port-version": 7 }, "libodb-sqlite": { "baseline": "2.4.0", @@ -4286,7 +4358,7 @@ }, "libopensp": { "baseline": "1.5.2", - "port-version": 1 + "port-version": 2 }, "libopnmidi": { "baseline": "1.5.1", @@ -4294,11 +4366,11 @@ }, "libopusenc": { "baseline": "0.2.1", - "port-version": 2 + "port-version": 3 }, "libosip2": { "baseline": "5.2.0", - "port-version": 2 + "port-version": 3 }, "libosmium": { "baseline": "2.18.0", @@ -4306,7 +4378,7 @@ }, "libosmscout": { "baseline": "1.1.1", - "port-version": 1 + "port-version": 2 }, "libp7-baical": { "baseline": "replaced", @@ -4314,7 +4386,7 @@ }, "libp7client": { "baseline": "5.6", - "port-version": 3 + "port-version": 4 }, "libpcap": { "baseline": "1.10.1", @@ -4322,10 +4394,10 @@ }, "libpff": { "baseline": "2021-11-14", - "port-version": 0 + "port-version": 1 }, "libphonenumber": { - "baseline": "8.13.9", + "baseline": "8.13.13", "port-version": 0 }, "libplist": { @@ -4342,11 +4414,11 @@ }, "libpopt": { "baseline": "1.16", - "port-version": 15 + "port-version": 16 }, "libpq": { - "baseline": "15.2", - "port-version": 2 + "baseline": "15.3", + "port-version": 0 }, "libpqxx": { "baseline": "7.7.4", @@ -4354,11 +4426,11 @@ }, "libprotobuf-mutator": { "baseline": "1.0", - "port-version": 1 + "port-version": 2 }, "libproxy": { "baseline": "0.4.18", - "port-version": 1 + "port-version": 2 }, "libqcow": { "baseline": "20221124", @@ -4385,7 +4457,7 @@ "port-version": 0 }, "librdkafka": { - "baseline": "2.0.2", + "baseline": "2.1.1", "port-version": 0 }, "libredwg": { @@ -4398,7 +4470,7 @@ }, "librsvg": { "baseline": "2.40.20", - "port-version": 5 + "port-version": 6 }, "librsync": { "baseline": "2.3.2", @@ -4410,7 +4482,7 @@ }, "librttopo": { "baseline": "1.1.0", - "port-version": 7 + "port-version": 8 }, "libsamplerate": { "baseline": "0.2.2", @@ -4421,8 +4493,8 @@ "port-version": 1 }, "libsbml": { - "baseline": "5.19.0", - "port-version": 2 + "baseline": "5.20.0", + "port-version": 0 }, "libsbsms": { "baseline": "2.3.0", @@ -4430,7 +4502,7 @@ }, "libsecret": { "baseline": "0.20.4", - "port-version": 1 + "port-version": 2 }, "libsercomm": { "baseline": "1.3.2", @@ -4472,6 +4544,10 @@ "baseline": "1.0.18", "port-version": 8 }, + "libsonic": { + "baseline": "0.2.0", + "port-version": 0 + }, "libsoundio": { "baseline": "2.0.0", "port-version": 7 @@ -4482,7 +4558,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 11 + "port-version": 12 }, "libspnav": { "baseline": "0.2.3", @@ -4510,11 +4586,11 @@ }, "libstemmer": { "baseline": "2017-9", - "port-version": 7 + "port-version": 8 }, "libstk": { "baseline": "4.6.1", - "port-version": 2 + "port-version": 3 }, "libsvm": { "baseline": "3.25", @@ -4529,7 +4605,7 @@ "port-version": 1 }, "libtcod": { - "baseline": "1.23.1", + "baseline": "1.24.0", "port-version": 0 }, "libtess2": { @@ -4546,18 +4622,22 @@ }, "libtomcrypt": { "baseline": "1.18.2", - "port-version": 2 + "port-version": 3 }, "libtommath": { "baseline": "1.2.0", - "port-version": 2 + "port-version": 3 }, "libtorch": { "baseline": "1.12.1", - "port-version": 2 + "port-version": 3 }, "libtorrent": { - "baseline": "2.0.8", + "baseline": "2.0.9", + "port-version": 0 + }, + "libtracepoint": { + "baseline": "1.0.0", "port-version": 0 }, "libu2f-server": { @@ -4570,7 +4650,7 @@ }, "libudns": { "baseline": "0.4", - "port-version": 4 + "port-version": 5 }, "libui": { "baseline": "2018-11-03", @@ -4606,7 +4686,7 @@ }, "libuuid": { "baseline": "1.0.3", - "port-version": 12 + "port-version": 13 }, "libuv": { "baseline": "1.44.2", @@ -4614,11 +4694,15 @@ }, "libuvc": { "baseline": "2020-11-24", - "port-version": 3 + "port-version": 4 + }, + "libvault": { + "baseline": "0.56.0", + "port-version": 0 }, "libvmdk": { "baseline": "20200926", - "port-version": 3 + "port-version": 4 }, "libvorbis": { "baseline": "1.3.7", @@ -4626,7 +4710,7 @@ }, "libvpx": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 1 }, "libwandio": { "baseline": "4.2.1", @@ -4710,7 +4794,7 @@ }, "libxlsxwriter": { "baseline": "1.1.5", - "port-version": 0 + "port-version": 1 }, "libxml2": { "baseline": "2.10.3", @@ -4722,11 +4806,11 @@ }, "libxmlpp": { "baseline": "5.0.0", - "port-version": 2 + "port-version": 3 }, - "libxmp-lite": { - "baseline": "4.4.1", - "port-version": 8 + "libxmp": { + "baseline": "2023-04-13", + "port-version": 0 }, "libxmu": { "baseline": "1.1.3", @@ -4758,7 +4842,7 @@ }, "libxslt": { "baseline": "1.1.37", - "port-version": 1 + "port-version": 2 }, "libxt": { "baseline": "1.2.1", @@ -4778,27 +4862,35 @@ }, "libyaml": { "baseline": "0.2.5", - "port-version": 3 + "port-version": 4 }, "libyuv": { "baseline": "1857", "port-version": 0 }, "libzen": { - "baseline": "0.4.40", + "baseline": "0.4.41", "port-version": 0 }, + "libzim": { + "baseline": "8.2.0", + "port-version": 1 + }, "libzip": { "baseline": "1.9.2", "port-version": 1 }, "libzippp": { - "baseline": "6.0-1.9.2", + "baseline": "6.1-1.9.2", "port-version": 0 }, "licensepp": { - "baseline": "2020-05-19", - "port-version": 4 + "baseline": "2020-11-24", + "port-version": 0 + }, + "lightningscanner": { + "baseline": "1.0.0", + "port-version": 0 }, "lilv": { "baseline": "0.24.10", @@ -4806,7 +4898,7 @@ }, "linalg": { "baseline": "2.1", - "port-version": 1 + "port-version": 2 }, "linenoise-ng": { "baseline": "4754bee2d8eb3", @@ -4817,7 +4909,7 @@ "port-version": 0 }, "lionkor-commandline": { - "baseline": "2.0.0", + "baseline": "2.2.0", "port-version": 0 }, "litehtml": { @@ -4825,7 +4917,7 @@ "port-version": 2 }, "live555": { - "baseline": "2023-03-30", + "baseline": "2023-05-10", "port-version": 0 }, "llfio": { @@ -4841,8 +4933,8 @@ "port-version": 1 }, "llvm": { - "baseline": "14.0.6", - "port-version": 1 + "baseline": "15.0.7", + "port-version": 3 }, "lmdb": { "baseline": "0.9.29", @@ -4869,7 +4961,7 @@ "port-version": 8 }, "log4cxx": { - "baseline": "0.13.0.1", + "baseline": "1.0.0", "port-version": 0 }, "loguru": { @@ -4878,11 +4970,35 @@ }, "lpeg": { "baseline": "1.0.2", - "port-version": 3 + "port-version": 4 + }, + "ltla-aarand": { + "baseline": "2023-03-19", + "port-version": 0 + }, + "ltla-cppirlba": { + "baseline": "2023-04-07", + "port-version": 0 + }, + "ltla-cppkmeans": { + "baseline": "2023-03-20", + "port-version": 0 + }, + "ltla-knncolle": { + "baseline": "2023-05-09", + "port-version": 0 + }, + "ltla-powerit": { + "baseline": "2023-03-19", + "port-version": 0 + }, + "ltla-umappp": { + "baseline": "2023-05-11", + "port-version": 0 }, "lua": { "baseline": "5.4.4", - "port-version": 5 + "port-version": 7 }, "lua-compat53": { "baseline": "0.10", @@ -4898,19 +5014,19 @@ }, "luafilesystem": { "baseline": "1.8.0", - "port-version": 3 + "port-version": 4 }, "luajit": { "baseline": "2023-01-04", - "port-version": 0 + "port-version": 1 }, "luasec": { - "baseline": "1.1.0", + "baseline": "1.3.1", "port-version": 0 }, "luasocket": { - "baseline": "3.0.0", - "port-version": 1 + "baseline": "3.1.0", + "port-version": 0 }, "luminoengine": { "baseline": "0.10.1", @@ -4934,27 +5050,27 @@ }, "lzfse": { "baseline": "1.0", - "port-version": 4 + "port-version": 5 }, "lzo": { "baseline": "2.10", - "port-version": 8 + "port-version": 9 }, "lzokay": { "baseline": "2020-07-30", - "port-version": 1 + "port-version": 2 }, "maddy": { "baseline": "1.1.2+20210419", "port-version": 0 }, "magic-enum": { - "baseline": "0.8.2", + "baseline": "0.9.1", "port-version": 0 }, "magic-get": { "baseline": "2019-09-02", - "port-version": 2 + "port-version": 3 }, "magnum": { "baseline": "2020.06", @@ -4966,7 +5082,7 @@ }, "magnum-integration": { "baseline": "2020.06", - "port-version": 2 + "port-version": 3 }, "magnum-plugins": { "baseline": "2020.06", @@ -4976,6 +5092,10 @@ "baseline": "0.21.0", "port-version": 2 }, + "makeid": { + "baseline": "1.0.2", + "port-version": 0 + }, "mapbox-geojson-cpp": { "baseline": "0.5.1", "port-version": 1 @@ -4994,7 +5114,7 @@ }, "mapbox-variant": { "baseline": "1.2.0", - "port-version": 1 + "port-version": 2 }, "mapbox-wagyu": { "baseline": "0.5.0", @@ -5026,11 +5146,11 @@ }, "mathc": { "baseline": "2019-09-29", - "port-version": 2 + "port-version": 3 }, "mathgl": { "baseline": "8.0.1", - "port-version": 0 + "port-version": 2 }, "matio": { "baseline": "1.5.23", @@ -5038,15 +5158,15 @@ }, "matplotlib-cpp": { "baseline": "2020-08-27", - "port-version": 1 + "port-version": 2 }, "matplotplusplus": { "baseline": "2021-04-11", "port-version": 6 }, "matroska": { - "baseline": "1.6.3", - "port-version": 0 + "baseline": "1.7.1", + "port-version": 1 }, "mbedtls": { "baseline": "2.28.1", @@ -5054,11 +5174,11 @@ }, "mchehab-zbar": { "baseline": "0.23.90", - "port-version": 3 + "port-version": 4 }, "mcpp": { "baseline": "2.7.2.14", - "port-version": 4 + "port-version": 5 }, "mdl-sdk": { "baseline": "2021.1.2", @@ -5078,15 +5198,15 @@ }, "mecab": { "baseline": "2019-09-25", - "port-version": 3 + "port-version": 4 }, "memorymodule": { "baseline": "2019-12-31", - "port-version": 2 + "port-version": 3 }, "mesa": { "baseline": "23.0.1", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b", @@ -5122,18 +5242,18 @@ }, "microsoft-signalr": { "baseline": "0.1.0-alpha4", - "port-version": 2 + "port-version": 6 }, "mikktspace": { "baseline": "2020-10-06", - "port-version": 2 + "port-version": 3 }, "milerius-sfml-imgui": { "baseline": "1.1", "port-version": 6 }, "mimalloc": { - "baseline": "2.0.9", + "baseline": "2.1.1", "port-version": 0 }, "minc": { @@ -5160,17 +5280,21 @@ "baseline": "0.1.1", "port-version": 1 }, + "miniply": { + "baseline": "2022-09-15", + "port-version": 1 + }, "minisat-master-keying": { "baseline": "2.3.6", "port-version": 0 }, "minitrace": { - "baseline": "2019.02.06", - "port-version": 2 + "baseline": "2023-04-23", + "port-version": 0 }, "miniupnpc": { "baseline": "2.1", - "port-version": 3 + "port-version": 4 }, "miniz": { "baseline": "3.0.2", @@ -5178,11 +5302,11 @@ }, "minizip": { "baseline": "1.2.13", - "port-version": 0 + "port-version": 2 }, "minizip-ng": { - "baseline": "3.0.7", - "port-version": 0 + "baseline": "4.0.0", + "port-version": 1 }, "mio": { "baseline": "2023-03-03", @@ -5230,19 +5354,19 @@ }, "moos-core": { "baseline": "10.4.0", - "port-version": 7 + "port-version": 8 }, "moos-essential": { "baseline": "10.0.1", - "port-version": 4 + "port-version": 5 }, "moos-ui": { "baseline": "10.0.1", - "port-version": 4 + "port-version": 5 }, "morton-nd": { "baseline": "4.0.0", - "port-version": 2 + "port-version": 3 }, "mosquitto": { "baseline": "2.0.14", @@ -5262,11 +5386,11 @@ }, "mpark-variant": { "baseline": "1.4.0", - "port-version": 2 + "port-version": 3 }, "mpc": { "baseline": "1.2.0", - "port-version": 2 + "port-version": 3 }, "mpfr": { "baseline": "4.2.0", @@ -5278,7 +5402,7 @@ }, "mpi": { "baseline": "1", - "port-version": 3 + "port-version": 4 }, "mpir": { "baseline": "2022-03-02", @@ -5302,7 +5426,7 @@ }, "ms-gltf": { "baseline": "2022-06-28", - "port-version": 1 + "port-version": 2 }, "ms-gsl": { "baseline": "4.0.0", @@ -5318,7 +5442,7 @@ }, "msgpack": { "baseline": "6.0.0", - "port-version": 0 + "port-version": 1 }, "msgpack-c": { "baseline": "6.0.0", @@ -5330,7 +5454,7 @@ }, "msinttypes": { "baseline": "2018-02-25", - "port-version": 1 + "port-version": 2 }, "msix": { "baseline": "1.7", @@ -5342,7 +5466,7 @@ }, "mstch": { "baseline": "1.0.2", - "port-version": 4 + "port-version": 5 }, "mujoco": { "baseline": "2.3.2", @@ -5365,12 +5489,12 @@ "port-version": 6 }, "mvfst": { - "baseline": "2022-11-03", + "baseline": "2023-05-18", "port-version": 0 }, "mygui": { "baseline": "3.4.1", - "port-version": 4 + "port-version": 5 }, "mysql-connector-cpp": { "baseline": "8.0.30", @@ -5382,11 +5506,11 @@ }, "nana": { "baseline": "1.7.4", - "port-version": 3 + "port-version": 4 }, "nano-signal-slot": { "baseline": "2.0.1", - "port-version": 1 + "port-version": 2 }, "nanobench": { "baseline": "4.3.10", @@ -5414,7 +5538,7 @@ }, "nanoprintf": { "baseline": "2020-05-27", - "port-version": 1 + "port-version": 2 }, "nanorange": { "baseline": "2020-07-06", @@ -5422,7 +5546,7 @@ }, "nanort": { "baseline": "2019-08-20", - "port-version": 2 + "port-version": 3 }, "nanosvg": { "baseline": "2022-12-04", @@ -5466,11 +5590,11 @@ }, "netcdf-c": { "baseline": "4.8.1", - "port-version": 2 + "port-version": 3 }, "netcdf-cxx4": { "baseline": "4.3.1", - "port-version": 4 + "port-version": 5 }, "nethost": { "baseline": "7.0.0", @@ -5478,22 +5602,22 @@ }, "nettle": { "baseline": "3.8.1", - "port-version": 0 + "port-version": 1 }, "networkdirect-sdk": { "baseline": "2.0.1", - "port-version": 3 + "port-version": 4 }, "nghttp2": { - "baseline": "1.51.0", - "port-version": 1 + "baseline": "1.53.0", + "port-version": 0 }, "nghttp2-asio": { "baseline": "2022-08-11", "port-version": 1 }, "nghttp3": { - "baseline": "0.10.0", + "baseline": "0.11.0", "port-version": 0 }, "ngspice": { @@ -5501,7 +5625,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "0.14.0", + "baseline": "0.14.1", "port-version": 0 }, "nifly": { @@ -5526,7 +5650,7 @@ }, "nmap": { "baseline": "7.70", - "port-version": 8 + "port-version": 9 }, "nmslib": { "baseline": "2.1.1", @@ -5538,27 +5662,27 @@ }, "nngpp": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "nnpack": { "baseline": "2021-02-21", "port-version": 3 }, "node-addon-api": { - "baseline": "6.0.0", + "baseline": "6.1.0", "port-version": 0 }, - "node-api": { - "baseline": "18.12.1", - "port-version": 2 + "node-api-headers": { + "baseline": "1.0.0", + "port-version": 1 }, "nonius": { "baseline": "2019-04-20", - "port-version": 3 + "port-version": 4 }, "nowide": { "baseline": "11.2.0", - "port-version": 0 + "port-version": 1 }, "nrf-ble-driver": { "baseline": "4.1.4", @@ -5566,11 +5690,11 @@ }, "nspr": { "baseline": "4.35", - "port-version": 2 + "port-version": 3 }, "nss": { "baseline": "3.87", - "port-version": 0 + "port-version": 1 }, "nsync": { "baseline": "1.24.0", @@ -5578,11 +5702,11 @@ }, "nt-wrapper": { "baseline": "2019-08-10", - "port-version": 2 + "port-version": 3 }, "nu-book-zxing-cpp": { "baseline": "2.0.0", - "port-version": 0 + "port-version": 1 }, "nuklear": { "baseline": "2022-05-12", @@ -5593,7 +5717,7 @@ "port-version": 1 }, "numcpp": { - "baseline": "2.6.0", + "baseline": "2.10.1", "port-version": 0 }, "nuspell": { @@ -5658,11 +5782,11 @@ }, "observer-ptr-lite": { "baseline": "0.4.0", - "port-version": 2 + "port-version": 3 }, "ocilib": { "baseline": "4.7.5", - "port-version": 0 + "port-version": 2 }, "octomap": { "baseline": "1.9.6", @@ -5682,7 +5806,7 @@ }, "ogre": { "baseline": "13.6.2", - "port-version": 0 + "port-version": 2 }, "ogre-next": { "baseline": "2.3.1", @@ -5692,6 +5816,10 @@ "baseline": "1.5.1", "port-version": 1 }, + "omniorb": { + "baseline": "4.3.0", + "port-version": 0 + }, "ompl": { "baseline": "1.5.1", "port-version": 5 @@ -5729,20 +5857,20 @@ "port-version": 0 }, "open62541": { - "baseline": "1.2.3", - "port-version": 1 + "baseline": "1.3.5", + "port-version": 0 }, "openal-soft": { "baseline": "1.23.0", "port-version": 0 }, "openblas": { - "baseline": "0.3.21", - "port-version": 2 + "baseline": "0.3.23", + "port-version": 0 }, "opencascade": { "baseline": "7.6.2", - "port-version": 1 + "port-version": 3 }, "opencc": { "baseline": "1.1.6", @@ -5754,7 +5882,7 @@ }, "opencl": { "baseline": "v2023.02.06", - "port-version": 0 + "port-version": 2 }, "opencolorio": { "baseline": "2.1.2", @@ -5766,7 +5894,7 @@ }, "opencsg": { "baseline": "1.4.2", - "port-version": 3 + "port-version": 4 }, "openctm": { "baseline": "1.0.3", @@ -5778,23 +5906,23 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 16 + "port-version": 18 }, "opencv3": { "baseline": "3.4.18", - "port-version": 6 + "port-version": 10 }, "opencv4": { "baseline": "4.7.0", - "port-version": 3 + "port-version": 6 }, "opendnp3": { "baseline": "3.1.1", "port-version": 1 }, "openexr": { - "baseline": "3.1.5", - "port-version": 1 + "baseline": "3.1.7", + "port-version": 0 }, "openfbx": { "baseline": "2022-07-18", @@ -5814,10 +5942,10 @@ }, "openigtlink": { "baseline": "3.0", - "port-version": 3 + "port-version": 4 }, "openimageio": { - "baseline": "2.4.9.0", + "baseline": "2.4.11.1", "port-version": 0 }, "openjpeg": { @@ -5826,11 +5954,11 @@ }, "openldap": { "baseline": "2.5.13", - "port-version": 0 + "port-version": 1 }, "openmama": { "baseline": "6.3.2", - "port-version": 0 + "port-version": 2 }, "openmesh": { "baseline": "9.0", @@ -5838,11 +5966,11 @@ }, "openmpi": { "baseline": "4.1.3", - "port-version": 1 + "port-version": 2 }, "openmvg": { "baseline": "2.0", - "port-version": 6 + "port-version": 7 }, "openmvs": { "baseline": "2.1.0", @@ -5861,8 +5989,8 @@ "port-version": 1 }, "openssl": { - "baseline": "3.1.0", - "port-version": 1 + "baseline": "3.1.1", + "port-version": 0 }, "openssl-unix": { "baseline": "deprecated", @@ -5882,7 +6010,7 @@ }, "opentelemetry-cpp": { "baseline": "1.8.3", - "port-version": 2 + "port-version": 6 }, "opentracing": { "baseline": "1.6.0", @@ -5914,15 +6042,15 @@ }, "optional-bare": { "baseline": "1.1.0", - "port-version": 2 + "port-version": 3 }, "optional-lite": { "baseline": "3.5.0", "port-version": 1 }, - "opus": { - "baseline": "1.3.1", - "port-version": 9 + "opus": { + "baseline": "1.4", + "port-version": 0 }, "opusfile": { "baseline": "0.12+20221121", @@ -5933,20 +6061,20 @@ "port-version": 0 }, "orocos-kdl": { - "baseline": "1.4", - "port-version": 6 + "baseline": "1.5.1", + "port-version": 0 }, "osg": { "baseline": "3.6.5", - "port-version": 18 + "port-version": 19 }, "osg-qt": { "baseline": "Qt5", "port-version": 3 }, "osgearth": { - "baseline": "3.3", - "port-version": 5 + "baseline": "3.4", + "port-version": 0 }, "osi": { "baseline": "0.108.6", @@ -5966,18 +6094,18 @@ }, "p-ranav-csv": { "baseline": "2019-07-11", - "port-version": 2 + "port-version": 3 }, "p-ranav-csv2": { "baseline": "2020-12-14", - "port-version": 3 + "port-version": 4 }, "pagmo2": { "baseline": "2.19.0", "port-version": 0 }, "paho-mqtt": { - "baseline": "1.3.10", + "baseline": "1.3.12", "port-version": 0 }, "paho-mqttpp3": { @@ -5989,8 +6117,8 @@ "port-version": 0 }, "pango": { - "baseline": "1.50.12", - "port-version": 2 + "baseline": "1.50.14", + "port-version": 0 }, "pangolin": { "baseline": "0.8", @@ -5998,15 +6126,15 @@ }, "pangomm": { "baseline": "2.50.1", - "port-version": 0 + "port-version": 2 }, "parallel-hashmap": { - "baseline": "1.3.8", + "baseline": "1.3.11", "port-version": 0 }, "parallelstl": { "baseline": "20200330", - "port-version": 2 + "port-version": 3 }, "paraview": { "baseline": "5.11.0", @@ -6018,7 +6146,7 @@ }, "parquet": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "parson": { "baseline": "2022-11-13", @@ -6026,19 +6154,23 @@ }, "pbc": { "baseline": "0.5.14", - "port-version": 6 + "port-version": 7 }, "pcapplusplus": { "baseline": "22.11", - "port-version": 0 + "port-version": 1 }, "pcg": { "baseline": "2021-04-06", - "port-version": 1 + "port-version": 2 + }, + "pciids": { + "baseline": "2023-04-11", + "port-version": 0 }, "pcl": { "baseline": "1.13.0", - "port-version": 1 + "port-version": 3 }, "pcre": { "baseline": "8.45", @@ -6046,35 +6178,35 @@ }, "pcre2": { "baseline": "10.40", - "port-version": 1 + "port-version": 2 }, "pdal": { - "baseline": "2.4.3", - "port-version": 2 + "baseline": "2.5.3", + "port-version": 1 }, "pdal-c": { - "baseline": "2.1", + "baseline": "2.2.0", "port-version": 0 }, "pdcurses": { "baseline": "3.9", - "port-version": 3 + "port-version": 5 }, "pdqsort": { "baseline": "2019-07-30", - "port-version": 1 + "port-version": 2 }, "pe-parse": { "baseline": "2.1.0", "port-version": 1 }, "pegtl": { - "baseline": "3.2.6", + "baseline": "3.2.7", "port-version": 0 }, "pegtl-2": { "baseline": "2.8.3", - "port-version": 2 + "port-version": 3 }, "pffft": { "baseline": "2021-10-09", @@ -6086,7 +6218,7 @@ }, "pfultz2-linq": { "baseline": "2019-05-14", - "port-version": 2 + "port-version": 3 }, "phnt": { "baseline": "2020-12-21", @@ -6106,11 +6238,11 @@ }, "picojson": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "picosha2": { "baseline": "2018-07-30", - "port-version": 1 + "port-version": 2 }, "piex": { "baseline": "2019-07-11", @@ -6142,7 +6274,7 @@ }, "platform-folders": { "baseline": "4.2.0", - "port-version": 0 + "port-version": 1 }, "plf-colony": { "baseline": "6.33", @@ -6154,19 +6286,19 @@ }, "plf-list": { "baseline": "2019-08-10", - "port-version": 1 + "port-version": 2 }, "plf-nanotimer": { "baseline": "2019-08-10", - "port-version": 1 + "port-version": 2 }, "plf-stack": { "baseline": "2019-08-10", - "port-version": 1 + "port-version": 2 }, "plib": { "baseline": "1.8.5", - "port-version": 6 + "port-version": 7 }, "plibsys": { "baseline": "0.0.4", @@ -6182,7 +6314,7 @@ }, "plustache": { "baseline": "0.4.0", - "port-version": 3 + "port-version": 4 }, "pmdk": { "baseline": "1.12.0", @@ -6190,19 +6322,19 @@ }, "pngpp": { "baseline": "0.2.10", - "port-version": 1 + "port-version": 2 }, "pngwriter": { "baseline": "0.7.0", - "port-version": 4 + "port-version": 5 }, "poco": { "baseline": "1.12.4", "port-version": 4 }, "podofo": { - "baseline": "0.9.8", - "port-version": 0 + "baseline": "0.10.0", + "port-version": 1 }, "poissonrecon": { "baseline": "2021-09-26", @@ -6214,10 +6346,10 @@ }, "polyclipping": { "baseline": "6.4.2", - "port-version": 11 + "port-version": 12 }, "polyhook2": { - "baseline": "2022-03-01", + "baseline": "2023-02-24", "port-version": 0 }, "polymorphic-value": { @@ -6226,7 +6358,7 @@ }, "ponder": { "baseline": "3.0.0", - "port-version": 4 + "port-version": 5 }, "poppler": { "baseline": "23.1.0", @@ -6236,6 +6368,10 @@ "baseline": "0.9", "port-version": 5 }, + "portable-file-dialogs": { + "baseline": "0.1.0", + "port-version": 0 + }, "portable-snippets": { "baseline": "2019-09-20", "port-version": 3 @@ -6254,19 +6390,19 @@ }, "ppconsul": { "baseline": "0.5", - "port-version": 4 + "port-version": 5 }, "ppmagic": { "baseline": "2020-07-03", - "port-version": 1 + "port-version": 2 }, "pprint": { "baseline": "2019-07-19", - "port-version": 2 + "port-version": 3 }, "pqp": { "baseline": "1.3", - "port-version": 6 + "port-version": 7 }, "presentmon": { "baseline": "1.7.0", @@ -6309,12 +6445,12 @@ "port-version": 0 }, "proxygen": { - "baseline": "2022.07.11.00", + "baseline": "2023.05.15.00", "port-version": 0 }, "psimd": { "baseline": "2021-02-21", - "port-version": 1 + "port-version": 2 }, "ptc-print": { "baseline": "1.4.0", @@ -6326,7 +6462,7 @@ }, "pthread": { "baseline": "3.0.0", - "port-version": 1 + "port-version": 2 }, "pthread-stubs": { "baseline": "0.4", @@ -6338,7 +6474,7 @@ }, "pthreads": { "baseline": "3.0.0", - "port-version": 13 + "port-version": 14 }, "ptyqt": { "baseline": "0.6.5", @@ -6358,15 +6494,15 @@ }, "python2": { "baseline": "2.7.18", - "port-version": 5 + "port-version": 6 }, "python3": { "baseline": "3.10.7", - "port-version": 5 + "port-version": 6 }, "qca": { "baseline": "2.3.5", - "port-version": 1 + "port-version": 2 }, "qcustomplot": { "baseline": "2.1.1", @@ -6393,79 +6529,79 @@ "port-version": 1 }, "qt": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qt-advanced-docking-system": { - "baseline": "3.8.2", - "port-version": 2 + "baseline": "4.0.3", + "port-version": 0 }, "qt3d": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qt5": { - "baseline": "5.15.8", - "port-version": 1 + "baseline": "5.15.9", + "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.8", - "port-version": 5 + "baseline": "5.15.9", + "port-version": 3 }, "qt5-canvas3d": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "qt5-charts": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.8", - "port-version": 0 + "baseline": "5.15.9", + "port-version": 1 }, "qt5-doc": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 1 }, "qt5-location": { - "baseline": "5.15.8", - "port-version": 0 + "baseline": "5.15.9", + "port-version": 1 }, "qt5-macextras": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-modularscripts": { @@ -6473,111 +6609,111 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.8", - "port-version": 0 + "baseline": "5.15.9", + "port-version": 1 }, "qt5-tools": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.8", - "port-version": 0 + "baseline": "5.15.9", + "port-version": 1 }, "qt5-wayland": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.8", - "port-version": 3 + "baseline": "5.15.9", + "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.8", - "port-version": 1 + "baseline": "5.15.9", + "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.8", + "baseline": "5.15.9", "port-version": 0 }, "qt5compat": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qt6betablock": { @@ -6585,55 +6721,59 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtbase": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.1", + "port-version": 0 }, "qtcharts": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtcoap": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtdoc": { - "baseline": "6.4.3", + "baseline": "6.5.1", + "port-version": 0 + }, + "qtgrpc": { + "baseline": "6.5.1", "port-version": 0 }, "qthttpserver": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtimageformats": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtkeychain": { @@ -6645,115 +6785,119 @@ "port-version": 1 }, "qtlanguageserver": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtlocation": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtlottie": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtmqtt": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtopcua": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtpositioning": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtquick3d": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtquickcontrols2": { "baseline": "deprecated", "port-version": 0 }, + "qtquickeffectmaker": { + "baseline": "6.5.1", + "port-version": 0 + }, "qtquicktimeline": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtscxml": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtsensors": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtserialbus": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtserialport": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtshadertools": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtspeech": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtsvg": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qttools": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qttranslations": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtwayland": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtwebengine": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "qtwebview": { - "baseline": "6.4.3", + "baseline": "6.5.1", "port-version": 0 }, "quadtree": { @@ -6761,12 +6905,12 @@ "port-version": 0 }, "quantlib": { - "baseline": "1.29", + "baseline": "1.30", "port-version": 0 }, "quaternions": { "baseline": "1.0.0", - "port-version": 1 + "port-version": 2 }, "quazip": { "baseline": "1.4", @@ -6781,7 +6925,7 @@ "port-version": 8 }, "quill": { - "baseline": "2.7.0", + "baseline": "2.9.1", "port-version": 0 }, "quirc": { @@ -6798,11 +6942,11 @@ }, "rabit": { "baseline": "0.1", - "port-version": 4 + "port-version": 5 }, "ragel": { "baseline": "6.10", - "port-version": 5 + "port-version": 6 }, "random123": { "baseline": "1.14.0", @@ -6822,7 +6966,7 @@ }, "range-v3-vs2015": { "baseline": "20151130-vcpkg5", - "port-version": 1 + "port-version": 2 }, "rapidcheck": { "baseline": "2023-01-13", @@ -6837,20 +6981,20 @@ "port-version": 0 }, "rapidjson": { - "baseline": "2022-06-28", - "port-version": 3 + "baseline": "2023-04-27", + "port-version": 0 }, "rapidxml": { "baseline": "1.13", - "port-version": 5 + "port-version": 6 }, "rapidxml-ns": { "baseline": "1.13.2", - "port-version": 1 + "port-version": 2 }, "rappture": { "baseline": "1.9", - "port-version": 2 + "port-version": 4 }, "raygui": { "baseline": "3.2", @@ -6858,7 +7002,7 @@ }, "raylib": { "baseline": "4.5.0", - "port-version": 0 + "port-version": 1 }, "rbdl": { "baseline": "3.2.0", @@ -6882,7 +7026,7 @@ }, "readline": { "baseline": "0", - "port-version": 3 + "port-version": 4 }, "readline-osx": { "baseline": "2020-01-04", @@ -6905,8 +7049,12 @@ "port-version": 0 }, "recast": { - "baseline": "1.5.1", - "port-version": 6 + "baseline": "deprecated", + "port-version": 0 + }, + "recastnavigation": { + "baseline": "1.6.0", + "port-version": 0 }, "recycle": { "baseline": "6.0.0", @@ -6921,8 +7069,8 @@ "port-version": 1 }, "refprop-headers": { - "baseline": "2019-04-14", - "port-version": 1 + "baseline": "2022-12-07", + "port-version": 0 }, "rendergraph": { "baseline": "1.3.0", @@ -6970,7 +7118,7 @@ }, "riffcpp": { "baseline": "2.2.4", - "port-version": 2 + "port-version": 3 }, "ring-span-lite": { "baseline": "0.6.0", @@ -6985,7 +7133,7 @@ "port-version": 0 }, "rmlui": { - "baseline": "5.0", + "baseline": "5.1", "port-version": 0 }, "roaring": { @@ -7010,11 +7158,11 @@ }, "rply": { "baseline": "1.1.4", - "port-version": 2 + "port-version": 3 }, "rsasynccpp": { "baseline": "0.0.7", - "port-version": 1 + "port-version": 2 }, "rsig": { "baseline": "0.1.1", @@ -7029,16 +7177,16 @@ "port-version": 0 }, "rsm-mmio": { - "baseline": "1.1.0", - "port-version": 2 + "baseline": "2.0.0", + "port-version": 0 }, "rsocket": { "baseline": "2021.08.30.00", - "port-version": 1 + "port-version": 2 }, "rtabmap": { "baseline": "0.21.0", - "port-version": 0 + "port-version": 1 }, "rtaudio": { "baseline": "2021-11-16", @@ -7082,7 +7230,7 @@ }, "ryu": { "baseline": "2.0", - "port-version": 7 + "port-version": 9 }, "s2geometry": { "baseline": "0.10.0", @@ -7102,11 +7250,11 @@ }, "sais": { "baseline": "2.4.1", - "port-version": 4 + "port-version": 5 }, "sajson": { "baseline": "2018-09-21", - "port-version": 2 + "port-version": 3 }, "sassc": { "baseline": "3.6.2", @@ -7121,12 +7269,12 @@ "port-version": 1 }, "scenepic": { - "baseline": "1.0.16", + "baseline": "1.1.0", "port-version": 1 }, "scintilla": { "baseline": "4.4.6", - "port-version": 1 + "port-version": 2 }, "sciplot": { "baseline": "0.3.1", @@ -7154,7 +7302,7 @@ }, "scylla-wrapper": { "baseline": "2018-08-26-16e6f435", - "port-version": 2 + "port-version": 3 }, "sdformat10": { "baseline": "10.0.0", @@ -7170,11 +7318,15 @@ }, "sdl1": { "baseline": "1.2.15", - "port-version": 17 + "port-version": 18 + }, + "sdl1-mixer": { + "baseline": "2023-03-25", + "port-version": 2 }, "sdl1-net": { "baseline": "1.2.8", - "port-version": 5 + "port-version": 6 }, "sdl2": { "baseline": "2.26.5", @@ -7182,7 +7334,7 @@ }, "sdl2-gfx": { "baseline": "1.0.4", - "port-version": 9 + "port-version": 10 }, "sdl2-image": { "baseline": "2.6.3", @@ -7192,6 +7344,10 @@ "baseline": "2.6.3", "port-version": 1 }, + "sdl2-mixer-ext": { + "baseline": "2023-05-04", + "port-version": 0 + }, "sdl2-net": { "baseline": "2.2.0", "port-version": 1 @@ -7206,7 +7362,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 3 + "port-version": 4 }, "seal": { "baseline": "4.1.1", @@ -7225,7 +7381,7 @@ "port-version": 2 }, "sentry-native": { - "baseline": "0.6.1", + "baseline": "0.6.3", "port-version": 0 }, "septag-dmon": { @@ -7234,15 +7390,15 @@ }, "septag-sx": { "baseline": "2019-05-07", - "port-version": 4 + "port-version": 5 }, "seqan": { "baseline": "2.4.0", - "port-version": 2 + "port-version": 3 }, "serd": { "baseline": "0.30.4", - "port-version": 1 + "port-version": 2 }, "serdepp": { "baseline": "0.1.4.1", @@ -7250,7 +7406,7 @@ }, "sf2cute": { "baseline": "0.2.0", - "port-version": 3 + "port-version": 4 }, "sfgui": { "baseline": "0.4.0", @@ -7258,15 +7414,15 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 14 + "port-version": 15 }, "sfsexp": { "baseline": "1.3.1", "port-version": 1 }, "shader-slang": { - "baseline": "0.24.43", - "port-version": 1 + "baseline": "0.27.20", + "port-version": 0 }, "shaderc": { "baseline": "2021.1", @@ -7278,7 +7434,7 @@ }, "shapelib": { "baseline": "1.5.0", - "port-version": 3 + "port-version": 4 }, "shiftmedia-libgcrypt": { "baseline": "1.10.1-1", @@ -7286,7 +7442,7 @@ }, "shiftmedia-libgnutls": { "baseline": "3.7.6", - "port-version": 0 + "port-version": 2 }, "shiftmedia-libgpg-error": { "baseline": "1.45", @@ -7298,19 +7454,19 @@ }, "shiva-sfml": { "baseline": "1.0", - "port-version": 3 + "port-version": 4 }, "shogun": { "baseline": "6.1.4", - "port-version": 8 + "port-version": 9 }, "signalrclient": { "baseline": "1.0.0-beta1-9", - "port-version": 3 + "port-version": 4 }, "sigslot": { "baseline": "1.0.0", - "port-version": 4 + "port-version": 5 }, "simage": { "baseline": "1.8.2", @@ -7325,11 +7481,11 @@ "port-version": 1 }, "simde": { - "baseline": "0.7.2", - "port-version": 1 + "baseline": "0.7.6", + "port-version": 0 }, "simdjson": { - "baseline": "3.1.6", + "baseline": "3.1.8", "port-version": 0 }, "simdutf": { @@ -7338,7 +7494,7 @@ }, "simple-fft": { "baseline": "2020-06-14", - "port-version": 1 + "port-version": 2 }, "simpleini": { "baseline": "4.19", @@ -7362,11 +7518,11 @@ }, "sleef": { "baseline": "3.5.1", - "port-version": 3 + "port-version": 4 }, "sleepy-discord": { "baseline": "2022-02-05", - "port-version": 0 + "port-version": 1 }, "slikenet": { "baseline": "2021-06-07", @@ -7374,7 +7530,7 @@ }, "sltbench": { "baseline": "2.4.0", - "port-version": 1 + "port-version": 2 }, "smf": { "baseline": "0.1.1", @@ -7382,7 +7538,7 @@ }, "smpeg2": { "baseline": "2.0.0", - "port-version": 8 + "port-version": 9 }, "snappy": { "baseline": "1.1.9", @@ -7390,18 +7546,18 @@ }, "sndfile": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "snowhouse": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "so5extra": { "baseline": "1.5.2", "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.4.2", + "baseline": "5.7.4.3", "port-version": 0 }, "soci": { @@ -7430,7 +7586,7 @@ }, "sokol": { "baseline": "2019-09-09", - "port-version": 1 + "port-version": 2 }, "sol2": { "baseline": "3.3.0", @@ -7450,7 +7606,7 @@ }, "sord": { "baseline": "0.16.4", - "port-version": 1 + "port-version": 2 }, "soundtouch": { "baseline": "2.3.1", @@ -7462,7 +7618,7 @@ }, "spaceland": { "baseline": "7.8.2", - "port-version": 6 + "port-version": 8 }, "span-lite": { "baseline": "0.10.3", @@ -7474,7 +7630,7 @@ }, "sparsepp": { "baseline": "1.22", - "port-version": 3 + "port-version": 4 }, "spatialite-tools": { "baseline": "5.0.1", @@ -7498,7 +7654,7 @@ }, "spdlog": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "spectra": { "baseline": "1.0.1", @@ -7510,7 +7666,7 @@ }, "speexdsp": { "baseline": "1.2.1", - "port-version": 0 + "port-version": 1 }, "spine-runtimes": { "baseline": "4.1.0", @@ -7518,7 +7674,7 @@ }, "spirit-po": { "baseline": "1.1.2", - "port-version": 2 + "port-version": 3 }, "spirv-cross": { "baseline": "2021-01-15", @@ -7546,11 +7702,11 @@ }, "sprout": { "baseline": "2019-06-20", - "port-version": 1 + "port-version": 2 }, "spscqueue": { "baseline": "1.1", - "port-version": 2 + "port-version": 3 }, "sqlcipher": { "baseline": "4.5.3", @@ -7558,7 +7714,7 @@ }, "sqlite-modern-cpp": { "baseline": "3.2-936cd0c8", - "port-version": 1 + "port-version": 2 }, "sqlite-orm": { "baseline": "1.8.2", @@ -7566,11 +7722,11 @@ }, "sqlite3": { "baseline": "3.40.1", - "port-version": 2 + "port-version": 3 }, "sqlitecpp": { - "baseline": "3.2.0", - "port-version": 1 + "baseline": "3.3.0", + "port-version": 0 }, "sqlpp11": { "baseline": "0.61", @@ -7590,7 +7746,7 @@ }, "sratom": { "baseline": "0.6.4", - "port-version": 1 + "port-version": 2 }, "srell": { "baseline": "3.010", @@ -7604,9 +7760,13 @@ "baseline": "1.5.1", "port-version": 1 }, + "stackwalker": { + "baseline": "1.20", + "port-version": 0 + }, "starlink-ast": { - "baseline": "9.2.7", - "port-version": 1 + "baseline": "9.2.10", + "port-version": 0 }, "staticjson": { "baseline": "1.0.0", @@ -7618,11 +7778,11 @@ }, "status-value-lite": { "baseline": "1.1.0", - "port-version": 2 + "port-version": 3 }, "stb": { - "baseline": "2022-09-09", - "port-version": 0 + "baseline": "2023-04-11", + "port-version": 1 }, "stdexec": { "baseline": "2023-03-05", @@ -7638,15 +7798,15 @@ }, "stlab": { "baseline": "1.7.1", - "port-version": 0 + "port-version": 1 }, "stormlib": { "baseline": "2019-05-10", - "port-version": 4 + "port-version": 5 }, "strict-variant": { "baseline": "0.5", - "port-version": 1 + "port-version": 2 }, "string-theory": { "baseline": "3.6", @@ -7666,7 +7826,7 @@ }, "strtk": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "stx": { "baseline": "0.0.3", @@ -7685,20 +7845,20 @@ "port-version": 0 }, "superlu": { - "baseline": "5.3.0", - "port-version": 1 + "baseline": "6.0.0", + "port-version": 0 }, "symengine": { - "baseline": "0.9.0", + "baseline": "0.10.1", "port-version": 0 }, "systemc": { "baseline": "2.3.3", - "port-version": 7 + "port-version": 8 }, "szip": { "baseline": "2.1.1", - "port-version": 10 + "port-version": 11 }, "tabulate": { "baseline": "1.4", @@ -7706,7 +7866,7 @@ }, "tacopie": { "baseline": "3.2.0", - "port-version": 4 + "port-version": 5 }, "taglib": { "baseline": "1.13.0", @@ -7714,19 +7874,23 @@ }, "taocpp-json": { "baseline": "2020-09-14", - "port-version": 2 + "port-version": 3 }, "tap-windows6": { "baseline": "9.21.2-0e30f5c", - "port-version": 1 + "port-version": 2 + }, + "task-thread-pool": { + "baseline": "1.0.7", + "port-version": 0 }, "taskflow": { - "baseline": "3.5.0", + "baseline": "3.6.0", "port-version": 0 }, "tbb": { - "baseline": "2021.8.0", - "port-version": 0 + "baseline": "2021.9.0", + "port-version": 1 }, "tcb-span": { "baseline": "2021-12-15", @@ -7750,7 +7914,7 @@ }, "telnetpp": { "baseline": "2.1.2", - "port-version": 2 + "port-version": 3 }, "tensorflow": { "baseline": "2.10.0", @@ -7766,7 +7930,7 @@ }, "tensorpipe": { "baseline": "2022-03-16", - "port-version": 2 + "port-version": 3 }, "termcolor": { "baseline": "2.1.0", @@ -7774,7 +7938,7 @@ }, "tesseract": { "baseline": "5.3.0", - "port-version": 0 + "port-version": 1 }, "tfhe": { "baseline": "1.0.1", @@ -7786,7 +7950,7 @@ }, "tgc": { "baseline": "2019-08-11", - "port-version": 3 + "port-version": 4 }, "tgui": { "baseline": "0.9.5", @@ -7805,16 +7969,16 @@ "port-version": 6 }, "thorvg": { - "baseline": "0.8.4", + "baseline": "0.9.0", "port-version": 0 }, "threadpool": { "baseline": "0.2.5", - "port-version": 2 + "port-version": 3 }, "thrift": { "baseline": "0.16.0", - "port-version": 0 + "port-version": 1 }, "tidy-html5": { "baseline": "5.8.0", @@ -7822,7 +7986,7 @@ }, "tiff": { "baseline": "4.5.0", - "port-version": 2 + "port-version": 3 }, "tinkerforge": { "baseline": "2.1.25", @@ -7830,15 +7994,15 @@ }, "tiny-aes-c": { "baseline": "2019-07-31", - "port-version": 2 + "port-version": 3 }, "tiny-bignum-c": { "baseline": "2019-07-31", - "port-version": 2 + "port-version": 3 }, "tiny-dnn": { "baseline": "2018-10-25", - "port-version": 1 + "port-version": 2 }, "tiny-process-library": { "baseline": "2.0.4", @@ -7846,7 +8010,7 @@ }, "tiny-regex-c": { "baseline": "2019-07-31", - "port-version": 2 + "port-version": 3 }, "tinycbor": { "baseline": "0.6.0", @@ -7854,7 +8018,7 @@ }, "tinycthread": { "baseline": "2019-08-06", - "port-version": 2 + "port-version": 3 }, "tinydir": { "baseline": "1.2.5", @@ -7866,7 +8030,7 @@ }, "tinyexpr": { "baseline": "2020-09-25", - "port-version": 1 + "port-version": 2 }, "tinyexr": { "baseline": "1.0.1", @@ -7886,7 +8050,7 @@ }, "tinynpy": { "baseline": "1.0.0", - "port-version": 5 + "port-version": 6 }, "tinyobjloader": { "baseline": "2.0.0-rc9", @@ -7902,11 +8066,11 @@ }, "tinythread": { "baseline": "1.1", - "port-version": 5 + "port-version": 6 }, "tinytoml": { "baseline": "20180219", - "port-version": 2 + "port-version": 3 }, "tinyutf8": { "baseline": "4.4.3", @@ -7914,7 +8078,7 @@ }, "tinyxml": { "baseline": "2.6.2", - "port-version": 9 + "port-version": 10 }, "tinyxml2": { "baseline": "9.0.0", @@ -7926,7 +8090,7 @@ }, "tl-function-ref": { "baseline": "1.0.0", - "port-version": 3 + "port-version": 4 }, "tl-generator": { "baseline": "2021-09-28", @@ -7942,7 +8106,7 @@ }, "tlx": { "baseline": "0.5.20191212", - "port-version": 3 + "port-version": 4 }, "tmx": { "baseline": "1.2.0", @@ -7973,8 +8137,8 @@ "port-version": 4 }, "tracy": { - "baseline": "0.9.0", - "port-version": 3 + "baseline": "0.9.1", + "port-version": 1 }, "transwarp": { "baseline": "2.2.2", @@ -7988,6 +8152,10 @@ "baseline": "0.8.0", "port-version": 5 }, + "tree-similarity": { + "baseline": "0.1.1", + "port-version": 0 + }, "tree-sitter": { "baseline": "0.20.6", "port-version": 0 @@ -7998,7 +8166,7 @@ }, "treehopper": { "baseline": "1.11.3", - "port-version": 6 + "port-version": 7 }, "triangle": { "baseline": "1.6", @@ -8014,15 +8182,15 @@ }, "tsl-hopscotch-map": { "baseline": "2.3.0", - "port-version": 2 + "port-version": 3 }, "tsl-ordered-map": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "tsl-sparse-map": { "baseline": "0.6.2", - "port-version": 2 + "port-version": 3 }, "ttauri": { "baseline": "0.5.0", @@ -8042,7 +8210,7 @@ }, "type-lite": { "baseline": "0.1.0", - "port-version": 2 + "port-version": 3 }, "type-safe": { "baseline": "0.2.2", @@ -8070,7 +8238,7 @@ }, "unicorn-lib": { "baseline": "2022-01-24", - "port-version": 0 + "port-version": 1 }, "units": { "baseline": "2.3.3", @@ -8086,18 +8254,18 @@ }, "unqlite": { "baseline": "1.1.9", - "port-version": 1 + "port-version": 2 }, "unrar": { "baseline": "6.1.7", - "port-version": 1 + "port-version": 2 }, "upb": { "baseline": "2022-06-21", "port-version": 0 }, "urdfdom": { - "baseline": "3.1.0", + "baseline": "3.1.1", "port-version": 0 }, "urdfdom-headers": { @@ -8106,7 +8274,7 @@ }, "urho3d": { "baseline": "2021-03-01", - "port-version": 3 + "port-version": 4 }, "uriparser": { "baseline": "0.9.7", @@ -8117,7 +8285,7 @@ "port-version": 3 }, "usd": { - "baseline": "23.2", + "baseline": "23.5", "port-version": 0 }, "usockets": { @@ -8142,7 +8310,7 @@ }, "utfz": { "baseline": "1.2", - "port-version": 3 + "port-version": 4 }, "uthash": { "baseline": "2.3.0", @@ -8153,15 +8321,15 @@ "port-version": 2 }, "uvatlas": { - "baseline": "2023-03-30", + "baseline": "2023-04-28", "port-version": 0 }, "uvw": { - "baseline": "2.12.1", - "port-version": 2 + "baseline": "3.0.0", + "port-version": 0 }, "uwebsockets": { - "baseline": "20.36.0", + "baseline": "20.44.0", "port-version": 0 }, "v-hacd": { @@ -8277,20 +8445,20 @@ "port-version": 1 }, "visit-struct": { - "baseline": "1.0", - "port-version": 3 + "baseline": "1.1.0", + "port-version": 0 }, "vk-bootstrap": { - "baseline": "0.5", - "port-version": 1 + "baseline": "0.7", + "port-version": 0 }, "vkfft": { - "baseline": "1.2.17", + "baseline": "1.2.31", "port-version": 0 }, "vlfeat": { "baseline": "2020-07-10", - "port-version": 2 + "port-version": 3 }, "vlpp": { "baseline": "1.1.0.0", @@ -8306,11 +8474,15 @@ }, "vs-yasm": { "baseline": "0.5.0", - "port-version": 1 + "port-version": 2 + }, + "vsg": { + "baseline": "1.0.5", + "port-version": 0 }, "vtk": { "baseline": "9.2.0-pv5.11.0", - "port-version": 6 + "port-version": 7 }, "vtk-dicom": { "baseline": "0.8.14", @@ -8318,14 +8490,14 @@ }, "vtk-m": { "baseline": "1.9.0", - "port-version": 1 + "port-version": 2 }, "vulkan": { "baseline": "1.1.82.1", - "port-version": 5 + "port-version": 6 }, "vulkan-headers": { - "baseline": "1.3.243", + "baseline": "1.3.250", "port-version": 2 }, "vulkan-hpp": { @@ -8353,12 +8525,12 @@ "port-version": 4 }, "wangle": { - "baseline": "2022.03.21.00", + "baseline": "2023.05.15.00", "port-version": 0 }, "wasmedge": { - "baseline": "0.12.0-alpha.1", - "port-version": 0 + "baseline": "0.12.1", + "port-version": 1 }, "wavelib": { "baseline": "2021-11-26", @@ -8376,17 +8548,21 @@ "baseline": "1.31", "port-version": 1 }, + "wcslib": { + "baseline": "7.12", + "port-version": 0 + }, "websocketpp": { "baseline": "0.8.2", "port-version": 2 }, "webview2": { "baseline": "1.0.1210.39", - "port-version": 0 + "port-version": 1 }, "wepoll": { "baseline": "1.5.8", - "port-version": 2 + "port-version": 3 }, "wg21-linear-algebra": { "baseline": "0.7.2", @@ -8394,10 +8570,10 @@ }, "wg21-sg14": { "baseline": "2019-08-13", - "port-version": 1 + "port-version": 2 }, "wil": { - "baseline": "2023-02-02", + "baseline": "2023-04-11", "port-version": 0 }, "wildmidi": { @@ -8414,7 +8590,7 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 8 + "port-version": 10 }, "winpty": { "baseline": "0.4.3", @@ -8430,12 +8606,16 @@ }, "winsparkle": { "baseline": "0.7.0", - "port-version": 1 + "port-version": 2 }, "wintoast": { "baseline": "1.2.0", "port-version": 2 }, + "wmipp": { + "baseline": "1.2.0", + "port-version": 0 + }, "woff2": { "baseline": "1.0.2", "port-version": 3 @@ -8454,7 +8634,7 @@ }, "wordnet": { "baseline": "3.0", - "port-version": 2 + "port-version": 3 }, "workflow": { "baseline": "0.10.5", @@ -8494,11 +8674,11 @@ }, "x-plane": { "baseline": "3.0.3", - "port-version": 1 + "port-version": 2 }, "x264": { "baseline": "0.164.3095", - "port-version": 3 + "port-version": 4 }, "x265": { "baseline": "3.4", @@ -8509,7 +8689,7 @@ "port-version": 0 }, "xapian": { - "baseline": "1.4.21", + "baseline": "1.4.22", "port-version": 1 }, "xaudio2redist": { @@ -8521,7 +8701,7 @@ "port-version": 0 }, "xbyak": { - "baseline": "6.60", + "baseline": "6.69", "port-version": 0 }, "xcb": { @@ -8566,19 +8746,19 @@ }, "xeus": { "baseline": "0.24.3", - "port-version": 2 + "port-version": 3 }, "xframe": { "baseline": "0.3.0", - "port-version": 2 + "port-version": 3 }, "xlnt": { "baseline": "1.5.0", "port-version": 4 }, "xlsxio": { - "baseline": "2021-03-24", - "port-version": 1 + "baseline": "0.2.34", + "port-version": 0 }, "xmlsec": { "baseline": "1.2.37", @@ -8597,12 +8777,12 @@ "port-version": 0 }, "xpack": { - "baseline": "2023-02-06", + "baseline": "1.0.5", "port-version": 0 }, "xproperty": { "baseline": "0.8.1", - "port-version": 2 + "port-version": 3 }, "xproto": { "baseline": "2021.5", @@ -8610,14 +8790,14 @@ }, "xqilla": { "baseline": "2.3.4", - "port-version": 1 + "port-version": 2 }, "xsimd": { - "baseline": "9.0.1", + "baseline": "10.0.0", "port-version": 0 }, "xtensor": { - "baseline": "0.24.3", + "baseline": "0.24.6", "port-version": 0 }, "xtensor-blas": { @@ -8626,15 +8806,15 @@ }, "xtensor-fftw": { "baseline": "2019-11-30", - "port-version": 3 + "port-version": 4 }, "xtensor-io": { "baseline": "0.13.0", "port-version": 1 }, "xtl": { - "baseline": "0.7.2", - "port-version": 1 + "baseline": "0.7.5", + "port-version": 0 }, "xtrans": { "baseline": "1.4.0", @@ -8642,11 +8822,11 @@ }, "xxhash": { "baseline": "0.8.1", - "port-version": 1 + "port-version": 2 }, "yajl": { "baseline": "2.1.0", - "port-version": 3 + "port-version": 4 }, "yaml-cpp": { "baseline": "0.7.0", @@ -8654,7 +8834,7 @@ }, "yara": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "yas": { "baseline": "7.1.0", @@ -8681,8 +8861,8 @@ "port-version": 0 }, "yomm2": { - "baseline": "1.1.2", - "port-version": 1 + "baseline": "1.3.1", + "port-version": 0 }, "yyjson": { "baseline": "0.6.0", @@ -8698,15 +8878,15 @@ }, "z85": { "baseline": "1.0", - "port-version": 1 + "port-version": 2 }, "zeroc-ice": { - "baseline": "3.7.7", - "port-version": 4 + "baseline": "3.7.9", + "port-version": 0 }, "zeromq": { "baseline": "2023-01-31", - "port-version": 1 + "port-version": 4 }, "zfp": { "baseline": "1.0.0", @@ -8725,28 +8905,28 @@ "port-version": 0 }, "zlib-ng": { - "baseline": "2.0.6", - "port-version": 1 + "baseline": "2.0.7", + "port-version": 0 }, "zookeeper": { "baseline": "3.5.6", - "port-version": 0 + "port-version": 1 }, "zopfli": { "baseline": "1.0.3", "port-version": 3 }, "zpp-bits": { - "baseline": "4.4.13", + "baseline": "4.4.17", "port-version": 0 }, "zserge-webview": { - "baseline": "2022-09-07", + "baseline": "2023-04-15", "port-version": 0 }, "zstd": { - "baseline": "1.5.4", - "port-version": 1 + "baseline": "1.5.5", + "port-version": 0 }, "zstr": { "baseline": "1.0.7", @@ -8770,7 +8950,7 @@ }, "zyre": { "baseline": "2019-07-07", - "port-version": 4 + "port-version": 5 }, "zziplib": { "baseline": "0.13.72", diff --git a/versions/c-/c9y.json b/versions/c-/c9y.json index 4b9b1782c17332..5b8f4a8bf8dbac 100644 --- a/versions/c-/c9y.json +++ b/versions/c-/c9y.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f7e3a1f7a70d40127c90193447fe5595f86c9fb", + "version-semver": "0.8.0", + "port-version": 0 + }, { "git-tree": "c9ab8ee7af65218c39d096c8d8d369bb413a49a5", "version-semver": "0.7.0", diff --git a/versions/c-/cachelib.json b/versions/c-/cachelib.json index 7f7598cb2ee16b..804a6f8f80087e 100644 --- a/versions/c-/cachelib.json +++ b/versions/c-/cachelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a22cdb1063bfa706ab5a7085ba8724785eabc53", + "version-string": "2023.05.08.00", + "port-version": 0 + }, { "git-tree": "0311771f0b688e0ff8ffd3c6d297dfbbf43dfd33", "version-string": "2023.02.27.00", diff --git a/versions/c-/caf.json b/versions/c-/caf.json index b2ef7f0a4143ce..44b4a548632e8c 100644 --- a/versions/c-/caf.json +++ b/versions/c-/caf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0561defb72007b054cede4fed6ef5950f8c2e2bc", + "version": "0.19.1", + "port-version": 0 + }, { "git-tree": "9b7001bd4d131fa36b766ca44a6ddbb47d3304a1", "version": "0.18.6", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 491d7326611a23..f275c2de3f1ba8 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a7e6f9ecf73d0a2ec27e9a70a099746e643ec84", + "version": "1.16.2", + "port-version": 3 + }, { "git-tree": "9e3f77f8b4d02d2a5bd898b0ca96031da57aae12", "version": "1.16.2", diff --git a/versions/c-/calceph.json b/versions/c-/calceph.json index 8e60196c269ec3..71428da52932df 100644 --- a/versions/c-/calceph.json +++ b/versions/c-/calceph.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e1167b91f758af9aa0077bdee620995c65898554", + "version": "3.5.2", + "port-version": 0 + }, + { + "git-tree": "66e61e880b832f24343545815d796cc529c4f503", + "version": "3.5.1", + "port-version": 1 + }, { "git-tree": "98f9a949826498f0929b5745fff07fb9747b82fa", "version": "3.5.1", diff --git a/versions/c-/capstone.json b/versions/c-/capstone.json index acdfcd871d5ad1..76acd9f7927adb 100644 --- a/versions/c-/capstone.json +++ b/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c9184889dd21d609401fe4ea34fa5320a9443a2", + "version": "5.0.0-rc2", + "port-version": 2 + }, { "git-tree": "f31ba3baba34c74dea464d864cca666c8793b1e7", "version": "5.0.0-rc2", diff --git a/versions/c-/catch-classic.json b/versions/c-/catch-classic.json index 18bb78d6f8dd1d..56dd2672253e56 100644 --- a/versions/c-/catch-classic.json +++ b/versions/c-/catch-classic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69c262237024b0aa361d06923511a4d571355b50", + "version": "1.12.2", + "port-version": 2 + }, { "git-tree": "a85b3103dd134a7fadafe0c7c5d67042ab4c2b18", "version-string": "1.12.2", diff --git a/versions/c-/ccfits.json b/versions/c-/ccfits.json index 466b8ade8407c3..e7d066a886377f 100644 --- a/versions/c-/ccfits.json +++ b/versions/c-/ccfits.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "69b00d0813b3ec9b7b963f07cf570cca5a8e2fd5", + "version": "2.5", + "port-version": 11 + }, + { + "git-tree": "77b570d63ebf64b4110d2555ce945144cc695364", + "version": "2.5", + "port-version": 10 + }, { "git-tree": "659ca5a77df9383a31166079a5f08ce70400d4ab", "version": "2.5", diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json index efd6b287814b83..cd559c1617c00a 100644 --- a/versions/c-/cctz.json +++ b/versions/c-/cctz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fb611037401f6c457c45f90d7a462fa13f6f1b1", + "version": "2.3", + "port-version": 5 + }, { "git-tree": "d9230440e30edf443d69ac13244f53b6191742ae", "version-string": "2.3", diff --git a/versions/c-/cdt.json b/versions/c-/cdt.json index 8d6479fc3d23a9..87ca934639c750 100644 --- a/versions/c-/cdt.json +++ b/versions/c-/cdt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2455f0f823d6e0f87540a29206f2779004aedce0", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "ddc92ab3ef284f9643001138f8ed320a2417a80f", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "d04985a703ae8b9201876879003d44c84f719a3a", "version": "1.2.0", diff --git a/versions/c-/cgicc.json b/versions/c-/cgicc.json index e043b067305086..277c9193bee3c5 100644 --- a/versions/c-/cgicc.json +++ b/versions/c-/cgicc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60fd4672dd6d913e3af2560314dd31bed192a205", + "version": "3.2.19", + "port-version": 7 + }, { "git-tree": "e5359ace765633e6912eb2898e175f797c6b2d45", "version-string": "3.2.19", diff --git a/versions/c-/chaiscript.json b/versions/c-/chaiscript.json index 39bb67f16cae50..a61224cd62f974 100644 --- a/versions/c-/chaiscript.json +++ b/versions/c-/chaiscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2745618f1726fd950c1f3aae35c8ceff2e11796e", + "version": "6.1.0", + "port-version": 3 + }, { "git-tree": "e661b450987c9f41f4cda3faed9067e54fe65f62", "version-string": "6.1.0", diff --git a/versions/c-/charls.json b/versions/c-/charls.json index 77407faf564190..ae697074ce4d13 100644 --- a/versions/c-/charls.json +++ b/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9909aaef0219e8727c8f7e22ab93cf3aabbc685", + "version": "2.4.2", + "port-version": 0 + }, { "git-tree": "5459a82cfd650a18a79539aa30a03fa751a8cfcb", "version": "2.4.1", diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json index b6cfe3467e0c68..8df13628b1b08e 100644 --- a/versions/c-/chartdir.json +++ b/versions/c-/chartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4de62166c67f2104f1e7180f04f1d5954d8e464a", + "version": "7.0.0", + "port-version": 7 + }, { "git-tree": "fecdbc20f2f4e027680223768c9a312c13cf4a75", "version": "7.0.0", diff --git a/versions/c-/chipmunk.json b/versions/c-/chipmunk.json index 9c1e1af231e9e5..7867eeddcd5e6b 100644 --- a/versions/c-/chipmunk.json +++ b/versions/c-/chipmunk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e48ba1fd1de2d9df5d51fa83d6563777053a9e2", + "version": "7.0.3", + "port-version": 4 + }, { "git-tree": "2d56c98d1d491f822d5f74d312e45b51a0cfccfc", "version-string": "7.0.3", diff --git a/versions/c-/chmlib.json b/versions/c-/chmlib.json index 4b0e16833c8b70..0f191f67788927 100644 --- a/versions/c-/chmlib.json +++ b/versions/c-/chmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfe4841377722e56ccb7817f6ad93fcf24eab13b", + "version": "0.40", + "port-version": 7 + }, { "git-tree": "eb8f888eae3c5747154d09844daadc5c117a8c38", "version": "0.40", diff --git a/versions/c-/cialloo-rcon.json b/versions/c-/cialloo-rcon.json new file mode 100644 index 00000000000000..d02323dbc0078c --- /dev/null +++ b/versions/c-/cialloo-rcon.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "15e453031d883d06102b67a48336af5c3930a1ae", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/c-/clara.json b/versions/c-/clara.json index 9b9ce7df35e6a1..0661ae8791005b 100644 --- a/versions/c-/clara.json +++ b/versions/c-/clara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea0e36e1acd8ce030d956c34f063cdce1bc53e83", + "version": "1.1.5", + "port-version": 2 + }, { "git-tree": "dd2473115d2b12883de5a00cdbb2aaa309702042", "version-string": "1.1.5", diff --git a/versions/c-/cmcstl2.json b/versions/c-/cmcstl2.json index 80c0917693804a..6ce17c987cf2d9 100644 --- a/versions/c-/cmcstl2.json +++ b/versions/c-/cmcstl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f2bfc5aadfc40719cf012a9b43d0a0037259738", + "version-date": "2019-07-20", + "port-version": 3 + }, { "git-tree": "71dc25003baa7f85cfb3924b553bf8642e7ea97e", "version-string": "2019-07-20", diff --git a/versions/c-/cminpack.json b/versions/c-/cminpack.json index c65eec048c27df..0c82eea0bb838d 100644 --- a/versions/c-/cminpack.json +++ b/versions/c-/cminpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0401d2c926529b034913ab84852eef3fac28f6d4", + "version": "1.3.8", + "port-version": 4 + }, { "git-tree": "c2b1d33d31878445649cbc22e23d10a7b0e5d0b3", "version": "1.3.8", diff --git a/versions/c-/cmocka.json b/versions/c-/cmocka.json index c463d336466a5c..86d30f61a433ee 100644 --- a/versions/c-/cmocka.json +++ b/versions/c-/cmocka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "296011d6dba4e267659df3c55989319334655604", + "version-date": "2020-08-01", + "port-version": 3 + }, { "git-tree": "b9b3ab47324bb53d72b5868cd190fdae50a49d24", "version-string": "2020-08-01", diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index 586e01516e1331..9d4a51060fd010 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4acafdbd8f1d4eecb1130668df0503173add00c3", + "version": "1.1.7", + "port-version": 3 + }, { "git-tree": "f491a42c0680489de38159c7dd1486afc766c7fe", "version-string": "1.1.7", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 01a96feb124910..7c24b758415b5a 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "329db8f62c8f5a6f9774670833471ad4decb75cc", + "version": "4.0.0", + "port-version": 7 + }, { "git-tree": "6a7f1c48f1f508f4935fc44a83645305ac5d6da4", "version-string": "4.0.0", diff --git a/versions/c-/collada-dom.json b/versions/c-/collada-dom.json index ef1e53e018a3d0..ce5b0896eb8397 100644 --- a/versions/c-/collada-dom.json +++ b/versions/c-/collada-dom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9c3011f64673cff7d61bac99def8048f4027f32", + "version": "2.5.0", + "port-version": 9 + }, { "git-tree": "52229b10acbed6e24eefd37ef20b30e24c6c7e71", "version": "2.5.0", diff --git a/versions/c-/constexpr-contracts.json b/versions/c-/constexpr-contracts.json index fd33869dd0245c..3f1fa7a5c0836b 100644 --- a/versions/c-/constexpr-contracts.json +++ b/versions/c-/constexpr-contracts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec1e4e87a25936620618f4807b63e2c03ca30f4d", + "version-date": "2020-08-09", + "port-version": 3 + }, { "git-tree": "57c829c4a74272397d4901cf6ed525b2200e1d93", "version-string": "2020-08-09", diff --git a/versions/c-/coolprop.json b/versions/c-/coolprop.json index c868fc16e88e9d..ef17f0ddd80cd4 100644 --- a/versions/c-/coolprop.json +++ b/versions/c-/coolprop.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "941407fb13d6b17cf04b6186a80db2e59d145a3f", + "version-semver": "6.4.3", + "port-version": 3 + }, + { + "git-tree": "5f114941efb93eadb6df38f9493de8bdab0b496a", + "version-semver": "6.4.3", + "port-version": 2 + }, { "git-tree": "b0bdc5514d6d96d6767c50a09840b164fbf86d93", "version-semver": "6.4.3", diff --git a/versions/c-/cpp-async.json b/versions/c-/cpp-async.json new file mode 100644 index 00000000000000..648cf85f0bc82e --- /dev/null +++ b/versions/c-/cpp-async.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f1eaddcca26f72bb7be5a6227bffd3897798341c", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index 7bc87a999248cb..6d613ba2355923 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "570d0fcd52fa9bb8048dfe84df6a31b2473949b5", + "version": "0.12.3", + "port-version": 0 + }, + { + "git-tree": "05e123da2bcd7b05fc8c31fd88e6d3d5aa06d520", + "version": "0.12.2", + "port-version": 0 + }, { "git-tree": "d5bea8aab6eaa201dfd01b054327e3c379ab0864", "version": "0.11.3", diff --git a/versions/c-/cpp-netlib.json b/versions/c-/cpp-netlib.json index 1d759c535b145f..372da8b4ac80c0 100644 --- a/versions/c-/cpp-netlib.json +++ b/versions/c-/cpp-netlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac3709aa4c5d5b70f38764f2fa7e0b8f8e891d96", + "version": "0.13.0", + "port-version": 8 + }, { "git-tree": "a71758ba258596edd94871670c3d8f7cec334e37", "version-string": "0.13.0", diff --git a/versions/c-/cpp-taskflow.json b/versions/c-/cpp-taskflow.json index 9e6d783e0e9c63..0b4f9c982d9e15 100644 --- a/versions/c-/cpp-taskflow.json +++ b/versions/c-/cpp-taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00114add33f7d8a7e8f4fb0d22f9206178181b8b", + "version": "2.6.0", + "port-version": 2 + }, { "git-tree": "edbd9a48db629e8b2c264cdd60fba4ca4e218f03", "version-string": "2.6.0", diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index 1d5f320679e880..8bf2f00f8955b4 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d87ba9b4921a48271c8c6abbe7e9c3f96651b4f", + "version": "4.5.3", + "port-version": 0 + }, { "git-tree": "28aa180fcf127016dd1d8ceca4fd964228af191a", "version": "4.5.1", diff --git a/versions/c-/cppkafka.json b/versions/c-/cppkafka.json index e063e29648f0a7..14a93e0232ee46 100644 --- a/versions/c-/cppkafka.json +++ b/versions/c-/cppkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "708cf007605104bc59394d47c9937b203c155b37", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "a33f71df221cb16bb2f7b1ce5d9cd0043a525e00", "version": "0.3.1", diff --git a/versions/c-/cppunit.json b/versions/c-/cppunit.json index 46d182a4b940f0..dcb6acca6429c9 100644 --- a/versions/c-/cppunit.json +++ b/versions/c-/cppunit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f41d796c28175989ae33707289645752d8b6c3f8", + "version": "1.15.1", + "port-version": 4 + }, { "git-tree": "671d125960c9cce11a92b65b8bdfba73f85b09b5", "version": "1.15.1", diff --git a/versions/c-/cppzmq.json b/versions/c-/cppzmq.json index 8b0863a0d1358e..674c7104a3ffa7 100644 --- a/versions/c-/cppzmq.json +++ b/versions/c-/cppzmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f50d93799a1982bbbdd22e88c7a784f9a7e38368", + "version": "4.9.0", + "port-version": 1 + }, { "git-tree": "7f4360cc5fa484c4ecd286ef6c545bde4b01bc39", "version": "4.9.0", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index dde66f02e9539e..18e5ea04276a1c 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96f05ba23a7dc5ba102ba451210b2c367669c1ad", + "version-semver": "1.10.2+3", + "port-version": 0 + }, { "git-tree": "13181536fae6181da65a2d2522a814fffb61bb83", "version-semver": "1.9.3", diff --git a/versions/c-/cr.json b/versions/c-/cr.json index eec55d22ad7398..3cda19c5e23219 100644 --- a/versions/c-/cr.json +++ b/versions/c-/cr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "992f08365509f46e7d51f252317ef8b6da7e11a9", + "version-date": "2020-04-26", + "port-version": 2 + }, { "git-tree": "67c46561394de15aee2a56d57590eeef1060019d", "version-string": "2020-04-26", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 65c8691077814c..72aa3bf0417073 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63c757af964d6d69f6abdeb0a3849889ad3531a9", + "version-date": "2022-09-05", + "port-version": 4 + }, { "git-tree": "699f5caaac594c10928ddf73ba45e64ad764252f", "version-date": "2022-09-05", diff --git a/versions/c-/cspice.json b/versions/c-/cspice.json index 9cb27a05fe4b5f..c8b587b7bed08f 100644 --- a/versions/c-/cspice.json +++ b/versions/c-/cspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a87828fb249f8a2f9d6ded34e0c8e79f4349d842", + "version": "67", + "port-version": 3 + }, { "git-tree": "1da82692c98d788552288f73818983fc3b561b7b", "version": "67", diff --git a/versions/c-/ctbignum.json b/versions/c-/ctbignum.json index 5765ddf2e4f80d..ba35020b6f3cb5 100644 --- a/versions/c-/ctbignum.json +++ b/versions/c-/ctbignum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3b10f0256bff010503b6ebcbb966235308947f2", + "version-date": "2019-08-02", + "port-version": 3 + }, { "git-tree": "555cc4f7caade3a6d817fd65d15ff2274ed0f5eb", "version-string": "2019-08-02", diff --git a/versions/c-/ctp.json b/versions/c-/ctp.json index 90896c07c44d98..f22b5c7f0f1d18 100644 --- a/versions/c-/ctp.json +++ b/versions/c-/ctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "711ec7abed5a21f5dbb07573e9895a9611fc6a11", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 4 + }, { "git-tree": "11ff3d437cca5956d99f8690143f12a0ebd5e839", "version-string": "6.6.1_P1_20210406_se", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index a33cd726ac1f4e..3f36e6a8a9c03b 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b70ded19f70e4b198d8c3f844324c7884d3faa7d", + "version": "8.1.2", + "port-version": 0 + }, { "git-tree": "08eea1b0a159f6555603ac8d26a9f8ab4738d02f", "version": "8.0.1", diff --git a/versions/c-/cute-headers.json b/versions/c-/cute-headers.json index a0d7ca06e7e2f8..292674418befa4 100644 --- a/versions/c-/cute-headers.json +++ b/versions/c-/cute-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73671c8a457d848d2fdb535fc56b72c48c344dcc", + "version-date": "2019-09-20", + "port-version": 2 + }, { "git-tree": "d6eb7ff72e3cede19e1f8900fe715014b3fa6d81", "version-string": "2019-09-20", diff --git a/versions/d-/darknet.json b/versions/d-/darknet.json index 6f2fa46c71b628..a85c812eb51d55 100644 --- a/versions/d-/darknet.json +++ b/versions/d-/darknet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0143bad2181e6280f1c59918b5c1767ff166ad31", + "version-date": "2022-03-06", + "port-version": 3 + }, { "git-tree": "979891799df34103a8312038f12bb6e6b73301d5", "version-date": "2022-03-06", diff --git a/versions/d-/dbg-macro.json b/versions/d-/dbg-macro.json index 9fa5bd8d38d8f4..c272f5d17045cf 100644 --- a/versions/d-/dbg-macro.json +++ b/versions/d-/dbg-macro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b6ca099516f914231ec442bea3e6c5f43a91e43", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "69061b0a26aff6be4f73d8f5fb8e028e5460d34b", "version-date": "2021-11-02", diff --git a/versions/d-/dbow2.json b/versions/d-/dbow2.json index b78b28f918898e..089ebdf089daf1 100644 --- a/versions/d-/dbow2.json +++ b/versions/d-/dbow2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94bdc02d1c0ea384086f9d3756da1e19b1c133b4", + "version-date": "2019-08-05", + "port-version": 3 + }, { "git-tree": "3494ca270396d5b2f8b496b5fc7b3043a8796069", "version-string": "2019-08-05", diff --git a/versions/d-/debug-assert.json b/versions/d-/debug-assert.json index 559f18d7879a72..931ff9e6617021 100644 --- a/versions/d-/debug-assert.json +++ b/versions/d-/debug-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac34fbcc09f0613c2dc9dbe8a513d29db6d73f6f", + "version": "1.3.3", + "port-version": 2 + }, { "git-tree": "b41dd0f27f6eb99b63780eed36a9f3170acd60df", "version-string": "1.3.3", diff --git a/versions/d-/decimal-for-cpp.json b/versions/d-/decimal-for-cpp.json index 2923eaa7d02ecf..cae6e18258441e 100644 --- a/versions/d-/decimal-for-cpp.json +++ b/versions/d-/decimal-for-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a78e582f830db392c8d551f3008a5977dad45692", + "version": "1.18", + "port-version": 1 + }, { "git-tree": "e6b418fe87e9affcbb4605d4aeb10e5e6883b239", "version-string": "1.18", diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 885cf647e95003..3775503a6ce9e1 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36881ec4ee5f1623dc083ef7afcfe1133c3fbd32", + "version": "1.610.2", + "port-version": 0 + }, { "git-tree": "9e443c72abae6f6a090ba8eec8983b7d5a99c4e4", "version": "1.608.2", diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index ff47f5b24ec4bc..c87055893696be 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cf91137f48f28bc44cb34d28b3d03113f109e2d", + "version-date": "2023-04-28", + "port-version": 0 + }, { "git-tree": "ca0059f3e1281fd0e23c37327b2d7db6fb0a5c17", "version-date": "2023-03-30", diff --git a/versions/d-/directxsdk.json b/versions/d-/directxsdk.json index 78d37a85765168..3d48f8c15ed9fc 100644 --- a/versions/d-/directxsdk.json +++ b/versions/d-/directxsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10f6ac11c6480f52d70ff2725cf34fd39b942376", + "version-string": "jun10", + "port-version": 7 + }, { "git-tree": "d39d11be448d2aae6541b902b33dcf23282250f2", "version-string": "jun10", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 40ba749cf66a6b..7818368e471444 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6d6f4042f6d636d2e24281cd5d0c1e29a28207d9", + "version-date": "2023-04-28", + "port-version": 1 + }, + { + "git-tree": "14daf71a3dffda45222d771968e399ec56e1c0e1", + "version-date": "2023-03-30", + "port-version": 1 + }, { "git-tree": "49ac22c74d82cd2a67dc98755d3bd78d1ff3be45", "version-date": "2023-03-30", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 34d9630f90f7d5..4ac28cb9a46968 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39f3ce588272b32b67881fb0e226c68e3255a0cb", + "version-date": "2023-04-28", + "port-version": 0 + }, { "git-tree": "87649cefdd3b789e8e29cd6da4396be1f18f7fd7", "version-date": "2023-03-30", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index fd288ef08dc2cd..f45cbdb456b02a 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b77dc8e9667b0717ed8c44333327a948e9f98eaa", + "version-date": "2023-04-28", + "port-version": 0 + }, { "git-tree": "95f45e85acae1eb5e82d00b3e6f2f4bc48ba87f4", "version-date": "2023-03-30", diff --git a/versions/d-/dirent.json b/versions/d-/dirent.json index 7bd05e8910d23a..17eb9996873727 100644 --- a/versions/d-/dirent.json +++ b/versions/d-/dirent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d27b241631b1f540dd16824cd8a2df735233733", + "version": "1.23.2", + "port-version": 2 + }, { "git-tree": "75a51df9f74a0b771b858caf42d3111a6386945c", "version-string": "1.23.2", diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index 58f913b5695bb9..c1b4197ba3dc9a 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b81659584b418c89a25dc9c6e68cb8d7d75fee5f", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "87af266946b8e9b9f6ed5b439b3af5e185b84766", "version": "2.5.6", diff --git a/versions/d-/discord-rpc.json b/versions/d-/discord-rpc.json index eb420539ee1a55..d57acc7f4952b2 100644 --- a/versions/d-/discord-rpc.json +++ b/versions/d-/discord-rpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "929ff2e2379863aabc478dfb7773549404c3f74f", + "version": "3.4.0", + "port-version": 3 + }, { "git-tree": "5f69d097fd478421946aceaaca5b2fca43de4f20", "version-string": "3.4.0", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 1c362a90c394c6..979c27af94acf5 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d24e2b697098510aeb4799426a66c5749f9a3b97", + "version-date": "2023-05-30", + "port-version": 0 + }, { "git-tree": "90c3313d8c31b532ab7e876d0b2f962d29e757f7", "version-date": "2023-01-02", diff --git a/versions/d-/discount.json b/versions/d-/discount.json index 87f7756a241074..827f509e4d27fb 100644 --- a/versions/d-/discount.json +++ b/versions/d-/discount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cd434c2eb8785c098c1bedc33764a78291fbf2b", + "version": "2.2.6", + "port-version": 3 + }, { "git-tree": "acdff2b22e0fc2351a96d099dedf2e4bbeb5ce9f", "version-string": "2.2.6", diff --git a/versions/d-/discreture.json b/versions/d-/discreture.json index 315b4bdda9d59b..8abf0fb99d3297 100644 --- a/versions/d-/discreture.json +++ b/versions/d-/discreture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ce6e0d3477245bce82e42445571ec25010be703", + "version-date": "2020-01-29", + "port-version": 3 + }, { "git-tree": "99f5fe641e52f034dc3fe62f2b5372d772a5ce42", "version-string": "2020-01-29", diff --git a/versions/d-/docopt.json b/versions/d-/docopt.json index 11f1cab055299b..033bd747b18d35 100644 --- a/versions/d-/docopt.json +++ b/versions/d-/docopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a18c91830f3f709c03b3d0e245f404e8cf7a99c3", + "version-date": "2018-11-01", + "port-version": 3 + }, { "git-tree": "9fe0c66a1eca6672184cb33b92ea744df0efc0b3", "version-string": "2018-11-01", diff --git a/versions/d-/double-conversion.json b/versions/d-/double-conversion.json index e6a5ccb2c1dd0d..28cfb7f5b447d9 100644 --- a/versions/d-/double-conversion.json +++ b/versions/d-/double-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c3184965fe6c2b602348a73c58752c2ef72bf9d", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "16b23d889f831b492aaa819cfde4d5d263be5bed", "version": "3.2.1", diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index a05124cc09d4f9..58f1cc79fdc057 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c631e7b3f93d40c4aea0d65e722e1ff1ac028ac", + "version": "10.0.24", + "port-version": 0 + }, { "git-tree": "f5258ce203526b7be2ba77c9ab6deb7a197273af", "version": "10.0.23", diff --git a/versions/d-/draco.json b/versions/d-/draco.json index dace9381ae2f66..c4aaf83ac17128 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bed378402e689e540a924f99869f7134d74bbdfb", + "version": "1.5.6", + "port-version": 0 + }, { "git-tree": "b4f39e03fdf47c2c1e9a945b362ed52ec098a354", "version": "1.5.3", diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index 4d34860b08519b..65d2476f028065 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18440695231677ed659b391e4a31c0100996cdb6", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "065715cb0fcd3b94934da5de3db5e2341cf1912c", "version": "1.1.0", diff --git a/versions/d-/duktape.json b/versions/d-/duktape.json index fff51803390811..3849cc553e60c3 100644 --- a/versions/d-/duktape.json +++ b/versions/d-/duktape.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5a2a59ce6d8477151b1bd30ad12e5a65ce86331", + "version": "2.5.0", + "port-version": 4 + }, { "git-tree": "ec86279e8f26e8d5d45b3292d7bdf6750da9439f", "version-string": "2.5.0", diff --git a/versions/d-/dumb.json b/versions/d-/dumb.json new file mode 100644 index 00000000000000..ad4a77513bd9f7 --- /dev/null +++ b/versions/d-/dumb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fb0e42347cd9ec43e40d2b123990e1705399dc02", + "version": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/versions/d-/dx.json b/versions/d-/dx.json index 96dffa0a87d687..26416ab1251741 100644 --- a/versions/d-/dx.json +++ b/versions/d-/dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "268d4fc68703cfcc25aa8cca04a67a80312dd2e9", + "version": "1.0.1", + "port-version": 3 + }, { "git-tree": "684efcf0d9ea4c1a8b7ec6d9440e0097ab38d586", "version-string": "1.0.1", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index 41ed89addc35a7..d3961809445959 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bca406e04cfde4f63d430a5f2f10273701747f31", + "version": "9.29.952.8", + "port-version": 6 + }, { "git-tree": "b12c3d78e879e1cd9608e02851132ae683bb587e", "version": "9.29.952.8", diff --git a/versions/e-/easycl.json b/versions/e-/easycl.json index 88f7e35dd53f6a..ceeebc47f42fde 100644 --- a/versions/e-/easycl.json +++ b/versions/e-/easycl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54235bb93553dde5363e98f4b8e24f74f4a57481", + "version": "0.3", + "port-version": 2 + }, { "git-tree": "f25251c36cd3423ca13cdf773e124ce01e7b08fe", "version-string": "0.3", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index 4c770cc0e6c663..ccd0c73a9d07b9 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8877642f19052e820932928a49049719516ebf9b", + "version": "2.7.7097.0", + "port-version": 6 + }, { "git-tree": "71b209c038081c700231ebc3be136c6976f22c4b", "version": "2.7.7097.0", diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json index a6e90e0aa8ce5a..535209398505dd 100644 --- a/versions/e-/easyloggingpp.json +++ b/versions/e-/easyloggingpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69f6b238899967e671f818a164f21de0219546bc", + "version": "9.97.0", + "port-version": 3 + }, { "git-tree": "40ca985ab8030ca0daf7c902e413423801d3e3d4", "version": "9.97.0", diff --git a/versions/e-/eathread.json b/versions/e-/eathread.json index 4568b724d3b451..1a560b921be3ce 100644 --- a/versions/e-/eathread.json +++ b/versions/e-/eathread.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "34f9cb023b8968a396617b8ff04abc086b1c02d7", + "version-string": "1.32.09", + "port-version": 5 + }, + { + "git-tree": "88ecba1014ac560fb1083f5e8b74c10cddf8d6ea", + "version-string": "1.32.09", + "port-version": 4 + }, { "git-tree": "341734fa50c34beff0593368922f71829fb0ff19", "version-string": "1.32.09", diff --git a/versions/e-/ebml.json b/versions/e-/ebml.json index d6ea50e463bd1b..1d3427d454aacc 100644 --- a/versions/e-/ebml.json +++ b/versions/e-/ebml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4dd27fceafb402b6a634a2a934e7c3df0c1a64c0", + "version": "1.4.4", + "port-version": 1 + }, + { + "git-tree": "a4b2091951270259a38b2b900547a544bfad046f", + "version": "1.4.4", + "port-version": 0 + }, { "git-tree": "4fc7059101f067e639c84844996c77eaba7908e6", "version": "1.4.2", diff --git a/versions/e-/ecos.json b/versions/e-/ecos.json index 6f456c3f7d5b38..479c91d505e110 100644 --- a/versions/e-/ecos.json +++ b/versions/e-/ecos.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "78694a162b97c80fc2b0017c3dc13c9c7e79f9c2", + "version": "2.0.8", + "port-version": 3 + }, + { + "git-tree": "7dff762b4bcf1a168140c6c69aa8180c579d8fd9", + "version": "2.0.8", + "port-version": 2 + }, { "git-tree": "10196c7185540fa8faccc2f3afcce7be58ab5a1f", "version-string": "2.0.8", diff --git a/versions/e-/ecsutil.json b/versions/e-/ecsutil.json index 2ca0f3a19ec636..1b4d83d19db975 100644 --- a/versions/e-/ecsutil.json +++ b/versions/e-/ecsutil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1758edf3915aba62cd6eaf2c70d1401acf663175", + "version": "1.0.7.15", + "port-version": 4 + }, { "git-tree": "9526f049f789b79ac68f8937a9af15da13de53b4", "version": "1.0.7.15", diff --git a/versions/e-/edflib.json b/versions/e-/edflib.json index 03caf49f1e1b6c..f9e78d8901e2c5 100644 --- a/versions/e-/edflib.json +++ b/versions/e-/edflib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1866b8a8e3db616811041a4f147a0dbed3db64cc", + "version": "1.24", + "port-version": 0 + }, { "git-tree": "161f6ffc0519e0944bce2573bbfb7ed800899690", "version": "1.21", diff --git a/versions/e-/entityx.json b/versions/e-/entityx.json index 2d7bb14ca30960..1545ee642cc2e7 100644 --- a/versions/e-/entityx.json +++ b/versions/e-/entityx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ad5351451933af0b68354f8ff7f018017c48d5c5", + "version": "1.3.0", + "port-version": 5 + }, + { + "git-tree": "e642d746ab67cfffbde02f5a78c2f5ee7acf635e", + "version": "1.3.0", + "port-version": 4 + }, { "git-tree": "191e57655630e9862440dd860de69d4baa62b089", "version-string": "1.3.0", diff --git a/versions/f-/fadbad.json b/versions/f-/fadbad.json index 8c67fe49e2ed4b..3810de5f1b3e5d 100644 --- a/versions/f-/fadbad.json +++ b/versions/f-/fadbad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a607ac03a90c00969c67d2ec609924e9b80795bc", + "version": "2.1.0", + "port-version": 2 + }, { "git-tree": "508423e28f6d567501bcfe9e8733627dcb9df7ec", "version-string": "2.1.0", diff --git a/versions/f-/fast-float.json b/versions/f-/fast-float.json index 9746b0c04462ae..9ac6b5683aa2f8 100644 --- a/versions/f-/fast-float.json +++ b/versions/f-/fast-float.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b3850e475298431083406c88bd1ced0a0c6e740", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "90a05053bff1f356dc27f0227210840d8a26ef27", "version": "3.11.0", diff --git a/versions/f-/fastfeat.json b/versions/f-/fastfeat.json index 7a85559db81658..3fe8b2057caedf 100644 --- a/versions/f-/fastfeat.json +++ b/versions/f-/fastfeat.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "358fa85ceb7b5e03878d6a14880e2ea990f19b70", + "version-string": "391d5e9", + "port-version": 4 + }, + { + "git-tree": "541afe72f533ebfd48289a605d3d6652245a7196", + "version-string": "391d5e9", + "port-version": 3 + }, { "git-tree": "c6df4d7e64a7c9cb69a300aa50f62e2fbb261138", "version-string": "391d5e9", diff --git a/versions/f-/fastgltf.json b/versions/f-/fastgltf.json index e1307bb6d6f24d..d88e24b5e52544 100644 --- a/versions/f-/fastgltf.json +++ b/versions/f-/fastgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fdd22bd96978abf4f7d8b8fef6406eb8d79ec3f", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "b74244ec99460cdaf1e81a401e423fe6975ce252", "version": "0.4.0", diff --git a/versions/f-/fastlz.json b/versions/f-/fastlz.json index d8485dc2c2cfb4..6b5542bca5b905 100644 --- a/versions/f-/fastlz.json +++ b/versions/f-/fastlz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c0b4a47d599f386343ef30714e7ad2757c07e969", + "version-date": "2021-05-10", + "port-version": 2 + }, + { + "git-tree": "85820ff391f7eb605232c0ae7e8db844ff8a4f18", + "version-date": "2021-05-10", + "port-version": 1 + }, { "git-tree": "638b6220eb5ca72dae00fb3b8bdd19834cf6b938", "version-date": "2021-05-10", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index 8b7d8d0814e09c..48c486088aec55 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2d64bc038a30ea7ad49dc5cb923c0e13618281c", + "version": "2.7.0", + "port-version": 1 + }, { "git-tree": "7a1b9df69d8a4219b390a65056d837dc6c0f385c", "version": "2.7.0", diff --git a/versions/f-/fbgemm.json b/versions/f-/fbgemm.json index 5f34b896ff21e9..33cf5cea75faf6 100644 --- a/versions/f-/fbgemm.json +++ b/versions/f-/fbgemm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e19b797fb42fad6dae0f9aca0890ddc62535800f", + "version": "0.4.1", + "port-version": 0 + }, { "git-tree": "e3afaf099d4759d2d2a57caccb7d54ca2d5b2359", "version-date": "2021-03-18", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 49f8193e4889ed..287b0be4cf8b66 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4ad62e4d34a61f43fee3a61b14aae377ed73249a", + "version-string": "2023.05.15.00", + "port-version": 0 + }, + { + "git-tree": "74805d5c9147b3255703cdce511d9082cdfee016", + "version-string": "2022.03.21.00", + "port-version": 3 + }, { "git-tree": "60135cc9f7a4bf698b67d275e1ad66a542d9acb4", "version-string": "2022.03.21.00", diff --git a/versions/f-/fdlibm.json b/versions/f-/fdlibm.json index 51bdc1f0d1187f..8b80e1e0c403ae 100644 --- a/versions/f-/fdlibm.json +++ b/versions/f-/fdlibm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b557ee44621e4f2935b37aee54d24addcbb418d2", + "version": "5.3", + "port-version": 7 + }, + { + "git-tree": "7b714eec8a6d6d491d3efa59688b7cc94bacf460", + "version": "5.3", + "port-version": 6 + }, { "git-tree": "7edc287bacd598a942ca6b29ed47329204b07faa", "version-string": "5.3", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 378a0a9d512b14..efe42e22b5d422 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a23ec27bf6a069ab7b60cc7c3b890a9224bf341c", + "version": "3.3.10", + "port-version": 6 + }, { "git-tree": "8dcd10c7fca8d58af1f601a45a74148942cff752", "version": "3.3.10", diff --git a/versions/f-/fineftp.json b/versions/f-/fineftp.json new file mode 100644 index 00000000000000..44056b036ad197 --- /dev/null +++ b/versions/f-/fineftp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "379dd5cfe0c3cad96197e14aa9782daf51daca3d", + "version": "1.3.4", + "port-version": 0 + } + ] +} diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 3f1788bbeee13c..b3dc373275aff7 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "81e1764f1bcde018ea8a73fc36c4f4d14b03e978", + "version-string": "2023.05.15.00", + "port-version": 0 + }, + { + "git-tree": "df45ebd305a5416215667058e31729d6f28f7b64", + "version-string": "2022.10.31.00", + "port-version": 1 + }, { "git-tree": "aa78418cc3a270fb236d03b946e1658feabd19dc", "version-string": "2022.10.31.00", diff --git a/versions/f-/flashlight-cpu.json b/versions/f-/flashlight-cpu.json index 9f6e60debc4b82..8b648b3f5c662f 100644 --- a/versions/f-/flashlight-cpu.json +++ b/versions/f-/flashlight-cpu.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fdd9cc7867f46f759c1376e35cd098e79a8adacd", + "version": "0.3", + "port-version": 5 + }, + { + "git-tree": "39bf5a47d9bf74db777caf107115e55fdedcf98e", + "version": "0.3", + "port-version": 4 + }, { "git-tree": "217b238dc2abf773a66a004f21d4c89dcc9324e3", "version": "0.3", diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json index 3c6f29741703fd..9b4d91f07631ac 100644 --- a/versions/f-/flashlight-cuda.json +++ b/versions/f-/flashlight-cuda.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c6d4ea65707f91031fb354aaeb2c76897256d861", + "version": "0.3", + "port-version": 6 + }, + { + "git-tree": "97fa08fe5524aef7cbaa3d1b428d2b65245f2708", + "version": "0.3", + "port-version": 5 + }, { "git-tree": "0c59cec24c52379832bb5b227963c0b6681346a7", "version": "0.3", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 461dd091ff3ce6..63792a3928a741 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "787f5c089a87c5896ef5f0f8b200de1d1081158c", + "version": "23.5.9", + "port-version": 0 + }, { "git-tree": "007f5be0ca9f1fb0e4cd747153edafe584f3e090", "version": "23.3.3", diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 449d3ae8fcc9c8..11c6a4a8a48fc5 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "a231eef7e805676077c2db021b773fbe143413b2", + "version": "3.2.3", + "port-version": 0 + }, + { + "git-tree": "2a59e268b884b19cbc93cb11f25d838af9c09f17", + "version": "3.2.2", + "port-version": 1 + }, + { + "git-tree": "912f444db03f6f652a404608a75df8fed734a701", + "version": "3.2.2", + "port-version": 0 + }, + { + "git-tree": "800db7e769bc8e59e56d9e7aeac0b5e48ab928f8", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "e1672e3bbd728fbe2c7e652160e5fd0f714e40eb", "version": "3.2.0", diff --git a/versions/f-/flint.json b/versions/f-/flint.json index ea685f8d13c5d6..315b3b2209a36e 100644 --- a/versions/f-/flint.json +++ b/versions/f-/flint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76d3f8bbb7b1b87a907a338070bfd83938c66986", + "version-semver": "2.8.0", + "port-version": 2 + }, { "git-tree": "26e57956bebf9fb602b989791e663db8cd4f686b", "version-semver": "2.8.0", diff --git a/versions/f-/fluidlite.json b/versions/f-/fluidlite.json index 851b6938569ce1..c171f4b2267ce3 100644 --- a/versions/f-/fluidlite.json +++ b/versions/f-/fluidlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cb547c733a48a1c7448c6db9e22432bca431ea6", + "version-date": "2023-04-18", + "port-version": 0 + }, { "git-tree": "280ded5f814d25cc6db5336f016ed4e26b704ffe", "version-date": "2020-08-27", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 2ea7668d772db4..0a9e45fe3d6eee 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "eb9b815d5af8da59d2cb5a42361a9c88e7d6a1f4", + "version": "2.3.2", + "port-version": 2 + }, + { + "git-tree": "0deaa03650b97bd28bcaa13d05fb3502f8651e48", + "version": "2.3.2", + "port-version": 1 + }, + { + "git-tree": "f52a32808a5cca54bfe78d97e3201abce4dc7c34", + "version": "2.3.2", + "port-version": 0 + }, { "git-tree": "f7f1e0961e62f96d41646e7eb07ac177e5b240e2", "version": "2.3.1", diff --git a/versions/f-/fmem.json b/versions/f-/fmem.json index 7f4d3a6ae2e4bc..58781db39cb83c 100644 --- a/versions/f-/fmem.json +++ b/versions/f-/fmem.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "167b469ebdee2b6b9400980dba003882576bc803", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 3 + }, + { + "git-tree": "c55d5bf565b64649e07fab3056d5f8cbc802f9ae", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 2 + }, { "git-tree": "eedcb4d269e8f834eaeaceb6fd3b3f477c46b8b4", "version-string": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fmilib.json b/versions/f-/fmilib.json index 756e21d91a92ad..4d03231980f0ff 100644 --- a/versions/f-/fmilib.json +++ b/versions/f-/fmilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e875efe56416de71aa671c57a77817c67290f0a9", + "version": "2.4.1", + "port-version": 2 + }, { "git-tree": "aa8b7d569a23fd953d1e4de558a034a6d9f95e33", "version": "2.4.1", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 5f084dead50d06..ed8f0bb0f2d06c 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eedb31bb1318118ec6a2d1bec60ab12e484092fd", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "3f452404270b508daf355b72031ad3ee7d0d5751", "version": "9.1.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 0fe1e279252448..0f7897a64cf4d3 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "691eb72c1ad244629c0993986a9f33240afa4710", + "version-string": "2023.05.15.00", + "port-version": 0 + }, + { + "git-tree": "003ae8b1bc9dc0a460b5c6f6cacda76fa5931cf8", + "version-string": "2022.10.31.00", + "port-version": 7 + }, + { + "git-tree": "204d88dbc53dc5ff37c58459c1af0c6f19f446db", + "version-string": "2022.10.31.00", + "port-version": 6 + }, + { + "git-tree": "2be8536b3faaf9f907284548e4db1f49b77054c1", + "version-string": "2022.10.31.00", + "port-version": 5 + }, { "git-tree": "9f031566a728d2a7adf76c1026324cfc993b02a6", "version-string": "2022.10.31.00", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 660cf3064be354..00a989f7054357 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26490bc4c9aa1377da98980ba6e1089525fdaa55", + "version": "2.14.2", + "port-version": 0 + }, { "git-tree": "b97a0d2144c26df38257732da8e15f133a084782", "version": "2.14.1", diff --git a/versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json index 735e3eff8e2b7a..1bd9d34210d172 100644 --- a/versions/f-/foonathan-memory.json +++ b/versions/f-/foonathan-memory.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "815422e5bf77feefa4e1c277832d307b6bb47438", + "version-date": "2019-07-21", + "port-version": 4 + }, + { + "git-tree": "9741bb189e28cb460ce563613aa3857e19fb9d0d", + "version-date": "2019-07-21", + "port-version": 3 + }, { "git-tree": "6e97aca605e065b0df1adaed316adc03d63b6334", "version-string": "2019-07-21", diff --git a/versions/f-/forge.json b/versions/f-/forge.json index 73230e6b98b099..e0b71ea863a4aa 100644 --- a/versions/f-/forge.json +++ b/versions/f-/forge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "020557ffe8bd7c66464eb1a19eb1a67b3151aa25", + "version-semver": "1.0.8", + "port-version": 3 + }, { "git-tree": "9d711924c7973e7f5fe16131a16b90b2317caf9e", "version-semver": "1.0.8", diff --git a/versions/f-/fp16.json b/versions/f-/fp16.json index 2785c93e5b7465..f84859f4423497 100644 --- a/versions/f-/fp16.json +++ b/versions/f-/fp16.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "387e9258cbd17b68a16e44b7fcd6bf20662aa7b1", + "version-date": "2021-02-21", + "port-version": 2 + }, + { + "git-tree": "99eb0d42bcecc27ff7831a478884bd84a5138563", + "version-date": "2021-02-21", + "port-version": 1 + }, { "git-tree": "849acf1f87e0194fda4cd5459e51c564874c60ed", "version-date": "2021-02-21", diff --git a/versions/f-/freeopcua.json b/versions/f-/freeopcua.json index 1ee029185b51db..f30ef68baa8b04 100644 --- a/versions/f-/freeopcua.json +++ b/versions/f-/freeopcua.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "adfdfa8138aa47929d7e6f1e03809d00c6bf8aa2", + "version": "20190125", + "port-version": 7 + }, + { + "git-tree": "3a355dca9d180e973ffaf9ab282c03575d75aa86", + "version": "20190125", + "port-version": 6 + }, { "git-tree": "15fe1dbb4b4b3283072825b22ef29acdf5835950", "version-string": "20190125", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index 0e74040b060124..bd11fbff9fd5fe 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a356f56c15dd0a66094c00cc35670791c545027e", + "version-date": "2022-01-17", + "port-version": 2 + }, { "git-tree": "c966935c663878c91381818cae1b87590be48191", "version-date": "2022-01-17", diff --git a/versions/f-/freexl.json b/versions/f-/freexl.json index 4f24d7422fd4a2..27aa41217d5f81 100644 --- a/versions/f-/freexl.json +++ b/versions/f-/freexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ffd19cd7345be08a7b93d1d4c806d27b98a83ef", + "version": "1.0.6", + "port-version": 2 + }, { "git-tree": "fa2b9775bc6c9594fc2f67ace1e80f54def8efe9", "version": "1.0.6", diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 25b26fc8e3dc3d..251f3791eb670c 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e69be1052699ec7fee92c1aaf9b4c1e66f9d47ef", + "version-semver": "4.1.1", + "port-version": 0 + }, { "git-tree": "acaddb4b8448c853dac8d132d591fd8062692ae8", "version-semver": "4.0.0", diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index f0118ceec51184..238f1da57a9302 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e4ad257a93efebb34ffabde85fa4a548d5038706", + "version": "1.1.0", + "port-version": 4 + }, + { + "git-tree": "61df7f37f44d59355e0ded6bb1241924a44143c8", + "version": "1.1.0", + "port-version": 3 + }, + { + "git-tree": "c640d5d8ccd519f8217444cc50a2ab3426e5de95", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "b768a3659402920019edfe8455e08e350743bd78", "version": "1.1.0", diff --git a/versions/f-/fxdiv.json b/versions/f-/fxdiv.json index faae1bc5eb42cc..4c8b464b84c8b2 100644 --- a/versions/f-/fxdiv.json +++ b/versions/f-/fxdiv.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "409284eafee5c5712bbf7c9efa301a12824d094f", + "version-date": "2021-02-21", + "port-version": 2 + }, + { + "git-tree": "c00d510e636391fa33a1fcb52c1e767f00a7aecf", + "version-date": "2021-02-21", + "port-version": 1 + }, { "git-tree": "58ee7e759479e81a3218ff4d5efb8ada40c40d65", "version-string": "2021-02-21", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index 34e9d0dfa836f5..19caa853b1a26a 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fb61dcf5596f2a9212644c4ac8736831b7448ba5", + "version-date": "2020-02-07", + "port-version": 4 + }, + { + "git-tree": "3c19fe8da1b3f679aa832330cd4ef565c0ee45dc", + "version-date": "2020-02-07", + "port-version": 3 + }, { "git-tree": "4fb8813de02bd243b25d9ed93065f9f9cba09e93", "version-string": "2020-02-07", diff --git a/versions/g-/gamma.json b/versions/g-/gamma.json index f507b7da0b9e69..0cdda4722217d1 100644 --- a/versions/g-/gamma.json +++ b/versions/g-/gamma.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dfa73b7b224977c60e757cd9eaa286c6db2bd90d", + "version-string": "gamma-2018-01-27", + "port-version": 6 + }, + { + "git-tree": "c81bf8a72f815cb3feaf26e0f8e82032bdb62e88", + "version-string": "gamma-2018-01-27", + "port-version": 5 + }, { "git-tree": "335e66b704d42844b1fef58f31a05545aec2e328", "version-string": "gamma-2018-01-27", diff --git a/versions/g-/gasol.json b/versions/g-/gasol.json index f9e5c97d4e0669..d949a04b0b1408 100644 --- a/versions/g-/gasol.json +++ b/versions/g-/gasol.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f6963a5230e144f34c86f0b846d028567859449f", + "version-date": "2018-01-04", + "port-version": 4 + }, + { + "git-tree": "70bdc4eeb2b24a5b03dcd34b2a2d507a96e23d7e", + "version-date": "2018-01-04", + "port-version": 3 + }, { "git-tree": "50bd4cd06666ebc284bb8d8157057c5a451bc11d", "version-date": "2018-01-04", diff --git a/versions/g-/gaussianlib.json b/versions/g-/gaussianlib.json index 231aa36b0dd7f1..eab7a7d0d8c9ac 100644 --- a/versions/g-/gaussianlib.json +++ b/versions/g-/gaussianlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3e4e44965a910829b7c5872bec340826e2c4559", + "version-date": "2019-08-04", + "port-version": 2 + }, { "git-tree": "9cce82b2b2013b0ccc2b2f3e827cd5911f9a473d", "version-string": "2019-08-04", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 0aa04293a7a032..a067e14cfef789 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "f287b8dfcfba6e4f2d8ee8cdba0e63f0ae326fd7", + "version-semver": "3.7.0", + "port-version": 2 + }, + { + "git-tree": "119c87c321a3a925253f5503cfac1e6960d5923e", + "version-semver": "3.7.0", + "port-version": 1 + }, + { + "git-tree": "befcd2fe67a87498bfdaea5601b58f120e984038", + "version-semver": "3.7.0", + "port-version": 0 + }, + { + "git-tree": "f83039e70646a59b782781b3c805f276fb4c72be", + "version-semver": "3.6.4", + "port-version": 0 + }, { "git-tree": "fd3b78eb622e4b5f176e4c72cb9aa855f1e6d985", "version-semver": "3.6.3", diff --git a/versions/g-/gdcm.json b/versions/g-/gdcm.json index 09eb12e926990e..092b7ba49a5c10 100644 --- a/versions/g-/gdcm.json +++ b/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4083ad5a17c338266c7e0b74adf6126c55112b0d", + "version": "3.0.22", + "port-version": 0 + }, { "git-tree": "cb3870f85a108727ba53c35d59633f9d6fdb4c4e", "version": "3.0.12", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index a8ff76d0c14b9d..65c8e7afd712fb 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39ca957973ae4f5cbeb0e658172c079e6ad0362c", + "version": "2.42.10", + "port-version": 0 + }, { "git-tree": "a2c86123a10143a8df7fe450b82a5f018a28058f", "version": "2.42.9", diff --git a/versions/g-/genann.json b/versions/g-/genann.json index 84c36d720cc160..79146466e3fb9d 100644 --- a/versions/g-/genann.json +++ b/versions/g-/genann.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "06697b312b624b447c7f8c4ba48e82ce6528883c", + "version-date": "2019-07-10", + "port-version": 3 + }, + { + "git-tree": "0f58751b97524c749b52f3953abab3cb9e962edc", + "version-date": "2019-07-10", + "port-version": 2 + }, { "git-tree": "74f4d685e744a09163c7bfcf502e3facc2d9bf95", "version-string": "2019-07-10", diff --git a/versions/g-/geos.json b/versions/g-/geos.json index a964fb43fbdb9b..541800bb851174 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e3173bfbaacdb8fee9ac698f0b6dc668136ed9b", + "version": "3.11.2", + "port-version": 0 + }, { "git-tree": "1f2b8b7ba62c8e0ca9e17f7ac5a2312c559eb547", "version": "3.11.1", diff --git a/versions/g-/getopt.json b/versions/g-/getopt.json index a0183d27f45163..aecd5566a19312 100644 --- a/versions/g-/getopt.json +++ b/versions/g-/getopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba541c1ce4012fae6dfdf34021b03d7253235b24", + "version": "0", + "port-version": 3 + }, { "git-tree": "be2552adc01c2ba30044325925f7348121de5c3d", "version-string": "0", diff --git a/versions/g-/gettext-libintl.json b/versions/g-/gettext-libintl.json new file mode 100644 index 00000000000000..f11756e85221c2 --- /dev/null +++ b/versions/g-/gettext-libintl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "783d7b1a2ddaf29b0f1a2d785ccfbb4a05615667", + "version": "0.21.1", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index 93a76292efec2f..cfe3eb9fe5d6e6 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cc01d324fb1fc9a461212e5577ec9897d7da345", + "version": "0.21.1", + "port-version": 1 + }, { "git-tree": "4c583e9adc3ab9a044b241466cebedf162cdc410", "version": "0.21.1", diff --git a/versions/g-/gettimeofday.json b/versions/g-/gettimeofday.json index 3dc3c259ef98ae..48ec6f483e00d8 100644 --- a/versions/g-/gettimeofday.json +++ b/versions/g-/gettimeofday.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "31b00a1043898e49c04087100294c10d37094e8d", + "version-date": "2017-10-14", + "port-version": 6 + }, + { + "git-tree": "2e68f17377612bdb5d084079d8d1376f696bb4a6", + "version-date": "2017-10-14", + "port-version": 5 + }, { "git-tree": "c39979379abaf1ecee42cbae6e83d68cfb201f13", "version-string": "2017-10-14", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index e20ff41292fc09..e513632c9a7344 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1c57a920065312afe80b1b8a3595f82005da61ee", + "version": "2.2.2", + "port-version": 7 + }, + { + "git-tree": "8231f09b610ad8610fbbdcbb53fc9bb32af807a7", + "version": "2.2.2", + "port-version": 6 + }, { "git-tree": "7c1fe35b0a7e9b5b9f58b16c6cc08caa108fb945", "version-string": "2.2.2", diff --git a/versions/g-/gl2ps.json b/versions/g-/gl2ps.json index 87cc00eaf6f538..57909dbef9b3d2 100644 --- a/versions/g-/gl2ps.json +++ b/versions/g-/gl2ps.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3607998f92ba0e61fbcae891aa6a8aa996e3bf0a", + "version": "1.4.2", + "port-version": 3 + }, + { + "git-tree": "65c00e3d59f426a74f7696bebc18ca8cf441c20d", + "version": "1.4.2", + "port-version": 2 + }, { "git-tree": "25f89a8ea4ae01f360444c1583dc6549d3857966", "version-string": "1.4.2", diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json new file mode 100644 index 00000000000000..e015cce5a4348e --- /dev/null +++ b/versions/g-/glaze.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "ccae5c60306415e7f7bd44e4ebb91b972b550c10", + "version": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "16c37a75de3f8e60dca6acec5bb868b869cb7e76", + "version": "1.2.2", + "port-version": 0 + }, + { + "git-tree": "e4e6b08e9aa73b948606044ed5c5c95c471a8f1f", + "version": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/versions/g-/glew.json b/versions/g-/glew.json index 48da5827673c34..f101a18176ec84 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "cfd894e57985fdb9c772bbf28a4aa261759bb6ac", + "version": "2.2.0", + "port-version": 3 + }, + { + "git-tree": "1fbf96a084cd511f49fa7f7009b56bd3d3361fb0", + "version": "2.2.0", + "port-version": 2 + }, + { + "git-tree": "90dfc684e6af42587e36df4e2167d7420424e829", + "version": "2.2.0", + "port-version": 1 + }, { "git-tree": "3211ed09c36542372ab3f1f690a42e2edbb072bc", "version-string": "2.2.0", diff --git a/versions/g-/gli.json b/versions/g-/gli.json index bf68470d3fbaa8..e01c2e7624494e 100644 --- a/versions/g-/gli.json +++ b/versions/g-/gli.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7505483cb3f7c8f2a8b1c1fccd460687cac6dbf3", + "version-date": "2021-07-06", + "port-version": 2 + }, + { + "git-tree": "773ce8321a978f3dcbdb0755a666715ad00f7b01", + "version-date": "2021-07-06", + "port-version": 1 + }, { "git-tree": "c8960dd5e56bd32e4cd09edacd38a7a311e05fcd", "version-date": "2021-07-06", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index b31633e66d2392..c43230b997fc3b 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "219fb684c85e933ff56764423c86055a7a23ee62", + "version": "2.76.2", + "port-version": 0 + }, + { + "git-tree": "82258d825872b8c0987fe62b759b7602edbed17b", + "version": "2.76.1", + "port-version": 1 + }, + { + "git-tree": "c44e4f3f2265fbdb713b8fecc8dd15418d99021e", + "version": "2.76.1", + "port-version": 0 + }, { "git-tree": "e08d2fbb65a5c4cb8a38c83726b35fe5f89dc785", "version": "2.76.0", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 24f9c0a6fe89ce..356dec298462f3 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16125400e378b3a45ff56a2f26573d9312ead0d1", + "version": "2.76.0", + "port-version": 0 + }, { "git-tree": "d633ca7a15a77e20cdf515ba74448d59f4e49021", "version": "2.74.0", diff --git a/versions/g-/globjects.json b/versions/g-/globjects.json index 75340cf939c43f..ad69ec0d2ce6f8 100644 --- a/versions/g-/globjects.json +++ b/versions/g-/globjects.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8ec42a207e240c2fa9d6d2a2b9e794a39ff60784", + "version": "1.1.0", + "port-version": 6 + }, + { + "git-tree": "fb8535a1b4b8e4068db9e102a11c3931c4db22ed", + "version": "1.1.0", + "port-version": 5 + }, { "git-tree": "0d9e98af47d7eb383a98e39c5661e573b1197e8c", "version-string": "1.1.0", diff --git a/versions/g-/gloo.json b/versions/g-/gloo.json index ca6fac1e07ad98..e3983a9d935c5d 100644 --- a/versions/g-/gloo.json +++ b/versions/g-/gloo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a48ea12e9618f830268147a2c05fc65769182f0d", + "version": "20201203", + "port-version": 2 + }, + { + "git-tree": "bd6e28e31f8b5d76a887e8b284c63596b9ffd65b", + "version": "20201203", + "port-version": 1 + }, { "git-tree": "18761f45d66d3eae3a73891f39142bbae80460b8", "version-string": "20201203", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 12a96cb24f6e22..1f3981a6131ae7 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aaa917d7743ac6e466f2d4ecf20b5745cd44fe98", + "version": "12.2.0", + "port-version": 0 + }, { "git-tree": "a2bca93dc0c41e31d464bfed8b2057bdc155abcb", "version": "12.1.0", diff --git a/versions/g-/glui.json b/versions/g-/glui.json index 00a7d98d6a4fbd..f1ed1ccb03fbfa 100644 --- a/versions/g-/glui.json +++ b/versions/g-/glui.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5fb1a005d3f676d62e974dbb3b96dba5c3c7369a", + "version-date": "2019-11-30", + "port-version": 3 + }, + { + "git-tree": "09f3f7fe385d4a84c2b987c3b233a3279837c05f", + "version-date": "2019-11-30", + "port-version": 2 + }, { "git-tree": "435b850a183a1fe599f56df300530e81c107cdfa", "version-string": "2019-11-30", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index be91778a8186bb..c22207fd2438f5 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6db1f443a21e7c2f4004f8039b562ca1506f966c", + "version": "3.2.6", + "port-version": 5 + }, + { + "git-tree": "05c799167bca25a0ed69cf87d63cfe087a5daa83", + "version": "3.2.6", + "port-version": 4 + }, { "git-tree": "84aa2f50c54bb6f9bff5623b67ec8b7c2e427cbd", "version": "3.2.6", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index ff76049a795e91..0b5fa719d94f14 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efae5abe8271dc5c25bfa47b9cc146a29e02dc05", + "version": "6.2.1", + "port-version": 18 + }, { "git-tree": "82d0d40ea6ffa93a17c696a2c2fac9a436d67958", "version": "6.2.1", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index e9f5654798e570..45f3f66d2259bc 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "47ab422de57e980b1294daf095a942d3ea36ae98", + "version": "1.72.0", + "port-version": 3 + }, + { + "git-tree": "1c57bf1b1ead704fc0899cb496732c42e5330cc4", + "version": "1.72.0", + "port-version": 2 + }, { "git-tree": "a74d57d679dac22f5b60c5b7da97cad7ecb3d0fb", "version": "1.72.0", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index bc3128a1529524..22c7f8e1d1ed4b 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3c69ec65e243e929646ca08f0697849d2d78191", + "version": "2.10.0", + "port-version": 0 + }, { "git-tree": "4f9ab675a9cb385078d01716543e99db9a95135a", "version": "2.9.0", diff --git a/versions/g-/gperf.json b/versions/g-/gperf.json index 9421e9188f6486..fe49fb61d3a6af 100644 --- a/versions/g-/gperf.json +++ b/versions/g-/gperf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1dc7145f2a0607798bfdaede7bf064b88e908ac", + "version": "3.1", + "port-version": 5 + }, { "git-tree": "2fd0763af6d1af5d123d81c77fe9062d33b3e918", "version": "3.1", diff --git a/versions/g-/gperftools.json b/versions/g-/gperftools.json index 426994d614f97f..25059fb3c11f6b 100644 --- a/versions/g-/gperftools.json +++ b/versions/g-/gperftools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6296ad4ccaeca6a3f7747fc173c78cb8f21b095", + "version-date": "2019-09-02", + "port-version": 4 + }, { "git-tree": "cc4a899d2089a6a683a2cbc8fc5ab6dae3fc45de", "version-date": "2019-09-02", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index ace90f30986f83..5c49f3ad329f51 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abffc31a5c8762671618bdca4bbcd620e171f6d1", + "version": "1.10.8", + "port-version": 2 + }, { "git-tree": "e8c7b10cc1bdcca2e09b0f42da6ad645699680a9", "version": "1.10.8", diff --git a/versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json index 696ce14ce59dbd..034b473ce63261 100644 --- a/versions/g-/graphicsmagick.json +++ b/versions/g-/graphicsmagick.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a4995e38b85cfc409f1a61561fde3bada483c23a", + "version": "1.3.37", + "port-version": 3 + }, + { + "git-tree": "7f5570af30ba3e4d38341fc16ae5fa98b2145f03", + "version": "1.3.37", + "port-version": 2 + }, { "git-tree": "c6ed21bf630e77483e7df659e7fd65eeefc6b543", "version": "1.3.37", diff --git a/versions/g-/gsl-lite.json b/versions/g-/gsl-lite.json index 8a386430a6930c..eaa588c4af33cf 100644 --- a/versions/g-/gsl-lite.json +++ b/versions/g-/gsl-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac07f676c563a519da1342d50de8cd9db68ac09f", + "version": "0.41.0", + "port-version": 0 + }, { "git-tree": "8d3c1399fe44414aaf2c88d845b8c03bfdb66d46", "version": "0.40.0", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index c80bd88015351d..d01dca2821a74d 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "533b0147bfc479e315c3dc4c181675c302272ae4", + "version": "2.7.1", + "port-version": 3 + }, + { + "git-tree": "c9aa024bd4ce8327328a818b75cc6188de15ddd2", + "version": "2.7.1", + "port-version": 2 + }, { "git-tree": "0bf0e1015fe68141e3c5d0b6777c2d38c352b72d", "version": "2.7.1", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 0e954569926e0b..1077ebdd934f1e 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85ca43c538fdb1f41292003c458eb209a1478906", + "version": "1.20.5", + "port-version": 1 + }, { "git-tree": "6bde18badd06f4466ca4cb75b83aa98b1f24f3bd", "version": "1.20.5", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index cbb67a1cff052e..7dc1235b990ab8 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "f4fa840c6345c1b7bf4c35e2977ed3f680d6584a", + "version": "1.20.5", + "port-version": 8 + }, + { + "git-tree": "877a4687de4ef7b958624b55a558f91b4b34c32b", + "version": "1.20.5", + "port-version": 7 + }, + { + "git-tree": "631b03d07848f5a632168da7e3f9e1bc753d4085", + "version": "1.20.5", + "port-version": 6 + }, + { + "git-tree": "86757cb6fd9f50813cadb3779f1096fe1377eef9", + "version": "1.20.5", + "port-version": 5 + }, + { + "git-tree": "084ea66aed42ba882e19b103de4042d676be1530", + "version": "1.20.5", + "port-version": 4 + }, { "git-tree": "e9724606bfcc594bbdde72fbcba7fbd019312ae6", "version": "1.20.5", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index f6f1792372c007..79c4e4c2ac7d42 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f6542974036eeeb96bcfa2f343a58dc9a07c54b3", + "version": "4.10.3", + "port-version": 0 + }, + { + "git-tree": "416961a907f2f0412d4d59517a904d06b4985ffb", + "version": "4.10.1", + "port-version": 0 + }, + { + "git-tree": "52d572bf77d0fa30174893ca6fe1bf6c17935cb2", + "version": "4.6.8", + "port-version": 2 + }, { "git-tree": "cadf0f3efc6e75b1a1978f5c29126ffaf4a75c8c", "version": "4.6.8", diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index 058310ffa5242e..af1ed2e08b3a12 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f4e197166d448971a8856734debc428f05b456cb", + "version": "3.24.37", + "port-version": 0 + }, + { + "git-tree": "93a006967f4d1c6e3ce8409cd1a134f81c2b1288", + "version": "3.24.36", + "port-version": 0 + }, { "git-tree": "0c25a1f1fc2d3f166ea007a97b845fb85769588e", "version": "3.24.34", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index ef30294f4e9e46..59e00717c13036 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5bede7b8a7ab28981640b17d73708e710c5e8701", + "version": "4.10.0", + "port-version": 0 + }, + { + "git-tree": "c20c4893b7e0aada402db3895d38d840123ae8c5", + "version": "4.6.0", + "port-version": 2 + }, + { + "git-tree": "8adcadbba0b316ce33796f84c2fe878c9f2cfa94", + "version": "4.6.0", + "port-version": 1 + }, { "git-tree": "f39d8f061ae7242baf2b1b78b76253b2ee21c936", "version": "4.6.0", diff --git a/versions/g-/gtl.json b/versions/g-/gtl.json index bc8ed1da425861..d78d1194f43e2d 100644 --- a/versions/g-/gtl.json +++ b/versions/g-/gtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1da92945b6f2d37dbf8c5e8f2c7804d7f02080fb", + "version": "1.1.8", + "port-version": 0 + }, { "git-tree": "1e858eb1464aecbfd828e88515da6c75dc9277bd", "version": "1.1.5", diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json new file mode 100644 index 00000000000000..865ab42b8c574e --- /dev/null +++ b/versions/g-/gz-cmake3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a1a12dbb8647dbc12381aa63fe0c66c48e2b4b31", + "version": "3.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-math7.json b/versions/g-/gz-math7.json new file mode 100644 index 00000000000000..7574a7ada977ae --- /dev/null +++ b/versions/g-/gz-math7.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "687462541825396052367baec48a08e4657d63d4", + "version": "7.0.2", + "port-version": 1 + }, + { + "git-tree": "13b399f38d70db748d1babf9296d2a4fc80dc302", + "version": "7.0.2", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-tools2.json b/versions/g-/gz-tools2.json new file mode 100644 index 00000000000000..0a73dc150980da --- /dev/null +++ b/versions/g-/gz-tools2.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "31343bbe7d8ae7e4bfaa5bf8e7a29dc653d98acc", + "version": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "10058238d27070a39c55eeb9ec6a4e5246a9f853", + "version": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-utils2.json b/versions/g-/gz-utils2.json new file mode 100644 index 00000000000000..6b2613885f6b46 --- /dev/null +++ b/versions/g-/gz-utils2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "427940c7d970bbcefb22b7930dd1196a90e42bc9", + "version": "2.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gzip-hpp.json b/versions/g-/gzip-hpp.json index c9f7c1d17a232e..30c3c2fa027349 100644 --- a/versions/g-/gzip-hpp.json +++ b/versions/g-/gzip-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "384745bc1f743b41fc1973ac4efefa82fea5d46c", + "version": "0.1.0", + "port-version": 2 + }, { "git-tree": "fa20c97f9bdf61c0adf326307bfeda1b24babfb1", "version-string": "0.1.0", diff --git a/versions/h-/h5py-lzf.json b/versions/h-/h5py-lzf.json index 1339053f389e86..25f03b4dfdce21 100644 --- a/versions/h-/h5py-lzf.json +++ b/versions/h-/h5py-lzf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bc038605ccbdc888df201ec6296f442e1b47c42a", + "version-date": "2019-12-04", + "port-version": 3 + }, + { + "git-tree": "e8323d8d5c2ced7273acaf951f5b62c87c112008", + "version-date": "2019-12-04", + "port-version": 2 + }, { "git-tree": "9852b593ea75baeff7131615d49a46d32af54dfb", "version-string": "2019-12-04", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index 7c7a42104c5aab..2b7f677488d13c 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "747567f07492ad16950a115456d31ba746a3bd10", + "version": "15.0.0", + "port-version": 1 + }, { "git-tree": "1d7e84604e36eb833964af361772ebcf5e3953c5", "version": "15.0.0", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 73c49c48977015..495a0b63c4b6f6 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6715cbef7e30e10a6888a737e49a3f971b08f24c", + "version": "7.2.0", + "port-version": 0 + }, + { + "git-tree": "e5129b8eb8c89bcf3564adce7328ed5fd5548794", + "version": "7.1.0", + "port-version": 0 + }, { "git-tree": "74d44792360393e3c1fee924def05c9d21a5fe3d", "version": "7.0.0", diff --git a/versions/h-/hayai.json b/versions/h-/hayai.json index a5fa0b26bb053c..f446e905c7365a 100644 --- a/versions/h-/hayai.json +++ b/versions/h-/hayai.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e016dbda8d2a5e66c6e9c50c6c819454fbebd341", + "version-date": "2019-08-10", + "port-version": 3 + }, + { + "git-tree": "068157b1c13d6e05c56cecb01eb18431402e69e2", + "version-date": "2019-08-10", + "port-version": 2 + }, { "git-tree": "fd5029e80c71cecda898075929dd64666be78885", "version-string": "2019-08-10", diff --git a/versions/h-/healpix.json b/versions/h-/healpix.json index a85f5293c2107b..ee4220febe014a 100644 --- a/versions/h-/healpix.json +++ b/versions/h-/healpix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8785aa8b74708a7614b1bcdc71f9ce46d4dca27b", + "version": "1.12.10", + "port-version": 9 + }, { "git-tree": "38bd9d397f3ba4e227f09a36ecb0af034f5f0c98", "version-string": "1.12.10", diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index 22044b723f1ad6..343bc28221845c 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef7fae56bd9bec8a3b50d4ab3f87ba7537ea330b", + "version-semver": "0.14.0", + "port-version": 0 + }, { "git-tree": "7deb8cf068244c5583ce565bf1d302b369ed622b", "version-semver": "0.13.1", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index 2c59b0b7f0774c..f121db33c680c7 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "413b1dbea0dd87e4a12a646ba12411d319e5bf38", + "version": "1.0.2", + "port-version": 5 + }, { "git-tree": "448374fa990c04aa7964508d32817a6d7868600b", "version": "1.0.2", diff --git a/versions/h-/hnswlib.json b/versions/h-/hnswlib.json index 1ed277d6806819..7bc1c41cc35de5 100644 --- a/versions/h-/hnswlib.json +++ b/versions/h-/hnswlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "497030f03d37d63ff86c9e99d24d9e8f048ea067", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "7053d263445d46410589894d921fa6c85fbf107c", "version": "0.7.0", diff --git a/versions/h-/http-parser.json b/versions/h-/http-parser.json index 8ed21169510d93..890105c8f7d614 100644 --- a/versions/h-/http-parser.json +++ b/versions/h-/http-parser.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8da57f708336be4ff2f58ab004147f01708a5cac", + "version": "2.9.4", + "port-version": 3 + }, + { + "git-tree": "efc0b81d99faca7a109c910d43816f8fc10470c9", + "version": "2.9.4", + "port-version": 2 + }, { "git-tree": "55d462cc4fb637891cc2d1dda24a9bd97c7d38f5", "version-string": "2.9.4", diff --git a/versions/h-/hungarian.json b/versions/h-/hungarian.json index 116c8e8594bfa3..ed272292fd7c2e 100644 --- a/versions/h-/hungarian.json +++ b/versions/h-/hungarian.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b5060bc0e31ae7abd3c95888c24c9f31ba691885", + "version": "0.1.3", + "port-version": 3 + }, + { + "git-tree": "32186cf61ba587da9ed75c14d0a289fbd76080b6", + "version-string": "v0.1.3", + "port-version": 2 + }, { "git-tree": "4440d428d76082b3b8af21c5eda247a33794b4ef", "version-string": "v0.1.3", diff --git a/versions/h-/hyperscan.json b/versions/h-/hyperscan.json index 432e36530ee8e7..2dfb8c0b231afb 100644 --- a/versions/h-/hyperscan.json +++ b/versions/h-/hyperscan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "174fd7953b696f08703b580901a840cc53157439", + "version": "5.4.2", + "port-version": 0 + }, { "git-tree": "72c36aba3fff7cd403bdf02ad8f691ced9da30a9", "version": "5.4.0", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 6448300dc513bb..4e944556b86fb7 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1735b83e7793135a9d1e3689f7d36475f6d5ff7", + "version": "72.1", + "port-version": 5 + }, + { + "git-tree": "1a0b575f86d37844108f940fd5f6a312a68d234c", + "version": "72.1", + "port-version": 4 + }, { "git-tree": "36a3246630c4794b3781e881e5a57db36092deea", "version": "72.1", diff --git a/versions/i-/idyntree.json b/versions/i-/idyntree.json new file mode 100644 index 00000000000000..2ad55e7fb4d5f4 --- /dev/null +++ b/versions/i-/idyntree.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "4c7bc2d8282bf918d6be1b0b63af3f4612e673ef", + "version": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "65e8740ace938a59b21dc97e30ab531c005ce399", + "version": "8.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/i-/if97.json b/versions/i-/if97.json index 0bf82e794089b0..4b7c4a44ffb9af 100644 --- a/versions/i-/if97.json +++ b/versions/i-/if97.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2177f39e3ea1add06da2e665c0e34d2f620ec9a5", + "version": "2.1.3", + "port-version": 1 + }, { "git-tree": "71c163c4d2b1ef30310ba2c87ce66fa6f616034c", "version": "2.1.3", diff --git a/versions/i-/igloo.json b/versions/i-/igloo.json index 928dbfd5ea1903..511acffc2761af 100644 --- a/versions/i-/igloo.json +++ b/versions/i-/igloo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92673b7970f94973bcdb16ac50a37555128353a0", + "version": "1.1.1", + "port-version": 2 + }, { "git-tree": "6ff1a6861322e6b0084c5f74a014a386a5e1040b", "version-string": "1.1.1", diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 1ee29b448c9e6d..f217614af800e7 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f770940cc2085c2f24a1673730fd8d642b49717f", + "version-date": "2023-05-05", + "port-version": 0 + }, + { + "git-tree": "bc5dc2fa00b5023e9f2fa1610a986e8d61874380", + "version-date": "2022-05-11", + "port-version": 2 + }, { "git-tree": "ae302700b77870b26543f2df7764304d848c198a", "version-date": "2022-05-11", diff --git a/versions/i-/ijg-libjpeg.json b/versions/i-/ijg-libjpeg.json index ab35bd7326afc5..4c3da57e5c9038 100644 --- a/versions/i-/ijg-libjpeg.json +++ b/versions/i-/ijg-libjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d413cf2a1c70df27136df1328ba1c344eb935a", + "version-string": "9e", + "port-version": 1 + }, { "git-tree": "fb37d14790c59df2657d83e21009faa54643f19d", "version-string": "9e", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index f3fd02c6bf9df9..c5b951ff357748 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68cf6847418f27dbd3ae70c557b1ef1357875fa1", + "version": "1.89.4", + "port-version": 1 + }, { "git-tree": "337ea84e098e85d4706ecdd807fe292933d9e6f8", "version": "1.89.4", diff --git a/versions/i-/indicators.json b/versions/i-/indicators.json index 014ea54588e4ce..349176c3459fbd 100644 --- a/versions/i-/indicators.json +++ b/versions/i-/indicators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8677c687ae2c0aebadf9db2535ac7af952b64661", + "version": "2.3", + "port-version": 0 + }, { "git-tree": "1f6f4a44b4af9900116de9bd567e78372d3f7278", "version": "2.2", diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index 0318e65bea9907..378898183f2eaf 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d03720b58912770380a8101fdbb729a57598a904", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "4eba82142d2afb448bc5295fe22e0849cd0f8ca7", "version-date": "2022-09-02", diff --git a/versions/i-/infoware.json b/versions/i-/infoware.json index 7c148d6b7332f6..1adf69d0776b65 100644 --- a/versions/i-/infoware.json +++ b/versions/i-/infoware.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10ceed518afc0c84b79aa36c1263a034b320511e", + "version-date": "2023-04-12", + "port-version": 0 + }, { "git-tree": "5501ab1b5d5391ca168856f073f6a46d5ea83268", "version-date": "2021-06-16", diff --git a/versions/i-/iniparser.json b/versions/i-/iniparser.json index a52fdeec1c35f0..5efd9a7e477e64 100644 --- a/versions/i-/iniparser.json +++ b/versions/i-/iniparser.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1f0fd9b0b224858a2bba125fae9cbfaa899e954b", + "version-date": "2020-04-06", + "port-version": 5 + }, + { + "git-tree": "e9b64e1b73f6befd9a565c43f5bbe4757fdd0a75", + "version-date": "2020-04-06", + "port-version": 4 + }, { "git-tree": "b1a9b214d253fa9d677b4ed158bd5e0d0e4e8a31", "version-date": "2020-04-06", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index c0d958ef49c6f7..6b71917ac97597 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "285fa0de9d6f05022ce06e53f7c8c21048ff586f", + "version": "2023.0.0", + "port-version": 1 + }, { "git-tree": "e5a15d03509e3eaf676a2e3ec935acff7fbb9285", "version": "2023.0.0", diff --git a/versions/i-/intelrdfpmathlib.json b/versions/i-/intelrdfpmathlib.json index fdeefa02e2a816..b8d448fc2bd7a2 100644 --- a/versions/i-/intelrdfpmathlib.json +++ b/versions/i-/intelrdfpmathlib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7cf5496b9f4fbf09ed05be9b87e063a0094ac331", + "version-string": "20U2", + "port-version": 6 + }, + { + "git-tree": "c829bd814e973cf55e135f1d9e50a36b9d73d551", + "version-string": "20U2", + "port-version": 5 + }, { "git-tree": "47e6c0bf433235a53c450a3c1c61388a10a643e0", "version-string": "20U2", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index a6c53b3c839dfb..1d5099ef8999da 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "662e296b47ae6e51ee6e96470833c87d7728714d", + "version-date": "2020-09-14", + "port-version": 5 + }, + { + "git-tree": "3acb6249cb7bf330233e36df8cde602597abcac5", + "version-date": "2020-09-14", + "port-version": 4 + }, { "git-tree": "281370843416f78e7c715a85db1b5754253b38ed", "version-date": "2020-09-14", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index 39261a9dff7b71..f9d7634c454f8a 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "708fa654ac49d99ff5c6a3146c806d576b1b94a3", + "version": "1.8.5", + "port-version": 0 + }, + { + "git-tree": "a66d1403393733885e625b5f95fc1b7d3ed03505", + "version": "1.8.4", + "port-version": 14 + }, { "git-tree": "a824dffa239fccbb9b780c9926c91f1a25d000df", "version-string": "1.8.4", diff --git a/versions/i-/irrxml.json b/versions/i-/irrxml.json index a5d182df852eca..b9aa9cd8602c06 100644 --- a/versions/i-/irrxml.json +++ b/versions/i-/irrxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85d4823526e4e7475669d2657e978382e23fddaa", + "version": "0", + "port-version": 1 + }, { "git-tree": "3bce4522729dab80e9a91571a9b772ac05970974", "version-string": "0", diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json index 9c7418be64bd05..44d121b8f57fbb 100644 --- a/versions/i-/itpp.json +++ b/versions/i-/itpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bb2b4a2f0b7fed9c43bf3587695b1c8c99079e32", + "version-semver": "4.3.1", + "port-version": 10 + }, + { + "git-tree": "8ba9ee864fcdbf30998904724db69a1cb515ebc2", + "version-semver": "4.3.1", + "port-version": 9 + }, { "git-tree": "be87bf8b58b5f6b0fb3f19dfc14acf24114332d0", "version-semver": "4.3.1", diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index e9d4e36af9b311..45f0ae26a07835 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7f51c26899ba9433a5a3ab92fc5b5887d5c764c", + "version": "4.0.0", + "port-version": 2 + }, { "git-tree": "1da5fa9a12bf207bf641f903856418e3aed7258d", "version": "4.0.0", diff --git a/versions/j-/jbig2dec.json b/versions/j-/jbig2dec.json index 7fbff5da5fc449..346b12ab30c628 100644 --- a/versions/j-/jbig2dec.json +++ b/versions/j-/jbig2dec.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ff97df9b9703a6314f50e608b155efb780d6deb7", + "version": "0.19", + "port-version": 3 + }, + { + "git-tree": "4622bedc189a466db46f55ab78e895b2c2eb4fef", + "version": "0.19", + "port-version": 2 + }, { "git-tree": "e60aa2c30fefe1269d1d8a6fede748cfa5736aed", "version-string": "0.19", diff --git a/versions/j-/jbigkit.json b/versions/j-/jbigkit.json index 242ea13a09aeeb..d0f0572a045589 100644 --- a/versions/j-/jbigkit.json +++ b/versions/j-/jbigkit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b91151a54db723a66541029866bd3011e405ade9", + "version": "2.1", + "port-version": 7 + }, + { + "git-tree": "6d6f0004f10c5977c83106a38debd04554a4b4a7", + "version": "2.1", + "port-version": 6 + }, { "git-tree": "fa2f967c15904877cd541d3c9d59f0c2f20f3fb4", "version-string": "2.1", diff --git a/versions/j-/jinja2cpplight.json b/versions/j-/jinja2cpplight.json index 8adffeb623be78..596f9a17333a30 100644 --- a/versions/j-/jinja2cpplight.json +++ b/versions/j-/jinja2cpplight.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a57eb0a010f89aa5d43a4aba792c4d25dca5af8e", + "version-date": "2018-05-08", + "port-version": 3 + }, + { + "git-tree": "a0768865a046b0bd51d90af67d0059c7d158474d", + "version-date": "2018-05-08", + "port-version": 2 + }, { "git-tree": "14ce844353cb5d4b2dbca4d36daf84c248208de2", "version-string": "2018-05-08", diff --git a/versions/j-/joltphysics.json b/versions/j-/joltphysics.json index 8b953f90f40ad8..1041f77e1a99a5 100644 --- a/versions/j-/joltphysics.json +++ b/versions/j-/joltphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa3834efa767ca95d2a0f7b367fe4f154101a35e", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "845755ddfb9fa5d6f88c836cffdb1f497e69ad46", "version": "2.0.1", diff --git a/versions/j-/josuttis-jthread.json b/versions/j-/josuttis-jthread.json index 34c83ced96a1b8..6d74e8af48c412 100644 --- a/versions/j-/josuttis-jthread.json +++ b/versions/j-/josuttis-jthread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d514a02f7eb9cf97eaba9112de40bdf08608fc4", + "version-date": "2020-07-21", + "port-version": 3 + }, { "git-tree": "5f37dd21a591e8f7ae566f16a085a10dbfe1ccbc", "version-string": "2020-07-21", diff --git a/versions/j-/jsmn.json b/versions/j-/jsmn.json index 9f3ba75beae905..2634d6a9712379 100644 --- a/versions/j-/jsmn.json +++ b/versions/j-/jsmn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "953e10924a7606aabb3181ae9bcfb68a6c808b2d", + "version-date": "2019-04-27", + "port-version": 2 + }, { "git-tree": "b05c2b522963eeacbcfcad169cf5ffc802bc7a42", "version-string": "2019-04-27", diff --git a/versions/j-/json-c.json b/versions/j-/json-c.json index b08334fc8c40f2..5594b4ebbc9c06 100644 --- a/versions/j-/json-c.json +++ b/versions/j-/json-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "787ad6eeafc631bea9f68c3ad2047a031575bb0f", + "version-date": "2022-06-26", + "port-version": 3 + }, { "git-tree": "2090ebb6a6e0be1d0f6331c266bd0bc6eef1cd57", "version-date": "2022-06-26", diff --git a/versions/j-/json-spirit.json b/versions/j-/json-spirit.json index 8fb1586f21a1d2..c40d91d0a08672 100644 --- a/versions/j-/json-spirit.json +++ b/versions/j-/json-spirit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a03472c9bc3c75081ffdd05a8aaf9aa4e86b9d01", + "version": "4.1.0", + "port-version": 4 + }, + { + "git-tree": "eebfdfbc7a3e422c96bb8c7205f5696dac6d4457", + "version": "4.1.0", + "port-version": 3 + }, { "git-tree": "d219034cdee1f6237e4863a001aece539df2ce8c", "version-string": "4.1.0", diff --git a/versions/j-/json11.json b/versions/j-/json11.json index 688a24f272c3cf..34e38bb5146b30 100644 --- a/versions/j-/json11.json +++ b/versions/j-/json11.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8b58dc7ee84c7424009066dd57f9b9f9a804f895", + "version-date": "2017-06-20", + "port-version": 6 + }, + { + "git-tree": "65ec4b34a9141b4f35e0870c383bbad03c7097b3", + "version-date": "2017-06-20", + "port-version": 5 + }, { "git-tree": "b99e54cd236396200e19e414a7375d0463d5ba5a", "version-string": "2017-06-20", diff --git a/versions/j-/json5-parser.json b/versions/j-/json5-parser.json index 4a67281942f827..ea2802dd736de3 100644 --- a/versions/j-/json5-parser.json +++ b/versions/j-/json5-parser.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "931114b0187ebc307e231658525cacfef79345ac", + "version": "1.0.0", + "port-version": 5 + }, + { + "git-tree": "94f6125fdc5c6624c9ca969d62ea8514ab2ed8c0", + "version": "1.0.0", + "port-version": 4 + }, { "git-tree": "e874e19b4f9b56647b5be1537ed0792041e96c25", "version-string": "1.0.0", diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index eaba417f4d7dab..69c66685769454 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "281de10de972059292e2850f6f509eb6cb9b2c40", + "version": "0.170.2", + "port-version": 0 + }, + { + "git-tree": "a5e66f5d2ae477089e3f87c432bdfdb7a7929da9", + "version": "0.170.1", + "port-version": 0 + }, { "git-tree": "32422a6f4405b4c330cc992bc40fc11e4e274450", "version": "0.170.0", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index a4d06cc6f4ae6a..17b17eebd36db2 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "46dce3bb23c3edd1ae77e46fa11543d678ae26e6", + "version": "0.9.2", + "port-version": 0 + }, + { + "git-tree": "990249b807aba05002ba2ac406e0bebc9af26a64", + "version": "0.9.1", + "port-version": 0 + }, { "git-tree": "61f861161144679903d44d5bf7de6aa29f159140", "version": "0.9.0", diff --git a/versions/k-/kd-soap.json b/versions/k-/kd-soap.json index 719c6ef92273f0..a855dfa6b7f6be 100644 --- a/versions/k-/kd-soap.json +++ b/versions/k-/kd-soap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4965d8dc59b019e7a99cc0f3ebc705d4c1e18752", + "version": "2.1.1", + "port-version": 1 + }, { "git-tree": "25205691e2c5a4f621d6b4c7fbe78f56324a311f", "version": "2.1.1", diff --git a/versions/k-/kenlm.json b/versions/k-/kenlm.json index 0ad8159aedcb26..7440dcb49d805f 100644 --- a/versions/k-/kenlm.json +++ b/versions/k-/kenlm.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6f1bed68940353855027de67f5f6d33c5dbe8617", + "version": "20200924", + "port-version": 4 + }, + { + "git-tree": "4947aeed6f0e7817a4be646bbb7685e4e5ebf62a", + "version": "20200924", + "port-version": 3 + }, + { + "git-tree": "8154d9ed8e6458688478aae1e09c2334362bc198", + "version": "20200924", + "port-version": 2 + }, { "git-tree": "5fd24bb27699940f72b94a9c3cf3e77a7d645a76", "version-string": "20200924", diff --git a/versions/k-/kf5parts.json b/versions/k-/kf5parts.json new file mode 100644 index 00000000000000..f03d4688a912cc --- /dev/null +++ b/versions/k-/kf5parts.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6d66ab25d03620f9df39a90fd00d00b0d6271620", + "version": "5.98.0", + "port-version": 0 + } + ] +} diff --git a/versions/k-/kissnet.json b/versions/k-/kissnet.json index 2e699fda859bc6..c567469ead2563 100644 --- a/versions/k-/kissnet.json +++ b/versions/k-/kissnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8abd6a40d03e28a8c4f23c8eaaccff4e840ee800", + "version-date": "2023-02-04", + "port-version": 0 + }, { "git-tree": "a8b6b18919cd26da45a720b5fb0b22fcc0282180", "version-date": "2022-10-18", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index 763dec938dcdea..fa5bc1fe9f29c3 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74b3fa8f53d6a1d173c09c2f87f865125717d894", + "version-semver": "4.1.0", + "port-version": 0 + }, { "git-tree": "b347df16db358ecb56e49c982c9a48f732f5da2f", "version-semver": "4.1.0-rc3", diff --git a/versions/k-/kuku.json b/versions/k-/kuku.json index f12b159a3b303b..dfac4be8c2545e 100644 --- a/versions/k-/kuku.json +++ b/versions/k-/kuku.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1a78898dbb7cbacda021768b5468af708035474b", + "version": "2.1", + "port-version": 3 + }, + { + "git-tree": "8d894f573635f4ccfa90ef38fa9b12ce90c27a7d", + "version": "2.1", + "port-version": 2 + }, { "git-tree": "fa4e0b6cf1ce1e5f0cd13fa2dba7953ddcfc3d6f", "version-string": "2.1", diff --git a/versions/k-/kvasir-mpl.json b/versions/k-/kvasir-mpl.json index 042536ad3322cf..191b23b1c8eca0 100644 --- a/versions/k-/kvasir-mpl.json +++ b/versions/k-/kvasir-mpl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4a0535a96e146cdd0412da4db03afc7c414581a2", + "version-date": "2019-08-06", + "port-version": 3 + }, + { + "git-tree": "5ff2749ed8f663ea06f6e3422e11192ac083d8cc", + "version-date": "2019-08-06", + "port-version": 2 + }, { "git-tree": "0eed1d5cd20c82b4cd2031f0fb21c2a5655b13d1", "version-string": "2019-08-06", diff --git a/versions/l-/lager.json b/versions/l-/lager.json index 7da3ee095e2789..92e09d29fc000f 100644 --- a/versions/l-/lager.json +++ b/versions/l-/lager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1669f03cca9f55a2952772a25942fcad3ca3a33", + "version-date": "2023-03-19", + "port-version": 0 + }, { "git-tree": "8dd0744209e866c731522176fdcdf056fcbb853f", "version-date": "2022-02-21", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index 5803b592258a71..fedbceca301bf1 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7c892b58c70ebc7d83444c4e727272cad40e28c2", + "version-date": "2022-02-22", + "port-version": 2 + }, + { + "git-tree": "5897ee099a5aa43bcb50c0d5a19cda3a9ed6a50c", + "version-date": "2022-02-22", + "port-version": 1 + }, { "git-tree": "3a9c5b51e3480db058719db223df981e0e679819", "version-date": "2022-02-22", diff --git a/versions/l-/leaf.json b/versions/l-/leaf.json index 13fd9940e56c2c..678f75d5486a43 100644 --- a/versions/l-/leaf.json +++ b/versions/l-/leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fb10737acdbc570266b8e23e9b435869374a822", + "version": "0.2.2", + "port-version": 2 + }, { "git-tree": "276f8e1eb0a3ea4e0b0bd72dee0822660e6704f7", "version-string": "0.2.2", diff --git a/versions/l-/lemon.json b/versions/l-/lemon.json index 04d37dbe20e4ad..5d4ca85d768f69 100644 --- a/versions/l-/lemon.json +++ b/versions/l-/lemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23f3790faebba60c744722f27efd4c031eb7fe62", + "version": "0", + "port-version": 2 + }, { "git-tree": "20bb9fd243449f9c1376ae916567331839375a90", "version-string": "0", diff --git a/versions/l-/lest.json b/versions/l-/lest.json index 1eddbca5a65d5f..0d61e812955cb5 100644 --- a/versions/l-/lest.json +++ b/versions/l-/lest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e79639edebf73ebe6a4243c00d9ab6370c07f07", + "version": "1.35.1", + "port-version": 3 + }, { "git-tree": "94a9fb0d9b6b57287a652feea7268760986bb448", "version-string": "1.35.1", diff --git a/versions/l-/levmar.json b/versions/l-/levmar.json index d7490901a35b2c..923a8ea4996601 100644 --- a/versions/l-/levmar.json +++ b/versions/l-/levmar.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cba09ff1cf1b17d901bd60ff2505b31e98bc862e", + "version": "2.6", + "port-version": 3 + }, + { + "git-tree": "dbdc4f754e8573fdad2ce75cb1b476d828dad76e", + "version": "2.6", + "port-version": 2 + }, { "git-tree": "a869430352021a5fcecdd780a25e5ee0a4d769f5", "version": "2.6", diff --git a/versions/l-/lexbor.json b/versions/l-/lexbor.json new file mode 100644 index 00000000000000..10962ee2b67dbd --- /dev/null +++ b/versions/l-/lexbor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f5c7890c5fb34ec0622b01dfdff10f11e8dccdbd", + "version": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libaaplus.json b/versions/l-/libaaplus.json index 4e7d376fbfe399..cc3fae04ad79bb 100644 --- a/versions/l-/libaaplus.json +++ b/versions/l-/libaaplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2254865f7618bb8f116d18156b41d307d32b0a6d", + "version": "2.36", + "port-version": 1 + }, { "git-tree": "196f02649779e1a3b06c9d0c32b41082205c69b5", "version": "2.36", diff --git a/versions/l-/libaiff.json b/versions/l-/libaiff.json index 0204fed5b4a549..db18870e5c1fd4 100644 --- a/versions/l-/libaiff.json +++ b/versions/l-/libaiff.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d32c6814dfaaf072180ad43068025fdc60713a9", + "version": "5.0", + "port-version": 9 + }, + { + "git-tree": "bb6134943648934661d3e2f2b9b5bd561cfe8822", + "version": "5.0", + "port-version": 8 + }, { "git-tree": "1bd67ed6002176c79933b7e4c237e06604e16b1d", "version-string": "5.0", diff --git a/versions/l-/libass.json b/versions/l-/libass.json index 1ab96ad462397e..2b132b24868ccf 100644 --- a/versions/l-/libass.json +++ b/versions/l-/libass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c71ba164ee51e31be931c03973fbeb756de7631e", + "version": "0.17.1", + "port-version": 0 + }, { "git-tree": "b5dfc84a884c525317deec9d8e62df51d64a8e3d", "version": "0.16.0", diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index b90ae2bb86cc2f..29aee2f4e9ac38 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "775b04db12d2353cc6e69d54faef89b857dd32eb", + "version-semver": "0.11.1", + "port-version": 1 + }, { "git-tree": "11db2c9c2c399768d55d5b54f203e1f789d06936", "version-semver": "0.11.1", diff --git a/versions/l-/libcaer.json b/versions/l-/libcaer.json index 9682cbe13c4be0..9b413413d358f3 100644 --- a/versions/l-/libcaer.json +++ b/versions/l-/libcaer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f90f31425f85b3bb2544a34fc0b9247491ecbf2b", + "version": "3.3.15", + "port-version": 0 + }, { "git-tree": "52791fbed0e817d00944e3ad1f9ab76759f543f8", "version-date": "2022-07-25", diff --git a/versions/l-/libcds.json b/versions/l-/libcds.json index 60bbde65468424..216c8e3e562a2f 100644 --- a/versions/l-/libcds.json +++ b/versions/l-/libcds.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2c2c64b70b3c99a15ddef75323dd98b8b4d066bc", + "version": "2.3.3", + "port-version": 4 + }, + { + "git-tree": "a9e46c27d63e8b303be787baa7349f1b1fe09e17", + "version": "2.3.3", + "port-version": 3 + }, { "git-tree": "2030ee3d0c39352e9617f28fb14ed17c20b96741", "version": "2.3.3", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 471bb29f3df990..012d99e04ef6a6 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d9138bfd878a5de79822e201b0e83649715121c", + "version": "1.13", + "port-version": 4 + }, { "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", "version": "1.13", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 9ec9af593e9ecc..7f98184b0bd1a3 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9056cd67b1885ed4721a931467fb7fd1eb5b4bf3", + "version": "1.7.3", + "port-version": 3 + }, + { + "git-tree": "cf6ab494ef19e4fb5bf1effcd86246cb758000af", + "version": "1.7.3", + "port-version": 2 + }, { "git-tree": "c9149e9c9d7a08455647bcadb1f178b7ee6ff3d2", "version-string": "1.7.3", diff --git a/versions/l-/libconfuse.json b/versions/l-/libconfuse.json index 3a22abe1e49b76..96eefd9a6fc194 100644 --- a/versions/l-/libconfuse.json +++ b/versions/l-/libconfuse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "395e64637b555a051b308e0e2e69b1bfd152b381", + "version-date": "2019-07-14", + "port-version": 4 + }, { "git-tree": "3de4b13956cc303338de0b311a0c35a72c2d0a22", "version-string": "2019-07-14", diff --git a/versions/l-/libcopp.json b/versions/l-/libcopp.json index 4af464c23fd21f..81a62990f80a92 100644 --- a/versions/l-/libcopp.json +++ b/versions/l-/libcopp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "45c928d0a5c7281930ae8f7cd424a939da766f1a", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "9a5300e82b2e96e71c1357f2dbb4b7c311a18022", + "version": "2.1.4", + "port-version": 0 + }, { "git-tree": "7c8f92b9a9feb08ffcb8212368c74a56efe6c1c8", "version": "2.1.2", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 8cbc24c8e2a6f8..6971adf03fe066 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96f395b47c8ee56f6a268f3e1da86eb23a4ba0ea", + "version-semver": "0.18.2", + "port-version": 1 + }, { "git-tree": "9bbf4ea991fbad7ab746fc1ff8c0ce121260715f", "version-semver": "0.18.2", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index c7bb6e85276b8a..89dab1ffce4b06 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "35f74e1100615e9ff16d6b05529baf8e7de774aa", + "version": "1.0.11", + "port-version": 1 + }, + { + "git-tree": "3c0c0eec97e9b7d9a46d6f1f5fb22c5b07aa5550", + "version": "1.0.11", + "port-version": 0 + }, { "git-tree": "bba9b6bf501c046f81f7335d1efff23ed0845ed4", "version": "1.0.8", diff --git a/versions/l-/libdisasm.json b/versions/l-/libdisasm.json index 62593ea3038f3a..e20096468a532c 100644 --- a/versions/l-/libdisasm.json +++ b/versions/l-/libdisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6870682ac5d76671fbe396235d4667f5edf669b", + "version": "0.23", + "port-version": 10 + }, { "git-tree": "ab983230ac21cfc3d2849abfa70551755ffcb5f8", "version-string": "0.23", diff --git a/versions/l-/libebur128.json b/versions/l-/libebur128.json index f306ea2bd6970e..b4af5e2806a41f 100644 --- a/versions/l-/libebur128.json +++ b/versions/l-/libebur128.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97dd5a1812c03f1822d75e8fa10ade616c7d9f15", + "version": "1.2.6", + "port-version": 2 + }, { "git-tree": "640f92877a6bde91d968b0b0668767b714297f6c", "version-string": "1.2.6", diff --git a/versions/l-/libeventheader-decode.json b/versions/l-/libeventheader-decode.json new file mode 100644 index 00000000000000..5e32bf698f15fb --- /dev/null +++ b/versions/l-/libeventheader-decode.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fd67531cc60d91c4d8b45da15cd7414b398b9cd7", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libeventheader-tracepoint.json b/versions/l-/libeventheader-tracepoint.json new file mode 100644 index 00000000000000..556d9c4ff6046e --- /dev/null +++ b/versions/l-/libeventheader-tracepoint.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d8ba8b72bb5c6dde050b85f84e01efb6b36d535c", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libftdi.json b/versions/l-/libftdi.json index 56af2c4ebb8d10..c22539bd17d82e 100644 --- a/versions/l-/libftdi.json +++ b/versions/l-/libftdi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "add947883422e59d9fec0bbd2080ac8dc95b29d0", + "version": "0.20", + "port-version": 5 + }, { "git-tree": "8dbb6c205662e734acdf218146e78db6bd3795a1", "version-string": "0.20", diff --git a/versions/l-/libftdi1.json b/versions/l-/libftdi1.json index a03ff9797a8bac..9794117a3fb4da 100644 --- a/versions/l-/libftdi1.json +++ b/versions/l-/libftdi1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef6feb3ad01d1d2483c5a369fd4e6bf3587ff52d", + "version": "1.5", + "port-version": 4 + }, { "git-tree": "bfed0e0f6e07e8ce7a94f47efbad9dde21f193c8", "version": "1.5", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index c539bb5dadc345..d231b03aba5867 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f42371900964fce2757e37ad8d36ca2b7bd0dfd8", + "version": "1.7.1", + "port-version": 3 + }, { "git-tree": "2397fd7d09c89af1810821e9b4c47ec71e2748c5", "version": "1.7.1", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 170466619c5b3f..b14ae5fdb29bcb 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "e400f294d284f6a7ff3a19b2454c919873405f08", + "version-semver": "1.6.4", + "port-version": 0 + }, + { + "git-tree": "7c2173f86743e6e3c6759d5c781f236c08adbec4", + "version-semver": "1.4.2", + "port-version": 3 + }, + { + "git-tree": "d5c636f8eb77d7d68c2a4b41fcd7d68759fb9ad0", + "version-semver": "1.4.2", + "port-version": 2 + }, + { + "git-tree": "53a1a7485857995d3b4cc5a2b6eaa22d6c6b036c", + "version-semver": "1.4.2", + "port-version": 1 + }, { "git-tree": "e036ca61d2e12b110c920cadf92f0aa4f39cac9b", "version-semver": "1.4.2", diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json index 4e8ba921ec9082..afbc40cd205752 100644 --- a/versions/l-/libgpiod.json +++ b/versions/l-/libgpiod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5fde793827568c4be74cb76793650e37e3e5354", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "effc79de6dafb6ef6762bd2863a222c6090881e8", "version": "1.6.3", diff --git a/versions/l-/libgta.json b/versions/l-/libgta.json index 11b71b662df1db..7ce423a65b4f7c 100644 --- a/versions/l-/libgta.json +++ b/versions/l-/libgta.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad7c16c2d14fa0d5a68a29c2a1cf3708897578ca", + "version": "1.0.8", + "port-version": 5 + }, { "git-tree": "644750a061baad1274a079365e11001849aa901e", "version-string": "1.0.8", diff --git a/versions/l-/libguarded.json b/versions/l-/libguarded.json index 2e1bb5fe2b5edf..3d5f1e45e9da14 100644 --- a/versions/l-/libguarded.json +++ b/versions/l-/libguarded.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "139aa9fff34e4003d7dab0be9699501c91a6d8ad", + "version-date": "2019-08-27", + "port-version": 3 + }, { "git-tree": "f3bf2a0dfd157d2505e5e992ec7c1fdc6a301198", "version-string": "2019-08-27", diff --git a/versions/l-/libgwenhywfar.json b/versions/l-/libgwenhywfar.json index 2fe59146912a9c..aefee739a55d27 100644 --- a/versions/l-/libgwenhywfar.json +++ b/versions/l-/libgwenhywfar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82aafb480367645c4ef047b08b420a8926b1b24e", + "version-semver": "5.6.0", + "port-version": 3 + }, { "git-tree": "0aa4c84df4c2b05214574c2dbd524dfee2b694f8", "version-semver": "5.6.0", diff --git a/versions/l-/libgxps.json b/versions/l-/libgxps.json index ef93cc3ff6cfe3..9228e066b6d222 100644 --- a/versions/l-/libgxps.json +++ b/versions/l-/libgxps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "125d54e29f5fc30ff36b06a7aad569d5f6064289", + "version": "0.3.2", + "port-version": 2 + }, { "git-tree": "bc4e4576421dec679fb4a7c09497cbc13f99df00", "version": "0.3.2", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 2b76372355c035..791c2f113d688e 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "30bfad0af10297606d1687eba9fabe7b5eda60e8", + "version": "1.16.1", + "port-version": 0 + }, + { + "git-tree": "e2b6e5599374567a1f1f61821adc8064fcfaaa0f", + "version": "1.15.1", + "port-version": 1 + }, { "git-tree": "b1cec44f5cafb35417b528d35cad601c3b1c6952", "version": "1.15.1", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index 84ba0484160fca..e84671efffe140 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "260c09078445cfce5ce800b1d3cfa47877f6f783", + "version": "2.4.0", + "port-version": 4 + }, + { + "git-tree": "4754633723fc5e93c13f54e405ce0b8662bb570b", + "version": "2.4.0", + "port-version": 3 + }, { "git-tree": "b1f7e5126f4bca6f7d6800bb8eb143d1640f8a80", "version": "2.4.0", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 777ed5143e29e6..a5cc0b5f568ec9 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2764640a1b2cc36636084470108de50f2b531085", + "version": "2.1.5.1", + "port-version": 1 + }, { "git-tree": "2b3b3fe0c258463586c0e421a2665ca1d2df9b4d", "version": "2.1.5.1", diff --git a/versions/l-/libkeyfinder.json b/versions/l-/libkeyfinder.json index 15caacdc3c4749..08a8f2d6b814f2 100644 --- a/versions/l-/libkeyfinder.json +++ b/versions/l-/libkeyfinder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb2b9f8da5e789508d5ceb645907d8e4d73236ce", + "version": "2.2.6", + "port-version": 1 + }, { "git-tree": "567c6574c6e38d9a10b7e08951c4c3a0fc72e3cb", "version": "2.2.6", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 2320dddf34f5d7..29251006c61337 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a72a32ce085b262e26bcadc55efd0159fdf00c4f", + "version": "1.8.1", + "port-version": 13 + }, + { + "git-tree": "c8f90c515041e9c2633daee8e536e8e5e9ce0170", + "version": "1.8.1", + "port-version": 12 + }, { "git-tree": "aff83be201bcfe7db23231cf8ab667541294c4a6", "version": "1.8.1", diff --git a/versions/l-/libleidenalg.json b/versions/l-/libleidenalg.json index e559f6158c3cc6..14ac2306708270 100644 --- a/versions/l-/libleidenalg.json +++ b/versions/l-/libleidenalg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c059e549496795874b93130451377bb09a78630", + "version": "0.10.0", + "port-version": 0 + }, { "git-tree": "9696d8a2ec996f80576288839bc059f5adf65eaa", "version": "0.9.0", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index a416806544191e..fd5e03d08223e0 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc35a6ae066974d006a1d3a50f2072acd6f4fcc5", + "version-date": "2019-06-13", + "port-version": 5 + }, { "git-tree": "49e74def611d3992ae671c2972eff648fe9437ed", "version-string": "2019-06-13", diff --git a/versions/l-/liblo.json b/versions/l-/liblo.json index e1680201898ec5..e95270bb7cf9f2 100644 --- a/versions/l-/liblo.json +++ b/versions/l-/liblo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31c66c76504889c3dbcbea04424b8ea993e2c63a", + "version": "0.31", + "port-version": 4 + }, { "git-tree": "a70409d660234bfbc8c3cbeaff029d9e5f5b890c", "version-string": "0.31", diff --git a/versions/l-/liblsl.json b/versions/l-/liblsl.json index 4d9b63a7d24814..4ad750d223dbf8 100644 --- a/versions/l-/liblsl.json +++ b/versions/l-/liblsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc1c3d9c2142ad970d88c0a79f680b31c8d674f9", + "version": "1.16.2", + "port-version": 0 + }, { "git-tree": "6849296814880dca06ffd923d7d5c8fc3e4f2a9c", "version": "1.16.1", diff --git a/versions/l-/liblsquic.json b/versions/l-/liblsquic.json index 0280cb1bdaf20f..6c114d84eaf735 100644 --- a/versions/l-/liblsquic.json +++ b/versions/l-/liblsquic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9117a86afaed60857454ba0b5a5e684fc947ba56", + "version": "3.1.1", + "port-version": 2 + }, { "git-tree": "2a2383de53efd9458419db7bd82db49b342023da", "version": "3.1.1", diff --git a/versions/l-/libmad.json b/versions/l-/libmad.json index 5e0cd6eab77a77..d2174b16ac02af 100644 --- a/versions/l-/libmad.json +++ b/versions/l-/libmad.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "eaed142825775ca972204c5c2d7720043eef3c2b", + "version": "0.15.1", + "port-version": 12 + }, + { + "git-tree": "c4393712733ce1f3078a4ec0a042736e5862efa7", + "version": "0.15.1", + "port-version": 11 + }, { "git-tree": "ff3cd79e45546dc58e00a69696ae1f8b900e231a", "version-string": "0.15.1", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index 9f7690d0dc4d42..d8d90fc1073548 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d70a57e09ed4060b2ade1cb1f80bcbdbd8a7a1ec", + "version": "5.40", + "port-version": 2 + }, { "git-tree": "7bc1a88e28473967fafa7be73db0304f127ae202", "version-string": "5.40", diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index f0b9548d55ecea..9c03ecca5fddef 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bac54e78c424e4420145ae4a407e7b88229a387", + "version": "1.4.3", + "port-version": 3 + }, { "git-tree": "71bed10d6ad6ff2a80692e0b920e01e3c7509bf7", "version-string": "1.4.3", diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index d4f1014c74f701..0fcde3542cacba 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5adf3a515c6144124fe9bb1825505de0f234b8c", + "version": "23.4", + "port-version": 0 + }, { "git-tree": "a6b640103a75b965e6527d10819d276c2193775d", "version-string": "21.03", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index d90a9e06b29b10..fec429522ee43c 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1b42f3ba710ee2202398b46cc349adfa90cd3d9", + "version": "0.9.75", + "port-version": 1 + }, { "git-tree": "059bfe5715b9179cbd4d365ca571e6fade762700", "version": "0.9.75", diff --git a/versions/l-/libmodman.json b/versions/l-/libmodman.json index b7eb568c744bcb..44bc210a0c920e 100644 --- a/versions/l-/libmodman.json +++ b/versions/l-/libmodman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02bcbb8a675722c0d2c205b762074c35805e6bf9", + "version": "2.0.1", + "port-version": 5 + }, { "git-tree": "64d71ad6052dd0027325c7e9390ad4264dbef108", "version-string": "2.0.1", diff --git a/versions/l-/libmount.json b/versions/l-/libmount.json index 59c6ecef63acf0..eeeb5fe352b877 100644 --- a/versions/l-/libmount.json +++ b/versions/l-/libmount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "747604a5c97736ced9e0ef3b2963c2c949bdc655", + "version": "2.38", + "port-version": 2 + }, { "git-tree": "a006357933a743ef48b94ce80a0565a1ce608769", "version": "2.38", diff --git a/versions/l-/libmspack.json b/versions/l-/libmspack.json index 0cc8382538b507..6f03352bd14bc0 100644 --- a/versions/l-/libmspack.json +++ b/versions/l-/libmspack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b26826abcd6d912b526809624f838431cb470b3d", + "version": "0.10.1", + "port-version": 6 + }, { "git-tree": "4448cdf014a452f1da35c2dd48a2c8b9dca3e08b", "version-string": "0.10.1", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 3d97708d500d92..616fc6f76dbea6 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "95618ed8c0e55195ee395eaf7bb230cc61776b33", + "version": "8.0.32", + "port-version": 4 + }, + { + "git-tree": "79e48f5efa358526cd1cd290fd477f366863129e", + "version": "8.0.32", + "port-version": 3 + }, + { + "git-tree": "8c4f68caa6f20ecfc912028a0f94ef956c154410", + "version": "8.0.32", + "port-version": 2 + }, + { + "git-tree": "1c2161c6415adf63a68c648172ff414eef484d4e", + "version": "8.0.32", + "port-version": 1 + }, + { + "git-tree": "217137c054653de9a691dce47638979c0f667e2e", + "version": "8.0.32", + "port-version": 0 + }, { "git-tree": "099f0d084c8fdad082e86d8291fb2de18f9e73d4", "version": "8.0.20", diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json index 58213445258e0b..bcea36ed84e89e 100644 --- a/versions/l-/libnice-gst.json +++ b/versions/l-/libnice-gst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ea8f77a4a4f70cceb4d65650ee5de24e14e8190", + "version": "0.1.21", + "port-version": 1 + }, { "git-tree": "3d7072d7e0810ec844b7f4b3ecaa1e325e407be6", "version": "0.1.21", diff --git a/versions/l-/libodb-pgsql.json b/versions/l-/libodb-pgsql.json index b3ad365b109008..3f6d2a34c52994 100644 --- a/versions/l-/libodb-pgsql.json +++ b/versions/l-/libodb-pgsql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "793728785becb5235725430c432d1acfb9496cdb", + "version": "2.4.0", + "port-version": 7 + }, { "git-tree": "2026f9dfa22bc2a9b7c5d865268cd53d1f6870ee", "version": "2.4.0", diff --git a/versions/l-/libopensp.json b/versions/l-/libopensp.json index 717e6e2ccdc541..cc2667f9873304 100644 --- a/versions/l-/libopensp.json +++ b/versions/l-/libopensp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88324b68d25d7301351327cd25493d4f13658cf1", + "version": "1.5.2", + "port-version": 2 + }, { "git-tree": "1c38530c26ffb1fc7fb2e0bd40f76ca8fa2bfb57", "version": "1.5.2", diff --git a/versions/l-/libopusenc.json b/versions/l-/libopusenc.json index b843b3e7eed689..5dc3b04cb3f890 100644 --- a/versions/l-/libopusenc.json +++ b/versions/l-/libopusenc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ddd48b3ea7d3363285602a3442c0e160316850a", + "version": "0.2.1", + "port-version": 3 + }, { "git-tree": "221b251f3848c9121ec517dc0c7d97cb19ea2297", "version-string": "0.2.1", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index e94b9362b90ba2..971d5e550fd8ca 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "564b7ffdb88b7d1b1823d7ec1166325337ae3ec5", + "version": "5.2.0", + "port-version": 3 + }, { "git-tree": "711e04603ccba9622918413848035af14335ef63", "version": "5.2.0", diff --git a/versions/l-/libosmscout.json b/versions/l-/libosmscout.json index bba085aebe5cb6..585c1a0ecf86b4 100644 --- a/versions/l-/libosmscout.json +++ b/versions/l-/libosmscout.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a9ab34b9b12105e070411d8be66aeb3a1baf246", + "version": "1.1.1", + "port-version": 2 + }, { "git-tree": "ebb31600572c819a33a2c7b5e013e2cd2bc85b85", "version-string": "1.1.1", diff --git a/versions/l-/libp7client.json b/versions/l-/libp7client.json index 238124ffc4a9fb..10badb818b0370 100644 --- a/versions/l-/libp7client.json +++ b/versions/l-/libp7client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0cf3d22ea3a838a2190f5d0ed1c804c42364268", + "version": "5.6", + "port-version": 4 + }, { "git-tree": "ff87a34ba0c530746a255fc3ee2ce3762781b50c", "version-string": "5.6", diff --git a/versions/l-/libpff.json b/versions/l-/libpff.json index 3b6c8eb07bdc67..1e6a5cd8ccc0fa 100644 --- a/versions/l-/libpff.json +++ b/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5358a29d95b177de74fe31072cfa21a7adf4254b", + "version-date": "2021-11-14", + "port-version": 1 + }, { "git-tree": "a47e314b091400914616ff8c5e017110f2493018", "version-date": "2021-11-14", diff --git a/versions/l-/libphonenumber.json b/versions/l-/libphonenumber.json index bc18673b8148d9..b685c8db9d904b 100644 --- a/versions/l-/libphonenumber.json +++ b/versions/l-/libphonenumber.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2289b15c4eee8082041820c9eb1bfc2cb3982cd9", + "version": "8.13.13", + "port-version": 0 + }, + { + "git-tree": "8f6bcac3d621a03907f69278cb2a1e303fa414f1", + "version": "8.13.11", + "port-version": 0 + }, { "git-tree": "c67ed43ff7bcb68e7d676e1a3be1139e7f5bdc2f", "version": "8.13.9", diff --git a/versions/l-/libpopt.json b/versions/l-/libpopt.json index 1bc1a6143bec27..c6b6c0d8761cbb 100644 --- a/versions/l-/libpopt.json +++ b/versions/l-/libpopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0610bc947719ba9009a8e99444332fd27d315033", + "version": "1.16", + "port-version": 16 + }, { "git-tree": "ba5769f936a4234dc9803bee2476b757d0a0f0f9", "version-string": "1.16", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 6b3d40b8bcd245..e8c2ad3e18c131 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d5388715a119316e407f15a6612bf05d2292d73d", + "version": "15.3", + "port-version": 0 + }, + { + "git-tree": "74cc57fa79744500aef02f0b66be5f46b8005af3", + "version": "15.2", + "port-version": 3 + }, { "git-tree": "29b49eb009f412e692853ca40d353f31711829ea", "version": "15.2", diff --git a/versions/l-/libprotobuf-mutator.json b/versions/l-/libprotobuf-mutator.json index a53656b9756899..314c6199c6e07e 100644 --- a/versions/l-/libprotobuf-mutator.json +++ b/versions/l-/libprotobuf-mutator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df52e818f4a57b22720260014d5adf089281af3c", + "version": "1.0", + "port-version": 2 + }, { "git-tree": "f0ca8762869223e88b2fa7aad7e1dc89c1dc0568", "version-string": "1.0", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index b82123c976cadd..78403134351cbc 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "190bb3f2c7dcb0e36636bbed1e4619f1072c86f2", + "version": "0.4.18", + "port-version": 2 + }, { "git-tree": "74ecff4623774abaa9333489e644bdbc881e268f", "version": "0.4.18", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index c5f27218688f97..57cd7b0269493e 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "65bfe7c79910979e418a3c20b1cc615a64997e82", + "version": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "e524f201bfa539b35c11c270d3e25a9c48eeff14", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "d5396e9968358ea9b99e1204b37dd8cba68fef6b", "version": "2.0.2", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index 735241c8a43dd6..a4ad5d3a572d2d 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e077a8a58a07c8c3d869ff6b875cc2dd7325025", + "version": "2.40.20", + "port-version": 6 + }, { "git-tree": "f1c471322f23a090a973337e83f0d9743adc549d", "version": "2.40.20", diff --git a/versions/l-/librttopo.json b/versions/l-/librttopo.json index 63ce7e7f9ef6a9..8da0fffffdf018 100644 --- a/versions/l-/librttopo.json +++ b/versions/l-/librttopo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adc1d3db75fdf633bfcf3ffd908a45005a576163", + "version": "1.1.0", + "port-version": 8 + }, { "git-tree": "d7e9514837d372d0a952762f6e7ea600c8a625f9", "version": "1.1.0", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 2f488b14479334..544d754823acf5 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b592087185a6576e30cc29e129bec77d12c4aeb", + "version": "5.20.0", + "port-version": 0 + }, { "git-tree": "9793402aaa4679187a9a703f189239544e3daf77", "version": "5.19.0", diff --git a/versions/l-/libsecret.json b/versions/l-/libsecret.json index 4b17d8ff5a9ff9..b360a742480518 100644 --- a/versions/l-/libsecret.json +++ b/versions/l-/libsecret.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56f3e1a575e955fb58859b9a50695c700f527325", + "version": "0.20.4", + "port-version": 2 + }, { "git-tree": "a5e91b4b0043a5deb14f9ab62710b3410e969d54", "version": "0.20.4", diff --git a/versions/l-/libsonic.json b/versions/l-/libsonic.json new file mode 100644 index 00000000000000..e0c8976a623d8e --- /dev/null +++ b/versions/l-/libsonic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b81fb841c7bcf7ce50cedfbdec8ff83b627a2d7a", + "version": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 02fbc09be8eeb5..2db3b9903a404e 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea959bb978266565d868fff1aed8641b56493131", + "version": "5.0.1", + "port-version": 12 + }, { "git-tree": "08ee2fddd99e37491e2ea37872716b5ff70f1d81", "version": "5.0.1", diff --git a/versions/l-/libstemmer.json b/versions/l-/libstemmer.json index b3521b887820d3..0f113f04a02476 100644 --- a/versions/l-/libstemmer.json +++ b/versions/l-/libstemmer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df38970bafcdd4475d3d15732a891ad2f897bede", + "version": "2017-9", + "port-version": 8 + }, { "git-tree": "576c66a3306ca3023e63dcaf12edad79a3784f32", "version-string": "2017-9", diff --git a/versions/l-/libstk.json b/versions/l-/libstk.json index 317d6316348a8d..860d4d0293744e 100644 --- a/versions/l-/libstk.json +++ b/versions/l-/libstk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "799334749f6ca3302c25b1db53dd27d03f7b9f2b", + "version": "4.6.1", + "port-version": 3 + }, { "git-tree": "237ff5e1bfd88a6a20172fd888ac539749052486", "version-string": "4.6.1", diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index 954b9ccd1279aa..12ccd5c0d8d1ed 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae0678aa4f8c3675932de4d2e8986f4a5ca7d30e", + "version": "1.24.0", + "port-version": 0 + }, { "git-tree": "09fe9037f9dc927b39eac5ed74cbce37dbb62f12", "version": "1.23.1", diff --git a/versions/l-/libtomcrypt.json b/versions/l-/libtomcrypt.json index 11775d9b224372..7bf9486a157c33 100644 --- a/versions/l-/libtomcrypt.json +++ b/versions/l-/libtomcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef279d3115e2f464337bed057d24e9072a3918e7", + "version": "1.18.2", + "port-version": 3 + }, { "git-tree": "b339006b76f8211aa40e6d88fc6adc843d1048fa", "version-string": "1.18.2", diff --git a/versions/l-/libtommath.json b/versions/l-/libtommath.json index f1a832ad50cde8..1cd44665e7617b 100644 --- a/versions/l-/libtommath.json +++ b/versions/l-/libtommath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70acf033d012ad744340243d73cdd40b07501f0e", + "version": "1.2.0", + "port-version": 3 + }, { "git-tree": "745f0ffe9bd56bb065e987124a7d0afebc445dc2", "version-string": "1.2.0", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index 229759741e8de8..3d8f6af2599683 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f8ee520ffcef31a008c2c73b1155b38151ebae4", + "version": "1.12.1", + "port-version": 3 + }, { "git-tree": "1fb6e115393430795e4173a45155e80c5462cd00", "version": "1.12.1", diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index f95abca5191aaf..9078366a261118 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "659f86cfa8b1e0f62ba1d7c6376ec5d7f292fb7c", + "version": "2.0.9", + "port-version": 0 + }, { "git-tree": "884acf58813237198df4d1265661ad93b6b57955", "version": "2.0.8", diff --git a/versions/l-/libtracepoint.json b/versions/l-/libtracepoint.json new file mode 100644 index 00000000000000..8a14f9ee300b2d --- /dev/null +++ b/versions/l-/libtracepoint.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f60f9a909a55a04c9bc87b6a3e10df5f0faec1a4", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libudns.json b/versions/l-/libudns.json index f1851a16901814..5eb542c70cd610 100644 --- a/versions/l-/libudns.json +++ b/versions/l-/libudns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5b2efa89aac8ab7f97487cf72ed8aa489b2c6af", + "version": "0.4", + "port-version": 5 + }, { "git-tree": "277ba57e6f9840670698c62196ea9b30c74485e0", "version-string": "0.4", diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json index 1636fbcf6fa327..f9a5b177fe076a 100644 --- a/versions/l-/libuuid.json +++ b/versions/l-/libuuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "356948d66a6dd59bd830d26c78d1df673de20ea1", + "version": "1.0.3", + "port-version": 13 + }, { "git-tree": "70aca4a70f3235201b05de87aa7ee6258d7c0231", "version": "1.0.3", diff --git a/versions/l-/libuvc.json b/versions/l-/libuvc.json index c29691ba51e6bd..f6d6c39f3b3346 100644 --- a/versions/l-/libuvc.json +++ b/versions/l-/libuvc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "578c4d06e3d518e46edee324e3c8048826c503ec", + "version-date": "2020-11-24", + "port-version": 4 + }, { "git-tree": "b254a9fb5aa3fc5d709a3f708d9c3dbb5d0a26bd", "version-date": "2020-11-24", diff --git a/versions/l-/libvault.json b/versions/l-/libvault.json new file mode 100644 index 00000000000000..441d33f1c4283f --- /dev/null +++ b/versions/l-/libvault.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3ab55180dfc75f58d833bae81f6e303416c992e6", + "version": "0.56.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libvmdk.json b/versions/l-/libvmdk.json index 4d421a0a082784..fcbd863f139b28 100644 --- a/versions/l-/libvmdk.json +++ b/versions/l-/libvmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e57cc839896d460f87ccf1a48562dcb876f7f6b", + "version": "20200926", + "port-version": 4 + }, { "git-tree": "f7144e40ca7cfd22875c2aa308e4e9b023ef3033", "version-string": "20200926", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 87e023c643b303..10301e6b4dcc84 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b346f9dc851b8598c461ae9b856c11d222848ec", + "version": "1.12.0", + "port-version": 1 + }, { "git-tree": "5bad78764d9138da1f5f2b1c49ec291377166a30", "version": "1.12.0", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index 4014a60641a4b5..c44d7202685620 100644 --- a/versions/l-/libxlsxwriter.json +++ b/versions/l-/libxlsxwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2769eadc216de088f724efd09edce1c73f9e8b4b", + "version": "1.1.5", + "port-version": 1 + }, { "git-tree": "1fec6d7beb6dff8486fb16b04849725ac466d409", "version": "1.1.5", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 526fed6df5546d..a9e868cad0c550 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "361ec896634a0f947949dcf71e2dbf991c066d44", + "version": "5.0.0", + "port-version": 3 + }, { "git-tree": "a603edc93c74d92bdbcef0bd8c38bbe331d1aa9d", "version": "5.0.0", diff --git a/versions/l-/libxmp.json b/versions/l-/libxmp.json new file mode 100644 index 00000000000000..8caedf06d37ab4 --- /dev/null +++ b/versions/l-/libxmp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2773b355a7b3a41ab6739548277b9b828d163242", + "version-date": "2023-04-13", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 2f867897ae9beb..b29b3a4855eb69 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5013956f82220811954d9ed3b68e122c11e88a0", + "version": "1.1.37", + "port-version": 2 + }, { "git-tree": "1e2ad3abc4c5d53f33c43f0a1b7aa09ca7e06dc1", "version": "1.1.37", diff --git a/versions/l-/libyaml.json b/versions/l-/libyaml.json index 3c90caf31cb15e..e8db03dad3f87c 100644 --- a/versions/l-/libyaml.json +++ b/versions/l-/libyaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae6fcd42cb9d1448913be2c7eb536df813601230", + "version": "0.2.5", + "port-version": 4 + }, { "git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7", "version-string": "0.2.5", diff --git a/versions/l-/libzen.json b/versions/l-/libzen.json index 07f7ed75cdf80c..5af1c768cf40ec 100644 --- a/versions/l-/libzen.json +++ b/versions/l-/libzen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab92638577d4a71ffc7acd3bee65dc7d8c0e7bca", + "version": "0.4.41", + "port-version": 0 + }, { "git-tree": "e3635609bd53140cc191a65b168d1a131f84366a", "version": "0.4.40", diff --git a/versions/l-/libzim.json b/versions/l-/libzim.json new file mode 100644 index 00000000000000..52f4ea9bc578df --- /dev/null +++ b/versions/l-/libzim.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "1488a183ad98b3610343e68c207554492b1e8c8e", + "version": "8.2.0", + "port-version": 1 + }, + { + "git-tree": "93b2790850e120148daf03563e24e6ed3ee9e02e", + "version": "8.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libzippp.json b/versions/l-/libzippp.json index 1dcb2b6b9d9983..9411d448d27609 100644 --- a/versions/l-/libzippp.json +++ b/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c15b10fa38a22c6ff395d7a87c3a4f02c5586add", + "version": "6.1-1.9.2", + "port-version": 0 + }, { "git-tree": "9b0548bad2ec87607ee6dec3e94ee4d3140ff726", "version": "6.0-1.9.2", diff --git a/versions/l-/licensepp.json b/versions/l-/licensepp.json index 382d7d62ad6378..2ffc57fa4cce50 100644 --- a/versions/l-/licensepp.json +++ b/versions/l-/licensepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00707f2d2df73ed1303b493178c791ef41996505", + "version-date": "2020-11-24", + "port-version": 0 + }, { "git-tree": "242d2988823856d4bec19a6a8844fb0d6a30eb33", "version-date": "2020-05-19", diff --git a/versions/l-/lightningscanner.json b/versions/l-/lightningscanner.json new file mode 100644 index 00000000000000..997e21af1b4b1f --- /dev/null +++ b/versions/l-/lightningscanner.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "25cfcf5944e73bfe349e264a37f98ea36558da18", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/linalg.json b/versions/l-/linalg.json index 10c2b9324b6872..a863c0854f8b63 100644 --- a/versions/l-/linalg.json +++ b/versions/l-/linalg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dec66a04dc695329609da7aad70ecfde3e36aa4b", + "version": "2.1", + "port-version": 2 + }, { "git-tree": "19b7c7f697dab441e8d16c883a66682f090fb0cf", "version-string": "2.1", diff --git a/versions/l-/lionkor-commandline.json b/versions/l-/lionkor-commandline.json index 0283efb574f1c2..b10eb4f4245e60 100644 --- a/versions/l-/lionkor-commandline.json +++ b/versions/l-/lionkor-commandline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5588648e1995f79458647db04b18ddf68c6ddcd6", + "version-semver": "2.2.0", + "port-version": 0 + }, { "git-tree": "bb56d3f901805ac69ea5d7bd27a07b789f3232e5", "version-semver": "2.0.0", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index c121998e2fe1f8..2774f145069f25 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4042dde466ab9adcd96e5271751a65a8b67270f7", + "version-date": "2023-05-10", + "port-version": 0 + }, { "git-tree": "0a8b18570460ba3155d5c6cba9f5c05c95d876e2", "version-date": "2023-03-30", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 16039c900477a5..875d835dfc3cd8 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "1ba26e4d72f4d6112c483a09d9a2dd0aa42067f3", + "version": "15.0.7", + "port-version": 3 + }, + { + "git-tree": "9c069ac90689417940c7a8e5a972afac79042619", + "version": "15.0.7", + "port-version": 2 + }, + { + "git-tree": "da5caa3f08a5e52f4d46559e0f5be3a73958dd2c", + "version": "15.0.7", + "port-version": 1 + }, + { + "git-tree": "cb3f603740884034c2a28562e35c47f3c8e45ad6", + "version": "15.0.7", + "port-version": 0 + }, { "git-tree": "321559ad78e1741e396fc25d5f51d4f99d1f40fc", "version": "14.0.6", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 33fc5613aeb205..f196519ecc039d 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f8391924df847ec08d25424cb7482be557c3d49", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "65dd3e2c021462bc3445c9f215ace6936a177bb6", "version": "0.13.0.1", diff --git a/versions/l-/lpeg.json b/versions/l-/lpeg.json index 4151d8e6bbc2ac..765303b41ce900 100644 --- a/versions/l-/lpeg.json +++ b/versions/l-/lpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e364c24f0029fc6589aae6051eec09af14cc02d2", + "version": "1.0.2", + "port-version": 4 + }, { "git-tree": "d8bf7969434ee53a126d419ba7387322658967bb", "version-string": "1.0.2", diff --git a/versions/l-/ltla-aarand.json b/versions/l-/ltla-aarand.json new file mode 100644 index 00000000000000..9a6bf9a8e61c70 --- /dev/null +++ b/versions/l-/ltla-aarand.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "78cd0fcfb69b096fb2f4261e02c0b0dbaa85b89a", + "version-date": "2023-03-19", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-cppirlba.json b/versions/l-/ltla-cppirlba.json new file mode 100644 index 00000000000000..df091854bf8f85 --- /dev/null +++ b/versions/l-/ltla-cppirlba.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a1a4fe3742a5fecbadcb34155df9230a279a3e1c", + "version-date": "2023-04-07", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-cppkmeans.json b/versions/l-/ltla-cppkmeans.json new file mode 100644 index 00000000000000..2342a0fd71f9d1 --- /dev/null +++ b/versions/l-/ltla-cppkmeans.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "98167fd1d30ddefc1bbb44a321af164cf59aee31", + "version-date": "2023-03-20", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-knncolle.json b/versions/l-/ltla-knncolle.json new file mode 100644 index 00000000000000..844029f746e009 --- /dev/null +++ b/versions/l-/ltla-knncolle.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "543f312cf96c53b41e8501bf473e5e8a336d8b12", + "version-date": "2023-05-09", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-powerit.json b/versions/l-/ltla-powerit.json new file mode 100644 index 00000000000000..af8b6d92f1ffe8 --- /dev/null +++ b/versions/l-/ltla-powerit.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "522b483967df42ac83d0876893d81becf3e88ab6", + "version-date": "2023-03-19", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-umappp.json b/versions/l-/ltla-umappp.json new file mode 100644 index 00000000000000..db0c44c68671a7 --- /dev/null +++ b/versions/l-/ltla-umappp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b96e4bc54041c787e0c15d884c0968aade97cfae", + "version-date": "2023-05-11", + "port-version": 0 + } + ] +} diff --git a/versions/l-/lua.json b/versions/l-/lua.json index 7c151ed6951efd..b1ca86671cee00 100644 --- a/versions/l-/lua.json +++ b/versions/l-/lua.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "804a148ba3bbecf8f998d38c682eaee628725fbb", + "version": "5.4.4", + "port-version": 7 + }, + { + "git-tree": "d250107f0ea435eb8145cd8b0db97aebee05f0b6", + "version": "5.4.4", + "port-version": 6 + }, { "git-tree": "0a579d274fbb147e35fc45578cc446cad2c76079", "version": "5.4.4", diff --git a/versions/l-/luafilesystem.json b/versions/l-/luafilesystem.json index 237944ca12f253..01ac651f4b73fa 100644 --- a/versions/l-/luafilesystem.json +++ b/versions/l-/luafilesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d399198385c222305569f32166f965843da16cdf", + "version": "1.8.0", + "port-version": 4 + }, { "git-tree": "b823db113deca954d5354f3e9f0cda24adcf9a7e", "version-string": "1.8.0", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 88937b7053a4e1..b1e59fa1a56b1a 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a564decc9569af8e940353cab9623b6f93f3a4b", + "version-date": "2023-01-04", + "port-version": 1 + }, { "git-tree": "3c7f639efd41b49e93c61ae54fd99bb332d80bf9", "version-date": "2023-01-04", diff --git a/versions/l-/luasec.json b/versions/l-/luasec.json index 4881a9987185be..20a920360840c6 100644 --- a/versions/l-/luasec.json +++ b/versions/l-/luasec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4f635627a073d4fbf97a5e54a974fadc788f7ac", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "9c562198b62737a1b5c47ef51bb4a5a7b46fd3ce", "version": "1.1.0", diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json index fcddb746f7cd84..93873451e97ffc 100644 --- a/versions/l-/luasocket.json +++ b/versions/l-/luasocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faad47eddfeeb72b135a34c713c20f821ab0261b", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "b4e4099cfa80585c7df33b66e37580cea982e83d", "version": "3.0.0", diff --git a/versions/l-/lzfse.json b/versions/l-/lzfse.json index d1b447fd467e98..35bf544a8a6d24 100644 --- a/versions/l-/lzfse.json +++ b/versions/l-/lzfse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b47ba3c21e10b55e1fa8761b8ddaf062ac0bb792", + "version": "1.0", + "port-version": 5 + }, { "git-tree": "c42d879181140bf395967f7c28e439056effc193", "version-string": "1.0", diff --git a/versions/l-/lzo.json b/versions/l-/lzo.json index b1b8c4a6246f5f..2d5d3ecbb036e3 100644 --- a/versions/l-/lzo.json +++ b/versions/l-/lzo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcd8844a4e80d418bf894cf93a0453f067e404de", + "version": "2.10", + "port-version": 9 + }, { "git-tree": "1a8143f905204b72c9753894bb397aa96a415216", "version-string": "2.10", diff --git a/versions/l-/lzokay.json b/versions/l-/lzokay.json index 900fdc64974e99..a1238b0a3dfd5b 100644 --- a/versions/l-/lzokay.json +++ b/versions/l-/lzokay.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a04a58317804702e2dc099904e39a58fb148d25", + "version-date": "2020-07-30", + "port-version": 2 + }, { "git-tree": "909885572ad121a7c7504af41fd2571ca01870ec", "version-string": "2020-07-30", diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index c9a857a5c7e1c3..882c31994ba436 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d423a24705ddc48956d0c7683f3f8e418ae44b0d", + "version": "0.9.1", + "port-version": 0 + }, { "git-tree": "579c97b898c772c488b1de1fef924cb8c767c511", "version": "0.8.2", diff --git a/versions/m-/magic-get.json b/versions/m-/magic-get.json index 6fcd5f61dfe80f..2d2900420747ec 100644 --- a/versions/m-/magic-get.json +++ b/versions/m-/magic-get.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "210c8bce711a4602b27ade5743bdb4126caa79ee", + "version-date": "2019-09-02", + "port-version": 3 + }, { "git-tree": "c74c7f4f5516bdfeffc916c0e72a650d65fe61fb", "version-string": "2019-09-02", diff --git a/versions/m-/magnum-integration.json b/versions/m-/magnum-integration.json index 096cdb0682a490..8e21a14de19e80 100644 --- a/versions/m-/magnum-integration.json +++ b/versions/m-/magnum-integration.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "191049e602f776d41b02b21f74df5c36393f8de0", + "version-string": "2020.06", + "port-version": 3 + }, { "git-tree": "7485cdf34b865de5cca00d40ee315a0504e226f1", "version-string": "2020.06", diff --git a/versions/m-/makeid.json b/versions/m-/makeid.json new file mode 100644 index 00000000000000..4b7c72c99db533 --- /dev/null +++ b/versions/m-/makeid.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "08114cbf3e65a21af7fa59508fc838fb4cac067c", + "version": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mapbox-variant.json b/versions/m-/mapbox-variant.json index 99c66d7627d132..307b09bf164aa3 100644 --- a/versions/m-/mapbox-variant.json +++ b/versions/m-/mapbox-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bbebe72c660725c3540133f722ad9cac7dc2c5c", + "version": "1.2.0", + "port-version": 2 + }, { "git-tree": "33967b083c32aab183281126cde3fdab878e71be", "version-string": "1.2.0", diff --git a/versions/m-/mathc.json b/versions/m-/mathc.json index 1edddb103ba291..875de4c3470e9d 100644 --- a/versions/m-/mathc.json +++ b/versions/m-/mathc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a622f49155eedd08e32999ae7642251a1f1e30b4", + "version-date": "2019-09-29", + "port-version": 3 + }, { "git-tree": "1bf40ce6eb363cb8981612f34fb96c41be4c804a", "version-string": "2019-09-29", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index e5bf286b143106..d696bec6456c37 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "34ffe72f88b0fa47c8bf8ad235ed3cf109560f65", + "version": "8.0.1", + "port-version": 2 + }, + { + "git-tree": "edd98363d2569c9ef358506313ce110045708f6a", + "version": "8.0.1", + "port-version": 1 + }, { "git-tree": "8fd2208b95f6ebc6f17a30cc79c3b57b1a8bcfb7", "version": "8.0.1", diff --git a/versions/m-/matplotlib-cpp.json b/versions/m-/matplotlib-cpp.json index f237470b3ecae7..77b7e60543d9c7 100644 --- a/versions/m-/matplotlib-cpp.json +++ b/versions/m-/matplotlib-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6daa977bec3896a8b102b44aaf1918778412e8a", + "version-date": "2020-08-27", + "port-version": 2 + }, { "git-tree": "baade687391a8a12d426361c378e7c1ee31d1182", "version-string": "2020-08-27", diff --git a/versions/m-/matroska.json b/versions/m-/matroska.json index 8bf36eb8f64a2c..eceb5076ae0cfb 100644 --- a/versions/m-/matroska.json +++ b/versions/m-/matroska.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "12137590eb6e5ec4e644e61b664d83a4ed6c8022", + "version": "1.7.1", + "port-version": 1 + }, + { + "git-tree": "041bae8554d02be4ce2909d9a01a8fd2bced588b", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "4f42c70e6e7b730f43e59e3dd7e0b4b8e7e7abd8", "version": "1.6.3", diff --git a/versions/m-/mchehab-zbar.json b/versions/m-/mchehab-zbar.json index ac77fde99e37f2..9a02cb4a6360a0 100644 --- a/versions/m-/mchehab-zbar.json +++ b/versions/m-/mchehab-zbar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34932d2a4b1c53aefeed99ef9133f8a307ad9958", + "version": "0.23.90", + "port-version": 4 + }, { "git-tree": "09371ba90d3c31d038bffd54a90203b5b4f7fdc8", "version": "0.23.90", diff --git a/versions/m-/mcpp.json b/versions/m-/mcpp.json index 932f03470ceb00..413d75f9ab316b 100644 --- a/versions/m-/mcpp.json +++ b/versions/m-/mcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7041df1b28901785cee16019a1fb8a0cef7c6bb1", + "version": "2.7.2.14", + "port-version": 5 + }, { "git-tree": "c8e9fb1b912244a0d844e2748210a805ae2a7a93", "version-string": "2.7.2.14", diff --git a/versions/m-/mecab.json b/versions/m-/mecab.json index 826e065e2936f9..6ab5b38ea3f24a 100644 --- a/versions/m-/mecab.json +++ b/versions/m-/mecab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5f64d85fddc71ff872f675cda3ed8ee767193f1", + "version-date": "2019-09-25", + "port-version": 4 + }, { "git-tree": "0728379df6bdd38f71f90bff5b1d75dcd3f0b6d0", "version-string": "2019-09-25", diff --git a/versions/m-/memorymodule.json b/versions/m-/memorymodule.json index 990365470d08f9..f309495fed6e74 100644 --- a/versions/m-/memorymodule.json +++ b/versions/m-/memorymodule.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffb374d5bca41e19f8bdc69582814e3fc65a93aa", + "version-date": "2019-12-31", + "port-version": 3 + }, { "git-tree": "f7818f51e182a651a0b090ea0d315c32b928d7c3", "version-string": "2019-12-31", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index df8cab3121592c..4d9607091924cd 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d76e69afa98f38f1b3102572a8a5516ce088b9ca", + "version": "23.0.1", + "port-version": 1 + }, { "git-tree": "87fb0741a264517b99f37f4ff2ba43264cdfe0f9", "version": "23.0.1", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index e3bd9400b6dc83..c269ad6d88a9a4 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "9a366b0a8f7b8177b0c91de00d652dfac38ed927", + "version": "0.1.0-alpha4", + "port-version": 6 + }, + { + "git-tree": "4d404283aa7fbee588db56cbe0a470d82c1f9258", + "version": "0.1.0-alpha4", + "port-version": 5 + }, + { + "git-tree": "1ea9d11c361ff46b14b9872df5b71b634ff1d709", + "version": "0.1.0-alpha4", + "port-version": 4 + }, + { + "git-tree": "756cbce0122778f80b0029e5efbec95f76e04457", + "version": "0.1.0-alpha4", + "port-version": 3 + }, { "git-tree": "3941fa934e8ae400f7cd47d0311f4e4f945dbacd", "version": "0.1.0-alpha4", diff --git a/versions/m-/mikktspace.json b/versions/m-/mikktspace.json index 66a232d226be1c..ee346c8cbae809 100644 --- a/versions/m-/mikktspace.json +++ b/versions/m-/mikktspace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d17da931820ec6b21851d8ad62927e33c8afd119", + "version-date": "2020-10-06", + "port-version": 3 + }, { "git-tree": "d568c517b4a55fcc8031ae6b7b1d9ccff6682185", "version-string": "2020-10-06", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index da9006fa36356a..702ceb4ec4b694 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6055b5cb8a3a2d744cac4781fed65cf1da1064f", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "aaa17dfe033cf63a5884ab214e39a790181ae8a3", "version": "2.0.9", diff --git a/versions/m-/miniply.json b/versions/m-/miniply.json new file mode 100644 index 00000000000000..79d77fad10bbf4 --- /dev/null +++ b/versions/m-/miniply.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "20ddfb09455e95fa20fcebc8d9e0d99409526a35", + "version-date": "2022-09-15", + "port-version": 1 + }, + { + "git-tree": "648516b62e07a6e5c6387f110f9f4bce0d6c67e9", + "version-date": "2022-09-15", + "port-version": 0 + } + ] +} diff --git a/versions/m-/minitrace.json b/versions/m-/minitrace.json index 42a7e6e1cd7d4c..ffee09093e862f 100644 --- a/versions/m-/minitrace.json +++ b/versions/m-/minitrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6bb405d13f5270e92c492306f317cb01dc4ab30", + "version-date": "2023-04-23", + "port-version": 0 + }, { "git-tree": "a108afe478661d93adbf6ca758501a543d89f2b1", "version-string": "2019.02.06", diff --git a/versions/m-/miniupnpc.json b/versions/m-/miniupnpc.json index ffbbbfca64b85b..95fae1f8d792e6 100644 --- a/versions/m-/miniupnpc.json +++ b/versions/m-/miniupnpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d63b7b18c08e0d968612093f1ada8f872c955688", + "version": "2.1", + "port-version": 4 + }, { "git-tree": "0c33ab6d1ebb5bc580617eaf6fd34930ec0d8233", "version-string": "2.1", diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 9df368d513f2f4..511750c2fdf74c 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1e55bf50acfd71d5f37f98bee270ff687f65219f", + "version": "4.0.0", + "port-version": 1 + }, + { + "git-tree": "f9a2226720f5e72647d6b0399f9c0bd5baf8f9b9", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "e97e41aa57defe3c82bebab5941a4e4320f5a704", "version": "3.0.7", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index 4cd3992405c86b..c9eeb9d1d78c6a 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "48d519ab0025623c54756c482453f8405d2646bd", + "version-semver": "1.2.13", + "port-version": 2 + }, + { + "git-tree": "c8831fffa825d9fafc38f1e3587046c49051ecba", + "version-semver": "1.2.13", + "port-version": 1 + }, { "git-tree": "c0843dcfad42a538a772797a3f50627b5c8d411a", "version-semver": "1.2.13", diff --git a/versions/m-/moos-core.json b/versions/m-/moos-core.json index b3c3d744a7f425..0816a4e0d70f0e 100644 --- a/versions/m-/moos-core.json +++ b/versions/m-/moos-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f2f00b654a7a9a9a810ae8d84099c9567f847cf", + "version": "10.4.0", + "port-version": 8 + }, { "git-tree": "2081cab97d387c22addea1cec2a244f45a1a6b09", "version": "10.4.0", diff --git a/versions/m-/moos-essential.json b/versions/m-/moos-essential.json index 7b9b278e1c8165..08ff17bef3cff1 100644 --- a/versions/m-/moos-essential.json +++ b/versions/m-/moos-essential.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ffee2f0ff0958105ea47afa647a7903843f7163", + "version": "10.0.1", + "port-version": 5 + }, { "git-tree": "92e1bf2cd4c25ce4d4cf529f9b1848973199d3e4", "version-string": "10.0.1", diff --git a/versions/m-/moos-ui.json b/versions/m-/moos-ui.json index f736f296bf6f23..baf50fe01119b4 100644 --- a/versions/m-/moos-ui.json +++ b/versions/m-/moos-ui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3a4cd845b217a94361bc21770a315dfcdec91b3", + "version": "10.0.1", + "port-version": 5 + }, { "git-tree": "41137f783f7948b1623b67b9fd96005fe2582e5a", "version-string": "10.0.1", diff --git a/versions/m-/morton-nd.json b/versions/m-/morton-nd.json index 81df6bad03bc94..9e1fb3f04ef417 100644 --- a/versions/m-/morton-nd.json +++ b/versions/m-/morton-nd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fa044c2e3de0da061e78acd5ebbdd9abaa11881", + "version": "4.0.0", + "port-version": 3 + }, { "git-tree": "c77c3725f93cfc65ae3882b9f7293ef85e89931b", "version-string": "4.0.0", diff --git a/versions/m-/mpark-variant.json b/versions/m-/mpark-variant.json index 3e88cae56ebd8d..31dbc014e183e6 100644 --- a/versions/m-/mpark-variant.json +++ b/versions/m-/mpark-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85fff47d4ae330fa186b8244975e2a211b12f4da", + "version": "1.4.0", + "port-version": 3 + }, { "git-tree": "01299a260338dce6a94d3b82eb8b478859a403b7", "version-string": "1.4.0", diff --git a/versions/m-/mpc.json b/versions/m-/mpc.json index da45380dc8aaac..c3a19e33708c42 100644 --- a/versions/m-/mpc.json +++ b/versions/m-/mpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac9e33d7db3d83459eeadc2c47a6dea8d3358dc0", + "version": "1.2.0", + "port-version": 3 + }, { "git-tree": "c38230459b115da37fe9fe0161c7462de85549d5", "version": "1.2.0", diff --git a/versions/m-/mpi.json b/versions/m-/mpi.json index d177803d619866..5ab104a083667a 100644 --- a/versions/m-/mpi.json +++ b/versions/m-/mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ae77ae0460cf7e6cfe308614e74e1d94b1ca641", + "version": "1", + "port-version": 4 + }, { "git-tree": "2eacb3d18a3407d1ceb6211ee7cad0b157249d22", "version-string": "1", diff --git a/versions/m-/ms-gltf.json b/versions/m-/ms-gltf.json index 82b9a8bda8d6f1..192e4f6d1d3753 100644 --- a/versions/m-/ms-gltf.json +++ b/versions/m-/ms-gltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fb5ea5c5659fa04f4038a9df76b469f39c4e8f0", + "version-date": "2022-06-28", + "port-version": 2 + }, { "git-tree": "b189e4d23ebe85437573b386d94b06b3f9fb6238", "version-date": "2022-06-28", diff --git a/versions/m-/msgpack.json b/versions/m-/msgpack.json index eeb891a68f9f72..bad0ee95d9f861 100644 --- a/versions/m-/msgpack.json +++ b/versions/m-/msgpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9f798edc049a449e0fe3dffb9401659339b371a", + "version": "6.0.0", + "port-version": 1 + }, { "git-tree": "fc124bda56c5eca176379c3e17f9c2f2d63bbdd9", "version": "6.0.0", diff --git a/versions/m-/msinttypes.json b/versions/m-/msinttypes.json index f59de2c3b00f95..3f0b64b96d3a99 100644 --- a/versions/m-/msinttypes.json +++ b/versions/m-/msinttypes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34e86ded5171b1516fe2e5b51c5122ccd078f8ae", + "version-date": "2018-02-25", + "port-version": 2 + }, { "git-tree": "e912f42451c0d3a2563a68db50d96318bd277e40", "version-string": "2018-02-25", diff --git a/versions/m-/mstch.json b/versions/m-/mstch.json index c04d397cc146d7..a6c72c92b4a80f 100644 --- a/versions/m-/mstch.json +++ b/versions/m-/mstch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "105e9bad13386dd0b785eb38884c375834f6a7bb", + "version": "1.0.2", + "port-version": 5 + }, { "git-tree": "8fe89ac9440d83aa39cda5e17f0787c90673dced", "version-string": "1.0.2", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 4b7412e2af279f..8bc751dc5cd933 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "345723d54eef6854daed66dedae0b9d4ead2f9a4", + "version-date": "2023-05-18", + "port-version": 0 + }, { "git-tree": "6187a6048afe0846ffb243d00981f0da0666aa38", "version-date": "2022-11-03", diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json index 7fc17d1042fab9..2da841a720a881 100644 --- a/versions/m-/mygui.json +++ b/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b68ea2f9e7d24c34d86ea4d45050adc7ac29663", + "version": "3.4.1", + "port-version": 5 + }, { "git-tree": "006d47cf87a29b68cbf5f7d1fbbc7e12a38e3cb7", "version": "3.4.1", diff --git a/versions/n-/nana.json b/versions/n-/nana.json index 478116c099077c..f3cd7e8e51019c 100644 --- a/versions/n-/nana.json +++ b/versions/n-/nana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a9b07b69a2b4c5adec89f6de54c4ad45df86b88", + "version": "1.7.4", + "port-version": 4 + }, { "git-tree": "e18604f3c78c739c1e1e127c0c0ab3e41345db5d", "version-string": "1.7.4", diff --git a/versions/n-/nano-signal-slot.json b/versions/n-/nano-signal-slot.json index c5ca118d7c8109..f100e79df9ff07 100644 --- a/versions/n-/nano-signal-slot.json +++ b/versions/n-/nano-signal-slot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8fe131fc48fcc5a0935df8458dd39dccfbac755", + "version": "2.0.1", + "port-version": 2 + }, { "git-tree": "b46cf4c106c7a062c72ff464ad172d52f9f2a642", "version-string": "2.0.1", diff --git a/versions/n-/nanoprintf.json b/versions/n-/nanoprintf.json index 44d94b76f673c1..c02549d10215ad 100644 --- a/versions/n-/nanoprintf.json +++ b/versions/n-/nanoprintf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dc3b1f718f303cda846f07207bc62a4acc6274b", + "version-date": "2020-05-27", + "port-version": 2 + }, { "git-tree": "eb37eca3c4891582693eb5a769cf307c60b059ac", "version-string": "2020-05-27", diff --git a/versions/n-/nanort.json b/versions/n-/nanort.json index 54e855482ed27b..c2ac3826ddaa43 100644 --- a/versions/n-/nanort.json +++ b/versions/n-/nanort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f299ee1037140bda3d4cd6ef09b2d877cc61db07", + "version-date": "2019-08-20", + "port-version": 3 + }, { "git-tree": "9fab3a6181cbaace8875990f9aab595cdad59956", "version-string": "2019-08-20", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index af3e5e2b495b38..00bf36d0cf2d16 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d17052df3479de37b4c756f4e90661c9fa85e7d", + "version": "4.8.1", + "port-version": 3 + }, { "git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5", "version": "4.8.1", diff --git a/versions/n-/netcdf-cxx4.json b/versions/n-/netcdf-cxx4.json index a71d832b68c500..f494867f1e3a88 100644 --- a/versions/n-/netcdf-cxx4.json +++ b/versions/n-/netcdf-cxx4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e923110ddc48818ad472b7b577823caabfb203ab", + "version": "4.3.1", + "port-version": 5 + }, { "git-tree": "58540066d5e44f206328ac7cc9744153dbd39a68", "version-string": "4.3.1", diff --git a/versions/n-/nettle.json b/versions/n-/nettle.json index 6415658430e774..ce348da9711767 100644 --- a/versions/n-/nettle.json +++ b/versions/n-/nettle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7734b67cb656bf12488ea137779b56d8865bbb02", + "version": "3.8.1", + "port-version": 1 + }, { "git-tree": "1ca3c1210bb511a4d94b53684fcb557e92678d7b", "version": "3.8.1", diff --git a/versions/n-/networkdirect-sdk.json b/versions/n-/networkdirect-sdk.json index 36ef8dc5074d92..0537e8a0139cee 100644 --- a/versions/n-/networkdirect-sdk.json +++ b/versions/n-/networkdirect-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a772a084c23789a5e43d7a8880cb7e980a6314b6", + "version": "2.0.1", + "port-version": 4 + }, { "git-tree": "4ae7e238a2a00496c78d2d2bb2101f9e054975e9", "version": "2.0.1", diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 684b4bc53c9002..1056bec407c52a 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0eb9ce7e6486785e3b3581274097e4d0e34ad828", + "version": "1.53.0", + "port-version": 0 + }, { "git-tree": "74c421607d322d652065b5414ddd4d7f0989c0bf", "version": "1.51.0", diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 3340e073f44187..7bcca795650b9f 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8139cb08a1dea31b13af01d3027129cf7874acab", + "version": "0.11.0", + "port-version": 0 + }, { "git-tree": "b490beccb519c1faa3bfbfae0bb6e8e873aed843", "version": "0.10.0", diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index a61d9ed6ab890f..d0d9fcf57ad17e 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae54f702f177016f67025862105af12921ccb325", + "version": "0.14.1", + "port-version": 0 + }, { "git-tree": "2ed43a821081be8b08e5e93265f04def890da42f", "version": "0.14.0", diff --git a/versions/n-/nmap.json b/versions/n-/nmap.json index 91784fbccef6d3..b6ef96201bbcea 100644 --- a/versions/n-/nmap.json +++ b/versions/n-/nmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6822fee19cc3071389e5a218c77e4ffadb963327", + "version": "7.70", + "port-version": 9 + }, { "git-tree": "429c00ca8882e0c2046de753bc8699603aa77343", "version": "7.70", diff --git a/versions/n-/nngpp.json b/versions/n-/nngpp.json index e4a53d1ab92f3b..880e59c1fc0cc5 100644 --- a/versions/n-/nngpp.json +++ b/versions/n-/nngpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e61e4c2585eb86f360f925d8c522c5d6764fc6a6", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "753d69bc50dbc03626d362d132de28e4f8079b19", "version-string": "1.3.0", diff --git a/versions/n-/node-addon-api.json b/versions/n-/node-addon-api.json index bda5bcc63729d9..64c0ca7d2a05b5 100644 --- a/versions/n-/node-addon-api.json +++ b/versions/n-/node-addon-api.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "33617d9929f3a05c2f3a98781dd6508a1b2ba1cd", + "version": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "cfdebff816f735bc5922266b54623e0a70b667cf", + "version": "6.0.0", + "port-version": 1 + }, { "git-tree": "45cf82eea2cea9f8fa60b8a476f6484f75f81ca5", "version": "6.0.0", diff --git a/versions/n-/node-api-headers.json b/versions/n-/node-api-headers.json new file mode 100644 index 00000000000000..2a7b0bb2eac1c2 --- /dev/null +++ b/versions/n-/node-api-headers.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "273191974015356594e8288781f46c01fd882d43", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "a38314df5ed9495e8e15abc596a5cd75e0116824", + "version": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "1a4d676ae2409acc29b77934186b1232e3a80408", + "version": "0.0.5", + "port-version": 1 + }, + { + "git-tree": "d8703d51a9b88c204782885707fc580ab490e9f4", + "version": "0.0.5", + "port-version": 0 + } + ] +} diff --git a/versions/n-/nonius.json b/versions/n-/nonius.json index 92c4d57647218d..f2b983187188a9 100644 --- a/versions/n-/nonius.json +++ b/versions/n-/nonius.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b44b6979dba8939009d769f36a90196e93afe9f", + "version-date": "2019-04-20", + "port-version": 4 + }, { "git-tree": "9c9da5344edbd70d4941eec3b1b1ef7ce90a3c1a", "version-string": "2019-04-20", diff --git a/versions/n-/nowide.json b/versions/n-/nowide.json index a90912bd77c9e8..57612b6970c002 100644 --- a/versions/n-/nowide.json +++ b/versions/n-/nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d91d4dcfdca6cb36e7c2235e9a14ccc131ed165e", + "version": "11.2.0", + "port-version": 1 + }, { "git-tree": "dc71e4553a59625e8daaf2c3e1d54af1f19a0279", "version": "11.2.0", diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json index 354249c8b372be..bcfc36e3d7e3fb 100644 --- a/versions/n-/nspr.json +++ b/versions/n-/nspr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6ae665af0bc5a8b98f846bf8e8468e823f09509", + "version": "4.35", + "port-version": 3 + }, { "git-tree": "26de592ee740014b5e1a5d038e5f2132671312b5", "version": "4.35", diff --git a/versions/n-/nss.json b/versions/n-/nss.json index 0938d6760037a8..2ab6abf96e9c55 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ee50028600372dc454e15907e4f3168463c5570", + "version": "3.87", + "port-version": 1 + }, { "git-tree": "dde235e6a76604d088e7fc8701354fea880c1065", "version": "3.87", diff --git a/versions/n-/nt-wrapper.json b/versions/n-/nt-wrapper.json index db8f024b378e59..e823b9be1401bc 100644 --- a/versions/n-/nt-wrapper.json +++ b/versions/n-/nt-wrapper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dca74052bdbd3af026eb8b37e3222beed0a43276", + "version-date": "2019-08-10", + "port-version": 3 + }, { "git-tree": "57d9be46d1ad11b6438efd40a0392c78ddbcfd9a", "version-string": "2019-08-10", diff --git a/versions/n-/nu-book-zxing-cpp.json b/versions/n-/nu-book-zxing-cpp.json index 71bb7e9d0a4756..e2b7cf83b3ce28 100644 --- a/versions/n-/nu-book-zxing-cpp.json +++ b/versions/n-/nu-book-zxing-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4cd1e936d33ae825fc57284f37bd29b1b0b08c5", + "version": "2.0.0", + "port-version": 1 + }, { "git-tree": "78c8636186395a676c941dc214b01d4576d643b6", "version": "2.0.0", diff --git a/versions/n-/numcpp.json b/versions/n-/numcpp.json index 6d168e28a70f67..11c11ca2614eed 100644 --- a/versions/n-/numcpp.json +++ b/versions/n-/numcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99f0dc5efa2ee18b46af92901b34426516cf3390", + "version": "2.10.1", + "port-version": 0 + }, { "git-tree": "648047125e8e78a10fec23ab02b10037197206a6", "version": "2.6.0", diff --git a/versions/o-/observer-ptr-lite.json b/versions/o-/observer-ptr-lite.json index 122b57582c4d91..798e6706c80caa 100644 --- a/versions/o-/observer-ptr-lite.json +++ b/versions/o-/observer-ptr-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "444c3b0a5c01cee300caac2c33b3cc738a2dc988", + "version": "0.4.0", + "port-version": 3 + }, { "git-tree": "c85545f2cf9bab22c6e35c60723c3cc594a6bd49", "version-string": "0.4.0", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index b9f09c0c9d61df..cf3f6492720781 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2e11027c9b427b4c46e47227da9ce270119f6ea1", + "version": "4.7.5", + "port-version": 2 + }, + { + "git-tree": "9a48c5a6650bc58fdea2fe06d75c3347d89e483a", + "version": "4.7.5", + "port-version": 1 + }, { "git-tree": "e77dfc3008f996ea2defcaf771f46d33d81a4470", "version": "4.7.5", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 028117c838a632..c1dab6d14a01d2 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9a0701fa116eca04bd8a2446f6e44c732084857b", + "version": "13.6.2", + "port-version": 2 + }, + { + "git-tree": "b7ec525c0cd854d1da91a5a11cd05109693b9333", + "version": "13.6.2", + "port-version": 1 + }, { "git-tree": "dda1cee749cebb6fc251073a702e6a698fd4521e", "version": "13.6.2", diff --git a/versions/o-/omniorb.json b/versions/o-/omniorb.json new file mode 100644 index 00000000000000..2db0ec429642c9 --- /dev/null +++ b/versions/o-/omniorb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "51fa63a0e4615dd806fd5ac4cd532f81123ddd4d", + "version": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 30f520ebd540fd..442b1acd16787b 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7412d5c63f5b77eb06f485b7fb89bb718b2f712", + "version": "1.3.5", + "port-version": 0 + }, { "git-tree": "78181e46126a93ba6bbea749a985ba675fb53c03", "version": "1.2.3", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 1d49726fa50302..1fd4534c1157de 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "716c00140c032ec22773130b006af542e011f00e", + "version": "0.3.23", + "port-version": 0 + }, { "git-tree": "ad5694adc46ca2974329e57896d0097e80d65c7d", "version": "0.3.21", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 9938358afb48d0..481908454808d7 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3bf7c68565ee022f685f20eb18bb2e38cfdffb17", + "version": "7.6.2", + "port-version": 3 + }, + { + "git-tree": "58939d51b0f33a014e48f1d7100ab8888d068c2d", + "version": "7.6.2", + "port-version": 2 + }, { "git-tree": "137097588b2328c3d7f66c4f0e46e6e4fe1559cf", "version": "7.6.2", diff --git a/versions/o-/opencl.json b/versions/o-/opencl.json index 13cd9405748ead..73222e54e46f97 100644 --- a/versions/o-/opencl.json +++ b/versions/o-/opencl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c55e82e4ec70906ec28b692d2625584025de4725", + "version-string": "v2023.02.06", + "port-version": 2 + }, + { + "git-tree": "d206a1716a411eb9862c98d65ab3552def0c6492", + "version-string": "v2023.02.06", + "port-version": 1 + }, { "git-tree": "2bdf9379777f48897786b5a69d395325c0eb4aec", "version-string": "v2023.02.06", diff --git a/versions/o-/opencsg.json b/versions/o-/opencsg.json index 818722052870d6..d6e513e33cedba 100644 --- a/versions/o-/opencsg.json +++ b/versions/o-/opencsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48c6aea4f747325a26bec13cf9a93f94c21f4fd2", + "version": "1.4.2", + "port-version": 4 + }, { "git-tree": "05f30c495ec6a79342b90446b3ecfe63c5f0edde", "version-string": "1.4.2", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 0931d661283952..602273cd0be504 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "246c2e39fa6e117cbea4548446b7f66909de3329", + "version": "2.4.13.7", + "port-version": 18 + }, + { + "git-tree": "0a9a6ab1907e36f372e3b379dcd1ddc7cfd96980", + "version": "2.4.13.7", + "port-version": 17 + }, { "git-tree": "27ef38b20b5788492a6a27370160f435b7d71502", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index f75ec971a7d5e1..207e8e4007ca16 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "b66d5bf3d61ae3bd5e71952b7642658d8562ae5d", + "version": "3.4.18", + "port-version": 10 + }, + { + "git-tree": "402e9aac0f32db08e2d69f70ba6384f8c7bf4733", + "version": "3.4.18", + "port-version": 9 + }, + { + "git-tree": "e026bd638aec52f279cbf10d7e75a0f6ca03feb6", + "version": "3.4.18", + "port-version": 8 + }, + { + "git-tree": "e28602bbfb118017bb2bf45795e0bfd9900af4dc", + "version": "3.4.18", + "port-version": 7 + }, { "git-tree": "2b9cff1ffb1822e359c63e291e1377af4b831c09", "version": "3.4.18", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 1890c4fbe19a71..06041561ab44a3 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d435a87c7a3f4dd38d623503d5200abe65c249d1", + "version": "4.7.0", + "port-version": 6 + }, + { + "git-tree": "0c3c175e672cc3a6f0d1465adba8a40a042ff717", + "version": "4.7.0", + "port-version": 5 + }, + { + "git-tree": "99e88adacfd87e496dddba403025e0fdd3b336b7", + "version": "4.7.0", + "port-version": 4 + }, { "git-tree": "ca4b616630bef409960661592549086539a7e28e", "version": "4.7.0", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index 66544b75c3540a..53718ab9cdf099 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bf66027763e861e804aee6113c5afc8bb0e1e7e", + "version": "3.1.7", + "port-version": 0 + }, { "git-tree": "1bdfd5d68efb96110d15fb1244b7413f1a5edcfe", "version": "3.1.5", diff --git a/versions/o-/openigtlink.json b/versions/o-/openigtlink.json index 3b952b491b9251..313fab899cbf4b 100644 --- a/versions/o-/openigtlink.json +++ b/versions/o-/openigtlink.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "519e18eaedd0beb68be3be8cd58f0877e3c40107", + "version": "3.0", + "port-version": 4 + }, { "git-tree": "b6ceb757ce8cc6ee189d7d2adb5df6b3cc0da87d", "version-string": "3.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 809e78e2d3f9f1..ccf0a9de9e672b 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7c06030b088b87143ff7a85c23af606bbd967496", + "version": "2.4.11.1", + "port-version": 0 + }, + { + "git-tree": "34493d776df3b1fee4ba5e01c882d1237a135362", + "version": "2.4.9.0", + "port-version": 1 + }, { "git-tree": "82fe27ff1713dd3f0fbaaa7399257fc4d56cf1b0", "version": "2.4.9.0", diff --git a/versions/o-/openldap.json b/versions/o-/openldap.json index 293f8b15af4de4..7bee389de0a1b4 100644 --- a/versions/o-/openldap.json +++ b/versions/o-/openldap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e20086782fc80cf2c6571a54237e86d0cadf84e", + "version": "2.5.13", + "port-version": 1 + }, { "git-tree": "63f4c67d336142daba83711983e54a8954794331", "version": "2.5.13", diff --git a/versions/o-/openmama.json b/versions/o-/openmama.json index 6ef20084f4295b..0bd5d8b6960ca6 100644 --- a/versions/o-/openmama.json +++ b/versions/o-/openmama.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e1a0265c65af044c234b3724715e089272679d40", + "version-semver": "6.3.2", + "port-version": 2 + }, + { + "git-tree": "0a928ad97fe18f50da889c2e468f5070d1c4e4b6", + "version-semver": "6.3.2", + "port-version": 1 + }, { "git-tree": "a385a51389791fdee1a47efdcfec5fffa7c4cbd3", "version-semver": "6.3.2", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index a4277359df8fdb..3dacc89cbb5cbd 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0958d31a6843d3961c39fb6d459543d9be852bad", + "version": "4.1.3", + "port-version": 2 + }, { "git-tree": "c24d22620b08b5839cf13480633e6a736fb5a038", "version": "4.1.3", diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 2597f7c00bf8d0..3f2c0df392a43a 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58d0c2b4b7785f8ace8ff861d5e45ef40619dcc6", + "version": "2.0", + "port-version": 7 + }, { "git-tree": "5c54c4aa02d2a668bd3d97a1b2a9d412efe284d3", "version": "2.0", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index e782c806abe905..5f4c258b8e02ce 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "dc8edd2b6e1e1552688c29dc46d5cd5c9183804b", + "version": "3.1.1", + "port-version": 0 + }, + { + "git-tree": "68137d1e48b5f9424e9de3d038a9e2c92f1baf39", + "version": "3.1.0", + "port-version": 4 + }, + { + "git-tree": "b99152f5be63f45b2f3be6eb1624d96d70b21b49", + "version": "3.1.0", + "port-version": 3 + }, + { + "git-tree": "64fc47730d346ecacc9f948c2c3138363ed8f702", + "version": "3.1.0", + "port-version": 2 + }, { "git-tree": "b123beef6759b490ff8679b5cd4db0f721a2808a", "version": "3.1.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 6248b06ba8e2b5..347650bed4a91f 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "dfd999f93f24e916631d57bf73c0bf02f8c2da0a", + "version-semver": "1.8.3", + "port-version": 6 + }, + { + "git-tree": "d01c3006eaa3db92a643c8b6e275e5275561d443", + "version-semver": "1.8.3", + "port-version": 5 + }, + { + "git-tree": "a2aaa1296022784fb28719885a59fe905dd80e06", + "version-semver": "1.8.3", + "port-version": 4 + }, + { + "git-tree": "ce4bc10a4f0ebad5cafd14de836017b281cba1f9", + "version-semver": "1.8.3", + "port-version": 3 + }, { "git-tree": "152ee0a0f79c1fc26d81291c9d1eb0417f9deeeb", "version-semver": "1.8.3", diff --git a/versions/o-/optional-bare.json b/versions/o-/optional-bare.json index e5f6ddb0e45fe9..9b91305a9d0da3 100644 --- a/versions/o-/optional-bare.json +++ b/versions/o-/optional-bare.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8ed63e195d0f747d80e48d9c36d37fa388eb65a", + "version": "1.1.0", + "port-version": 3 + }, { "git-tree": "4174971e91de4c7fd5eb1e487ec73976579e7995", "version-string": "1.1.0", diff --git a/versions/o-/opus.json b/versions/o-/opus.json index ff7b4e205c3287..dd59293b65860e 100644 --- a/versions/o-/opus.json +++ b/versions/o-/opus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1bf537b6144eb7899c56f1a9bda5de3fd4e2025", + "version": "1.4", + "port-version": 0 + }, { "git-tree": "969377a42b9e5887f42419aff6182d9c111f65c2", "version": "1.3.1", diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json index de3ef73525faf0..2ba686831c6ae6 100644 --- a/versions/o-/orocos-kdl.json +++ b/versions/o-/orocos-kdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9fdf57afeb547c9e5fdad47dff693fe8f96f4b5", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "4c2ee586866fcf7a9f3c3930bd1af16763047aa4", "version": "1.4", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 2db46a0915d37f..1b99314dceea00 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50d656eed69f1bb2d38d5ead688d555f4faf8224", + "version": "3.6.5", + "port-version": 19 + }, { "git-tree": "cb957f4950031c9c7fedfbcfe1ba698cc435dedd", "version": "3.6.5", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 1dd35dc26b5018..c438f5d8e839b2 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "765cddcfc821c355b20c1fed7a43f181f8eb0817", + "version": "3.4", + "port-version": 0 + }, + { + "git-tree": "c39e21352cff6e65fe8f6315ee9b7828143e0eb8", + "version": "3.3", + "port-version": 7 + }, + { + "git-tree": "93f980541af3527f2940eede908836a7cfc63166", + "version": "3.3", + "port-version": 6 + }, { "git-tree": "606bbaf1456dc9d5a6f5ef879a54b894c4ace5b3", "version": "3.3", diff --git a/versions/p-/p-ranav-csv.json b/versions/p-/p-ranav-csv.json index 3c5cc75ee1c4d4..0d9f1734af8270 100644 --- a/versions/p-/p-ranav-csv.json +++ b/versions/p-/p-ranav-csv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b8c39e843a84b3c24987d688412eb5346cd6b5d", + "version-date": "2019-07-11", + "port-version": 3 + }, { "git-tree": "47066c91320e9526c1eefebfcaf4862420f90794", "version-string": "2019-07-11", diff --git a/versions/p-/p-ranav-csv2.json b/versions/p-/p-ranav-csv2.json index d33a36654e10da..f3e13c759bea37 100644 --- a/versions/p-/p-ranav-csv2.json +++ b/versions/p-/p-ranav-csv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fed336f391db2faf9b7c96b7b32d5838bd6c5e7", + "version-date": "2020-12-14", + "port-version": 4 + }, { "git-tree": "3562046ef991d88c67599b6e736b3e00d0409327", "version-string": "2020-12-14", diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index 8bb1182a4b8c85..de20423c8637a9 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db58caf818518c074d1ab00297ce3a2fc784bc0a", + "version": "1.3.12", + "port-version": 0 + }, { "git-tree": "9edde45ee5a278ee52bbb1891e9a30cab33669f8", "version-semver": "1.3.10", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 6f20bb6a5a6009..1ce3eef7e958c0 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3985e71b9e3446f57995321a290a75a7bf5101dc", + "version": "1.50.14", + "port-version": 0 + }, { "git-tree": "5f1f5e6f18ba1451a6fd4dadf82463a2ac3f9326", "version": "1.50.12", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 008d6b20248928..db1095b632483f 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "359b0fe0cdacbc56edd56143da7d545633e50960", + "version": "2.50.1", + "port-version": 2 + }, + { + "git-tree": "34b3f456c3c28463b38376b91dddb715ec4a6b7c", + "version": "2.50.1", + "port-version": 1 + }, { "git-tree": "10147b103c8e2678a9a45161a861a239c73d7d17", "version": "2.50.1", diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index 6586a5d3b4dd76..3f13fcb1fb99fe 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48536bee28b7473d0e838f70946ddfe8afdba2e2", + "version": "1.3.11", + "port-version": 0 + }, { "git-tree": "65be62557bbdb29d6d0ee383b70a6f84ef401b2f", "version": "1.3.8", diff --git a/versions/p-/parallelstl.json b/versions/p-/parallelstl.json index 243b840f192f82..0aa4dcbc0db495 100644 --- a/versions/p-/parallelstl.json +++ b/versions/p-/parallelstl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebb3771df9c41c1ce97f00d55a3a303390a53cfd", + "version": "20200330", + "port-version": 3 + }, { "git-tree": "c346357a00664a95f183ba0d0565b7badac24635", "version-string": "20200330", diff --git a/versions/p-/parquet.json b/versions/p-/parquet.json index 91b6e1e7f85c75..fbee3b5f7cd030 100644 --- a/versions/p-/parquet.json +++ b/versions/p-/parquet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf699327dbf4ef8d8f7f94eb1c21305c7b71579f", + "version": "0", + "port-version": 2 + }, { "git-tree": "35d3995589a5c775f1f64cb1f3f331fd38362fb9", "version-string": "0", diff --git a/versions/p-/pbc.json b/versions/p-/pbc.json index 1e3b1744586581..60bc59d6f56546 100644 --- a/versions/p-/pbc.json +++ b/versions/p-/pbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8622a50777b672d1eb2066d3110c8cb503da84ba", + "version": "0.5.14", + "port-version": 7 + }, { "git-tree": "23742abe8879e71a911c56845977ad2387e9bfa6", "version": "0.5.14", diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json index 69f45a37013b85..7ad837a0dffad1 100644 --- a/versions/p-/pcapplusplus.json +++ b/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dc217621a6ef6ef4f4bd353a1e5088b15960428", + "version": "22.11", + "port-version": 1 + }, { "git-tree": "0959bc0d3b12e4e90af3ce1d6983566957af555b", "version-string": "22.11", diff --git a/versions/p-/pcg.json b/versions/p-/pcg.json index 52b5f3c7c34f84..e8ecf30f7b4dcc 100644 --- a/versions/p-/pcg.json +++ b/versions/p-/pcg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e99f9b5bed0586fa85e5410bb27917496450481b", + "version-date": "2021-04-06", + "port-version": 2 + }, { "git-tree": "dfdbf3fad0c295b94b400509530d3642d5a6abcc", "version-string": "2021-04-06", diff --git a/versions/p-/pciids.json b/versions/p-/pciids.json new file mode 100644 index 00000000000000..970dd93e6a342d --- /dev/null +++ b/versions/p-/pciids.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ffc7c82fb249347c25b294b6c8131e1f3b2156c2", + "version-date": "2023-04-11", + "port-version": 0 + } + ] +} diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index d4e9d9c82192f3..f1066ccb635923 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c780fc254eb97b60360f60c43034a625667c6530", + "version": "1.13.0", + "port-version": 3 + }, + { + "git-tree": "0c53a841b49d311f52e047bc61455479475c446e", + "version": "1.13.0", + "port-version": 2 + }, { "git-tree": "b992407a0319c7dc434236acb567e629367d8eff", "version": "1.13.0", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index 46b57427e92710..a9ce1fd02b295c 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "533fc8ada3da33f695eb499fe8190a5e9b24a5c8", + "version": "10.40", + "port-version": 2 + }, { "git-tree": "941f187c16a9385815fd353a9b79abf55bd2a7ec", "version": "10.40", diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index 0eb2c8be9f68e4..99ecbc9777cee2 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d7916bf5653f1e62814a0a975e2af90d6862c881", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "e84b5eb190d2b4885ff56ec4168b1c6ba5569fb9", + "version": "2.1", + "port-version": 1 + }, { "git-tree": "c19bcf077b95f0d81ef14bfdf9774795521d6013", "version-string": "2.1", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index fc7e1180806add..830157c09d4473 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "a8618eb3877634f95eb6edbbba64f3e4cccb1d58", + "version": "2.5.3", + "port-version": 1 + }, + { + "git-tree": "36cec2be04df8ba1771c374ccc8ae3c8a0cc96f3", + "version": "2.5.3", + "port-version": 0 + }, + { + "git-tree": "e0e82c8480da2e69cc7532911895844095466aad", + "version": "2.4.3", + "port-version": 3 + }, { "git-tree": "ecc35d5b8ff83ebb84e0f2edfa7c5fef7630467f", "version": "2.4.3", diff --git a/versions/p-/pdcurses.json b/versions/p-/pdcurses.json index 68869abfcd4d59..f6124a65663b06 100644 --- a/versions/p-/pdcurses.json +++ b/versions/p-/pdcurses.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a74893fbd7290450958bf2beddbb59486bb8c04f", + "version": "3.9", + "port-version": 5 + }, + { + "git-tree": "cb1edd90103d19fa2ecf7e6343416a35714ffe43", + "version": "3.9", + "port-version": 4 + }, { "git-tree": "e09ec910aff6b25bd1e1554b15dce08656b3f3d5", "version-string": "3.9", diff --git a/versions/p-/pdqsort.json b/versions/p-/pdqsort.json index cda3f3dc435fc0..6f112c9269ff92 100644 --- a/versions/p-/pdqsort.json +++ b/versions/p-/pdqsort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b8febcdb827ff644e65b87287e69a322e90d959", + "version-date": "2019-07-30", + "port-version": 2 + }, { "git-tree": "70783c2d8d848d78dd2d725fd1cf16d669b7c356", "version-string": "2019-07-30", diff --git a/versions/p-/pegtl-2.json b/versions/p-/pegtl-2.json index af590a1b950daf..fc0015e9d25c4b 100644 --- a/versions/p-/pegtl-2.json +++ b/versions/p-/pegtl-2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2d2306e1021faeb0c473f1e67896a48f039de17", + "version": "2.8.3", + "port-version": 3 + }, { "git-tree": "7f33030e3ca062aaa5b8c5cd1c17b5062a1d077f", "version-string": "2.8.3", diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index 45bf43ca6c7371..66ce733e78b5ac 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee1dbb5f06f7dee38ef4a535efcbe4488556d349", + "version-semver": "3.2.7", + "port-version": 0 + }, { "git-tree": "ed96fd80f2820b9e5ad6f38a9ea24d7aebfb64be", "version-semver": "3.2.6", diff --git a/versions/p-/pfultz2-linq.json b/versions/p-/pfultz2-linq.json index 0defc4ade5ae71..8164ebc79747cb 100644 --- a/versions/p-/pfultz2-linq.json +++ b/versions/p-/pfultz2-linq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2ad1ee9e58e3e6afcc6bf0872583a3871a65bcf", + "version-date": "2019-05-14", + "port-version": 3 + }, { "git-tree": "debf87753624003ec29fcf03e8ae9d53fd8660b4", "version-string": "2019-05-14", diff --git a/versions/p-/picojson.json b/versions/p-/picojson.json index 05665cd4d0b2ed..e4168b75c7861a 100644 --- a/versions/p-/picojson.json +++ b/versions/p-/picojson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38eb00e2d3f94c17ae204744d95228441bbc51e3", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "2d186166bf75e9e77fce5e6a93440d5aa21fc830", "version-string": "1.3.0", diff --git a/versions/p-/picosha2.json b/versions/p-/picosha2.json index 57e22ab28a0c32..160e50f92ed728 100644 --- a/versions/p-/picosha2.json +++ b/versions/p-/picosha2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c873a8748f3e35ae1be390b0de9cc3754191c987", + "version-date": "2018-07-30", + "port-version": 2 + }, { "git-tree": "8192d1108b62d31bcb879332175c994fa62878dc", "version-string": "2018-07-30", diff --git a/versions/p-/platform-folders.json b/versions/p-/platform-folders.json index bd92441933dff6..80c0445cfa63e3 100644 --- a/versions/p-/platform-folders.json +++ b/versions/p-/platform-folders.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf5e8d5b3192a857b2e85276a2ff8c6f76e28d82", + "version": "4.2.0", + "port-version": 1 + }, { "git-tree": "8448d41ddd7f2f2302c9a6a80dde44bb8494b096", "version": "4.2.0", diff --git a/versions/p-/plf-list.json b/versions/p-/plf-list.json index 27493b78790d66..2f3e7ddf892c0f 100644 --- a/versions/p-/plf-list.json +++ b/versions/p-/plf-list.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "942af5dfaf5c57871605ea4a07e74748cdd3cb71", + "version-date": "2019-08-10", + "port-version": 2 + }, { "git-tree": "91600934f8054e05c6716dbcb08f287c2ae22c44", "version-string": "2019-08-10", diff --git a/versions/p-/plf-nanotimer.json b/versions/p-/plf-nanotimer.json index c114c1a8a362fe..3d2c5961fbc0cd 100644 --- a/versions/p-/plf-nanotimer.json +++ b/versions/p-/plf-nanotimer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13a0687d35296ff50a7db2cea6f3d1f13616036c", + "version-date": "2019-08-10", + "port-version": 2 + }, { "git-tree": "f669e0df9a7af5bae94971f1b625143893f3ee72", "version-string": "2019-08-10", diff --git a/versions/p-/plf-stack.json b/versions/p-/plf-stack.json index a047b9dfd075af..b060ffa3af9fe5 100644 --- a/versions/p-/plf-stack.json +++ b/versions/p-/plf-stack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c49e48114d693f6ef74eddadd15ceafffb125ac8", + "version-date": "2019-08-10", + "port-version": 2 + }, { "git-tree": "a4212c7276e8c1881b76e58ae6d20dafaec3628d", "version-string": "2019-08-10", diff --git a/versions/p-/plib.json b/versions/p-/plib.json index c77021e1cda00f..55d7d046cc23cc 100644 --- a/versions/p-/plib.json +++ b/versions/p-/plib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe0ee99ffd2bcad6cc3709d85477c174fb9773f7", + "version": "1.8.5", + "port-version": 7 + }, { "git-tree": "df2cccd607d973a945593bfec6ef15bd7549e6c0", "version": "1.8.5", diff --git a/versions/p-/plustache.json b/versions/p-/plustache.json index 1c0aa702f44329..c54754fb06b49e 100644 --- a/versions/p-/plustache.json +++ b/versions/p-/plustache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed120794f8dee3abcddbf4aafcf13cb76d73dcb4", + "version": "0.4.0", + "port-version": 4 + }, { "git-tree": "a3906d7df26b970381ac0f802678c10cab6cd857", "version-string": "0.4.0", diff --git a/versions/p-/pngpp.json b/versions/p-/pngpp.json index 0e58928989e546..ac502247c3baee 100644 --- a/versions/p-/pngpp.json +++ b/versions/p-/pngpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "944223fc9e521ccae17b526845278a3b71ed9bba", + "version": "0.2.10", + "port-version": 2 + }, { "git-tree": "088d8489ba3b0778d1612d59682ea0b6b3c2eb88", "version": "0.2.10", diff --git a/versions/p-/pngwriter.json b/versions/p-/pngwriter.json index e07508157eb504..c3054759b1904f 100644 --- a/versions/p-/pngwriter.json +++ b/versions/p-/pngwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64ea498d769bb149dfa99fd0e37a5b5e21ff1cf7", + "version": "0.7.0", + "port-version": 5 + }, { "git-tree": "4aca96434bc9128c143f8924560e76010cc39b87", "version-string": "0.7.0", diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index 8d6ab713507d5b..9952781259ed64 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8282e8f30863ef7d8a84928ef5dbe0625b09fa2a", + "version": "0.10.0", + "port-version": 1 + }, + { + "git-tree": "179964b988c6b05e259e8e631b2a3db4539589a1", + "version": "0.10.0", + "port-version": 0 + }, { "git-tree": "e302c730989d9f85b236c00b51e44dd067af7e6d", "version": "0.9.8", diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json index 3bf5d8474434af..3675ad3b58b0c4 100644 --- a/versions/p-/polyclipping.json +++ b/versions/p-/polyclipping.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7de01c0a001bc72c4d934184b3bd4ae97f860c01", + "version": "6.4.2", + "port-version": 12 + }, { "git-tree": "bb17ed7201d587053828c88e1bf1f1ed1fc0025a", "version-string": "6.4.2", diff --git a/versions/p-/polyhook2.json b/versions/p-/polyhook2.json index 33d7a2951854ac..50169532d607e2 100644 --- a/versions/p-/polyhook2.json +++ b/versions/p-/polyhook2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61f26f962dfbb071aeb0f22c4cfe15e100c0524c", + "version-date": "2023-02-24", + "port-version": 0 + }, { "git-tree": "bd2324e09d967fab5a098f0c2d42682abf5b4113", "version-date": "2022-03-01", diff --git a/versions/p-/ponder.json b/versions/p-/ponder.json index 0ba234e3eb9249..a89681c44edde3 100644 --- a/versions/p-/ponder.json +++ b/versions/p-/ponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e88e9908caf5e81e073a7b0fa0e082a6a917df04", + "version": "3.0.0", + "port-version": 5 + }, { "git-tree": "82147bc05cb5c080baabe1085f8ab690f71ba6e2", "version-string": "3.0.0", diff --git a/versions/p-/portable-file-dialogs.json b/versions/p-/portable-file-dialogs.json new file mode 100644 index 00000000000000..961a58fc144306 --- /dev/null +++ b/versions/p-/portable-file-dialogs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c205f3002701aeb61986151fb84016f820f04103", + "version": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/ppconsul.json b/versions/p-/ppconsul.json index a5cb666482ed2d..7ca915d35fcade 100644 --- a/versions/p-/ppconsul.json +++ b/versions/p-/ppconsul.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15a4740ba0476c6490c353b004eb8acbbdbb8a32", + "version": "0.5", + "port-version": 5 + }, { "git-tree": "1de0499185f0f0915b69dbd0d932f2781aa62ecc", "version-string": "0.5", diff --git a/versions/p-/ppmagic.json b/versions/p-/ppmagic.json index e631a882675443..ba91d765bb737e 100644 --- a/versions/p-/ppmagic.json +++ b/versions/p-/ppmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97538f3bb1177f8239ef9fa0a0f26d4a53100183", + "version-date": "2020-07-03", + "port-version": 2 + }, { "git-tree": "7b985dc0f03d5df0b9fb71e88c3a3a4ab0b05d56", "version-string": "2020-07-03", diff --git a/versions/p-/pprint.json b/versions/p-/pprint.json index 6f8fe4392ea9c2..b1ca7b01681f3d 100644 --- a/versions/p-/pprint.json +++ b/versions/p-/pprint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d7e1794f816538df660aaee158c0d9674b6d46", + "version-date": "2019-07-19", + "port-version": 3 + }, { "git-tree": "b2697245181487e6cd80664355c1eaea7aa8f7bf", "version-string": "2019-07-19", diff --git a/versions/p-/pqp.json b/versions/p-/pqp.json index 47d44d01a7651c..f52de416069c00 100644 --- a/versions/p-/pqp.json +++ b/versions/p-/pqp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4260f6ff5614f3a8e85aeb773224362635b47337", + "version": "1.3", + "port-version": 7 + }, { "git-tree": "1fa6daf5d0017a40b45a47d4827eff295569b4b7", "version-string": "1.3", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 6c1060086e626a..687773730a87a9 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8b7e41b105fbb8e30443037e04098621d31a4fb2", + "version-string": "2023.05.15.00", + "port-version": 0 + }, + { + "git-tree": "e66bcd352675efbaf2ff458ae1709c165ed26696", + "version-string": "2022.07.11.00", + "port-version": 1 + }, { "git-tree": "7f8e28d0d1ec8591df5cdfa602d60e0efaa8ee7a", "version-string": "2022.07.11.00", diff --git a/versions/p-/psimd.json b/versions/p-/psimd.json index 81f7b316f6a58f..266ff367555e4d 100644 --- a/versions/p-/psimd.json +++ b/versions/p-/psimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2958518cdbe3f8902fe0b056cf37bf1eec26137", + "version-date": "2021-02-21", + "port-version": 2 + }, { "git-tree": "b67508201a4c33896694e1e5b3ed732bf1bbf0c3", "version-string": "2021-02-21", diff --git a/versions/p-/pthread.json b/versions/p-/pthread.json index eacfe2e530735c..2a050c6869ec51 100644 --- a/versions/p-/pthread.json +++ b/versions/p-/pthread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e32a8cb12153277234e7c7e04322bdf90580659a", + "version": "3.0.0", + "port-version": 2 + }, { "git-tree": "22a35f55dc3993fb589e44781ae36dbdf1c625fa", "version-string": "3.0.0", diff --git a/versions/p-/pthreads.json b/versions/p-/pthreads.json index ba81c8c3fb05e7..044b0af613114b 100644 --- a/versions/p-/pthreads.json +++ b/versions/p-/pthreads.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e0a6df2800d3677b941dc6504f083965b7886d9", + "version": "3.0.0", + "port-version": 14 + }, { "git-tree": "f4037e12c8075b814cab20c65509b49bd7f59257", "version": "3.0.0", diff --git a/versions/p-/python2.json b/versions/p-/python2.json index 8460f25629825a..67ae0d8189b7ad 100644 --- a/versions/p-/python2.json +++ b/versions/p-/python2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2e0390fa02b868d438156ccfc47bbc85ea98660", + "version": "2.7.18", + "port-version": 6 + }, { "git-tree": "33912f36bba22e343da793d7de1a2dde41ab9da0", "version": "2.7.18", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index b418509a714c5b..88aa979324519f 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3a8a2c668d77aaf0fa1862c6b3eff5018519e19", + "version": "3.10.7", + "port-version": 6 + }, { "git-tree": "43e3e2453968d19d674b96aea99718541c96d852", "version": "3.10.7", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index 9cb5b84be99a0c..d032255dc1d0a8 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32321bfdc0e4563ed40687585b48038d551f6149", + "version": "2.3.5", + "port-version": 2 + }, { "git-tree": "a5af940aef31f91feea8cb12daddb268a7cf4608", "version": "2.3.5", diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index db37199fb36dfc..1712819963e317 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "152f31d925c8f0d75f41ad9f656abbe8f30c1b44", + "version": "4.0.3", + "port-version": 0 + }, { "git-tree": "0e2298c569112e322898697b9680723c35a55cd5", "version": "3.8.2", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 3ea4d61d8d22f6..8bb0dd8710d771 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "da935525e462432e2d89412513704c8c4d04b7cd", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "ecd656220f58ebf6651801b9fc439ba5d8f6b62b", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "6e93109d6a3a6a6ef65470ce467a01a931a723b9", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "01393fc66b4bf4414a40b6dfe895e025c1778fe6", "version": "6.4.3", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 90bd05b2fd4a7e..5b29f27877cf48 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c367d3e4afaa2271628a5608d9144f912c830236", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "56a3a7a27a022640d0f965aeb1d56ece4c63006d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "c3c0d24660bf42af84e27538b011b36e831ba942", "version": "6.4.3", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 634f014737e9ab..84061810715676 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4cd3a7a30f7ffa9d3bd66371293a0427f3d2fa9", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "57e1c6c944b35af1de16f24d8871c42c44e90b23", "version": "5.15.8", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index d32b5099d6c961..b7fc7ddaaf0386 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76aaf6a6e40ee58a40a88ae725c230623cfd0762", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "a65cfaf1d3657b487df5a7d18e886b4c638ec182", "version": "5.15.8", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index fae4ea89235899..ab1a07b1ff35c4 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e877be0fe4f6fbb37edc7f97f90fcddb32dc7913", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "f0dd22632c0c5ceef5194777566b4a18a5222504", "version": "5.15.8", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index e9619a9767030f..c3dac43b92cb6d 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "9107483664812c119937623d402bea6395c24cd3", + "version": "5.15.9", + "port-version": 3 + }, + { + "git-tree": "1137d1509e996fa4bde14ec310c6955b50408c8a", + "version": "5.15.9", + "port-version": 2 + }, + { + "git-tree": "11985a25ce0eb80b4a66246fc5962140f454225f", + "version": "5.15.9", + "port-version": 1 + }, + { + "git-tree": "0dbe8668bfb03c43ce4fec9edf98da248e581774", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "51c0d7f3e15a664dba88e8c9891d4a045661f4ec", "version": "5.15.8", diff --git a/versions/q-/qt5-canvas3d.json b/versions/q-/qt5-canvas3d.json index c7ed4c73706e0f..cee8affb1702bb 100644 --- a/versions/q-/qt5-canvas3d.json +++ b/versions/q-/qt5-canvas3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "335184e95b862a3548cd14e4336e870082fde3d1", + "version": "0", + "port-version": 2 + }, { "git-tree": "7c880f36024ca1fe697ebfa6bfe4b9ae47c9b33a", "version-string": "0", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 21a21aa97bcc4d..8550d717fca2aa 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98ec3df0bc18cf346f84be63fe575377f87ab053", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "db1bc883831fe3210e65d31c3b20e16c75537ed8", "version": "5.15.8", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 52b4fcc3177583..01266a2ae89812 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b92dc1593710e8d95fd2c43788bb9d5788bc0d83", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "af4a5faaf3806fbd80687094df924674b6b6a125", "version": "5.15.8", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 233b1391837bf4..1bc8f47108a910 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d35ff571bdff05dbbb479eee33741e289137abdd", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "6a0e0d0e81419e2844de1d518444fd79400f965a", "version": "5.15.8", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index c616a54be97db6..d178b2371d962f 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d3485a7652a098831fc278dd06952308704ed906", + "version": "5.15.9", + "port-version": 1 + }, + { + "git-tree": "c1e284599a1003dcb722972309215a0e13155f7b", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "cacc1062f632a0f2984356abcbeb690c18eecfa4", "version": "5.15.8", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index aaed42b9a95263..e6f0243eca84f1 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3f3b6a93468d062c26ccfb117d42bc988fb20a0", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "ce002bfdb26ee7bd9a4fe8c953a899ce0afa74f1", "version": "5.15.8", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 1d38e0a1150aeb..2a98703c6886aa 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f26357a04aa8c322ef4eb762501e153c6aaf2fa3", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "f5c4a80b19479a187dba37aeaaab4a0b4eabc02c", "version": "5.15.8", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 9490f02724f5b3..52bedcde79ab02 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc31ed992b42598677d387fc1d8736b312c957e5", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "12b13611d9c467a5502523a796e71238bebb3eb6", "version": "5.15.8", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 684534a7ac841c..ba72baeefbd950 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2f076f78b7733120039477509c1472f270ad3e88", + "version": "5.15.9", + "port-version": 1 + }, + { + "git-tree": "889e130592f375153e49fc8d334204ccdaf6010d", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "51299732d963e9fa181b759715ecf78b4ee01698", "version": "5.15.8", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 868e117ce6bb7b..d99c39748d9815 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dcf89830b5916153b3bb982f389b3d034ed3e0fd", + "version": "5.15.9", + "port-version": 1 + }, + { + "git-tree": "b5380b9e781af61e3e32a65248aa7eae321214ae", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "a435ee12c98f4b76b372e29f7c562adea269d0e1", "version": "5.15.8", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index a4a6690fefafb4..03a891d465722c 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "055e2050aaf199ae2b8ada774ae2ec5c76dc1141", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "0f09f1569ac92f2a01e9f00b9b3e912de8d1ec03", "version": "5.15.8", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 29ebc5e89025ce..b78da3ab3c40b7 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bada513b94e08f849d485063acaf985344960091", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "a4db323b888193bbda28b58b39652a26d4749f18", "version": "5.15.8", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 54f7e6bb495933..364b6a797956a4 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79586b3e3936c0f3f7e4ec1ed42cadb7fb464050", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "a380134b399bd02c84d5240f3e6381c9605613a2", "version": "5.15.8", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index aa4c484ac21fcf..7701c0222516bd 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd367c42034978d2fe8e73265e9dbd18eb18cbdd", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "37b1dbc52bd3008a7ca6f224b2c477be5b590c73", "version": "5.15.8", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index b3c01433950244..17e48b946c8edf 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50f67d52fdd3dd85f8d02b7b14074a7dcf573ead", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "fac98903a6cab2776756d60696bbfc63509cb4b7", "version": "5.15.8", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index 54d0a0347680df..a03cad29dabecc 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e50966048714ac6d7e309ff3f7b07f848d6c4cbe", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "216c7c7cbdce99d9243b50236cb14ab65720c724", "version": "5.15.8", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index fa634eeeec6d4b..10f202bdf65dda 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc05632d8e9b8d4914b3787433fe508dade58f55", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "ce95955e6e1dadc2b37464200d62f7f8421adc13", "version": "5.15.8", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index 21fd7b54d28b82..8082bf31226a38 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a24133acd1d8a33e3cbdca79de311b291d18b0a", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "7dc7b7c919bafb726a7be0c919f14c96d239d095", "version": "5.15.8", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 5cae1830239bd5..c5fd74142cdd30 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d15191c2760ad90868e2f1f9b430a378f3b049f8", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "a41ea5542a7f045fbf76026f81b2ce2f143cff9a", "version": "5.15.8", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 263e140c14579b..1480086ce39387 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85edf08e60bcd7025af68908b62fd39dccc22b4e", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "9e4132deecb0af1b0a0351d2e28cf45ce9a40621", "version": "5.15.8", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 58cbda54923a76..24758e8bdcc546 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36b4ecf4a66c6c8152157e94c91626d559d17fee", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "37f42a4f1235e29d71cd14af250e3ee5a15de97b", "version": "5.15.8", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index 1df9469925ecbb..7a69d206a6592a 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cadf58b50b49925073fafb754be7da26b893630", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "37153882132a0701ac327cd5051af0b8e49b7bc6", "version": "5.15.8", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index 73bc9e24eb8ca5..98a177ba8acdb9 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3db00ae0c957077673d439f3c84d58680dd76090", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "aaeca01bff54a12e6796d5d2208910e2e4b953c5", "version": "5.15.8", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 3dac0bb70bc5c2..7700f7b0e7e130 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a8a7c0b36409296d3d03d3b346ee684f9342e77", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "3e77ae03d7a86138f8b9995ce0760310f6477632", "version": "5.15.8", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 76579bd81b6251..c382d4e1897517 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a16175a9771d1e7556bcfb785956f0ce5afc26fb", + "version": "5.15.9", + "port-version": 1 + }, + { + "git-tree": "2182d0b3d29d1e3c4cf58c5a93e896f304d86805", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "2e2b2b3fc8842ad5afe280847ebf39954a72de64", "version": "5.15.8", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index d6e93cf315686f..bfe14462ec9c20 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "504602318bcd6faffa35b309bbf083860792bab6", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "4a12956237942365c39cf8d98a51874bb6329c72", "version": "5.15.8", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index 33e462690c8120..dfe797641d7450 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7cbb16a11e55adb2e957a5ed4828e7b2d1037b9", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "bc4bd1d81b2929a66be97b04a78c1ad901438ede", "version": "5.15.8", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index d992efa100b5a2..69a438b06c00fc 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5653adcb47c0b00c694d7a311c893da13fc3a2a2", + "version": "5.15.9", + "port-version": 1 + }, + { + "git-tree": "97391cc291fbe059b044e26c3718b1e6f2fb831c", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "6aac3d5b8af9387d6b487283a4105056626872f3", "version": "5.15.8", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 0b5e377c7ca11b..273aa485687bae 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "955af6470f524a9537ae0d2d72e7857497c46a9c", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "b64c3f347e804369e84b3bf03bd2a233cca38d3e", "version": "5.15.8", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 60a8a85afed652..45bea32368bc80 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f5d72f36efa8cdd8b1d248b124f99f4a0e58fb0", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "18c9307e7a141b9a2c34f64978ac1cb79fd2ecf4", "version": "5.15.8", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 9833b86e6df191..f019ea7a368970 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47b6255a30e17081a1a9c0201c243ce6d908cca9", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "0bc99174795ada551c8bfbae6d829a2a8fd208a8", "version": "5.15.8", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 6a23a5e2221178..ed05b4f2221eb7 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75f0da5f93d565350bc869ac119786e63354a520", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "977263a84371c116e22d1a717ea32ffc6e756777", "version": "5.15.8", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index 6255a0e07ffd3e..c63d1e953dfa45 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3c4b86102dc85ea933fb02679306d4a514174c7", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "ed5892e08e10ad7b2fd2182b8c7abd99f1dce3ed", "version": "5.15.8", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index 83962ea7d005c2..bfd7bf9e927dd9 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e9fa2103c4b8f738ba8786e9c2a5bacb4bd935c", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "e4f6c2e023e8e7f69fdaa6537f1313d204985fef", "version": "5.15.8", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 7791664f87fe13..a7619418bfe3f3 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea585f612f4470a52c850b68664f95fea52c766e", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "a4eb0168059ec5bd56cb782a005b91262ebd421f", "version": "5.15.8", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index b07bcecb86891a..525ff14bc47c0b 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac580d5217fcefbe07addb7cf42bc7fb03eba7eb", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "c2128b2d148d58eabb6106cbc093713c62a20c5f", "version": "5.15.8", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 4dd35498411987..73ea9e8a1f41d7 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4a3d14b71ff33f5aef8316c46fc2b0c79f7ea60", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "1a97f09b82d545dceecdfb2b2320fa88535ea595", "version": "5.15.8", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 9f5617b5542d7c..22cc49cba246d4 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b194230fb11eb7bf37092591a917b024ac96a9b", + "version": "5.15.9", + "port-version": 0 + }, { "git-tree": "f770e40ee8bc91d18f208ceee737d2c8abfaf8d0", "version": "5.15.8", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index d0821b58b741f9..8eb7e001c8d46e 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8c953278f6f3c74a1976bc64198fea68cdb8cf33", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "b4a3c116018e4b6f97e056193c82af718bda10b3", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "0a79c6cfb2113f764e603ee13a4c12493f16b6d5", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "df64fa51cb5aaaf59cbe76b91476db4b5c272152", "version": "6.4.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 0ca3bd6c7485c9..b5e6304b8975a7 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ac50dbe92da8d65ed1109b1d5aa29ee11a3c8484", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "906e0b257af28f5690907f94ad79bc95f3a34f5c", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f2ba14310d63294366c151fc33bc22807ddc4381", "version": "6.4.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 31fc3ff601feb7..9519c7086b18ee 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "176431e9f906352e8c2d98e040ae240f5e1af12b", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "02767f9ffe5a4a96fa2555440e17e92d1795548d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "abe5601cca736c754b78f7451584d76fa06387f7", "version": "6.4.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index a86ea786904197..60c606d6e81025 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "ce56d3e7af720645f1c4be18d11e659c1d3e48bf", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "8a00cef259fdf1a9198f95e0618c98b7f1b21527", + "version": "6.5.0", + "port-version": 2 + }, + { + "git-tree": "a66d81c3d9432499f24c76df346a4daf5725f90b", + "version": "6.5.0", + "port-version": 1 + }, + { + "git-tree": "501903e9d1d55ca5dbeee2ff61c8c846e77fe7b3", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "cc1cc5c1a5d6a7c4c10feebe8d43a069d3a375a7", + "version": "6.4.3", + "port-version": 3 + }, + { + "git-tree": "b694b6e51c89c8610540165e6e8b3a236acb4301", + "version": "6.4.3", + "port-version": 2 + }, { "git-tree": "425f6dcfce1eadab0723c4ec5e9085da0272ab6d", "version": "6.4.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 7bafe6243fd88f..33de7f92a2a7d2 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b89cbc106466e35706c76769266b48a6f6c4a7dc", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "a9cb7b445154fb5957aec5455428d0bde929fcda", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "2cf33ba2051247bb8a97afec744df43f608f995f", "version": "6.4.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index fa3d2a68235e5d..902bf567fc5e71 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8611534889e66c2c8754af713351c1638a481fd5", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "f5c864cedd1698478c95617d82ba56b1dd240ab2", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0ec02fcfbcdf7429b89d559491dce4912d93533a", "version": "6.4.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index ab1ed5496711e0..d336b321f3e885 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e2f10a4251e58ed95aed33cb1fa65be236b9aa93", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "4e87723595352e8637721bea77ffc9c1ad73c031", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3c207cf03cd774a0540d8199ca4c3e5d1279949b", "version": "6.4.3", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 751dc6a846e808..3989df21e9cad7 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "72b95739835b676e075323ca63ef5aaff5b08599", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "55f14b0a4149603a1d171ebf4cc99d8dfb2739c3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "b240e1a2bf68f450855c7a93d6ff755e9e519afb", "version": "6.4.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index e3a1a338904546..6ec3acb286d3f3 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b2c7cddc945b4f3d00f6cda3b2fc99406a2b8aab", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "c0d4c48a9b7ef8047bb2068271fb433deddd3ffb", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "d95042b70d48866fce13c9474b4bedd62ac9be7f", "version": "6.4.3", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index d6d53bb78e0497..34f5158bcb693d 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5ea28da9eb4c9533b02f9033b1e15e2dab30a411", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "21885adf14cf548990d1a47fb4baf3c75bc00859", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "30f0d972b16884ce41d64dea7550976b4bb102d5", "version": "6.4.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 52ace62f3b9bc4..3aa77b24ac1ea4 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f443139e15746d7e481577bc491bf6aa6bcbe21a", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "54a7e5b497830856aad12dec08b7bb01c37b4999", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6b0bc07f88766c3534b163684451151b4f7346ef", "version": "6.4.3", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json new file mode 100644 index 00000000000000..20943d90318e75 --- /dev/null +++ b/versions/q-/qtgrpc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ee1ca6322fefa8ed2e2b6ac36cd884017773eb3e", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "8fb784c858ca56e7ed43e80c0d5937962a2f72b2", + "version": "6.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index 74f07476813b53..2426ecbb7e0183 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f1706eb781c19e5462e3571cece087413afb5f9d", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "9467160ab402bfd2f04461aee718cb9043d3a094", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0725482920b4594c7f9345ef21124041aa648075", "version": "6.4.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 9c774a45babc71..b80e00974b8352 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5f034441ea62f407b1950448250507277defe3d1", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "6a6f759bf37a0bbc86ccdac3eccbfa40816cbd79", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "bf254edd44146eaac43755ff680855122d2a8705", "version": "6.4.3", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 43f58f66f17b77..8fd34c5f01065f 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f68eabb8f185b700ff927d6bbf92a9442d7997c9", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "3c0fac0141ef882b26d1904189a1aafd4dc4540f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0bb5fdc2bde29cd083a90c67dc1892d68772dadc", "version": "6.4.3", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 6a2eb47fe688e7..9e93cfdd194fe7 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e7f571ef4fa6f184badc8c18c602f8c16e6a6241", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "248be805b9a3c9d95efa723392d374a9c94a5c27", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "9e626f373f4ca8f18e9bde990f75c34aef89baa2", "version": "6.4.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 27419f01233d17..5c135435b12f5b 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6e02cff0ad1cc428f9cb4b1a3913c2a8e94b5269", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "d015b0691674d099f1a1ab1c6b812a914f3bad80", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "9ff1609af9be7a187f0edcc495b0d646dc36a976", "version": "6.4.3", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 935d5a4b56cb8b..3424eb3a8119c0 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6520cf06147823c43100bdb90f5028c362f32241", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "5c8d01536a9c595ddc58327caac428c86ffe2262", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "d8887bee44785f3c285c103d31d6c1436908ea8f", "version": "6.4.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 38699392fbc042..decdee0b95bd9f 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "571de902d0fb9afca17431fa67b9538e9d044435", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "3129ca4a0ba4f6e94550a56d32228560cb3483f9", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "67ca11347716f0408dd58bec49c52b8bc3c04da5", "version": "6.4.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 8643b0e2c4e06b..2cd6a9676813f1 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d52c87cf46872d7383c2ce8e1ea8fc733278d801", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "a10258ebedf8a3f71b8d761b58933e40bf70fac3", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "833b2e1397868c7a5ba8f195dca85ac73ddd93bc", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "2a9eedae47a3b44c519f165c7fbceec2f1deb331", "version": "6.4.3", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 385ec93f47309f..70e1170e0e2927 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fd5935ec38e0763e16b5114b3cfd11a8637356e6", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "767609a9d9713dae6a4c0fd2696a1ec994e28e21", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "e521ca0bc29e9c96290d6765997d4c7df3712599", "version": "6.4.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 7016ba53673dc8..c4a79e37e9ffbf 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "efd0da43f5e4b4f2b82e450c4221447a911ceec5", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "efe3fbd8d37c121fbb7758de82fac9bd4b315a77", + "version": "6.5.0", + "port-version": 1 + }, + { + "git-tree": "4e08f45ca76dba44e3de1c48d6210e1d987f44b3", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "4c9519c0e8f61a9f9cddd4711fb8d8a6139baef9", + "version": "6.4.3", + "port-version": 2 + }, + { + "git-tree": "9adaecfcef9783e8df0e92acbd817a4051b11ffb", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "2271b5bd852c0d9afdcee54b6f335667e7883501", "version": "6.4.3", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 1dcc9a49c638d6..907144fb2f89d7 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "584655742d0c13b02e93e6ee399db6b815240ae9", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "440f18e3ab2e18be1de9550ed16ddb7164c5b826", + "version": "6.5.0", + "port-version": 1 + }, + { + "git-tree": "0da142e2b032f345e88aed41ef444684523be056", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "e6e37d5325bba76a2c912dcc537c36f5214e45d7", "version": "6.4.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 470059b687a40e..04f1da7a4e1b6d 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "fbcfad3bdbfc6ce6b91af6022fc4356cb9d7d121", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "ab3f7bbf20de8d370d5ac8711f2190d96db87f7e", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "a927a30de733a8bb6f1149dd4a5a37aeeca8f521", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "4fcbc24a4f09f2e43f69d771ed87ac6cc187a629", "version": "6.4.3", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index 860df2f1db7d92..9ceb87f3b8f1ec 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8adad221bc2099c9d260511d3089c8ed2095e08d", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "dc5e1726976f64617ee280062596560c791d4b38", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "2fe5d74e187c7131e0b799d59a9bdf056a921396", "version": "6.4.3", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json new file mode 100644 index 00000000000000..8a2747f446929e --- /dev/null +++ b/versions/q-/qtquickeffectmaker.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b1281941d8283e90e488de0850976dc7c931f90b", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "fafa1b506a25f0b343afc09ee5708e885ac56076", + "version": "6.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index c28cbcc86d0734..66001849b79d9e 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ee7485463ea5cecaf0588e3981f92f5383b5de23", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "3f9caf40f1987be65ca3ce699cd176c4453bea14", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "8272dedda604707ed4bdd252fb855ca828b41719", "version": "6.4.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 4a3f2991213d98..594d4a72bf91e1 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "31dc41d8cdd92f1338d68c02d92c6d82131d893c", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "cce29bbf6dbad6125ffd59ca29bbc0fd8f9d1108", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "bcb4cf681ccbf7b720b26eb93cf4d656a107652f", "version": "6.4.3", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 08194fe23a54f5..0635cbc4a412a9 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "aa85f82d720805365a3aee69c035d6a36f458852", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "a900efa4d344d886cba9d538ecee24346957a76f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "60116e86139859df7acad954b48f839240e78272", "version": "6.4.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index f0773c11527406..9db6812d438c2f 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6563eec17634cc4113685b766af209e123d0403d", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "2520f438dda2ec0a8b244be6e1b0fc839e26948d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "21c5259e771214cb14555b2b0310a4ef4c068294", "version": "6.4.3", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 120c5579c07092..ecd986b17ded55 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2bd32a069bea0cd0bc541e079d5ec54cc00067e1", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "8a3dea63a3bfc75f36c32fffd27ff7e300febc8f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3dba771f89dc1c260819b83479a1daba0a822936", "version": "6.4.3", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 8358f2985f1988..3ca92c7d395970 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6b47a09c1a8be3ad3663701e234582b96c44b919", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "e16e52bb2baeb3a3af3d096cf6357e2494b325d6", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "32ebc82d527f3da5977dcfae337c4eab9e6f228f", "version": "6.4.3", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 2fb92580b1b1df..a8e9a110df27ab 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "98f9ec2c71036ec90f472a4dd927a8ba3ca58e4c", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "664a5427ec4a5d715d4e09f9bbe1222810ddb898", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "c935fae16c7d0dba049dae8b7cc5709c2cc237cf", "version": "6.4.3", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index 8e3b0d0bd18439..c14f515d33b9d8 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8ce40cf354db1eac0e6b54e428113a9cf693af33", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "6407a70cfbb2ced50ed116bd1e51b8f3a7e54c8a", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "3e3478f6de5a8d655c7d97e40b158bc7dfdfa39c", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "93a6cd65b0db0994bbedef360adbe246b5df6d91", "version": "6.4.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index e25bfc50088a9e..8003200fa37bce 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e0cbdb8adac05f3e67bcf95b7c03e8ecb7ae7bc6", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "816b0eb532cf6901c8448ccba8363cfe9938ef5b", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "864d53d5bedd0946c9790551a06258580647478f", "version": "6.4.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 40631ad08e3a38..920b399e8f9909 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "5c5bb58bb17966dd13c0ca571efb413a60633c5a", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "98c6a3ef4410b89a77895592986355c43674a881", + "version": "6.5.0", + "port-version": 1 + }, + { + "git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "f3e02443f5bc251e7fdaffdfe1079ac2d1492a42", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "5cd027bf0913c633be6757fac34fb5cb0ebea6ac", "version": "6.4.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index a657006ad32972..42ef3b1793cf2a 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "93a8ee0c9d08e15552ec7fe153a7ba70ece3024b", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "b75cda024ccc8c8ba3f9a196a9a6149309d93425", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "48b6fd21acccdffacd9390b9b860a5b2e3ba554a", "version": "6.4.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 5b282747e42b5c..79cfbd1a21f5cf 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dd796171aaa99042b420d9e8bbaf78f68b67ee8c", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "2591b11ad8fe48bb353ece5a06c8c27492cb1c1d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6cbb11db41affe7798e62dbec8ebb5aa8e728b5d", "version": "6.4.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index f241ad6db10523..ff9519b3752f7d 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8f02347f31fc483b355d5cf812a28a278ce27413", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "860b82f5d06b7f0eed9ed449507a47d156cfb4ca", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f40d9bfc0c57c9facd1b4db9da9eaa7ba565692c", "version": "6.4.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 9a798ee8c08698..9c191dad0b9371 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a0fcf659cccb63f7924f92e042a08b13bb1a82c7", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "40d6a94591187d5fdfb57beebbbad45aa26a1859", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "27b0c979401491880b2dad92b728e14fb5b7e37b", "version": "6.4.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index c7d109d2ff7366..4bba71fbb9dda9 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6ed2eac3d05493db52c3bf31dd9b25893cdc287c", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "2d44e1b4b4683a771c3457652baef60f290f1776", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "7a5dda5f36b2686d421d061f93a73da169815174", "version": "6.4.3", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 28cd5b519b5332..e1935fee42842e 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "389d6233f9bca6f05e244de47e42add02f15f52e", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "c325d5163eea00256739eb59ac084c0c386c2b0d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "89352bf06b1d966295a7b5e919836e9994eef0a9", "version": "6.4.3", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 95ffe29eafb16c..84686d20d83d4d 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b9854803006b93e0c755bad2e044a79973818db1", + "version": "6.5.1", + "port-version": 0 + }, + { + "git-tree": "250bcb4eb32ec73ee4376ec7af6a365c8f8f61f1", + "version": "6.5.0", + "port-version": 0 + }, + { + "git-tree": "cef8861fee214027a5ade446692eafb6490fb7ea", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "9b5466522d3ff72530716724384c7122f4ffe8c1", "version": "6.4.3", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 9774fee3b57edc..fb1ea4d3f442d1 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a4c25e9a7ca2099d8a528f7477a43fd60a271bb", + "version": "1.30", + "port-version": 0 + }, { "git-tree": "0b303bae8ef48f28c1cf4cf88b717756c1a20a1b", "version": "1.29", diff --git a/versions/q-/quaternions.json b/versions/q-/quaternions.json index 045481f0561c4e..7dc8557d76f338 100644 --- a/versions/q-/quaternions.json +++ b/versions/q-/quaternions.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d4dbad40b4bc58a73f0c49490f43204130b8bd8", + "version": "1.0.0", + "port-version": 2 + }, { "git-tree": "99b78fe0eae2a9ccdad34ba39bc165eccc547c3b", "version-string": "1.0.0", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 261907cd92f377..30fe7574230b6c 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7d0b893d24e4034db0e663e68c95188a26523d29", + "version": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "134b2fe4a72269e7e9be72b882fcf21f37ed1809", + "version": "2.9.0", + "port-version": 0 + }, + { + "git-tree": "bbf59f883b4fd8de5efdb3401847fa1f8e486a95", + "version": "2.8.0", + "port-version": 0 + }, { "git-tree": "4e295cb41ae38fae9cc3330af5ef0c000f515959", "version": "2.7.0", diff --git a/versions/r-/rabit.json b/versions/r-/rabit.json index 95acbc992122e0..453f4e180dd0db 100644 --- a/versions/r-/rabit.json +++ b/versions/r-/rabit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35485a2d9060abcad1c7bd21647986b7e88d9bc0", + "version": "0.1", + "port-version": 5 + }, { "git-tree": "50ee4512e6e59245f356eceed9c60d036d5983ab", "version-string": "0.1", diff --git a/versions/r-/ragel.json b/versions/r-/ragel.json index baecf482810375..657359e7c58047 100644 --- a/versions/r-/ragel.json +++ b/versions/r-/ragel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efacd9dde74b0cd221344329fd3f950f60ba39ca", + "version": "6.10", + "port-version": 6 + }, { "git-tree": "a3d1aa86cc062c7e0e6b1233388150f57da301dd", "version-string": "6.10", diff --git a/versions/r-/range-v3-vs2015.json b/versions/r-/range-v3-vs2015.json index 49e74ab86c3f7b..e7b47e90790d80 100644 --- a/versions/r-/range-v3-vs2015.json +++ b/versions/r-/range-v3-vs2015.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f067993520ed7aa3241b7af46d6e3b9120b9950", + "version": "20151130-vcpkg5", + "port-version": 2 + }, { "git-tree": "7323da8a61ce8b5fc2e0cb3a59cff779c484e4e0", "version-string": "20151130-vcpkg5", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 0837af0b5358a2..7d632c02b06318 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea1032a866631acc7d63b4804be4ece09baeb47f", + "version-date": "2023-04-27", + "port-version": 0 + }, { "git-tree": "b33122751fc9d722f05cc50538aa9b6d08e2d105", "version-date": "2022-06-28", diff --git a/versions/r-/rapidxml-ns.json b/versions/r-/rapidxml-ns.json index ea933065d6f296..7349eb2cb19fbe 100644 --- a/versions/r-/rapidxml-ns.json +++ b/versions/r-/rapidxml-ns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1549988737e5a9e2215e8bf782e66db4cf03c373", + "version": "1.13.2", + "port-version": 2 + }, { "git-tree": "073f99111cb3bba2632117601ccc024e3f98b508", "version-string": "1.13.2", diff --git a/versions/r-/rapidxml.json b/versions/r-/rapidxml.json index af020f2d70531a..feeda9e74c0b94 100644 --- a/versions/r-/rapidxml.json +++ b/versions/r-/rapidxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a460282de022af98f967771cdecab3efee97bc5d", + "version": "1.13", + "port-version": 6 + }, { "git-tree": "160f717432a1eed69af62a9eb7c724031609994a", "version-string": "1.13", diff --git a/versions/r-/rappture.json b/versions/r-/rappture.json index c1622b43821f73..ffb1871bafb29b 100644 --- a/versions/r-/rappture.json +++ b/versions/r-/rappture.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "31376dbc3c6b3f397f76819c46c05a653c47e1ce", + "version": "1.9", + "port-version": 4 + }, + { + "git-tree": "fabc9ec282c2f7ec7f5d5e2ae48fbaacb9227876", + "version": "1.9", + "port-version": 3 + }, { "git-tree": "8a477ff69e89f147d8d51545dce1eaf309401bc2", "version": "1.9", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 33455aecb98ded..b1c9e11592af53 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ae048ec33152df88804d243fd6e89691d5712d2", + "version-semver": "4.5.0", + "port-version": 1 + }, { "git-tree": "f8a98453d76631d6a8f4f8d762646808cc3e9e1a", "version-semver": "4.5.0", diff --git a/versions/r-/readline.json b/versions/r-/readline.json index 1581311c25ebdc..a15bb5ea84beef 100644 --- a/versions/r-/readline.json +++ b/versions/r-/readline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24b7f806888a5db397f8d737e361e2c9e5025c1f", + "version": "0", + "port-version": 4 + }, { "git-tree": "87822d2ce5b0936d374d94185da700e8a1cf4619", "version-string": "0", diff --git a/versions/r-/recast.json b/versions/r-/recast.json index 521da8273858aa..b9f2a59db8dee0 100644 --- a/versions/r-/recast.json +++ b/versions/r-/recast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08f63ca8f875d78682decac6a5084cf72589ce1f", + "version-string": "deprecated", + "port-version": 0 + }, { "git-tree": "f6f99b923ad8fbbee1aafd0deb361f8cf7eb7bd6", "version": "1.5.1", diff --git a/versions/r-/recastnavigation.json b/versions/r-/recastnavigation.json new file mode 100644 index 00000000000000..a4b5216dc24622 --- /dev/null +++ b/versions/r-/recastnavigation.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d08244dcfe4974f58b9dd481f1e3e34414a46207", + "version": "1.6.0", + "port-version": 0 + } + ] +} diff --git a/versions/r-/refprop-headers.json b/versions/r-/refprop-headers.json index a1f65398596b57..bdb95e6473a9f6 100644 --- a/versions/r-/refprop-headers.json +++ b/versions/r-/refprop-headers.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cd807170148b9b1e7ae93fe6073004fe5438193f", + "version-date": "2022-12-07", + "port-version": 0 + }, + { + "git-tree": "d7ea98d3dfab53c440e5b2da61a3c347b4d00beb", + "version-date": "2019-04-14", + "port-version": 2 + }, { "git-tree": "d8224d6d1e5b4d151c557a1055307624848ce8db", "version-string": "2019-04-14", diff --git a/versions/r-/riffcpp.json b/versions/r-/riffcpp.json index 06446aa7986d57..cc84e5acd810aa 100644 --- a/versions/r-/riffcpp.json +++ b/versions/r-/riffcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2726a0276bb4fb9f93c818173ec5d46d84d40f08", + "version": "2.2.4", + "port-version": 3 + }, { "git-tree": "2709604490dce2c3a52b6818542cd4ce71d8712d", "version-string": "2.2.4", diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index 8d48628b5bed6f..6b6f5bb08ab387 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eef365a991fcf66a1848ed65bb9af75e767ffce6", + "version": "5.1", + "port-version": 0 + }, { "git-tree": "7938b94aadfdba5af77643ebec4d36a7e6037e29", "version": "5.0", diff --git a/versions/r-/rply.json b/versions/r-/rply.json index 75a6e14ee93cdd..6c5d8eea8b93d9 100644 --- a/versions/r-/rply.json +++ b/versions/r-/rply.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "824058a46ec01bf8d290a56e3b42f1b01ef4ce68", + "version": "1.1.4", + "port-version": 3 + }, { "git-tree": "bd6882d9bea26ba3fafbebd6327e2ca075af5a32", "version-string": "1.1.4", diff --git a/versions/r-/rsasynccpp.json b/versions/r-/rsasynccpp.json index fbd102a5decccb..1a1afbc268bba5 100644 --- a/versions/r-/rsasynccpp.json +++ b/versions/r-/rsasynccpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44c0663e6c7ee48730c4db3336c455e1e45c473a", + "version": "0.0.7", + "port-version": 2 + }, { "git-tree": "7fc33d5002210774c5e4d7450a0cd88c3be82ca8", "version": "0.0.7", diff --git a/versions/r-/rsm-mmio.json b/versions/r-/rsm-mmio.json index 31ae61086639b9..7f14bad7728fd9 100644 --- a/versions/r-/rsm-mmio.json +++ b/versions/r-/rsm-mmio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e1a7d844e1e48dab00aab46943a739a4fe2f3e4", + "version-semver": "2.0.0", + "port-version": 0 + }, { "git-tree": "b64c5538a5de9cc3e4e516ba97f437480b94c6f0", "version-semver": "1.1.0", diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json index 9b4d581a30cd54..eb7a6e82adbe97 100644 --- a/versions/r-/rsocket.json +++ b/versions/r-/rsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1d02b39aaa70e97e3ec2551d1cfc6ae1a163199", + "version-string": "2021.08.30.00", + "port-version": 2 + }, { "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c", "version-string": "2021.08.30.00", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index fb84b55756988e..f063294b3cec2c 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a0ba7b4b9ea0239aa474d40263d96919a81958c", + "version": "0.21.0", + "port-version": 1 + }, { "git-tree": "557a37dc751f64ec6040505e57074251f2441822", "version": "0.21.0", diff --git a/versions/r-/ryu.json b/versions/r-/ryu.json index 0d189aadcdc6a3..d4e4ddb62f558d 100644 --- a/versions/r-/ryu.json +++ b/versions/r-/ryu.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c19f7f75e6695396873fa98b4d39512899a34fb5", + "version": "2.0", + "port-version": 9 + }, + { + "git-tree": "660ffa1a7a15e75dbcff064ac704f53b8a2da880", + "version": "2.0", + "port-version": 8 + }, { "git-tree": "9eef3ab0a0bafea6db1a02920f60b756c3eeabfc", "version": "2.0", diff --git a/versions/s-/sais.json b/versions/s-/sais.json index 6077ca3f276bcf..01802a73e1f7ba 100644 --- a/versions/s-/sais.json +++ b/versions/s-/sais.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e417443d4480212c41ff38d6356e7ed0ba349116", + "version": "2.4.1", + "port-version": 5 + }, { "git-tree": "557f4ba1ab3603ba23d82024f83fb41ab4a6e288", "version-string": "2.4.1", diff --git a/versions/s-/sajson.json b/versions/s-/sajson.json index fa69fbf92c1858..24d7e5ca5d491c 100644 --- a/versions/s-/sajson.json +++ b/versions/s-/sajson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0e624249788d999ef739af061ce797c49cbe7b6", + "version-date": "2018-09-21", + "port-version": 3 + }, { "git-tree": "7401d8ffce21268a90491dcf853727b9c8ec569c", "version-string": "2018-09-21", diff --git a/versions/s-/scenepic.json b/versions/s-/scenepic.json index 35ba1d88efa956..b7b81446477203 100644 --- a/versions/s-/scenepic.json +++ b/versions/s-/scenepic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70b1207796dcdf599a5ede346b4a1748106d2c02", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "57d4ac99e32e53ed59ea56871fefb332a01e7481", "version": "1.0.16", diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json index 649075160f61f7..10da952742b22b 100644 --- a/versions/s-/scintilla.json +++ b/versions/s-/scintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6d2625e3fbec10fec4c9ee4de19143df3656213", + "version": "4.4.6", + "port-version": 2 + }, { "git-tree": "65fa530f4695dbecf4c90bc60d89d59abc6eab2f", "version": "4.4.6", diff --git a/versions/s-/scylla-wrapper.json b/versions/s-/scylla-wrapper.json index 2b12423a4bc403..bd439e14e08e39 100644 --- a/versions/s-/scylla-wrapper.json +++ b/versions/s-/scylla-wrapper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22f98506f8fe59a6d4a1b2a052a96d46aeb2d20e", + "version": "2018-08-26-16e6f435", + "port-version": 3 + }, { "git-tree": "c1633de82a41a7dac94c972377145d3bf67b80a4", "version-string": "2018-08-26-16e6f435", diff --git a/versions/s-/sdl1-mixer.json b/versions/s-/sdl1-mixer.json new file mode 100644 index 00000000000000..aae68871ffd5cb --- /dev/null +++ b/versions/s-/sdl1-mixer.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d9948f6d30a19d1be8d0de5406f7874c5991aec1", + "version-date": "2023-03-25", + "port-version": 2 + }, + { + "git-tree": "2e208f00e12332057ca6986afe060ff5fc1ef7cc", + "version-date": "2023-03-25", + "port-version": 1 + } + ] +} diff --git a/versions/s-/sdl1-net.json b/versions/s-/sdl1-net.json index d7ba09100eaf19..cc499e489758e3 100644 --- a/versions/s-/sdl1-net.json +++ b/versions/s-/sdl1-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2824fc580a2bee556194640f973257f342e31b79", + "version": "1.2.8", + "port-version": 6 + }, { "git-tree": "8fcf264bba028ea84bf1a7ed6c0bd63c749bd082", "version-string": "1.2.8", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index 65c464975fc993..3426feee6821f0 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5463be881042b7d98bf14377bb790a2a83c3a39e", + "version": "1.2.15", + "port-version": 18 + }, { "git-tree": "45b686784ad1b01e7cfa7988bc3f95bf9aff6b6a", "version": "1.2.15", diff --git a/versions/s-/sdl2-gfx.json b/versions/s-/sdl2-gfx.json index 759d0ebf39a572..0e29a98178a0bf 100644 --- a/versions/s-/sdl2-gfx.json +++ b/versions/s-/sdl2-gfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6799c7e90f7c606835a0544db0852f31dbf99cbb", + "version": "1.0.4", + "port-version": 10 + }, { "git-tree": "bbbde3e3c97c7bca48c0509f20ff3858b6522abc", "version-string": "1.0.4", diff --git a/versions/s-/sdl2-mixer-ext.json b/versions/s-/sdl2-mixer-ext.json new file mode 100644 index 00000000000000..f12db451ffa7ff --- /dev/null +++ b/versions/s-/sdl2-mixer-ext.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "04312072ef4ea392cb39c240e579f06b4d62b955", + "version-date": "2023-05-04", + "port-version": 0 + } + ] +} diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index 9bc5a89e4318e9..102d0aeb645fdc 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "709e85621b7fe043156154d04e5d9c174e47fab9", + "version-date": "2022-11-22", + "port-version": 4 + }, { "git-tree": "f49bca0bdf21c4b79c80ecefe3d3aa9a75ba49e7", "version-date": "2022-11-22", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index ca5b21e8750c1d..507906d1e0b704 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "26846f654fd9638934b225f981999759025ff252", + "version": "0.6.3", + "port-version": 0 + }, + { + "git-tree": "d7e8c1737ce3b69ee1dda758a40891fc460c8ff9", + "version": "0.6.2", + "port-version": 0 + }, { "git-tree": "b3b1a8af6979eb89aefb53e29667592309485c18", "version": "0.6.1", diff --git a/versions/s-/septag-sx.json b/versions/s-/septag-sx.json index 00bdc85e85457a..b520a31674a099 100644 --- a/versions/s-/septag-sx.json +++ b/versions/s-/septag-sx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb36ba5d776b41de1b33781f478d455046e1d9e3", + "version-date": "2019-05-07", + "port-version": 5 + }, { "git-tree": "3455654e48ff0abd3dc1babfc0bf163a9f567ed5", "version-string": "2019-05-07", diff --git a/versions/s-/seqan.json b/versions/s-/seqan.json index 7fda5058fe763f..3aff9bf3a1c95b 100644 --- a/versions/s-/seqan.json +++ b/versions/s-/seqan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9c24c4c48a7664bc9b685cd6c931d534ff6164b", + "version": "2.4.0", + "port-version": 3 + }, { "git-tree": "308d1d7ca45d981ec55da094763b72c2ffc062ca", "version-string": "2.4.0", diff --git a/versions/s-/serd.json b/versions/s-/serd.json index a29faa2a9111b1..0d43b2b1b421fe 100644 --- a/versions/s-/serd.json +++ b/versions/s-/serd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f1848f6d4c698376b95a53e329eba78ff6ae893", + "version": "0.30.4", + "port-version": 2 + }, { "git-tree": "8ad1dbe412b4b19067a792c18f690d84b245eafb", "version-string": "0.30.4", diff --git a/versions/s-/sf2cute.json b/versions/s-/sf2cute.json index 93ab863c0fda97..d70125ab889b4c 100644 --- a/versions/s-/sf2cute.json +++ b/versions/s-/sf2cute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "909fbb570e221be633377b03cc7831c64d860c96", + "version": "0.2.0", + "port-version": 4 + }, { "git-tree": "e1ef32c3c0950a30ebd1b857009193245488f9ed", "version-string": "0.2.0", diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index dc814d0bfec3f3..f7de9517b8c81f 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "477c029a9588d5f24c19fd0b6dbc82813fdc2150", + "version": "2.5.1", + "port-version": 15 + }, { "git-tree": "8ab010b7ce899203149c75197c19380506984683", "version": "2.5.1", diff --git a/versions/s-/shader-slang.json b/versions/s-/shader-slang.json index 19bbeef97b58c8..aded3cbcb4e222 100644 --- a/versions/s-/shader-slang.json +++ b/versions/s-/shader-slang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a21463df58c9c2fb4af01bc6c9197ddb98804db", + "version": "0.27.20", + "port-version": 0 + }, { "git-tree": "b03b5bc45ef502e0ce522ce6fb71eba994348cf2", "version": "0.24.43", diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json index e558b2abd1954d..2cd29737ecd5dc 100644 --- a/versions/s-/shapelib.json +++ b/versions/s-/shapelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07bc870ae6b0fd620c817bd35c8ec499ecbf4f22", + "version": "1.5.0", + "port-version": 4 + }, { "git-tree": "befbba83687abe4b10f1fb55ac5ccc344bd11084", "version": "1.5.0", diff --git a/versions/s-/shiftmedia-libgnutls.json b/versions/s-/shiftmedia-libgnutls.json index 82eeb9204c1432..4b698fb548a469 100644 --- a/versions/s-/shiftmedia-libgnutls.json +++ b/versions/s-/shiftmedia-libgnutls.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "44e16573e54fa8a8c8599c0b2cb82a0d1f829e22", + "version": "3.7.6", + "port-version": 2 + }, + { + "git-tree": "1af7188530a656fe2103e74844333d8c37c5232d", + "version": "3.7.6", + "port-version": 1 + }, { "git-tree": "c204a889320c521ef348d1108a3f665be0bbe07a", "version": "3.7.6", diff --git a/versions/s-/shiva-sfml.json b/versions/s-/shiva-sfml.json index aec1258e1d20d6..157073a647e393 100644 --- a/versions/s-/shiva-sfml.json +++ b/versions/s-/shiva-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "243e316b0f03e7473f24e379ca8fa22992695f2b", + "version": "1.0", + "port-version": 4 + }, { "git-tree": "15b34188ab13ed064aabffac0b2faca203b214a1", "version-string": "1.0", diff --git a/versions/s-/shogun.json b/versions/s-/shogun.json index c005224590f3ac..ad4f7c93a09d68 100644 --- a/versions/s-/shogun.json +++ b/versions/s-/shogun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66286469fa661da12735a2f8267a293bd63117a8", + "version": "6.1.4", + "port-version": 9 + }, { "git-tree": "3164a64864f9758f6dede7b1ea6bcdb2ae199dd9", "version-string": "6.1.4", diff --git a/versions/s-/signalrclient.json b/versions/s-/signalrclient.json index faba98cba9b857..4010ae87dd8bfe 100644 --- a/versions/s-/signalrclient.json +++ b/versions/s-/signalrclient.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2981e91dbe37fc7ab10d1c071d4a47b1388eb3b", + "version": "1.0.0-beta1-9", + "port-version": 4 + }, { "git-tree": "142a336533806e7d9e1fc0807363be351ecf5286", "version-string": "1.0.0-beta1-9", diff --git a/versions/s-/sigslot.json b/versions/s-/sigslot.json index 2ef6ef5f0f7074..676b1d195bd82b 100644 --- a/versions/s-/sigslot.json +++ b/versions/s-/sigslot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db470857420cb91f6f0e4ddcb3f7bcd33d540ab9", + "version": "1.0.0", + "port-version": 5 + }, { "git-tree": "78e94753c09651ef7e2c09cbb134ae2cb786ade4", "version-string": "1.0.0", diff --git a/versions/s-/simde.json b/versions/s-/simde.json index e60cf9df4d6095..3f860fd31085e3 100644 --- a/versions/s-/simde.json +++ b/versions/s-/simde.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3776be38dc5cf963db0a97cbb5b043488c43b79c", + "version": "0.7.6", + "port-version": 0 + }, + { + "git-tree": "f46b6e3bc03d59a8f45ae99c0c0d08b8386f230a", + "version": "0.7.4", + "port-version": 0 + }, { "git-tree": "b9f97efd430bad429766d57361f329bb1e1597f4", "version": "0.7.2", diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 3ff191b38ff7d1..1fbbc79b371beb 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d62e75a24f4a107faf802fc187d3cf72e0041c51", + "version": "3.1.8", + "port-version": 0 + }, + { + "git-tree": "9ef276894dacedca108836726f0e37278fb53861", + "version": "3.1.7", + "port-version": 0 + }, { "git-tree": "8d4926521a5e488d316ec612c5cca368ae842cc9", "version": "3.1.6", diff --git a/versions/s-/simple-fft.json b/versions/s-/simple-fft.json index 8ea28d2b174987..011039e84220e7 100644 --- a/versions/s-/simple-fft.json +++ b/versions/s-/simple-fft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "711bb14f0925c407c350fb8428d0721692639342", + "version-date": "2020-06-14", + "port-version": 2 + }, { "git-tree": "c8c90beba45454e3e497fb7ef62b20a188bee1c2", "version-string": "2020-06-14", diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json index 5e58f02d7b9298..b404bed22d9910 100644 --- a/versions/s-/sleef.json +++ b/versions/s-/sleef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12afaa5146f51bf2912339befaafd1776e10442a", + "version": "3.5.1", + "port-version": 4 + }, { "git-tree": "bd282d0004a477385c5e6487aabc83bab31059ec", "version": "3.5.1", diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 78559640b2c4bd..663ead090d7aa9 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d9b72be7b331d4451d11594b175b0e1f97a75ab", + "version-date": "2022-02-05", + "port-version": 1 + }, { "git-tree": "5e868f4817878ec1c9686ab467b60f8086c50a00", "version-date": "2022-02-05", diff --git a/versions/s-/sltbench.json b/versions/s-/sltbench.json index 3a39f732854748..d10ea99ab1da0b 100644 --- a/versions/s-/sltbench.json +++ b/versions/s-/sltbench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5a607736f0e3c2bb0a3c0c9c3525dec4cc3c980", + "version": "2.4.0", + "port-version": 2 + }, { "git-tree": "5df47ef0674021ac20500e87c0b3c19c176fa005", "version-string": "2.4.0", diff --git a/versions/s-/smpeg2.json b/versions/s-/smpeg2.json index 5e14b9977ceb6a..4c606676814e6b 100644 --- a/versions/s-/smpeg2.json +++ b/versions/s-/smpeg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8152688421f7023b7160c97976631b798025bb39", + "version": "2.0.0", + "port-version": 9 + }, { "git-tree": "a09fe59a859ca99ee652c6bfb0b27cbd4e99a9cd", "version-string": "2.0.0", diff --git a/versions/s-/sndfile.json b/versions/s-/sndfile.json index 0700452b2284df..99e2d240818470 100644 --- a/versions/s-/sndfile.json +++ b/versions/s-/sndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa2da433a3aae003670c43ef93492b9d27cc190e", + "version": "0", + "port-version": 2 + }, { "git-tree": "b0706d70c299fbe9e9e32d80e5ba2cb910dfd294", "version-string": "0", diff --git a/versions/s-/snowhouse.json b/versions/s-/snowhouse.json index 0031ac5844920f..ff7777e46d3c51 100644 --- a/versions/s-/snowhouse.json +++ b/versions/s-/snowhouse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8177477e8aad0ea23005b80b169029ff00aef04", + "version": "5.0.0", + "port-version": 2 + }, { "git-tree": "d49ba83122c461ba6d57aa2768241cc07ff3e32e", "version-string": "5.0.0", diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 246303007d44b1..c2ff686142a113 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52eda985aee5e14e16a47573154b39f069824d49", + "version": "5.7.4.3", + "port-version": 0 + }, { "git-tree": "a77d86943e98697db670f9ee10fd24e8d19f08ce", "version": "5.7.4.2", diff --git a/versions/s-/sokol.json b/versions/s-/sokol.json index d1445dacefaa20..93581b46a647d1 100644 --- a/versions/s-/sokol.json +++ b/versions/s-/sokol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ba547d31c66bb41bf11cb755706b99e1b615e2e", + "version-date": "2019-09-09", + "port-version": 2 + }, { "git-tree": "18b4da89731b9e7cf61e56fc72594049c420d2e1", "version-string": "2019-09-09", diff --git a/versions/s-/sord.json b/versions/s-/sord.json index 5965caea25a215..964632a177ef37 100644 --- a/versions/s-/sord.json +++ b/versions/s-/sord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d67b14f489ea7ebae790682dfe2beb9acb54720", + "version": "0.16.4", + "port-version": 2 + }, { "git-tree": "43058c5106d4162b43522646df027c913f088e61", "version-string": "0.16.4", diff --git a/versions/s-/spaceland.json b/versions/s-/spaceland.json index 365accca13d114..83a8d7825277c7 100644 --- a/versions/s-/spaceland.json +++ b/versions/s-/spaceland.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "261556139a5816276568790ac8b8c7eba3b58f72", + "version": "7.8.2", + "port-version": 8 + }, + { + "git-tree": "e8139a817a073bd514472aae3fb0366dcc52d620", + "version": "7.8.2", + "port-version": 7 + }, { "git-tree": "05079a1eaffbd5cdd7d2fae904816c3dd849ea24", "version-string": "7.8.2", diff --git a/versions/s-/sparsepp.json b/versions/s-/sparsepp.json index 6c14b57e3aed51..af05620bb6d485 100644 --- a/versions/s-/sparsepp.json +++ b/versions/s-/sparsepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06d3ed1d599ab1737aa060480027d87d25505337", + "version": "1.22", + "port-version": 4 + }, { "git-tree": "37dc23bec7c8cd878b8ab1a808e2a177c0930644", "version-string": "1.22", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json old mode 100755 new mode 100644 index 347c6b18a1b1d0..c37ac8af31ca7b --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67656948712582d93d9096cc08871a3270908d38", + "version-semver": "1.11.0", + "port-version": 1 + }, { "git-tree": "296d78e54c14ce64474b66f60847026ddb1f576e", "version-semver": "1.11.0", diff --git a/versions/s-/speexdsp.json b/versions/s-/speexdsp.json index a598b990f32080..59f37fac753236 100644 --- a/versions/s-/speexdsp.json +++ b/versions/s-/speexdsp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79efeda6f8cdd6f28e85bee7787e529da2d94c3c", + "version": "1.2.1", + "port-version": 1 + }, { "git-tree": "9d3a05d75970beec385a36ceb592f9f9e928d62f", "version": "1.2.1", diff --git a/versions/s-/spirit-po.json b/versions/s-/spirit-po.json index f1551b040a6116..d1a481c8c89dcf 100644 --- a/versions/s-/spirit-po.json +++ b/versions/s-/spirit-po.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9948e3b6cffe3bc1b61bf71089ad85247ecc1355", + "version": "1.1.2", + "port-version": 3 + }, { "git-tree": "9cebcf471848bf1b121a7335d3af54c64a038a9e", "version-string": "1.1.2", diff --git a/versions/s-/sprout.json b/versions/s-/sprout.json index a8aff6295d7f5c..405af17459f538 100644 --- a/versions/s-/sprout.json +++ b/versions/s-/sprout.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "795a63868d8c0d156de6a03b4b79c5ce9cb92461", + "version-date": "2019-06-20", + "port-version": 2 + }, { "git-tree": "614a0748fa2deac704af2170ab88ed64c7475e11", "version-string": "2019-06-20", diff --git a/versions/s-/spscqueue.json b/versions/s-/spscqueue.json index c69a556dee0a86..ac105d70909957 100644 --- a/versions/s-/spscqueue.json +++ b/versions/s-/spscqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1edb233f352fa0104a9ba8958788e5f6cc43830c", + "version": "1.1", + "port-version": 3 + }, { "git-tree": "ffd613482d5eb0a109b43a8e0eeae5a83ea4d840", "version-string": "1.1", diff --git a/versions/s-/sqlite-modern-cpp.json b/versions/s-/sqlite-modern-cpp.json index 302e1a3edc0dda..e45820219b77b8 100644 --- a/versions/s-/sqlite-modern-cpp.json +++ b/versions/s-/sqlite-modern-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b468e28a38d1849eecaa0113410b214dbe41cd27", + "version": "3.2-936cd0c8", + "port-version": 2 + }, { "git-tree": "ac74c74504305a6929128356e348907745b01c11", "version-string": "3.2-936cd0c8", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 19dcb07683bd77..358d74496a04cf 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "846077eab115952eeb4dda0eaae97a3eb776fa9f", + "version": "3.40.1", + "port-version": 3 + }, { "git-tree": "6bb52479b5ab874f6283e585a3bf2294f52966ca", "version": "3.40.1", diff --git a/versions/s-/sqlitecpp.json b/versions/s-/sqlitecpp.json index efd840260e6036..316add8815e659 100644 --- a/versions/s-/sqlitecpp.json +++ b/versions/s-/sqlitecpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b239a7578034b934210ab61e462b789feffe2136", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "3e0dea72ad51e6dd229ecb147989143608868369", "version": "3.2.0", diff --git a/versions/s-/sratom.json b/versions/s-/sratom.json index 39f1703014b77f..3f72b9a1e78bf1 100644 --- a/versions/s-/sratom.json +++ b/versions/s-/sratom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8659897618d9d3ac1f3d8ae10a136a57f3d05610", + "version": "0.6.4", + "port-version": 2 + }, { "git-tree": "5536e4cc0cc0e24c2e0ada700a5cbcc89b13d0fe", "version-string": "0.6.4", diff --git a/versions/s-/stackwalker.json b/versions/s-/stackwalker.json new file mode 100644 index 00000000000000..8441c9507b2d04 --- /dev/null +++ b/versions/s-/stackwalker.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "31a65d527a4476b3ababfd0ec1b9bb78371900ca", + "version": "1.20", + "port-version": 0 + } + ] +} diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json index 1ebc5ce9411bce..1134be1b4df3d8 100644 --- a/versions/s-/starlink-ast.json +++ b/versions/s-/starlink-ast.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f79db80b697effc13bf43a3d370701e0e7a244c4", + "version": "9.2.10", + "port-version": 0 + }, + { + "git-tree": "88677a462cafe1aea0ff773adb4b57ea1e89c9c5", + "version": "9.2.7", + "port-version": 3 + }, + { + "git-tree": "36d8a5acad3aceddae181c099448d336fdefb0e7", + "version": "9.2.7", + "port-version": 2 + }, { "git-tree": "f749208cd4ad912baf5f9b84482f32a176ef910a", "version": "9.2.7", diff --git a/versions/s-/status-value-lite.json b/versions/s-/status-value-lite.json index c65a27ae17ae7c..20163f3956c9c2 100644 --- a/versions/s-/status-value-lite.json +++ b/versions/s-/status-value-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f68af4939ee1b22bd9f3e56dac9a7034e779d04", + "version": "1.1.0", + "port-version": 3 + }, { "git-tree": "8b5ac338ea6bcfa9e1da3c30a068b7ef84c4dd62", "version-string": "1.1.0", diff --git a/versions/s-/stb.json b/versions/s-/stb.json index 6103b111f611b0..9e3985c56ed4ff 100644 --- a/versions/s-/stb.json +++ b/versions/s-/stb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "acd9c2bf96a3e32fbf629b1bfd6cba4827761069", + "version-date": "2023-04-11", + "port-version": 1 + }, + { + "git-tree": "4da95279f1989ddca993d095fcd2c0e245c8b5d6", + "version-date": "2023-04-11", + "port-version": 0 + }, { "git-tree": "259df7e67a205697472aa4a3ff0326ac6fa60aa2", "version-date": "2022-09-09", diff --git a/versions/s-/stlab.json b/versions/s-/stlab.json index 4467a04c684ef6..d2f45242d54c37 100644 --- a/versions/s-/stlab.json +++ b/versions/s-/stlab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abb069e17e53344d850ff3b01ebf636a1734a6e0", + "version": "1.7.1", + "port-version": 1 + }, { "git-tree": "82ee8586032e3eb89368644e78fe4a4726a17774", "version": "1.7.1", diff --git a/versions/s-/stormlib.json b/versions/s-/stormlib.json index 31f59af4aeae19..a3b7aa7d52f12e 100644 --- a/versions/s-/stormlib.json +++ b/versions/s-/stormlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be1785249ddff2cfdcee25685c3775946edf9d6e", + "version-date": "2019-05-10", + "port-version": 5 + }, { "git-tree": "6041fce722face7562ea7e514f590a6c3e60b2d2", "version-string": "2019-05-10", diff --git a/versions/s-/strict-variant.json b/versions/s-/strict-variant.json index df6be4fb3757aa..6828b4ef0be56b 100644 --- a/versions/s-/strict-variant.json +++ b/versions/s-/strict-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1461f2e46ee70ef3690b836eab3270cf88322a1a", + "version": "0.5", + "port-version": 2 + }, { "git-tree": "f4589b1df5892a4966987c9a6d856b76c7c2481d", "version-string": "0.5", diff --git a/versions/s-/strtk.json b/versions/s-/strtk.json index 111ce2ba6ec540..31f96ef7e75001 100644 --- a/versions/s-/strtk.json +++ b/versions/s-/strtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42d71cbd4755eecc7183ac64b262ddd87450c431", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "ac754f80d0eec3321c07b9389b10ba93490ee148", "version-string": "2020-09-14", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index 5e425fa781d504..45548e8cd1de72 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8187a877fbae6bdc54d5922753a1d67141576be0", + "version": "6.0.0", + "port-version": 0 + }, { "git-tree": "bcc27a8221ab0323b537025944ebc20ae56c36ac", "version": "5.3.0", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index 3ac8fdb5461a8f..309e9fbaf70ab8 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63418f8cd771072202c4155627e90e280ddecf3c", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "dd28d6549b4c7db81ef2ee9e91a4e41b0c739191", "version": "0.9.0", diff --git a/versions/s-/systemc.json b/versions/s-/systemc.json index 9f5879f5531113..cf9f16f5f07ff8 100644 --- a/versions/s-/systemc.json +++ b/versions/s-/systemc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbe865a5931720b89f0c20153c65aecc71dd7336", + "version": "2.3.3", + "port-version": 8 + }, { "git-tree": "52e920673434754e167ac8136dad29d92069a7a4", "version-string": "2.3.3", diff --git a/versions/s-/szip.json b/versions/s-/szip.json index 80dddafbcca96c..ce2dc31a822ce9 100644 --- a/versions/s-/szip.json +++ b/versions/s-/szip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d70141a3b02fbaec47b0aae75b6abdee3502a0b7", + "version": "2.1.1", + "port-version": 11 + }, { "git-tree": "0d56cd5d38926df8d26c6ed3a829a392726ee27a", "version": "2.1.1", diff --git a/versions/t-/tacopie.json b/versions/t-/tacopie.json index a9c70548b71b93..9e510ac84ffe97 100644 --- a/versions/t-/tacopie.json +++ b/versions/t-/tacopie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9f280c1d8b799fd2b5617955348dd299b246c86", + "version": "3.2.0", + "port-version": 5 + }, { "git-tree": "e9eacb6c5a31c44cd1c8707ba92b0acf5133c13a", "version-string": "3.2.0", diff --git a/versions/t-/taocpp-json.json b/versions/t-/taocpp-json.json index f3400c11d4a014..6509314c285de9 100644 --- a/versions/t-/taocpp-json.json +++ b/versions/t-/taocpp-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3efce615deb5e4414df2c3731c1e8eae333d32c9", + "version-date": "2020-09-14", + "port-version": 3 + }, { "git-tree": "d3ae444025a6267cf41b462f77061757254bc829", "version-string": "2020-09-14", diff --git a/versions/t-/tap-windows6.json b/versions/t-/tap-windows6.json index f22fe46ddb4d7c..532dc6324c8edd 100644 --- a/versions/t-/tap-windows6.json +++ b/versions/t-/tap-windows6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0096b2007c6e7854bf5cd89279c028f4c96dd50", + "version": "9.21.2-0e30f5c", + "port-version": 2 + }, { "git-tree": "2b35b39ca3996a529812b69654a194568127e4e1", "version-string": "9.21.2-0e30f5c", diff --git a/versions/t-/task-thread-pool.json b/versions/t-/task-thread-pool.json new file mode 100644 index 00000000000000..4cc180cdb53226 --- /dev/null +++ b/versions/t-/task-thread-pool.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b64ff5ad8b40dbfe129aabe53f11b81ba71e4743", + "version": "1.0.7", + "port-version": 0 + } + ] +} diff --git a/versions/t-/taskflow.json b/versions/t-/taskflow.json index 38343bf24aeb53..52f470e421d81c 100644 --- a/versions/t-/taskflow.json +++ b/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce89c70566c24ddbcaf7ddb1ee9dc3101c3c30e0", + "version": "3.6.0", + "port-version": 0 + }, { "git-tree": "fd5f9c87cc440939ef97da59cbd47bd044851751", "version": "3.5.0", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 23d443e1b7ff44..a63cac549edba0 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "97a86c92ba0419c50673782f0b3a7f1568aaaef7", + "version": "2021.9.0", + "port-version": 1 + }, + { + "git-tree": "3a44303f590164f98542c516a049e1328a178bc2", + "version": "2021.9.0", + "port-version": 0 + }, { "git-tree": "d08a7732c5a162a88ac98871ebf98869d5490a97", "version": "2021.8.0", diff --git a/versions/t-/telnetpp.json b/versions/t-/telnetpp.json index d010324975b22c..660dd40faad0fb 100644 --- a/versions/t-/telnetpp.json +++ b/versions/t-/telnetpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e251b079bf2c0424b1e06f60ecb93d8eb331704a", + "version": "2.1.2", + "port-version": 3 + }, { "git-tree": "b80086b6f36f27c3884929bbbfe0e25416cb2c08", "version-string": "2.1.2", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 97f803c145ae10..7f1840473f11c3 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea5e9e44827c85ad455621231cb7ca1f2447cdd9", + "version-date": "2022-03-16", + "port-version": 3 + }, { "git-tree": "eed8e7f9952716b9aa7fcde453fad358b6b7bd2f", "version-date": "2022-03-16", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index c6ac4ef06bac17..b3bdbbfa4f725a 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a43b33297fd09c075b57f2441b45cca4291a48a5", + "version": "5.3.0", + "port-version": 1 + }, { "git-tree": "9536858220896569da2d0e66fa3f6a4b95621186", "version": "5.3.0", diff --git a/versions/t-/tgc.json b/versions/t-/tgc.json index 57189f3b1fffdc..c336b2bcab77a6 100644 --- a/versions/t-/tgc.json +++ b/versions/t-/tgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8be2721fdfa9114ab8fada6a4bd5b2f3e8778cc7", + "version-date": "2019-08-11", + "port-version": 4 + }, { "git-tree": "8388893f06b6027878f739f9e7d30c9bf74faf61", "version-string": "2019-08-11", diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 12671bba96af19..c768020af7f105 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e0dd9030c6e211cbf558dae00ea87e9591a09f8", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "09d722c7f2cb784d571af9a6f46abb83aa907d2b", "version": "0.8.4", diff --git a/versions/t-/threadpool.json b/versions/t-/threadpool.json index 6af078b544a504..70526ce93fec2a 100644 --- a/versions/t-/threadpool.json +++ b/versions/t-/threadpool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5408b19ee78bb22c9d2b37cade5701463f6e085", + "version": "0.2.5", + "port-version": 3 + }, { "git-tree": "498f064539d36777494d54a9edcce63a012ac503", "version-string": "0.2.5", diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json index 1f9daf0e2863c1..384f4e6f21001c 100644 --- a/versions/t-/thrift.json +++ b/versions/t-/thrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc85618cd8a4849e400d28916b733f2426c9246d", + "version": "0.16.0", + "port-version": 1 + }, { "git-tree": "075afb4c9f18e75caa0eb4b07609324fa35b5ca5", "version": "0.16.0", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 525edff7faa7ff..b51f8a69a5c518 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "658dc44e4f5495f0820db6358d8edf74e6ac8d48", + "version": "4.5.0", + "port-version": 3 + }, { "git-tree": "b96d20619404c16ef469583437a776b2e74afcef", "version": "4.5.0", diff --git a/versions/t-/tiny-aes-c.json b/versions/t-/tiny-aes-c.json index 4e285f54098ee8..f3fb507d6d38b1 100644 --- a/versions/t-/tiny-aes-c.json +++ b/versions/t-/tiny-aes-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8b05d66491544d63c411f39744d4e0cedb45e38", + "version-date": "2019-07-31", + "port-version": 3 + }, { "git-tree": "08ce412a6bc1a1318909c6bf40160c64929599fc", "version-string": "2019-07-31", diff --git a/versions/t-/tiny-bignum-c.json b/versions/t-/tiny-bignum-c.json index 6c61a7a99a0035..62aebfd5598155 100644 --- a/versions/t-/tiny-bignum-c.json +++ b/versions/t-/tiny-bignum-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42506150a5e1726cd12954d8aba925127a03a8ee", + "version-date": "2019-07-31", + "port-version": 3 + }, { "git-tree": "8ee270199f8de84b30355b48f8342ea917b573ba", "version-string": "2019-07-31", diff --git a/versions/t-/tiny-dnn.json b/versions/t-/tiny-dnn.json index ba07444159746b..40501ce3d4de33 100644 --- a/versions/t-/tiny-dnn.json +++ b/versions/t-/tiny-dnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb93b92373f36876e6473490ec463db8a06cf901", + "version-date": "2018-10-25", + "port-version": 2 + }, { "git-tree": "6de81be7e06cac0652c8ffcc136ffdb889cb41f8", "version-string": "2018-10-25", diff --git a/versions/t-/tiny-regex-c.json b/versions/t-/tiny-regex-c.json index 8f7cfaa3a8544a..f465928377518c 100644 --- a/versions/t-/tiny-regex-c.json +++ b/versions/t-/tiny-regex-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afd5a1b0b7618dd4848895024f2d52443dcdce47", + "version-date": "2019-07-31", + "port-version": 3 + }, { "git-tree": "9a8827f5b9bb6e24ad3746638423b618cf8a9085", "version-string": "2019-07-31", diff --git a/versions/t-/tinycthread.json b/versions/t-/tinycthread.json index 9d719113b327ce..73317ee70e207d 100644 --- a/versions/t-/tinycthread.json +++ b/versions/t-/tinycthread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e83b13c0c11b452c92d01925a2a80e437e8e074c", + "version-date": "2019-08-06", + "port-version": 3 + }, { "git-tree": "29aee6896d4b7a5f2b60a2d97f52082624d0f194", "version-string": "2019-08-06", diff --git a/versions/t-/tinyexpr.json b/versions/t-/tinyexpr.json index d07e1d13582d27..9d0b25f708abca 100644 --- a/versions/t-/tinyexpr.json +++ b/versions/t-/tinyexpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30f7a31f5f6d12948d2f8650ea80859af56bb7aa", + "version-date": "2020-09-25", + "port-version": 2 + }, { "git-tree": "27a749014c1877a6c9cde48fda29f0128894741b", "version-string": "2020-09-25", diff --git a/versions/t-/tinynpy.json b/versions/t-/tinynpy.json index d2a949a1e08e6a..7be9c3da38d3bc 100644 --- a/versions/t-/tinynpy.json +++ b/versions/t-/tinynpy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d38130d27f5897153ce1ca9770e81b7a23f65d63", + "version": "1.0.0", + "port-version": 6 + }, { "git-tree": "9d762ceb4183ad5e67099a7618346f7588b1b067", "version-string": "1.0.0", diff --git a/versions/t-/tinythread.json b/versions/t-/tinythread.json index 5c210ee11cf12e..c962ef296406f2 100644 --- a/versions/t-/tinythread.json +++ b/versions/t-/tinythread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44a036748075e5b49c49e5a2d2dc96ed9107fa11", + "version": "1.1", + "port-version": 6 + }, { "git-tree": "987670b38c02ffa4761d1ce547e76f76545aac3c", "version-string": "1.1", diff --git a/versions/t-/tinytoml.json b/versions/t-/tinytoml.json index b7eb2bbda52fe8..f56a51f4370593 100644 --- a/versions/t-/tinytoml.json +++ b/versions/t-/tinytoml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef300476c58abc2799c021f745aaa66dae45f043", + "version": "20180219", + "port-version": 3 + }, { "git-tree": "1bc5fcab066d64cc4693428f2375e9232f17b7d0", "version-string": "20180219", diff --git a/versions/t-/tinyxml.json b/versions/t-/tinyxml.json index d67aa586477588..3b8eaaf231a36e 100644 --- a/versions/t-/tinyxml.json +++ b/versions/t-/tinyxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4463cb1a60eed81cb34748d54b2ad5e3b8ed3a08", + "version": "2.6.2", + "port-version": 10 + }, { "git-tree": "a26a6fd0c41c77f82aba481a315e3a0f1e3d0eca", "version-string": "2.6.2", diff --git a/versions/t-/tl-function-ref.json b/versions/t-/tl-function-ref.json index 9e162cc4909a92..ce6f759bab6473 100644 --- a/versions/t-/tl-function-ref.json +++ b/versions/t-/tl-function-ref.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f74755cb477baa2fd51734a985fa1e95d4a6854d", + "version": "1.0.0", + "port-version": 4 + }, { "git-tree": "6afb229de5666e245476b0ca4152d2073f538a2e", "version-string": "1.0.0", diff --git a/versions/t-/tlx.json b/versions/t-/tlx.json index 647a3233b003d3..e92d72b9a01fa4 100644 --- a/versions/t-/tlx.json +++ b/versions/t-/tlx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "160b776d3650302ac8cccc81357f11e54d81fbf4", + "version": "0.5.20191212", + "port-version": 4 + }, { "git-tree": "0e8a25c74e2f56ab5f033191bf7b00eb26084067", "version-string": "0.5.20191212", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index c08acbbe2b6b5f..48efad1c12aeb3 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "77e2063ccf000ddf44db90335335b0d87efe0bf4", + "version-semver": "0.9.1", + "port-version": 1 + }, + { + "git-tree": "1dbe1080d7c00eb3aa76f87c8c62511d9d9671a7", + "version-semver": "0.9.1", + "port-version": 0 + }, { "git-tree": "0866d3457267bff478bd158261b25869adf3e480", "version-semver": "0.9.0", diff --git a/versions/t-/tree-similarity.json b/versions/t-/tree-similarity.json new file mode 100644 index 00000000000000..2893d0b504c2c0 --- /dev/null +++ b/versions/t-/tree-similarity.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d7f5637a5f1a5c0ba5d50a5734a69c6d190ac75d", + "version-semver": "0.1.1", + "port-version": 0 + } + ] +} diff --git a/versions/t-/treehopper.json b/versions/t-/treehopper.json index 572ae5dbbb2792..e8271133ea627b 100644 --- a/versions/t-/treehopper.json +++ b/versions/t-/treehopper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfc0dea8339d81f05a040cd2ca7831c18c43f765", + "version": "1.11.3", + "port-version": 7 + }, { "git-tree": "d3eb869813ca17e782c54f3df95af48cbb47346c", "version-string": "1.11.3", diff --git a/versions/t-/tsl-hopscotch-map.json b/versions/t-/tsl-hopscotch-map.json index d0df7c62d93381..80a79d4c3f8bb2 100644 --- a/versions/t-/tsl-hopscotch-map.json +++ b/versions/t-/tsl-hopscotch-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f6b67b30812de79b65fcd5764d45bec74411521", + "version": "2.3.0", + "port-version": 3 + }, { "git-tree": "cb999b94c279946d93639a2d54d3a8972a61519f", "version-string": "2.3.0", diff --git a/versions/t-/tsl-ordered-map.json b/versions/t-/tsl-ordered-map.json index e611a4835bea32..6b6afcce382be1 100644 --- a/versions/t-/tsl-ordered-map.json +++ b/versions/t-/tsl-ordered-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4adcef91a9fce2b4213e5402973b8afdb50baeb2", + "version": "1.0.0", + "port-version": 3 + }, { "git-tree": "2d21077c63a818b22dd0d4f3c1e3d70ebbf6de84", "version-string": "1.0.0", diff --git a/versions/t-/tsl-sparse-map.json b/versions/t-/tsl-sparse-map.json index 0a993a39d11f99..28de0babe33af1 100644 --- a/versions/t-/tsl-sparse-map.json +++ b/versions/t-/tsl-sparse-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71fff3f16d7b3d0d58d918e57d619225ffd1ff6e", + "version": "0.6.2", + "port-version": 3 + }, { "git-tree": "392c1afdb1f4ce3319f631466472de6d16924882", "version-string": "0.6.2", diff --git a/versions/t-/type-lite.json b/versions/t-/type-lite.json index 642854a2a54869..38111da8bb2b89 100644 --- a/versions/t-/type-lite.json +++ b/versions/t-/type-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87b4ca306e885d75327f894c485304ca3ead022c", + "version": "0.1.0", + "port-version": 3 + }, { "git-tree": "fd2fb158fe4964b9f41777379d19bf0790c76fd4", "version-string": "0.1.0", diff --git a/versions/u-/unicorn-lib.json b/versions/u-/unicorn-lib.json index db2bc9f7856661..976fcb4cc85add 100644 --- a/versions/u-/unicorn-lib.json +++ b/versions/u-/unicorn-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20329e00e75f4f13bb1b77f3e19c23182861c6cd", + "version-date": "2022-01-24", + "port-version": 1 + }, { "git-tree": "278115c391839dcfc66ac80339c8dcd9a660c9e0", "version-date": "2022-01-24", diff --git a/versions/u-/unqlite.json b/versions/u-/unqlite.json index e0ead45a2cbe8b..3b461599970665 100644 --- a/versions/u-/unqlite.json +++ b/versions/u-/unqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c553ddb0b70a37f30c5a61fca9c055cfebf345b0", + "version": "1.1.9", + "port-version": 2 + }, { "git-tree": "e62e679c8bef82c536cf33cb6f2a1f842930d98a", "version-string": "1.1.9", diff --git a/versions/u-/unrar.json b/versions/u-/unrar.json index 7ce46bc2f8e822..27da1388c1ac4b 100644 --- a/versions/u-/unrar.json +++ b/versions/u-/unrar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6849b794133f944030e40dc8c73b1fa4fc2a4f13", + "version": "6.1.7", + "port-version": 2 + }, { "git-tree": "282699df90f6c302560fa8fdb097e386ae9de7db", "version": "6.1.7", diff --git a/versions/u-/urdfdom.json b/versions/u-/urdfdom.json index 391d13c438c248..d31d83fab704c0 100644 --- a/versions/u-/urdfdom.json +++ b/versions/u-/urdfdom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb1c1a30329b850ac4450d3b1a72166697058bb8", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "35eed492633e8ac2b137093a51d13ad325d9e7c5", "version": "3.1.0", diff --git a/versions/u-/urho3d.json b/versions/u-/urho3d.json index e0defa3c53a631..1009d23737502d 100644 --- a/versions/u-/urho3d.json +++ b/versions/u-/urho3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe6e49016a6f15bc04e04727f2e4712e75625425", + "version-date": "2021-03-01", + "port-version": 4 + }, { "git-tree": "6f9e8452934bac3542907f50fd466a34e44b3fdc", "version-date": "2021-03-01", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 66cac186b9e3da..1b163da1cea196 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5a5cb56688d1804bb35d8e361cfd41ef858919c9", + "version": "23.5", + "port-version": 0 + }, + { + "git-tree": "9db13a48bde68c5107143c6a68fb50b6b71b8483", + "version": "23.2", + "port-version": 1 + }, { "git-tree": "f52bda67df8cc837cf678d105ecba88358c016c0", "version": "23.2", diff --git a/versions/u-/utfz.json b/versions/u-/utfz.json index 4f74bc8975e507..5789078f29ca14 100644 --- a/versions/u-/utfz.json +++ b/versions/u-/utfz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29787ab2794e0e9cb0183207820b2e5f37a3e8f7", + "version": "1.2", + "port-version": 4 + }, { "git-tree": "e17e36e3f6a6d86a17ed5633baf9a45e1a4d7ce9", "version-string": "1.2", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 8093cd19265c55..7c3906fef5a059 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d245ea2b1c8fe04d653e858d2c9dda5fde706da", + "version-date": "2023-04-28", + "port-version": 0 + }, { "git-tree": "6e028b8207a31b10b755c11400d7c33f73fb5511", "version-date": "2023-03-30", diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json index 048053fbcfbeb1..a6fc4153db01e4 100644 --- a/versions/u-/uvw.json +++ b/versions/u-/uvw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffc751aa641f583e42aad836b6bd7766661f789a", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "c36c66a8d5f4a6eed4aa9fe4399f32a516d3883c", "version": "2.12.1", diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 9a3cc140af6128..e681c10afa3cf0 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "53155ed92665dafb62c89bcc7bb9722fd5875316", + "version-semver": "20.44.0", + "port-version": 0 + }, + { + "git-tree": "0b0f3943b2e6e8260c638dc75c430d4975b87999", + "version-semver": "20.41.0", + "port-version": 0 + }, + { + "git-tree": "93461a35ff4e9611909379c0e64a1b22213a1c57", + "version-semver": "20.40.0", + "port-version": 0 + }, { "git-tree": "4d9dadfe2a7ad5ed25314c0511325f05c20702fc", "version-semver": "20.36.0", diff --git a/versions/v-/visit-struct.json b/versions/v-/visit-struct.json index 110b6eb3652216..77c858ea1f0dd6 100644 --- a/versions/v-/visit-struct.json +++ b/versions/v-/visit-struct.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "59296ff30012685f7c9c1d7b0723fc940997a2b1", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "a803da3fde987d8abc319748c6a599e6ace6e650", + "version": "1.0", + "port-version": 4 + }, { "git-tree": "b3d55a4cdc5320d704eba7c458eed48fe0d59dff", "version-string": "1.0", diff --git a/versions/v-/vk-bootstrap.json b/versions/v-/vk-bootstrap.json index 1eddc88c0abb3b..c4a5b579b29045 100644 --- a/versions/v-/vk-bootstrap.json +++ b/versions/v-/vk-bootstrap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76afd9e4fb4d1ac5c3329b5f2db845a3923d4aa6", + "version": "0.7", + "port-version": 0 + }, { "git-tree": "5b4e562582567c73a3bad2120a3b23e0b6b32dde", "version": "0.5", diff --git a/versions/v-/vkfft.json b/versions/v-/vkfft.json index bc864103ce3e0f..31e5bfbc66c71e 100644 --- a/versions/v-/vkfft.json +++ b/versions/v-/vkfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfc9ae6d28ea3043ce04e923fc7a4b0a0346c4db", + "version": "1.2.31", + "port-version": 0 + }, { "git-tree": "cefb73461bdbaf1e71eefa7bb7a9dce7352fd3b3", "version": "1.2.17", diff --git a/versions/v-/vlfeat.json b/versions/v-/vlfeat.json index 73a685f0f61a14..01eda1022b02cb 100644 --- a/versions/v-/vlfeat.json +++ b/versions/v-/vlfeat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8ae9112b64ac005ccb493693bf4f5f9f8753355", + "version-date": "2020-07-10", + "port-version": 3 + }, { "git-tree": "2d4ca95a246089f7b15bcbfc6d8e74e364f5f867", "version-string": "2020-07-10", diff --git a/versions/v-/vs-yasm.json b/versions/v-/vs-yasm.json index 71ca133ddabb9b..c7d18526902f83 100644 --- a/versions/v-/vs-yasm.json +++ b/versions/v-/vs-yasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3d803c82a542e9f105f72e7f01c18a68a3669b1", + "version": "0.5.0", + "port-version": 2 + }, { "git-tree": "578afbadfc6dd06f3e83fc3d40dbbcfe98a392ae", "version-string": "0.5.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json new file mode 100644 index 00000000000000..440b6c40114975 --- /dev/null +++ b/versions/v-/vsg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0542d7bb873d65fa6ecbf2c3a02d7a2c7221d34a", + "version": "1.0.5", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vtk-m.json b/versions/v-/vtk-m.json index b86a7682f4da91..9b20ffd5c97408 100644 --- a/versions/v-/vtk-m.json +++ b/versions/v-/vtk-m.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d9c1ecc2af5787432fdebcdf6cd293b7af075bf", + "version": "1.9.0", + "port-version": 2 + }, { "git-tree": "7df5e71334a22b5dc19ffb3c02880554b2838f86", "version": "1.9.0", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 232b24571a3c42..ff008111c0bf92 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ec376669498a8b43b3dc1779386dcc383d7cc1f", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 7 + }, { "git-tree": "340d82faf130e467fb4ed6d5e8ce5bf93101513e", "version-semver": "9.2.0-pv5.11.0", diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index f6db8e6a48d263..e1f8cecf78450e 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58c480d0beaa5a34988bd99c452a6fcbfe08721a", + "version": "1.3.250", + "port-version": 2 + }, { "git-tree": "535abf6f9fe02ff97da42e5594a4c1fd55190ec1", "version": "1.3.243", diff --git a/versions/v-/vulkan.json b/versions/v-/vulkan.json index 08a39ad3a218d0..022bb1bc162424 100644 --- a/versions/v-/vulkan.json +++ b/versions/v-/vulkan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea62236a3c91051f5ccb340442b60a026bf160c6", + "version": "1.1.82.1", + "port-version": 6 + }, { "git-tree": "80d4793fe3882fca0afcb470183f404d97c22981", "version": "1.1.82.1", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index d764dcfead5c76..f3e570fa2b98c5 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "05744fe658f891ca87fd5cdad73a382ace640bed", + "version-string": "2023.05.15.00", + "port-version": 0 + }, + { + "git-tree": "e79739dcf42e3dd4d0e32c595b27ece48c762bdd", + "version-string": "2022.03.21.00", + "port-version": 1 + }, { "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724", "version-string": "2022.03.21.00", diff --git a/versions/w-/wasmedge.json b/versions/w-/wasmedge.json index 1e369422a1a5f3..643d2933167490 100644 --- a/versions/w-/wasmedge.json +++ b/versions/w-/wasmedge.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1c5d407c35a142f50bf1a79d7a720d8df43b54ec", + "version": "0.12.1", + "port-version": 1 + }, + { + "git-tree": "053400dd62ab5a02842f107aaad7dff7fdeb0a40", + "version": "0.12.1", + "port-version": 0 + }, + { + "git-tree": "a13dbbe58cedd77daae5f42016df4f74101c34b0", + "version-semver": "0.12.0-alpha.1", + "port-version": 1 + }, { "git-tree": "8f45668b8b49bb5ac4cefd31ee7e41abddc15107", "version-semver": "0.12.0-alpha.1", diff --git a/versions/w-/wcslib.json b/versions/w-/wcslib.json new file mode 100644 index 00000000000000..988a5185fb3ec4 --- /dev/null +++ b/versions/w-/wcslib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2e33104b54c3db79012234ded4db319a3464885b", + "version": "7.12", + "port-version": 0 + } + ] +} diff --git a/versions/w-/webview2.json b/versions/w-/webview2.json index 5a68306fe9bc02..dc4844fb87435b 100644 --- a/versions/w-/webview2.json +++ b/versions/w-/webview2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f620381c9d12e72ae72e693571bc98ab82510da", + "version": "1.0.1210.39", + "port-version": 1 + }, { "git-tree": "67a13efe8865489439c423563ee9fdaecf8baab1", "version": "1.0.1210.39", diff --git a/versions/w-/wepoll.json b/versions/w-/wepoll.json index b8cec575275b7b..d5c7034f0c3f19 100644 --- a/versions/w-/wepoll.json +++ b/versions/w-/wepoll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83177ec0e0684dc043f5a7f7f800d1c8c8df47d9", + "version": "1.5.8", + "port-version": 3 + }, { "git-tree": "ece0a454c25f5fba81265f1bc66bae4036efdcec", "version-string": "1.5.8", diff --git a/versions/w-/wg21-sg14.json b/versions/w-/wg21-sg14.json index 8b620cc22cc6f1..9873b95c0ff151 100644 --- a/versions/w-/wg21-sg14.json +++ b/versions/w-/wg21-sg14.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7477a801b9a1dfa1adcf2c59d486b0c3e602de3", + "version-date": "2019-08-13", + "port-version": 2 + }, { "git-tree": "2f11507c370b719e1a17ced7ab2dd0af19fe47d4", "version-string": "2019-08-13", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index d060db361ba33e..dd76fa52cdfa34 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e96d6798de6842dc009f957172841b8fcf711d7", + "version-date": "2023-04-11", + "port-version": 0 + }, { "git-tree": "15b6edcd080a9c2dab9a62a7d4a029b33b835f08", "version-date": "2023-02-02", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index b29cb56e0dd93e..ce841f61c47833 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "93484c8257a6ac5a90f5d540d143a6f4fe5968f2", + "version": "4.1.3", + "port-version": 10 + }, + { + "git-tree": "5444737a0b6d0d6a1c5129ae7435f52ac5f6bcb4", + "version": "4.1.3", + "port-version": 9 + }, { "git-tree": "85d70a721afa26cf8ff26aec62fd04a16f8e6f7b", "version": "4.1.3", diff --git a/versions/w-/winsparkle.json b/versions/w-/winsparkle.json index b642ca7d94c263..543117aa62560f 100644 --- a/versions/w-/winsparkle.json +++ b/versions/w-/winsparkle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c6c0404e941beb4139069e5a5cb03e7e59655a4", + "version": "0.7.0", + "port-version": 2 + }, { "git-tree": "8f1aed9d3a5aac4c967bc6e8be9b8bbe0ce09a76", "version": "0.7.0", diff --git a/versions/w-/wmipp.json b/versions/w-/wmipp.json new file mode 100644 index 00000000000000..1afd5fe3f1c59d --- /dev/null +++ b/versions/w-/wmipp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "62fe399df24f53348677d6ee7af427a6d0018aaf", + "version": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "70a7cc2553e70e4a9e6f50110b0e8b6eedb8c0f9", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/w-/wordnet.json b/versions/w-/wordnet.json index 0abcb3b7138be1..90624a6e9619a2 100644 --- a/versions/w-/wordnet.json +++ b/versions/w-/wordnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c34a2cc15fdbba26554bfebc0142e7de7cb3264a", + "version": "3.0", + "port-version": 3 + }, { "git-tree": "ac5ddd0978d9192feed17e2c643d7c8c9451064a", "version-string": "3.0", diff --git a/versions/x-/x-plane.json b/versions/x-/x-plane.json index 34333db077cb66..62e2c66012d35b 100644 --- a/versions/x-/x-plane.json +++ b/versions/x-/x-plane.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f081103e3e99e2d77b5b3124824ad6f0d7410fc", + "version": "3.0.3", + "port-version": 2 + }, { "git-tree": "5b49030933a1014e1e897438a29a52fbb163b5f3", "version": "3.0.3", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index e747ee64b381ec..480ef7d94e5375 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0361283be94126cf5e42a4cf765f700f8f209ea5", + "version": "0.164.3095", + "port-version": 4 + }, { "git-tree": "18da69fb69b926e7784135262798356e7b1ee5e4", "version": "0.164.3095", diff --git a/versions/x-/xapian.json b/versions/x-/xapian.json index 31672ba282450c..1e183f3ba05045 100644 --- a/versions/x-/xapian.json +++ b/versions/x-/xapian.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0a050725d62e180539040589c1691a5ec3974a30", + "version": "1.4.22", + "port-version": 1 + }, + { + "git-tree": "f2da71ae6ceb7c0d2317c1d06f11a302f48f89dd", + "version": "1.4.22", + "port-version": 0 + }, { "git-tree": "88d78609c12312fdd2b7260e1c4c1fb3838373b7", "version": "1.4.21", diff --git a/versions/x-/xbyak.json b/versions/x-/xbyak.json index 26a62ce5658832..7b6431e94dc757 100644 --- a/versions/x-/xbyak.json +++ b/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9774b99e4f632c777b1f0d1cec57f4918acc591a", + "version": "6.69", + "port-version": 0 + }, { "git-tree": "d4441480fab1434594b5441612ae5158c81a6642", "version": "6.60", diff --git a/versions/x-/xeus.json b/versions/x-/xeus.json index 15c72b6b7dc6c5..eda395f433ba61 100644 --- a/versions/x-/xeus.json +++ b/versions/x-/xeus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b36c5dea30b1657552313a07c10623753918b1bf", + "version": "0.24.3", + "port-version": 3 + }, { "git-tree": "58ccbb03903ad023da77a9a53225dc4bd25df600", "version": "0.24.3", diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json index 42a8f16c9c8d4d..2271f0b7c29c94 100644 --- a/versions/x-/xframe.json +++ b/versions/x-/xframe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0dc724af03bbad13a480e399160f7cf03bb4219c", + "version": "0.3.0", + "port-version": 3 + }, { "git-tree": "e0e77fd0b1b188f69a5c08856e518e61845bed7f", "version-string": "0.3.0", diff --git a/versions/x-/xlsxio.json b/versions/x-/xlsxio.json index da0b392025b73f..a56ac4283983af 100644 --- a/versions/x-/xlsxio.json +++ b/versions/x-/xlsxio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd38fc13e5e2b58d149261e8d692e1df7f93b88a", + "version": "0.2.34", + "port-version": 0 + }, { "git-tree": "6b4eb1ccf9e863a9291e03521af9ff4d62f5eb3d", "version-date": "2021-03-24", diff --git a/versions/x-/xpack.json b/versions/x-/xpack.json index b87511faff68ce..432728c90ac005 100644 --- a/versions/x-/xpack.json +++ b/versions/x-/xpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05f0ea1a83e35833ccf855d9cb507ab1c9a99a0b", + "version": "1.0.5", + "port-version": 0 + }, { "git-tree": "5123943d7e13cfac8d5a58f7fe3cf027275e5bee", "version-date": "2023-02-06", diff --git a/versions/x-/xproperty.json b/versions/x-/xproperty.json index 95e4bae55ee06c..dd3d8fdddce926 100644 --- a/versions/x-/xproperty.json +++ b/versions/x-/xproperty.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "237cd26cda6bc5f75e9dd2d75e5a65725512065d", + "version": "0.8.1", + "port-version": 3 + }, { "git-tree": "efc510fa8cbd77c3effc463f019d8b7520d5c29b", "version-string": "0.8.1", diff --git a/versions/x-/xqilla.json b/versions/x-/xqilla.json index edca35147760dd..36e81f327fbca2 100644 --- a/versions/x-/xqilla.json +++ b/versions/x-/xqilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e825e06e975c55c3a0811107d2488b32b1f600b", + "version": "2.3.4", + "port-version": 2 + }, { "git-tree": "110b08065d892a635f1a8f2dd76f42727788020f", "version": "2.3.4", diff --git a/versions/x-/xsimd.json b/versions/x-/xsimd.json index 9059dbc12ab543..4392a23c2e84fc 100644 --- a/versions/x-/xsimd.json +++ b/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c67f06803f30a45e0dc0db77378869d4c3067a0", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "be6cd49ae57f84d0d66692b388c2ee0ce25cd0e0", "version": "9.0.1", diff --git a/versions/x-/xtensor-fftw.json b/versions/x-/xtensor-fftw.json index 2624bdbcf1adcd..dbaf99685a2c0a 100644 --- a/versions/x-/xtensor-fftw.json +++ b/versions/x-/xtensor-fftw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f535672e2935cbbf33bd2a3f332d3a100cf6a4a", + "version-date": "2019-11-30", + "port-version": 4 + }, { "git-tree": "b0593649089167c5e7e5e8da3d48dc20bbb0e366", "version-string": "2019-11-30", diff --git a/versions/x-/xtensor.json b/versions/x-/xtensor.json index 8871db52b84662..3a836ce093d90b 100644 --- a/versions/x-/xtensor.json +++ b/versions/x-/xtensor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeb0efc2bdf326191f5dff18bb2506690902b162", + "version": "0.24.6", + "port-version": 0 + }, { "git-tree": "474191556a342fc77b9defef9ba63a4dcf2205c4", "version": "0.24.3", diff --git a/versions/x-/xtl.json b/versions/x-/xtl.json index 06d85fb16a1f4e..978bdc9b90b2fd 100644 --- a/versions/x-/xtl.json +++ b/versions/x-/xtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5cad9625b1b7459135265c4f8647b2bcae0e252", + "version": "0.7.5", + "port-version": 0 + }, { "git-tree": "8255a333f114b449c2578ec70e91970eace40598", "version": "0.7.2", diff --git a/versions/x-/xxhash.json b/versions/x-/xxhash.json index bd93be72cf761c..151f9c336dd8b0 100644 --- a/versions/x-/xxhash.json +++ b/versions/x-/xxhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c45988bd467674cb21961646a9379645a235ba5", + "version": "0.8.1", + "port-version": 2 + }, { "git-tree": "895a0039b3cd40c7f66725608d07dc851e0d54b6", "version": "0.8.1", diff --git a/versions/y-/yajl.json b/versions/y-/yajl.json index a6494c169c6fe8..74831ee23b22c5 100644 --- a/versions/y-/yajl.json +++ b/versions/y-/yajl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f4f50d7448d28c577777c09895a93847124e1d3", + "version": "2.1.0", + "port-version": 4 + }, { "git-tree": "348d0cb4e70b0db911dbd9e014d69164eb53cec4", "version-string": "2.1.0", diff --git a/versions/y-/yara.json b/versions/y-/yara.json index 84b9b944d1ee1e..2fb694f1546b16 100644 --- a/versions/y-/yara.json +++ b/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4deddff9f05a4c7f2fc13b77da1717b50d25072a", + "version": "4.3.0", + "port-version": 1 + }, { "git-tree": "33fe4f18e0ce42f7ff01fde67f188eed7d74616e", "version": "4.3.0", diff --git a/versions/y-/yomm2.json b/versions/y-/yomm2.json index 5bcc69e8e4cdf2..5c495265dee87a 100644 --- a/versions/y-/yomm2.json +++ b/versions/y-/yomm2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8", + "version": "1.3.1", + "port-version": 0 + }, + { + "git-tree": "8bd8a2b21272e70a16c55b55215a7b5f6bd295d3", + "version": "1.1.2", + "port-version": 2 + }, { "git-tree": "883f87feff25739b1922362bcc35438d86a6454d", "version-string": "1.1.2", diff --git a/versions/z-/z85.json b/versions/z-/z85.json index 1301a3972a18c4..e5f3b0ec23a8fb 100644 --- a/versions/z-/z85.json +++ b/versions/z-/z85.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b74a8c81b9118c04732c5e0c0f15714fc19ca73c", + "version": "1.0", + "port-version": 2 + }, { "git-tree": "eb7115fc8b2a5c84c958196521ec5f6c5f502ca6", "version-string": "1.0", diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json index 6c3d37cfa3af8a..3f7dbb1e357304 100644 --- a/versions/z-/zeroc-ice.json +++ b/versions/z-/zeroc-ice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aba63efeb29d2249b285f6188b44fde25dbff9d3", + "version": "3.7.9", + "port-version": 0 + }, { "git-tree": "2ec016c70ea82b2ddb340c6c809aece865c7c2ce", "version": "3.7.7", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index db3d4a2d40819d..0043d92eaeef41 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "487c1669ab781a8adfa16097f1c7142165f5debf", + "version-date": "2023-01-31", + "port-version": 4 + }, + { + "git-tree": "3cbcf46fa4e8e9bdd5c586a15b9d4549497d8d6e", + "version-date": "2023-01-31", + "port-version": 3 + }, + { + "git-tree": "3926aa389f1ff91b3895fd51c502600effe6c4f2", + "version-date": "2023-01-31", + "port-version": 2 + }, { "git-tree": "faad6e9fea08c6740bc27652b7d3df33ee693a41", "version-date": "2023-01-31", diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index d69c235c4c094f..ab73c500e03947 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea181bc5e9362185c5d5d85d23bbb15267c82cdb", + "version": "2.0.7", + "port-version": 0 + }, { "git-tree": "60e9a6f12ede4c5e87d2b3077c25e83991a02eea", "version": "2.0.6", diff --git a/versions/z-/zookeeper.json b/versions/z-/zookeeper.json index 61432ca7df53c7..3321d301e60eb2 100644 --- a/versions/z-/zookeeper.json +++ b/versions/z-/zookeeper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cddd556547f1e8fef18c115b551f0ba9b5428def", + "version": "3.5.6", + "port-version": 1 + }, { "git-tree": "2ad08d6a8c4d4f812c50c02872d046c84dd4ccbc", "version": "3.5.6", diff --git a/versions/z-/zpp-bits.json b/versions/z-/zpp-bits.json index 155644b4c6fbfb..92911980a5d24e 100644 --- a/versions/z-/zpp-bits.json +++ b/versions/z-/zpp-bits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2068c0855edbc51965c9001fb5af8d45e5115f26", + "version": "4.4.17", + "port-version": 0 + }, { "git-tree": "f1497476711852911f21a84e80c76a30530c98c7", "version": "4.4.13", diff --git a/versions/z-/zserge-webview.json b/versions/z-/zserge-webview.json index 6d2c4538ab144c..c9537d07c433c7 100644 --- a/versions/z-/zserge-webview.json +++ b/versions/z-/zserge-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d184b0d8540c194ab3013884180efd8dfdc39d4", + "version-date": "2023-04-15", + "port-version": 0 + }, { "git-tree": "173fd4ea0d862f8cca595a8726fe7e0ef6444d45", "version-date": "2022-09-07", diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index 433e9ec15c9898..e539895eb9584f 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2a6d14da5f876e43859950a12a330f8b03cdc327", + "version": "1.5.5", + "port-version": 0 + }, + { + "git-tree": "fcc4fe2738d903bc347d20d2d4c836699e273509", + "version": "1.5.4", + "port-version": 2 + }, { "git-tree": "4b61cbe1e314aa678d7cbf37a24b59e37694f4a6", "version": "1.5.4", diff --git a/versions/z-/zyre.json b/versions/z-/zyre.json index b9afab402f37d1..9f1bbeb1e70db0 100644 --- a/versions/z-/zyre.json +++ b/versions/z-/zyre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1d72fc5e7b5c99dcc352a92aa5850fe28a6ac44", + "version-date": "2019-07-07", + "port-version": 5 + }, { "git-tree": "7f6439c85ad5a70e10b42f4d4a6f34bc97a3b7fd", "version-string": "2019-07-07",